Merge branch 'nmi' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[firefly-linux-kernel-4.4.55.git] / drivers / pci / of.c

diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index f0929934bb7ac0c8a5d0dca4dbb197fb4700b6d3..2e99a500cb83fe48ac065333fad036186935aa4f 100644 (file)
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -9,6 +9,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 
+#include <linux/irqdomain.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/of.h>
@@ -59,3 +60,32 @@ struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus)
                return of_node_get(bus->bridge->parent->of_node);
        return NULL;
 }
+
+struct irq_domain *pci_host_bridge_of_msi_domain(struct pci_bus *bus)
+{
+#ifdef CONFIG_IRQ_DOMAIN
+       struct device_node *np;
+       struct irq_domain *d;
+
+       if (!bus->dev.of_node)
+               return NULL;
+
+       /* 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)
+               np = bus->dev.of_node;
+
+       d = irq_find_matching_host(np, DOMAIN_BUS_PCI_MSI);
+       if (d)
+               return d;
+
+       return irq_find_host(np);
+#else
+       return NULL;
+#endif
+}