1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index e6b6b9c67023..337e16ab4a92 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -981,5 +981,15 @@ EXPORT_SYMBOL(pci_msi_enabled);
 
 void pci_msi_init_pci_dev(struct pci_dev *dev)
 {
+        int pos;
         INIT_LIST_HEAD(&dev->msi_list);
+
+        /* Disable the msi hardware to avoid screaming interrupts
+         * during boot.  This is the power on reset default so
+         * usually this should be a noop.
+         */
+        pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
+        if (pos)
+                msi_set_enable(dev, pos, 0);
+        msix_set_enable(dev, 0);
 }