Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b37670b0 authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

ARM: KVM: abstract S1TW abort detection away 



Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <cdall@cs.columbia.edu>
parent 78abfcde

arch/arm/include/asm/kvm_arm.h

+1 −0
Original line number Diff line number Diff line
@@ -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)

arch/arm/include/asm/kvm_emulate.h

+5 −0
Original line number Diff line number Diff line
@@ -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__ */

arch/arm/kvm/mmio.c

+1 −1
Original line number Diff line number Diff line
@@ -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;