From c3e5e10138b691ef672fdf4008eb82d6ec40ffcd Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 17 Apr 2014 15:57:48 +0100 Subject: [PATCH] kvm tools: ARM: allow potential relocation of IO port Whilst our IO port is fixed at CPU physical address 0x0, changing ARM_IOPORT_AREA should be all that's necessary to move it around in CPU physical space (it will still be at 0x0 in the bus address space). This patch ensures we subtract KVM_IOPORT_AREA from the faulting CPU physical address when calculating the port for kvm__emulate_io. Reported-by: Arnd Bergmann Signed-off-by: Will Deacon Signed-off-by: Pekka Enberg --- arm/kvm-cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm/kvm-cpu.c b/arm/kvm-cpu.c index b017994..9c9616f 100644 --- a/arm/kvm-cpu.c +++ b/arm/kvm-cpu.c @@ -105,7 +105,7 @@ bool kvm_cpu__emulate_mmio(struct kvm *kvm, u64 phys_addr, u8 *data, u32 len, return kvm__emulate_mmio(kvm, phys_addr, data, len, is_write); } else if (arm_addr_in_ioport_region(phys_addr)) { int direction = is_write ? KVM_EXIT_IO_OUT : KVM_EXIT_IO_IN; - u16 port = phys_addr & USHRT_MAX; + u16 port = (phys_addr - KVM_IOPORT_AREA) & USHRT_MAX; return kvm__emulate_io(kvm, port, data, direction, len, 1); } else if (arm_addr_in_pci_region(phys_addr)) { return kvm__emulate_mmio(kvm, phys_addr, data, len, is_write);