leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: KVM: abstract S1TW abort detection away

Browse Source 
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <cdall@cs.columbia.edu>
This commit is contained in:
Marc Zyngier
2012-09-18 11:37:28 +01:00
committed by Christoffer Dall
parent 78abfcde49
commit b37670b0f3
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/include/asm/kvm_arm.h
View File

@@ -211,6 +211,7 @@
#define HSR_HVC_IMM_MASK ((1UL << 16) - 1) #define HSR_HVC_IMM_MASK ((1UL << 16) - 1)
#define HSR_DABT_S1PTW (1U << 7)
#define HSR_DABT_CM (1U << 8) #define HSR_DABT_CM (1U << 8)
#define HSR_DABT_EA (1U << 9) #define HSR_DABT_EA (1U << 9)

5
arch/arm/include/asm/kvm_emulate.h
View File

@@ -115,4 +115,9 @@ static inline bool kvm_vcpu_dabt_isextabt(struct kvm_vcpu *vcpu)
return kvm_vcpu_get_hsr(vcpu) & HSR_DABT_EA; 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__ */ #endif /* __ARM_KVM_EMULATE_H__ */

2
arch/arm/kvm/mmio.c
View File

@@ -71,7 +71,7 @@ static int decode_hsr(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
return 1; 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 */ /* page table accesses IO mem: tell guest to fix its TTBR */
kvm_inject_dabt(vcpu, kvm_vcpu_get_hfar(vcpu)); kvm_inject_dabt(vcpu, kvm_vcpu_get_hfar(vcpu));
return 1; return 1;