From: Bjorn Helgaas Date: Fri, 7 Mar 2014 23:06:05 +0000 (-0700) Subject: PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled X-Git-Tag: v3.13.11~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16d36cdf2bd2b8e821ea1286dd3e8b2d657e6b3c;p=thirdparty%2Fkernel%2Fstable.git PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled commit 866d54177b4e671cd52bed1fb487d140d7b691f5 upstream. Andreas reported that after 1f42db786b14 ("PCI: Enable INTx if BIOS left them disabled"), pciehp surprise removal stopped working. This happens because pci_reenable_device() on the hotplug bridge (used in the pciehp_configure_device() path) clears the Interrupt Disable bit, which apparently breaks the bridge's MSI hotplug event reporting. Previously we cleared the Interrupt Disable bit in do_pci_enable_device(), which is used by both pci_enable_device() and pci_reenable_device(). But we use pci_reenable_device() after the driver may have enabled MSI or MSI-X, and we *set* Interrupt Disable as part of enabling MSI/MSI-X. This patch clears Interrupt Disable only when MSI/MSI-X has not been enabled. Fixes: 1f42db786b14 PCI: Enable INTx if BIOS left them disabled Link: https://bugzilla.kernel.org/show_bug.cgi?id=71691 Reported-and-tested-by: Andreas Noever Signed-off-by: Bjorn Helgaas CC: Sarah Sharp Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 1a8a4fdafe6d1..6f01c74d4ced9 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1131,6 +1131,9 @@ static int do_pci_enable_device(struct pci_dev *dev, int bars) return err; pci_fixup_device(pci_fixup_enable, dev); + if (dev->msi_enabled || dev->msix_enabled) + return 0; + if (dev->msi_enabled || dev->msix_enabled) return 0;