Merge remote-tracking branch 'torvalds/master' into perf/urgent

[linux-2.6-microblaze.git] / drivers / pci / msi.c

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 3162f88..217dc9f 100644 (file)
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -64,39 +64,18 @@ static void pci_msi_teardown_msi_irqs(struct pci_dev *dev)
 /* Arch hooks */
 int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
 {
-       struct msi_controller *chip = dev->bus->msi;
-       int err;
-
-       if (!chip || !chip->setup_irq)
-               return -EINVAL;
-
-       err = chip->setup_irq(chip, dev, desc);
-       if (err < 0)
-               return err;
-
-       irq_set_chip_data(desc->irq, chip);
-
-       return 0;
+       return -EINVAL;
 }
 
 void __weak arch_teardown_msi_irq(unsigned int irq)
 {
-       struct msi_controller *chip = irq_get_chip_data(irq);
-
-       if (!chip || !chip->teardown_irq)
-               return;
-
-       chip->teardown_irq(chip, irq);
 }
 
 int __weak arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 {
-       struct msi_controller *chip = dev->bus->msi;
        struct msi_desc *entry;
        int ret;
 
-       if (chip && chip->setup_irqs)
-               return chip->setup_irqs(chip, dev, nvec, type);
        /*
         * If an architecture wants to support multiple MSI, it needs to
         * override arch_setup_msi_irqs()
@@ -115,11 +94,7 @@ int __weak arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
        return 0;
 }
 
-/*
- * We have a default implementation available as a separate non-weak
- * function, as it is used by the Xen x86 PCI code
- */
-void default_teardown_msi_irqs(struct pci_dev *dev)
+void __weak arch_teardown_msi_irqs(struct pci_dev *dev)
 {
        int i;
        struct msi_desc *entry;
@@ -129,11 +104,6 @@ void default_teardown_msi_irqs(struct pci_dev *dev)
                        for (i = 0; i < entry->nvec_used; i++)
                                arch_teardown_msi_irq(entry->irq + i);
 }
-
-void __weak arch_teardown_msi_irqs(struct pci_dev *dev)
-{
-       return default_teardown_msi_irqs(dev);
-}
 #endif /* CONFIG_PCI_MSI_ARCH_FALLBACKS */
 
 static void default_restore_msi_irq(struct pci_dev *dev, int irq)
@@ -901,8 +871,15 @@ static int pci_msi_supported(struct pci_dev *dev, int nvec)
         * Any bridge which does NOT route MSI transactions from its
         * secondary bus to its primary bus must set NO_MSI flag on
         * the secondary pci_bus.
-        * We expect only arch-specific PCI host bus controller driver
-        * or quirks for specific PCI bridges to be setting NO_MSI.
+        *
+        * The NO_MSI flag can either be set directly by:
+        * - arch-specific PCI host bus controller drivers (deprecated)
+        * - quirks for specific PCI bridges
+        *
+        * or indirectly by platform-specific PCI host bridge drivers by
+        * advertising the 'msi_domain' property, which results in
+        * the NO_MSI flag when no MSI domain is found for this bridge
+        * at probe time.
         */
        for (bus = dev->bus; bus; bus = bus->parent)
                if (bus->bus_flags & PCI_BUS_FLAGS_NO_MSI)