[PATCH] ARM: KVM: Handle loads from I/O addresses to PC

[Christoffer Dall]

If a VM does something like this:

ldr     pc, [r0]        @ r0 is an I/O address

Then simply let that value load into the PC on kvm_handle_mmio_return
overwriting the PC value set from kvm_skip_instr.

Signed-off-by: Christoffer Dall <cdall at cs.columbia.edu>
---
 arch/arm/kvm/mmio.c |    6 ------
 1 file changed, 6 deletions(-)

diff --git a/arch/arm/kvm/mmio.c b/arch/arm/kvm/mmio.c
index 72a12f2..b8e06b7 100644
--- a/arch/arm/kvm/mmio.c
+++ b/arch/arm/kvm/mmio.c
@@ -86,12 +86,6 @@ static int decode_hsr(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
 	sign_extend = kvm_vcpu_dabt_issext(vcpu);
 	rt = kvm_vcpu_dabt_get_rd(vcpu);
 
-	if (kvm_vcpu_reg_is_pc(vcpu, rt)) {
-		/* IO memory trying to read/write pc */
-		kvm_inject_pabt(vcpu, kvm_vcpu_get_hfar(vcpu));
-		return 1;
-	}
-
 	mmio->is_write = is_write;
 	mmio->phys_addr = fault_ipa;
 	mmio->len = len;
-- 
1.7.9.5