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

ARM: KVM: abstract HSR_EC_IABT away

Browse source 
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
This commit is contained in:
Marc Zyngier 2012-10-15 10:33:38 +01:00 • committed by Christoffer Dall
parent 1cc287dd08
commit 52d1dba933
2 changed files with 8 additions and 5 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

@ -147,6 +147,11 @@ static inline u8 kvm_vcpu_trap_get_class(struct kvm_vcpu *vcpu)
return kvm_vcpu_get_hsr(vcpu) >> HSR_EC_SHIFT; return kvm_vcpu_get_hsr(vcpu) >> HSR_EC_SHIFT;
} }
static inline bool kvm_vcpu_trap_is_iabt(struct kvm_vcpu *vcpu)
{
return kvm_vcpu_trap_get_class(vcpu) == HSR_EC_IABT;
}
static inline u8 kvm_vcpu_trap_get_fault(struct kvm_vcpu *vcpu) static inline u8 kvm_vcpu_trap_get_fault(struct kvm_vcpu *vcpu)
{ {
return kvm_vcpu_get_hsr(vcpu) & HSR_FSC_TYPE; return kvm_vcpu_get_hsr(vcpu) & HSR_FSC_TYPE;

8
arch/arm/kvm/mmu.c
View file

@ -585,7 +585,6 @@ out_unlock:
*/ */
int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run) int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run)
{ {
unsigned long hsr_ec;
unsigned long fault_status; unsigned long fault_status;
phys_addr_t fault_ipa; phys_addr_t fault_ipa;
struct kvm_memory_slot *memslot; struct kvm_memory_slot *memslot;
@ -593,8 +592,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run)
gfn_t gfn; gfn_t gfn;
int ret, idx; int ret, idx;
hsr_ec = kvm_vcpu_trap_get_class(vcpu); is_iabt = kvm_vcpu_trap_is_iabt(vcpu);
is_iabt = (hsr_ec == HSR_EC_IABT);
fault_ipa = kvm_vcpu_get_fault_ipa(vcpu); fault_ipa = kvm_vcpu_get_fault_ipa(vcpu);
trace_kvm_guest_fault(*vcpu_pc(vcpu), kvm_vcpu_get_hsr(vcpu), trace_kvm_guest_fault(*vcpu_pc(vcpu), kvm_vcpu_get_hsr(vcpu),
@ -603,8 +601,8 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run)
/* Check the stage-2 fault is trans. fault or write fault */ /* Check the stage-2 fault is trans. fault or write fault */
fault_status = kvm_vcpu_trap_get_fault(vcpu); fault_status = kvm_vcpu_trap_get_fault(vcpu);
if (fault_status != FSC_FAULT && fault_status != FSC_PERM) { if (fault_status != FSC_FAULT && fault_status != FSC_PERM) {
kvm_err("Unsupported fault status: EC=%#lx DFCS=%#lx\n", kvm_err("Unsupported fault status: EC=%#x DFCS=%#lx\n",
hsr_ec, fault_status); kvm_vcpu_trap_get_class(vcpu), fault_status);
return -EFAULT; return -EFAULT;
} }