irqchip/GICv2m: Get rid of struct msi_controller

GICv2m only uses the msi_controller structure as a way to match
the host bridge with its MSI HW, and thus the msi_domain.

But now that we can directly associate an msi_domain with a device,
there is no use keeping this msi_controller around.

Just remove all traces of msi_controller from the driver. Also
tag the inner (non-PCI) domain with DOMAIN_BUS_NEXUS.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: <linux-arm-kernel@lists.infradead.org>
Cc: Yijing Wang <wangyijing@huawei.com>
Cc: Ma Jun <majun258@huawei.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Duc Dang <dhdang@apm.com>
Cc: Hanjun Guo <hanjun.guo@linaro.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1438091186-10244-17-git-send-email-marc.zyngier@arm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c
index fdf706555d72f3a84b76513262bb5ab6dc688526..ec9c37674a0b6bbbf258bdf8f3f5c3c93b6f8354 100644 (file)
--- a/drivers/irqchip/irq-gic-v2m.c
+++ b/drivers/irqchip/irq-gic-v2m.c
@@ -45,7 +45,6 @@
 
 struct v2m_data {
        spinlock_t msi_cnt_lock;
-       struct msi_controller mchip;
        struct resource res;    /* GICv2m resource */
        void __iomem *base;     /* GICv2m virt address */
        u32 spi_start;          /* The SPI number that MSIs start */
@@ -218,6 +217,7 @@ static int __init gicv2m_init_one(struct device_node *node,
 {
        int ret;
        struct v2m_data *v2m;
+       struct irq_domain *inner_domain;
 
        v2m = kzalloc(sizeof(struct v2m_data), GFP_KERNEL);
        if (!v2m) {
@@ -261,19 +261,18 @@ static int __init gicv2m_init_one(struct device_node *node,
                goto err_iounmap;
        }
 
-       v2m->domain = irq_domain_add_tree(NULL, &gicv2m_domain_ops, v2m);
-       if (!v2m->domain) {
+       inner_domain = irq_domain_add_tree(node, &gicv2m_domain_ops, v2m);
+       if (!inner_domain) {
                pr_err("Failed to create GICv2m domain\n");
                ret = -ENOMEM;
                goto err_free_bm;
        }
 
-       v2m->domain->parent = parent;
-       v2m->mchip.of_node = node;
-       v2m->mchip.domain = pci_msi_create_irq_domain(node,
-                                                     &gicv2m_msi_domain_info,
-                                                     v2m->domain);
-       if (!v2m->mchip.domain) {
+       inner_domain->bus_token = DOMAIN_BUS_NEXUS;
+       inner_domain->parent = parent;
+       v2m->domain = pci_msi_create_irq_domain(node, &gicv2m_msi_domain_info,
+                                               inner_domain);
+       if (!v2m->domain) {
                pr_err("Failed to create MSI domain\n");
                ret = -ENOMEM;
                goto err_free_domains;
@@ -281,12 +280,6 @@ static int __init gicv2m_init_one(struct device_node *node,
 
        spin_lock_init(&v2m->msi_cnt_lock);
 
-       ret = of_pci_msi_chip_add(&v2m->mchip);
-       if (ret) {
-               pr_err("Failed to add msi_chip.\n");
-               goto err_free_domains;
-       }
-
        pr_info("Node %s: range[%#lx:%#lx], SPI[%d:%d]\n", node->name,
                (unsigned long)v2m->res.start, (unsigned long)v2m->res.end,
                v2m->spi_start, (v2m->spi_start + v2m->nr_spis));
@@ -294,10 +287,10 @@ static int __init gicv2m_init_one(struct device_node *node,
        return 0;
 
 err_free_domains:
-       if (v2m->mchip.domain)
-               irq_domain_remove(v2m->mchip.domain);
        if (v2m->domain)
                irq_domain_remove(v2m->domain);
+       if (inner_domain)
+               irq_domain_remove(inner_domain);
 err_free_bm:
        kfree(v2m->bm);
 err_iounmap: