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

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

ARM: KVM: abstract HSR_ISV away 



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

arch/arm/include/asm/kvm_emulate.h

+5 −0
Original line number Diff line number Diff line
@@ -90,4 +90,9 @@ static inline unsigned long kvm_vcpu_get_hyp_pc(struct kvm_vcpu *vcpu) 
	return vcpu->arch.fault.hyp_pc;

}



static inline bool kvm_vcpu_dabt_isvalid(struct kvm_vcpu *vcpu)

{

	return kvm_vcpu_get_hsr(vcpu) & HSR_ISV;

}



#endif /* __ARM_KVM_EMULATE_H__ */

arch/arm/kvm/mmio.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run, 
	 * space do its magic.

	 */



	if (kvm_vcpu_get_hsr(vcpu) & HSR_ISV) {

	if (kvm_vcpu_dabt_isvalid(vcpu)) {

		ret = decode_hsr(vcpu, fault_ipa, &mmio);

		if (ret)

			return ret;