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

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

ARM: KVM: abstract fault decoding away 



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

arch/arm/include/asm/kvm_emulate.h

+5 −0
Original line number Diff line number Diff line
@@ -147,4 +147,9 @@ static inline u8 kvm_vcpu_trap_get_class(struct kvm_vcpu *vcpu) 
	return kvm_vcpu_get_hsr(vcpu) >> HSR_EC_SHIFT;

}



static inline u8 kvm_vcpu_trap_get_fault(struct kvm_vcpu *vcpu)

{

	return kvm_vcpu_get_hsr(vcpu) & HSR_FSC_TYPE;

}



#endif /* __ARM_KVM_EMULATE_H__ */

arch/arm/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run) 
			      kvm_vcpu_get_hfar(vcpu), fault_ipa);



	/* Check the stage-2 fault is trans. fault or write fault */

	fault_status = (kvm_vcpu_get_hsr(vcpu) & HSR_FSC_TYPE);

	fault_status = kvm_vcpu_trap_get_fault(vcpu);

	if (fault_status != FSC_FAULT && fault_status != FSC_PERM) {

		kvm_err("Unsupported fault status: EC=%#lx DFCS=%#lx\n",

			hsr_ec, fault_status);