diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-18 14:14:16 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-18 14:14:16 -0400 |
commit | 140217ae3fbabc7b718b5595fd251ce2afcb3bc1 (patch) | |
tree | 1c3d1a367c04203a88b4677376cbd6c8e08d1c65 | |
parent | e822a007047fb84cd068bfa35a682015e0fe19b9 (diff) | |
parent | 0bdb3b213ac64f9a16e59d57660174543eaa01f0 (diff) |
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) | |||
2897 | bool mask_supported = false; | 2897 | bool mask_supported = false; |
2898 | u16 orig, new; | 2898 | u16 orig, new; |
2899 | 2899 | ||
2900 | if (dev->broken_intx_masking) | ||
2901 | return false; | ||
2902 | |||
2900 | pci_cfg_access_lock(dev); | 2903 | pci_cfg_access_lock(dev); |
2901 | 2904 | ||
2902 | pci_read_config_word(dev, PCI_COMMAND, &orig); | 2905 | 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) | |||
2929 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq); | 2929 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq); |
2930 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq); | 2930 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq); |
2931 | 2931 | ||
2932 | /* | ||
2933 | * Some devices may pass our check in pci_intx_mask_supported if | ||
2934 | * PCI_COMMAND_INTX_DISABLE works though they actually do not properly | ||
2935 | * support this feature. | ||
2936 | */ | ||
2937 | static void __devinit quirk_broken_intx_masking(struct pci_dev *dev) | ||
2938 | { | ||
2939 | dev->broken_intx_masking = 1; | ||
2940 | } | ||
2941 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CHELSIO, 0x0030, | ||
2942 | quirk_broken_intx_masking); | ||
2943 | DECLARE_PCI_FIXUP_HEADER(0x1814, 0x0601, /* Ralink RT2800 802.11n PCI */ | ||
2944 | quirk_broken_intx_masking); | ||
2945 | |||
2932 | static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, | 2946 | static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, |
2933 | struct pci_fixup *end) | 2947 | struct pci_fixup *end) |
2934 | { | 2948 | { |
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 { | |||
324 | unsigned int is_hotplug_bridge:1; | 324 | unsigned int is_hotplug_bridge:1; |
325 | unsigned int __aer_firmware_first_valid:1; | 325 | unsigned int __aer_firmware_first_valid:1; |
326 | unsigned int __aer_firmware_first:1; | 326 | unsigned int __aer_firmware_first:1; |
327 | unsigned int broken_intx_masking:1; | ||
327 | pci_dev_flags_t dev_flags; | 328 | pci_dev_flags_t dev_flags; |
328 | atomic_t enable_cnt; /* pci_enable_device has been called */ | 329 | atomic_t enable_cnt; /* pci_enable_device has been called */ |
329 | 330 | ||