aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2015-07-28 14:46:19 +0100
committerAlex Shi <alex.shi@linaro.org>2015-10-15 16:14:53 +0800
commit0b90b0d971fd5ffd77d8975af3f38eebacafff33 (patch)
tree1db5868ee4173cd215562a9d536eef539bf398f6
parentcacce87c5687ba30ae743fe5096fd888e2996a4c (diff)
irqchip/gicv3-its: Register irq domain with NEXUS token
Now that we can distinguish between multiple domains carrying the same device_node, tag the raw ITS domain with DOMAIN_BUS_NEXUS. This will allow MSI providers built on top of the raw ITS domain to identify it. 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-13-git-send-email-marc.zyngier@arm.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de> (cherry picked from commit e55dcd4d8b8b82e4ecef2937c6d1dde7ba82916b) Signed-off-by: Alex Shi <alex.shi@linaro.org>
-rw-r--r--drivers/irqchip/irq-gic-v3-its.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index 261e4c8fc368..b8fac6b03003 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -1445,13 +1445,14 @@ static int its_probe(struct device_node *node, struct irq_domain *parent)
writel_relaxed(GITS_CTLR_ENABLE, its->base + GITS_CTLR);
if (of_property_read_bool(its->msi_chip.of_node, "msi-controller")) {
- its->domain = irq_domain_add_tree(NULL, &its_domain_ops, its);
+ its->domain = irq_domain_add_tree(node, &its_domain_ops, its);
if (!its->domain) {
err = -ENOMEM;
goto out_free_tables;
}
its->domain->parent = parent;
+ its->domain->bus_token = DOMAIN_BUS_NEXUS;
its->msi_chip.domain = its_pci_msi_alloc_domain(node,
its->domain);