ARM: KVM: VGIC accept vcpu and dist base addresses from user space

User space defines the model to emulate to a guest and should therefore
decide which addresses are used for both the virtual CPU interface
directly mapped in the guest physical address space and for the emulated
distributor interface, which is mapped in software by the in-kernel VGIC
support.

Reviewed-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Christoffer Dall <c.dall@virtualopensystems.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

1 files changed, 15 insertions, 1 deletions

diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index 7305aef28d0e..c327fd9d8ec3 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -880,7 +880,21 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log)
 static int kvm_vm_ioctl_set_device_addr(struct kvm *kvm,
                                         struct kvm_arm_device_addr *dev_addr)
 {
-        return -ENODEV;
+        unsigned long dev_id, type;
+
+        dev_id = (dev_addr->id & KVM_ARM_DEVICE_ID_MASK) >>
+                KVM_ARM_DEVICE_ID_SHIFT;
+        type = (dev_addr->id & KVM_ARM_DEVICE_TYPE_MASK) >>
+                KVM_ARM_DEVICE_TYPE_SHIFT;
+
+        switch (dev_id) {
+        case KVM_ARM_DEVICE_VGIC_V2:
+                if (!vgic_present)
+                        return -ENXIO;
+                return kvm_vgic_set_addr(kvm, type, dev_addr->addr);
+        default:
+                return -ENODEV;
+        }
 }
 
 long kvm_arch_vm_ioctl(struct file *filp,