diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2015-07-28 14:46:13 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-07-30 00:14:37 +0200 |
| commit | 471c931cb248ab7af0cd62503d811239b47f217b (patch) | |
| tree | 02a784c22c030dd382b609df45d9dd0a6192e618 /drivers | |
| parent | b165e2b60b39888a7ff8efbc1de40137471dda41 (diff) | |
| download | linux-stable-471c931cb248ab7af0cd62503d811239b47f217b.tar.gz linux-stable-471c931cb248ab7af0cd62503d811239b47f217b.tar.bz2 linux-stable-471c931cb248ab7af0cd62503d811239b47f217b.zip | |
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@google.com>
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: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1438091186-10244-7-git-send-email-marc.zyngier@arm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/of.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/pci/of.c b/drivers/pci/of.c index 85844d8c3efd..2e99a500cb83 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) |