[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-471c931cb248ab7af0cd62503d811239b47f217b@git.kernel.org>
Date: Wed, 29 Jul 2015 15:26:31 -0700
From: tip-bot for Marc Zyngier <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: bhelgaas@...gle.com, linux-arm-kernel@...ts.infradead.org,
jiang.liu@...ux.intel.com, dhdang@....com, marc.zyngier@....com,
tglx@...utronix.de, wangyijing@...wei.com, majun258@...wei.com,
lorenzo.pieralisi@....com, hpa@...or.com, mingo@...nel.org,
linux-kernel@...r.kernel.org, hanjun.guo@...aro.org,
jason@...edaemon.net
Subject: [tip:irq/core] PCI/MSI:
Allow msi_domain lookup using the host bridge node
Commit-ID: 471c931cb248ab7af0cd62503d811239b47f217b
Gitweb: http://git.kernel.org/tip/471c931cb248ab7af0cd62503d811239b47f217b
Author: Marc Zyngier <marc.zyngier@....com>
AuthorDate: Tue, 28 Jul 2015 14:46:13 +0100
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Thu, 30 Jul 2015 00:14:37 +0200
PCI/MSI: Allow msi_domain lookup using the host bridge node
A number of platforms do not need to use the msi-parent property,
as the host bridge itself provides the MSI controller.
Allow this configuration by performing an irq domain lookup based
on the host bridge node if it doesn't have a valid msi-parent property.
Acked-by: Bjorn Helgaas <bhelgaas@...gle.com>
Signed-off-by: Marc Zyngier <marc.zyngier@....com>
Cc: <linux-arm-kernel@...ts.infradead.org>
Cc: Yijing Wang <wangyijing@...wei.com>
Cc: Ma Jun <majun258@...wei.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@....com>
Cc: Duc Dang <dhdang@....com>
Cc: Hanjun Guo <hanjun.guo@...aro.org>
Cc: Jiang Liu <jiang.liu@...ux.intel.com>
Cc: Jason Cooper <jason@...edaemon.net>
Link: http://lkml.kernel.org/r/1438091186-10244-7-git-send-email-marc.zyngier@arm.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
drivers/pci/of.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index 85844d8..2e99a50 100644
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -72,8 +72,13 @@ struct irq_domain *pci_host_bridge_of_msi_domain(struct pci_bus *bus)
/* Start looking for a phandle to an MSI controller. */
np = of_parse_phandle(bus->dev.of_node, "msi-parent", 0);
+
+ /*
+ * If we don't have an msi-parent property, look for a domain
+ * directly attached to the host bridge.
+ */
if (!np)
- return NULL;
+ np = bus->dev.of_node;
d = irq_find_matching_host(np, DOMAIN_BUS_PCI_MSI);
if (d)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists