MSI: Consolidate BUG_ON()s.

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

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index ad33e0159514bd17dd796b52603d8ff0b83b602d..38e4c807f80f22d3f102fe47434f9f80da8b97c6 100644 (file)
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -68,6 +68,29 @@ static void msix_set_enable(struct pci_dev *dev, int enable)
        }
 }
 
+static void msix_flush_writes(unsigned int irq)
+{
+       struct msi_desc *entry;
+
+       entry = get_irq_msi(irq);
+       BUG_ON(!entry || !entry->dev);
+       switch (entry->msi_attrib.type) {
+       case PCI_CAP_ID_MSI:
+               /* nothing to do */
+               break;
+       case PCI_CAP_ID_MSIX:
+       {
+               int offset = entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +
+                       PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET;
+               readl(entry->mask_base + offset);
+               break;
+       }
+       default:
+               BUG();
+               break;
+       }
+}
+
 static void msi_set_mask_bit(unsigned int irq, int flag)
 {
        struct msi_desc *entry;
@@ -94,6 +117,7 @@ static void msi_set_mask_bit(unsigned int irq, int flag)
                int offset = entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +
                        PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET;
                writel(flag, entry->mask_base + offset);
+               readl(entry->mask_base + offset);
                break;
        }
        default:
@@ -186,11 +210,13 @@ void write_msi_msg(unsigned int irq, struct msi_msg *msg)
 void mask_msi_irq(unsigned int irq)
 {
        msi_set_mask_bit(irq, 1);
+       msix_flush_writes(irq);
 }
 
 void unmask_msi_irq(unsigned int irq)
 {
        msi_set_mask_bit(irq, 0);
+       msix_flush_writes(irq);
 }
 
 static int msi_free_irq(struct pci_dev* dev, int irq);
@@ -546,18 +572,13 @@ void pci_disable_msi(struct pci_dev* dev)
        if (!entry || !entry->dev || entry->msi_attrib.type != PCI_CAP_ID_MSI) {
                return;
        }
-       if (irq_has_action(dev->first_msi_irq)) {
-               printk(KERN_WARNING "PCI: %s: pci_disable_msi() called without "
-                      "free_irq() on MSI irq %d\n",
-                      pci_name(dev), dev->first_msi_irq);
-               BUG_ON(irq_has_action(dev->first_msi_irq));
-       } else {
-               default_irq = entry->msi_attrib.default_irq;
-               msi_free_irq(dev, dev->first_msi_irq);
 
-               /* Restore dev->irq to its default pin-assertion irq */
-               dev->irq = default_irq;
-       }
+       default_irq = entry->msi_attrib.default_irq;
+       msi_free_irq(dev, dev->first_msi_irq);
+
+       /* Restore dev->irq to its default pin-assertion irq */
+       dev->irq = default_irq;
+
        dev->first_msi_irq = 0;
 }
 
@@ -567,6 +588,8 @@ static int msi_free_irq(struct pci_dev* dev, int irq)
        int head, entry_nr, type;
        void __iomem *base;
 
+       BUG_ON(irq_has_action(irq));
+
        entry = get_irq_msi(irq);
        if (!entry || entry->dev != dev) {
                return -EINVAL;
@@ -651,10 +674,24 @@ int pci_enable_msix(struct pci_dev* dev, struct msix_entry *entries, int nvec)
        return status;
 }
 
-void pci_disable_msix(struct pci_dev* dev)
+static void msix_free_all_irqs(struct pci_dev *dev)
 {
-       int irq, head, tail = 0, warning = 0;
+       int irq, head, tail = 0;
+
+       irq = head = dev->first_msi_irq;
+       while (head != tail) {
+               tail = get_irq_msi(irq)->link.tail;
 
+               if (irq != head)
+                       msi_free_irq(dev, irq);
+               irq = tail;
+       }
+       msi_free_irq(dev, irq);
+       dev->first_msi_irq = 0;
+}
+
+void pci_disable_msix(struct pci_dev* dev)
+{
        if (!pci_msi_enable)
                return;
        if (!dev)
@@ -667,23 +704,7 @@ void pci_disable_msix(struct pci_dev* dev)
        pci_intx(dev, 1);               /* enable intx */
        dev->msix_enabled = 0;
 
-       irq = head = dev->first_msi_irq;
-       while (head != tail) {
-               tail = get_irq_msi(irq)->link.tail;
-               if (irq_has_action(irq))
-                       warning = 1;
-               else if (irq != head)   /* Release MSI-X irq */
-                       msi_free_irq(dev, irq);
-               irq = tail;
-       }
-       msi_free_irq(dev, irq);
-       if (warning) {
-               printk(KERN_WARNING "PCI: %s: pci_disable_msix() called without "
-                       "free_irq() on all MSI-X irqs\n",
-                       pci_name(dev));
-               BUG_ON(warning > 0);
-       }
-       dev->first_msi_irq = 0;
+       msix_free_all_irqs(dev);
 }
 
 /**
@@ -700,38 +721,11 @@ void msi_remove_pci_irq_vectors(struct pci_dev* dev)
        if (!pci_msi_enable || !dev)
                return;
 
-       if (dev->msi_enabled) {
-               if (irq_has_action(dev->first_msi_irq)) {
-                       printk(KERN_WARNING "PCI: %s: msi_remove_pci_irq_vectors() "
-                              "called without free_irq() on MSI irq %d\n",
-                              pci_name(dev), dev->first_msi_irq);
-                       BUG_ON(irq_has_action(dev->first_msi_irq));
-               } else /* Release MSI irq assigned to this device */
-                       msi_free_irq(dev, dev->first_msi_irq);
-       }
-       if (dev->msix_enabled) {
-               int irq, head, tail = 0, warning = 0;
-               void __iomem *base = NULL;
-
-               irq = head = dev->first_msi_irq;
-               while (head != tail) {
-                       tail = get_irq_msi(irq)->link.tail;
-                       base = get_irq_msi(irq)->mask_base;
-                       if (irq_has_action(irq))
-                               warning = 1;
-                       else if (irq != head) /* Release MSI-X irq */
-                               msi_free_irq(dev, irq);
-                       irq = tail;
-               }
-               msi_free_irq(dev, irq);
-               if (warning) {
-                       iounmap(base);
-                       printk(KERN_WARNING "PCI: %s: msi_remove_pci_irq_vectors() "
-                              "called without free_irq() on all MSI-X irqs\n",
-                              pci_name(dev));
-                       BUG_ON(warning > 0);
-               }
-       }
+       if (dev->msi_enabled)
+               msi_free_irq(dev, dev->first_msi_irq);
+
+       if (dev->msix_enabled)
+               msix_free_all_irqs(dev);
 }
 
 void pci_no_msi(void)