Commit 140217ae authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'topic/jan-intx-masking' into next 

* topic/jan-intx-masking:
  PCI: add Ralink RT2800 broken INTx masking quirk
  PCI: add Chelsio T310 10GbE NIC broken INTx masking quirk
  PCI: add infrastructure for devices with broken INTx masking
parents e822a007 0bdb3b21

drivers/pci/pci.c

+3 −0
Original line number Diff line number Diff line
@@ -2897,6 +2897,9 @@ bool pci_intx_mask_supported(struct pci_dev *dev) 
	bool mask_supported = false;

	u16 orig, new;



	if (dev->broken_intx_masking)

		return false;



	pci_cfg_access_lock(dev);



	pci_read_config_word(dev, PCI_COMMAND, &orig);

drivers/pci/quirks.c

+14 −0
Original line number Diff line number Diff line
@@ -2929,6 +2929,20 @@ static void __devinit disable_igfx_irq(struct pci_dev *dev) 
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);



/*

 * Some devices may pass our check in pci_intx_mask_supported if

 * PCI_COMMAND_INTX_DISABLE works though they actually do not properly

 * support this feature.

 */

static void __devinit quirk_broken_intx_masking(struct pci_dev *dev)

{

	dev->broken_intx_masking = 1;

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CHELSIO, 0x0030,

			 quirk_broken_intx_masking);

DECLARE_PCI_FIXUP_HEADER(0x1814, 0x0601, /* Ralink RT2800 802.11n PCI */

			 quirk_broken_intx_masking);



static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,

			  struct pci_fixup *end)

{

include/linux/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ struct pci_dev { 
	unsigned int    is_hotplug_bridge:1;

	unsigned int    __aer_firmware_first_valid:1;

	unsigned int	__aer_firmware_first:1;

	unsigned int	broken_intx_masking:1;

	pci_dev_flags_t dev_flags;

	atomic_t	enable_cnt;	/* pci_enable_device has been called */