diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index e6b6b9c67023ecc4a24a5d0baaa60c4ef4e4566e..337e16ab4a92ba3cde34b53b220b61d9191b4658 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);
 }