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

Revert "FROMLIST: KVM: arm64: Expose PSCI SYSTEM_RESET2 call to the guest"

Browse Source 
This reverts commit 25aa354adb.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I2fe4cc1a129872e0cd5d65ae974a358b23895526
This commit is contained in:
Will Deacon
2022-07-07 15:49:14 +01:00
parent fb05e4fb48
commit 4c29fddedd
2 changed files with 4 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -280,7 +280,7 @@ out:
static int kvm_psci_1_x_call(struct kvm_vcpu *vcpu, u32 minor)
{
u32 psci_fn = smccc_get_function(vcpu);
u32 arg;
u32 feature;
unsigned long val;
int ret = 1;
@@ -292,12 +292,12 @@ static int kvm_psci_1_x_call(struct kvm_vcpu *vcpu, u32 minor)
val = minor == 0 ? KVM_ARM_PSCI_1_0 : KVM_ARM_PSCI_1_1;
break;
case PSCI_1_0_FN_PSCI_FEATURES:
arg = smccc_get_arg1(vcpu);
val = kvm_psci_check_allowed_function(vcpu, arg);
feature = smccc_get_arg1(vcpu);
val = kvm_psci_check_allowed_function(vcpu, feature);
if (val)
break;
switch(arg) {
switch(feature) {
case PSCI_0_2_FN_PSCI_VERSION:
case PSCI_0_2_FN_CPU_SUSPEND:
case PSCI_0_2_FN64_CPU_SUSPEND:
@@ -313,36 +313,11 @@ static int kvm_psci_1_x_call(struct kvm_vcpu *vcpu, u32 minor)
case ARM_SMCCC_VERSION_FUNC_ID:
val = 0;
break;
case PSCI_1_1_FN_SYSTEM_RESET2:
case PSCI_1_1_FN64_SYSTEM_RESET2:
if (minor >= 1) {
val = 0;
break;
}
fallthrough;
default:
val = PSCI_RET_NOT_SUPPORTED;
break;
}
break;
case PSCI_1_1_FN_SYSTEM_RESET2:
kvm_psci_narrow_to_32bit(vcpu);
fallthrough;
case PSCI_1_1_FN64_SYSTEM_RESET2:
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) {
val = PSCI_RET_INVALID_PARAMS;
} else {
kvm_psci_system_reset(vcpu);
val = PSCI_RET_INTERNAL_FAILURE;
ret = 0;
}
break;
};
fallthrough;
default:
return kvm_psci_0_2_call(vcpu);
}

4
include/uapi/linux/psci.h
View File

@@ -82,10 +82,6 @@
#define PSCI_0_2_TOS_UP_NO_MIGRATE 1
#define PSCI_0_2_TOS_MP 2
/* PSCI v1.1 reset type encoding for SYSTEM_RESET2 */
#define PSCI_1_1_RESET_TYPE_SYSTEM_WARM_RESET 0
#define PSCI_1_1_RESET_TYPE_VENDOR_START 0x80000000U
/* PSCI version decoding (independent of PSCI version) */
#define PSCI_VERSION_MAJOR_SHIFT 16
#define PSCI_VERSION_MINOR_MASK \