Re: [PATCH] x86 PCI: Do not use interrupt links for devices using MSI-X

Bjorn Helgaas
2009-01-06T17:19:50Z

On Sunday 04 January 2009 03:08:42 pm Rafael J. Wysocki wrote:
> pcibios_enable_device() and pcibios_disable_device() don't handle
> IRQs for devices that have MSI enabled and it should tread the
> devices with MSI-X enabled in the same way.

There are other places that need similar fixes, too, aren't there?
I see cris, frv, ia64, and a driver or two testing dev->msi_enabled.

> --- linux-2.6.orig/arch/x86/pci/common.c
> +++ linux-2.6/arch/x86/pci/common.c
> @@ -551,14 +551,14 @@ int pcibios_enable_device(struct pci_dev
> if ((err = pci_enable_resources(dev, mask)) < 0)
> return err;
>
> - if (!dev->msi_enabled)
> + if (!dev->msi_enabled && !dev->msix_enabled)
> return pcibios_enable_irq(dev);
> return 0;
> }
>
> void pcibios_disable_device (struct pci_dev *dev)
> {
> - if (!dev->msi_enabled && pcibios_disable_irq)
> + if (!dev->msi_enabled && !dev->msix_enabled && pcibios_disable_irq)
> pcibios_disable_irq(dev);
> }