Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / pci / probe.c

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 04cfc60f786070617e06dfdd692129cbac841ee3..8177f3b0449152a7c01136a1925f4bfcf885cf8a 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -661,6 +661,35 @@ static void pci_set_bus_speed(struct pci_bus *bus)
        }
 }
 
+static struct irq_domain *pci_host_bridge_msi_domain(struct pci_bus *bus)
+{
+       struct irq_domain *d;
+
+       /*
+        * Any firmware interface that can resolve the msi_domain
+        * should be called from here.
+        */
+       d = pci_host_bridge_of_msi_domain(bus);
+
+       return d;
+}
+
+static void pci_set_bus_msi_domain(struct pci_bus *bus)
+{
+       struct irq_domain *d;
+
+       /*
+        * Either bus is the root, and we must obtain it from the
+        * firmware, or we inherit it from the bridge device.
+        */
+       if (pci_is_root_bus(bus))
+               d = pci_host_bridge_msi_domain(bus);
+       else
+               d = dev_get_msi_domain(&bus->self->dev);
+
+       dev_set_msi_domain(&bus->dev, d);
+}
+
 static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent,
                                           struct pci_dev *bridge, int busnr)
 {
@@ -714,6 +743,7 @@ static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent,
        bridge->subordinate = child;
 
 add_dev:
+       pci_set_bus_msi_domain(child);
        ret = device_register(&child->dev);
        WARN_ON(ret < 0);
 
@@ -1594,6 +1624,17 @@ static void pci_init_capabilities(struct pci_dev *dev)
        pci_enable_acs(dev);
 }
 
+static void pci_set_msi_domain(struct pci_dev *dev)
+{
+       /*
+        * If no domain has been set through the pcibios_add_device
+        * callback, inherit the default from the bus device.
+        */
+       if (!dev_get_msi_domain(&dev->dev))
+               dev_set_msi_domain(&dev->dev,
+                                  dev_get_msi_domain(&dev->bus->dev));
+}
+
 void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
 {
        int ret;
@@ -1635,6 +1676,9 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
        ret = pcibios_add_device(dev);
        WARN_ON(ret < 0);
 
+       /* Setup MSI irq domain */
+       pci_set_msi_domain(dev);
+
        /* Notifier could use PCI capabilities */
        dev->match_driver = false;
        ret = device_add(&dev->dev);
@@ -2008,6 +2052,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
        b->bridge = get_device(&bridge->dev);
        device_enable_async_suspend(b->bridge);
        pci_set_bus_of_node(b);
+       pci_set_bus_msi_domain(b);
 
        if (!parent)
                set_dev_node(b->bridge, pcibus_to_node(b));