KVM: arm64: nvhe: Pass through PSCI v1.3 SYSTEM_OFF2 call

Pass through the SYSTEM_OFF2 function for hibernation, just like SYSTEM_OFF.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Miguel Luis <miguel.luis@oracle.com>
Link: https://lore.kernel.org/r/20241019172459.2241939-6-dwmw2@infradead.org
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>

diff --git a/arch/arm64/kvm/hyp/nvhe/psci-relay.c b/arch/arm64/kvm/hyp/nvhe/psci-relay.c
index dfe8fe0f7eaff098348091b67b87f58b756517cb..9c2ce1e0e99a55043f00d57cf4870385a93bdd25 100644 (file)
--- a/arch/arm64/kvm/hyp/nvhe/psci-relay.c
+++ b/arch/arm64/kvm/hyp/nvhe/psci-relay.c
@@ -265,6 +265,8 @@ static unsigned long psci_1_0_handler(u64 func_id, struct kvm_cpu_context *host_
        case PSCI_1_0_FN_PSCI_FEATURES:
        case PSCI_1_0_FN_SET_SUSPEND_MODE:
        case PSCI_1_1_FN64_SYSTEM_RESET2:
+       case PSCI_1_3_FN_SYSTEM_OFF2:
+       case PSCI_1_3_FN64_SYSTEM_OFF2:
                return psci_forward(host_ctxt);
        case PSCI_1_0_FN64_SYSTEM_SUSPEND:
                return psci_system_suspend(func_id, host_ctxt);