Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1336644

[PATCH v2 1/3] Revert "x86/PCI: Don't alloc pcibios-irq when MSI is enabled"

Show all headers | View raw

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@google.com>
CC: Jiang Liu <jiang.liu@linux.intel.com>
CC: Joerg Roedel <jroedel@suse.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 2879efc..cb499c5 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -713,14 +713,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);
 }
 

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/3] PCI: Revert "Implement pcibios_alloc_irq() and  pcibios_free_irq()" Bjorn Helgaas <bhelgaas@google.com> - 2016-02-17 19:40 +0100
  [PATCH v2 1/3] Revert "x86/PCI: Don't alloc pcibios-irq when MSI is  enabled" Bjorn Helgaas <bhelgaas@google.com> - 2016-02-17 19:40 +0100
  [PATCH v2 2/3] Revert "PCI: Add helpers to manage pci_dev->irq and  pci_dev->irq_managed" Bjorn Helgaas <bhelgaas@google.com> - 2016-02-17 19:40 +0100
  Re: [PATCH v2 0/3] PCI: Revert "Implement pcibios_alloc_irq() and pcibios_free_irq()" "Rafael J. Wysocki" <rafael@kernel.org> - 2016-02-17 20:50 +0100
  Re: [PATCH v2 0/3] PCI: Revert "Implement pcibios_alloc_irq() and  pcibios_free_irq()" Мороз Олег <oleg.moroz@mcc.vniiem.ru> - 2016-02-18 06:20 +0100
    Re: [PATCH v2 0/3] PCI: Revert "Implement pcibios_alloc_irq() and  pcibios_free_irq()" Bjorn Helgaas <helgaas@kernel.org> - 2016-02-18 17:10 +0100

csiph-web