[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20160413055705.6877.38953.stgit@bhelgaas-glaptop2.roam.corp.google.com>
Date: Wed, 13 Apr 2016 00:57:05 -0500
From: Bjorn Helgaas <bhelgaas@...gle.com>
To: stable@...r.kernel.org
Cc: ОлегМороз
<oleg.moroz@....vniiem.ru>, Joerg Roedel <jroedel@...e.de>,
"Rafael J. Wysocki" <rafael@...nel.org>, linux-pci@...r.kernel.org,
linux-kernel@...r.kernel.org, Sunjin Yang <fan4326@...il.com>,
Rob Groner <rgroner@....com>,
Thomas Gleixner <tglx@...utronix.de>,
Jiang Liu <jiang.liu@...ux.intel.com>
Subject: [PATCH 1/3] Revert "x86/PCI: Don't alloc pcibios-irq when MSI is
enabled"
This reverts commit 8affb487d4a4e223d961d7034cb41cd31982b618.
Revert 8affb487d4a4 ("x86/PCI: Don't alloc pcibios-irq when MSI is
enabled").
This is part of reverting 991de2e59090 ("PCI, x86: Implement
pcibios_alloc_irq() and pcibios_free_irq()") to fix regressions it
introduced.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=111211
Fixes: 991de2e59090 ("PCI, x86: Implement pcibios_alloc_irq() and pcibios_free_irq()")
Signed-off-by: Bjorn Helgaas <bhelgaas@...gle.com>
Acked-by: Rafael J. Wysocki <rafael@...nel.org>
CC: stable@...r.kernel.org # v4.4
CC: Jiang Liu <jiang.liu@...ux.intel.com>
CC: Joerg Roedel <jroedel@...e.de>
---
arch/x86/pci/common.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index eccd4d9..dc78a4a 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -675,14 +675,6 @@ int pcibios_add_device(struct pci_dev *dev)
int pcibios_alloc_irq(struct pci_dev *dev)
{
- /*
- * If the PCI device was already claimed by core code and has
- * MSI enabled, probing of the pcibios IRQ will overwrite
- * dev->irq. So bail out if MSI is already enabled.
- */
- if (pci_dev_msi_enabled(dev))
- return -EBUSY;
-
return pcibios_enable_irq(dev);
}
Powered by blists - more mailing lists