Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16cf0ebc authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Jesse Barnes
Browse files

x86/PCI: Do not use interrupt links for devices using MSI-X 



pcibios_enable_device() and pcibios_disable_device() don't handle
IRQs for devices that have MSI enabled and it should treat the
devices with MSI-X enabled in the same way.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent ef1bba28

arch/x86/pci/common.c

+2 −2
Original line number Diff line number Diff line
@@ -551,14 +551,14 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) 
	if ((err = pci_enable_resources(dev, mask)) < 0)

		return err;



	if (!dev->msi_enabled)

	if (!pci_dev_msi_enabled(dev))

		return pcibios_enable_irq(dev);

	return 0;

}



void pcibios_disable_device (struct pci_dev *dev)

{

	if (!dev->msi_enabled && pcibios_disable_irq)

	if (!pci_dev_msi_enabled(dev) && pcibios_disable_irq)

		pcibios_disable_irq(dev);

}

include/linux/pci.h

+9 −0
Original line number Diff line number Diff line
@@ -336,6 +336,15 @@ struct pci_bus { 
#define pci_bus_b(n)	list_entry(n, struct pci_bus, node)

#define to_pci_bus(n)	container_of(n, struct pci_bus, dev)



#ifdef CONFIG_PCI_MSI

static inline bool pci_dev_msi_enabled(struct pci_dev *pci_dev)

{

	return pci_dev->msi_enabled || pci_dev->msix_enabled;

}

#else

static inline bool pci_dev_msi_enabled(struct pci_dev *pci_dev) { return false; }

#endif



/*

 * Error values that may be returned by PCI functions.

 */