From: David Woodhouse Date: Sat, 19 Oct 2024 17:15:46 +0000 (+0100) Subject: KVM: arm64: nvhe: Pass through PSCI v1.3 SYSTEM_OFF2 call X-Git-Tag: v6.13-rc1~97^2~5^2~6^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94f985c39a1e3c7df8c1db79749074f0e5ac1e10;p=thirdparty%2Flinux.git 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 Reviewed-by: Miguel Luis Link: https://lore.kernel.org/r/20241019172459.2241939-6-dwmw2@infradead.org Signed-off-by: Oliver Upton --- diff --git a/arch/arm64/kvm/hyp/nvhe/psci-relay.c b/arch/arm64/kvm/hyp/nvhe/psci-relay.c index dfe8fe0f7eaff..9c2ce1e0e99a5 100644 --- 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);