shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "FROMGIT: KVM: arm64: Really propagate PSCI SYSTEM_RESET2 arguments to userspace"

Browse Source 
This reverts commit b12a57fccd.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I68964d91a8bfc2ef84b142705098cbbcf985143c
This commit is contained in:
Will Deacon
2022-07-07 15:49:06 +01:00
parent 543f342a14
commit 567e5b159c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm64/kvm/psci.c
View File

@@ -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;