diff options
| author | Bjorn Helgaas | 2012-06-18 20:14:16 +0200 |
|---|---|---|
| committer | Bjorn Helgaas | 2012-06-18 20:14:16 +0200 |
| commit | 140217ae3fbabc7b718b5595fd251ce2afcb3bc1 (patch) | |
| tree | 1c3d1a367c04203a88b4677376cbd6c8e08d1c65 | |
| parent | Merge branch 'topic/sebastian-devinit-fixups' into next (diff) | |
| parent | PCI: add Ralink RT2800 broken INTx masking quirk (diff) | |
| download | kernel-qcow2-linux-140217ae3fbabc7b718b5595fd251ce2afcb3bc1.tar.gz kernel-qcow2-linux-140217ae3fbabc7b718b5595fd251ce2afcb3bc1.tar.xz kernel-qcow2-linux-140217ae3fbabc7b718b5595fd251ce2afcb3bc1.zip | |
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
| -rw-r--r-- | drivers/pci/pci.c | 3 | ||||
| -rw-r--r-- | drivers/pci/quirks.c | 14 | ||||
| -rw-r--r-- | include/linux/pci.h | 1 |
3 files changed, 18 insertions, 0 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index ae5d96ac2aac..d4d758d7b726 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -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); diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 6484a5434693..a2d9d330a01e 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -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) { diff --git a/include/linux/pci.h b/include/linux/pci.h index 43a007cbdf65..c739df91bac9 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -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 */ |