From 567e5b159c05ee7bcc958fd3892f87b09b4d8cb9 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:49:06 +0100 Subject: [PATCH] Revert "FROMGIT: KVM: arm64: Really propagate PSCI SYSTEM_RESET2 arguments to userspace" This reverts commit b12a57fccd1d3029f4ec444d7a40eaa3a1ece503. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I68964d91a8bfc2ef84b142705098cbbcf985143c --- arch/arm64/kvm/psci.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kvm/psci.c b/arch/arm64/kvm/psci.c index 371ebbc6b529..cc675b651d63 100644 --- a/arch/arm64/kvm/psci.c +++ b/arch/arm64/kvm/psci.c @@ -339,14 +339,14 @@ static int kvm_psci_1_x_call(struct kvm_vcpu *vcpu, u32 minor) if (minor >= 1) { arg = smccc_get_arg1(vcpu); - if (arg <= PSCI_1_1_RESET_TYPE_SYSTEM_WARM_RESET || - arg >= PSCI_1_1_RESET_TYPE_VENDOR_START) { + if (arg > PSCI_1_1_RESET_TYPE_SYSTEM_WARM_RESET && + arg < PSCI_1_1_RESET_TYPE_VENDOR_START) { + val = PSCI_RET_INVALID_PARAMS; + } else { kvm_psci_system_reset2(vcpu); - vcpu_set_reg(vcpu, 0, PSCI_RET_INTERNAL_FAILURE); - return 0; + val = PSCI_RET_INTERNAL_FAILURE; + ret = 0; } - - val = PSCI_RET_INVALID_PARAMS; break; }; fallthrough;