x86/PCI: Do not use interrupt links for devices using MSI-X

pcibios_enable_device() and pcibios_disable_device() don't handle
IRQs for devices that have MSI enabled and it should treat the
devices with MSI-X enabled in the same way.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

2 files changed, 11 insertions, 2 deletions

diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 9ab8509f7b15..82d22fc601ae 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -551,14 +551,14 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
         if ((err = pci_enable_resources(dev, mask)) < 0)
                 return err;
 
-        if (!dev->msi_enabled)
+        if (!pci_dev_msi_enabled(dev))
                 return pcibios_enable_irq(dev);
         return 0;
 }
 
 void pcibios_disable_device (struct pci_dev *dev)
 {
-        if (!dev->msi_enabled && pcibios_disable_irq)
+        if (!pci_dev_msi_enabled(dev) && pcibios_disable_irq)
                 pcibios_disable_irq(dev);
 }
 
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 0f6d2bb1df9c..80f8b8b65fde 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -336,6 +336,15 @@ struct pci_bus {
 #define pci_bus_b(n)    list_entry(n, struct pci_bus, node)
 #define to_pci_bus(n)   container_of(n, struct pci_bus, dev)
 
+#ifdef CONFIG_PCI_MSI
+static inline bool pci_dev_msi_enabled(struct pci_dev *pci_dev)
+{
+        return pci_dev->msi_enabled || pci_dev->msix_enabled;
+}
+#else
+static inline bool pci_dev_msi_enabled(struct pci_dev *pci_dev) { return false; }
+#endif
+
 /*
  * Error values that may be returned by PCI functions.
  */