evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: KVM: abstract HSR_ISV 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:06:23 +01:00 • committed by Christoffer Dall
parent 7393b59917
commit 4a1df28ac0
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -90,4 +90,9 @@ static inline unsigned long kvm_vcpu_get_hyp_pc(struct kvm_vcpu *vcpu)
return vcpu->arch.fault.hyp_pc; 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__ */ #endif /* __ARM_KVM_EMULATE_H__ */

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

@ -130,7 +130,7 @@ int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run,
* space do its magic. * 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); ret = decode_hsr(vcpu, fault_ipa, &mmio);
if (ret) if (ret)
return ret; return ret;