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

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

ARM: KVM: abstract HSR_SRT_{MASK,SHIFT} away 



Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 7c511b88

arch/arm/include/asm/kvm_emulate.h

+5 −0
Original line number Diff line number Diff line
@@ -105,4 +105,9 @@ static inline bool kvm_vcpu_dabt_issext(struct kvm_vcpu *vcpu) 
	return kvm_vcpu_get_hsr(vcpu) & HSR_SSE;

}



static inline int kvm_vcpu_dabt_get_rd(struct kvm_vcpu *vcpu)

{

	return (kvm_vcpu_get_hsr(vcpu) & HSR_SRT_MASK) >> HSR_SRT_SHIFT;

}



#endif /* __ARM_KVM_EMULATE_H__ */

arch/arm/kvm/mmio.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static int decode_hsr(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, 


	is_write = kvm_vcpu_dabt_iswrite(vcpu);

	sign_extend = kvm_vcpu_dabt_issext(vcpu);

	rt = (kvm_vcpu_get_hsr(vcpu) & HSR_SRT_MASK) >> HSR_SRT_SHIFT;

	rt = kvm_vcpu_dabt_get_rd(vcpu);



	if (kvm_vcpu_reg_is_pc(vcpu, rt)) {

		/* IO memory trying to read/write pc */