xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm64: Kill PSCI_GET_VERSION as a variant-2 workaround

Browse Source 
Now that we've standardised on SMCCC v1.1 to perform the branch
prediction invalidation, let's drop the previous band-aid.
If vendors haven't updated their firmware to do SMCCC 1.1, they
haven't updated PSCI either, so we don't loose anything.

Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
Marc Zyngier
2018-02-06 17:56:21 +00:00
committed by Catalin Marinas
parent b092201e00
commit 3a0a397ff5
3 changed files with 13 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm64/kvm/hyp/switch.c
View File

@@ -350,20 +350,6 @@ again:
if (exit_code == ARM_EXCEPTION_TRAP && !__populate_fault_info(vcpu))
goto again;
if (exit_code == ARM_EXCEPTION_TRAP &&
(kvm_vcpu_trap_get_class(vcpu) == ESR_ELx_EC_HVC64 ||
kvm_vcpu_trap_get_class(vcpu) == ESR_ELx_EC_HVC32)) {
u32 val = vcpu_get_reg(vcpu, 0);
if (val == PSCI_0_2_FN_PSCI_VERSION) {
val = kvm_psci_version(vcpu, kern_hyp_va(vcpu->kvm));
if (unlikely(val == KVM_ARM_PSCI_0_1))
val = PSCI_RET_NOT_SUPPORTED;
vcpu_set_reg(vcpu, 0, val);
goto again;
}
}
if (static_branch_unlikely(&vgic_v2_cpuif_trap) &&
exit_code == ARM_EXCEPTION_TRAP) {
bool valid;