Skip to content

Commit fc9683f

Browse files
bjorn-helgaasgregkh
authored andcommitted
Revert "x86/PCI: Don't alloc pcibios-irq when MSI is enabled"
commit fe25d078874f2c29c38f4160467d74f5756537c9 upstream. Revert 8affb48 ("x86/PCI: Don't alloc pcibios-irq when MSI is enabled"). This is part of reverting 991de2e ("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: 991de2e ("PCI, x86: Implement pcibios_alloc_irq() and pcibios_free_irq()") Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Rafael J. Wysocki <rafael@kernel.org> CC: Jiang Liu <jiang.liu@linux.intel.com> CC: Joerg Roedel <jroedel@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent b66a7a3 commit fc9683f

1 file changed

Lines changed: 0 additions & 8 deletions

File tree

arch/x86/pci/common.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -675,14 +675,6 @@ int pcibios_add_device(struct pci_dev *dev)
675675

676676
int pcibios_alloc_irq(struct pci_dev *dev)
677677
{
678-
/*
679-
* If the PCI device was already claimed by core code and has
680-
* MSI enabled, probing of the pcibios IRQ will overwrite
681-
* dev->irq. So bail out if MSI is already enabled.
682-
*/
683-
if (pci_dev_msi_enabled(dev))
684-
return -EBUSY;
685-
686678
return pcibios_enable_irq(dev);
687679
}
688680

0 commit comments

Comments
 (0)