1 files changed, 38 insertions, 1 deletions

diff --git a/virt/kvm/arm/vgic-v3-emul.c b/virt/kvm/arm/vgic-v3-emul.c
index 2f03a36a9312..eb1a797cb9c1 100644
--- a/virt/kvm/arm/vgic-v3-emul.c
+++ b/virt/kvm/arm/vgic-v3-emul.c
@@ -758,6 +758,9 @@ static int vgic_v3_map_resources(struct kvm *kvm,
 {
         int ret = 0;
         struct vgic_dist *dist = &kvm->arch.vgic;
+        gpa_t rdbase = dist->vgic_redist_base;
+        struct vgic_io_device *iodevs = NULL;
+        int i;
 
         if (!irqchip_in_kernel(kvm))
                 return 0;
@@ -783,7 +786,41 @@ static int vgic_v3_map_resources(struct kvm *kvm,
                 goto out;
         }
 
-        kvm->arch.vgic.ready = true;
+        ret = vgic_register_kvm_io_dev(kvm, dist->vgic_dist_base,
+                                       GIC_V3_DIST_SIZE, vgic_v3_dist_ranges,
+                                       -1, &dist->dist_iodev);
+        if (ret)
+                goto out;
+
+        iodevs = kcalloc(dist->nr_cpus, sizeof(iodevs[0]), GFP_KERNEL);
+        if (!iodevs) {
+                ret = -ENOMEM;
+                goto out_unregister;
+        }
+
+        for (i = 0; i < dist->nr_cpus; i++) {
+                ret = vgic_register_kvm_io_dev(kvm, rdbase,
+                                               SZ_128K, vgic_redist_ranges,
+                                               i, &iodevs[i]);
+                if (ret)
+                        goto out_unregister;
+                rdbase += GIC_V3_REDIST_SIZE;
+        }
+
+        dist->redist_iodevs = iodevs;
+        dist->ready = true;
+        goto out;
+
+out_unregister:
+        kvm_io_bus_unregister_dev(kvm, KVM_MMIO_BUS, &dist->dist_iodev.dev);
+        if (iodevs) {
+                for (i = 0; i < dist->nr_cpus; i++) {
+                        if (iodevs[i].dev.ops)
+                                kvm_io_bus_unregister_dev(kvm, KVM_MMIO_BUS,
+                                                          &iodevs[i].dev);
+                }
+        }
+
 out:
         if (ret)
                 kvm_vgic_destroy(kvm);