ARM: KVM: abstract S1TW abort detection away

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <cdall@cs.columbia.edu>

diff --git a/arch/arm/include/asm/kvm_arm.h b/arch/arm/include/asm/kvm_arm.h
index 990764e894893554becfce15b5e01549a1c86dd9..124623e5ef14ab2bde6b6ab954901fa4d4b8c3a7 100644 (file)
--- a/arch/arm/include/asm/kvm_arm.h
+++ b/arch/arm/include/asm/kvm_arm.h
@@ -211,6 +211,7 @@
 
 #define HSR_HVC_IMM_MASK       ((1UL << 16) - 1)
 
+#define HSR_DABT_S1PTW         (1U << 7)
 #define HSR_DABT_CM            (1U << 8)
 #define HSR_DABT_EA            (1U << 9)
 

diff --git a/arch/arm/include/asm/kvm_emulate.h b/arch/arm/include/asm/kvm_emulate.h
index 2d1c5854243bc24cf19888c5b39e9e3dde012e09..6b43653865fb138f3f682f70842bd63afe306434 100644 (file)
--- a/arch/arm/include/asm/kvm_emulate.h
+++ b/arch/arm/include/asm/kvm_emulate.h
@@ -115,4 +115,9 @@ static inline bool kvm_vcpu_dabt_isextabt(struct kvm_vcpu *vcpu)
        return kvm_vcpu_get_hsr(vcpu) & HSR_DABT_EA;
 }
 
+static inline bool kvm_vcpu_dabt_iss1tw(struct kvm_vcpu *vcpu)
+{
+       return kvm_vcpu_get_hsr(vcpu) & HSR_DABT_S1PTW;
+}
+
 #endif /* __ARM_KVM_EMULATE_H__ */

diff --git a/arch/arm/kvm/mmio.c b/arch/arm/kvm/mmio.c
index e4682a3af31345bb0366da9d9e3af4ba852c739a..6495c1ca7bfadd7a1b39358403f5b2de84a3a3d6 100644 (file)
--- a/arch/arm/kvm/mmio.c
+++ b/arch/arm/kvm/mmio.c
@@ -71,7 +71,7 @@ static int decode_hsr(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
                return 1;
        }
 
-       if ((kvm_vcpu_get_hsr(vcpu) >> 7) & 1) {
+       if (kvm_vcpu_dabt_iss1tw(vcpu)) {
                /* page table accesses IO mem: tell guest to fix its TTBR */
                kvm_inject_dabt(vcpu, kvm_vcpu_get_hfar(vcpu));
                return 1;