Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[~andy/linux] / drivers / pci / msi.c

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index c71e8e4c716895c659eb424bcd3c0fb25117bea0..d9cbd586ae4bc282815a6b7aad16ddb3ecb523df 100644 (file)
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -12,7 +12,6 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
-#include <linux/smp_lock.h>
 #include <linux/pci.h>
 #include <linux/proc_fs.h>
 #include <linux/msi.h>
@@ -207,7 +206,7 @@ void unmask_msi_irq(unsigned int irq)
        msix_flush_writes(irq);
 }
 
-static int msi_free_irq(struct pci_dev* dev, int irq);
+static int msi_free_irqs(struct pci_dev* dev);
 
 
 static struct msi_desc* alloc_msi_entry(void)
@@ -339,8 +338,7 @@ static int msi_capability_init(struct pci_dev *dev)
        /* Configure MSI capability structure */
        ret = arch_setup_msi_irqs(dev, 1, PCI_CAP_ID_MSI);
        if (ret) {
-               list_del(&entry->list);
-               kfree(entry);
+               msi_free_irqs(dev);
                return ret;
        }
 
@@ -415,10 +413,11 @@ static int msix_capability_init(struct pci_dev *dev,
                list_for_each_entry(entry, &dev->msi_list, list) {
                        if (entry->irq != 0) {
                                avail++;
-                               msi_free_irq(dev, entry->irq);
                        }
                }
 
+               msi_free_irqs(dev);
+
                /* If we had some success report the number of irqs
                 * we succeeded in setting up.
                 */
@@ -539,39 +538,35 @@ void pci_disable_msi(struct pci_dev* dev)
        }
 
        default_irq = entry->msi_attrib.default_irq;
-       msi_free_irq(dev, entry->irq);
+       msi_free_irqs(dev);
 
        /* Restore dev->irq to its default pin-assertion irq */
        dev->irq = default_irq;
 }
 EXPORT_SYMBOL(pci_disable_msi);
 
-static int msi_free_irq(struct pci_dev* dev, int irq)
+static int msi_free_irqs(struct pci_dev* dev)
 {
-       struct msi_desc *entry;
-       int entry_nr, type;
-       void __iomem *base;
-
-       BUG_ON(irq_has_action(irq));
+       struct msi_desc *entry, *tmp;
 
-       entry = get_irq_msi(irq);
-       if (!entry || entry->dev != dev) {
-               return -EINVAL;
+       list_for_each_entry(entry, &dev->msi_list, list) {
+               if (entry->irq)
+                       BUG_ON(irq_has_action(entry->irq));
        }
-       type = entry->msi_attrib.type;
-       entry_nr = entry->msi_attrib.entry_nr;
-       base = entry->mask_base;
-       list_del(&entry->list);
 
-       arch_teardown_msi_irq(irq);
-       kfree(entry);
+       arch_teardown_msi_irqs(dev);
 
-       if (type == PCI_CAP_ID_MSIX) {
-               writel(1, base + entry_nr * PCI_MSIX_ENTRY_SIZE +
-                       PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET);
+       list_for_each_entry_safe(entry, tmp, &dev->msi_list, list) {
+               if (entry->msi_attrib.type == PCI_CAP_ID_MSIX) {
+                       if (list_is_last(&entry->list, &dev->msi_list))
+                               iounmap(entry->mask_base);
 
-               if (list_empty(&dev->msi_list))
-                       iounmap(base);
+                       writel(1, entry->mask_base + entry->msi_attrib.entry_nr
+                                 * PCI_MSIX_ENTRY_SIZE
+                                 + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET);
+               }
+               list_del(&entry->list);
+               kfree(entry);
        }
 
        return 0;
@@ -636,10 +631,7 @@ EXPORT_SYMBOL(pci_enable_msix);
 
 static void msix_free_all_irqs(struct pci_dev *dev)
 {
-       struct msi_desc *entry;
-
-       list_for_each_entry(entry, &dev->msi_list, list)
-               msi_free_irq(dev, entry->irq);
+       msi_free_irqs(dev);
 }
 
 void pci_disable_msix(struct pci_dev* dev)
@@ -669,12 +661,8 @@ void msi_remove_pci_irq_vectors(struct pci_dev* dev)
        if (!pci_msi_enable || !dev)
                return;
 
-       if (dev->msi_enabled) {
-               struct msi_desc *entry;
-               BUG_ON(list_empty(&dev->msi_list));
-               entry = list_entry(dev->msi_list.next, struct msi_desc, list);
-               msi_free_irq(dev, entry->irq);
-       }
+       if (dev->msi_enabled)
+               msi_free_irqs(dev);
 
        if (dev->msix_enabled)
                msix_free_all_irqs(dev);
@@ -719,3 +707,19 @@ arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 
        return 0;
 }
+
+void __attribute__ ((weak)) arch_teardown_msi_irq(unsigned int irq)
+{
+       return;
+}
+
+void __attribute__ ((weak))
+arch_teardown_msi_irqs(struct pci_dev *dev)
+{
+       struct msi_desc *entry;
+
+       list_for_each_entry(entry, &dev->msi_list, list) {
+               if (entry->irq != 0)
+                       arch_teardown_msi_irq(entry->irq);
+       }
+}