arm64: Kill PSCI_GET_VERSION as a variant-2 workaround

[mirror_ubuntu-artful-kernel.git] / arch / arm64 / kvm / hyp / switch.c

diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c
index 6568656147c0f69fbaac77d214edd6afa6393dad..79364d3455c0461ee7c6f459ebb038ef79ab04e6 100644 (file)
--- a/arch/arm64/kvm/hyp/switch.c
+++ b/arch/arm64/kvm/hyp/switch.c
@@ -325,20 +325,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;