summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2014-12-10 17:30:59 +0000
committerJon Medhurst <tixy@linaro.org>2015-06-15 09:28:06 +0100
commit1a5a81fe957b969a25e263b16f18ef7a100af566 (patch)
treeb2e33bb579905dc8ca603d546286d958ed5f6cc5
parenta59cf343c0dda4965c089a51730c43ef7bb34fb3 (diff)
PCI/MSI: of: Allow msi_domain lookup using the PHB 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 PHB node if it doesn't have a valid msi-parent property. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rw-r--r--drivers/pci/of.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index d8d12742e11..75bfb854337 100644
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -68,9 +68,14 @@ void pci_set_phb_of_msi_domain(struct pci_bus *bus)
if (!bus->dev.of_node)
return;
+ /* 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;
+ np = bus->dev.of_node;
dev_set_msi_domain(&bus->dev, irq_find_host(np));
#endif
}