arm/arm64: KVM: Turn kvm_psci_version into a static inline

[android-x86/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 67f0ee2..6568656 100644 (file)
--- a/arch/arm64/kvm/hyp/switch.c
+++ b/arch/arm64/kvm/hyp/switch.c
@@ -19,6 +19,8 @@
 #include <linux/jump_label.h>
 #include <uapi/linux/psci.h>
 
+#include <kvm/arm_psci.h>
+
 #include <asm/kvm_asm.h>
 #include <asm/kvm_emulate.h>
 #include <asm/kvm_hyp.h>
@@ -325,14 +327,16 @@ 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) &&
-           vcpu_get_reg(vcpu, 0) == PSCI_0_2_FN_PSCI_VERSION) {
-               u64 val = PSCI_RET_NOT_SUPPORTED;
-               if (test_bit(KVM_ARM_VCPU_PSCI_0_2, vcpu->arch.features))
-                       val = 2;
-
-               vcpu_set_reg(vcpu, 0, val);
-               goto again;
+            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) &&