Merge branch 'kvm-arm64/misc-5.9' into kvmarm-master/next-WIP

[platform/kernel/linux-rpi.git] / arch / arm64 / kvm / hyp / include / hyp / switch.h

diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h
index 784a581..0511af1 100644 (file)
--- a/arch/arm64/kvm/hyp/include/hyp/switch.h
+++ b/arch/arm64/kvm/hyp/include/hyp/switch.h
@@ -199,7 +199,7 @@ static inline bool __populate_fault_info(struct kvm_vcpu *vcpu)
 static inline bool __hyp_handle_fpsimd(struct kvm_vcpu *vcpu)
 {
        bool vhe, sve_guest, sve_host;
-       u8 hsr_ec;
+       u8 esr_ec;
 
        if (!system_supports_fpsimd())
                return false;
@@ -219,14 +219,14 @@ static inline bool __hyp_handle_fpsimd(struct kvm_vcpu *vcpu)
                vhe = has_vhe();
        }
 
-       hsr_ec = kvm_vcpu_trap_get_class(vcpu);
-       if (hsr_ec != ESR_ELx_EC_FP_ASIMD &&
-           hsr_ec != ESR_ELx_EC_SVE)
+       esr_ec = kvm_vcpu_trap_get_class(vcpu);
+       if (esr_ec != ESR_ELx_EC_FP_ASIMD &&
+           esr_ec != ESR_ELx_EC_SVE)
                return false;
 
        /* Don't handle SVE traps for non-SVE vcpus here: */
        if (!sve_guest)
-               if (hsr_ec != ESR_ELx_EC_FP_ASIMD)
+               if (esr_ec != ESR_ELx_EC_FP_ASIMD)
                        return false;
 
        /* Valid trap.  Switch the context: */
@@ -284,7 +284,7 @@ static inline bool __hyp_handle_fpsimd(struct kvm_vcpu *vcpu)
 
 static inline bool handle_tx2_tvm(struct kvm_vcpu *vcpu)
 {
-       u32 sysreg = esr_sys64_to_sysreg(kvm_vcpu_get_hsr(vcpu));
+       u32 sysreg = esr_sys64_to_sysreg(kvm_vcpu_get_esr(vcpu));
        int rt = kvm_vcpu_sys_get_rt(vcpu);
        u64 val = vcpu_get_reg(vcpu, rt);
 
@@ -379,7 +379,7 @@ static inline bool __hyp_handle_ptrauth(struct kvm_vcpu *vcpu)
        u64 val;
 
        if (!vcpu_has_ptrauth(vcpu) ||
-           !esr_is_ptrauth_trap(kvm_vcpu_get_hsr(vcpu)))
+           !esr_is_ptrauth_trap(kvm_vcpu_get_esr(vcpu)))
                return false;
 
        ctxt = &__hyp_this_cpu_ptr(kvm_host_data)->host_ctxt;