Signed-off-by: Andrew Morton --- drivers/pci/quirks.c | 11 +++++++++++ include/linux/pci.h | 1 + include/linux/pci_ids.h | 1 + 3 files changed, 13 insertions(+) diff -puN drivers/pci/quirks.c~gregkh-pci-pci-bus-parity-status-broken-hardware-attribute-edac-foundation drivers/pci/quirks.c --- devel/drivers/pci/quirks.c~gregkh-pci-pci-bus-parity-status-broken-hardware-attribute-edac-foundation 2006-06-09 15:21:28.000000000 -0700 +++ devel-akpm/drivers/pci/quirks.c 2006-06-09 15:21:28.000000000 -0700 @@ -24,6 +24,17 @@ #include #include "pci.h" +/* The Mellanox Tavor device gives false positive parity errors + * Mark this device with a broken_parity_status, to allow + * PCI scanning code to "skip" this now blacklisted device. + */ +static void __devinit quirk_mellanox_tavor(struct pci_dev *dev) +{ + dev->broken_parity_status = 1; /* This device gives false positives */ +} +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX,PCI_DEVICE_ID_MELLANOX_TAVOR,quirk_mellanox_tavor); +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX,PCI_DEVICE_ID_MELLANOX_TAVOR_BRIDGE,quirk_mellanox_tavor); + /* Deal with broken BIOS'es that neglect to enable passive release, which can cause problems in combination with the 82441FX/PPro MTRRs */ static void __devinit quirk_passive_release(struct pci_dev *dev) diff -puN include/linux/pci.h~gregkh-pci-pci-bus-parity-status-broken-hardware-attribute-edac-foundation include/linux/pci.h --- devel/include/linux/pci.h~gregkh-pci-pci-bus-parity-status-broken-hardware-attribute-edac-foundation 2006-06-09 15:21:28.000000000 -0700 +++ devel-akpm/include/linux/pci.h 2006-06-09 15:21:28.000000000 -0700 @@ -162,6 +162,7 @@ struct pci_dev { unsigned int is_busmaster:1; /* device is busmaster */ unsigned int no_msi:1; /* device may not use msi */ unsigned int block_ucfg_access:1; /* userspace config space access is blocked */ + unsigned int broken_parity_status:1; /* Device generates false positive parity */ u32 saved_config_space[16]; /* config space saved at suspend time */ struct hlist_head saved_cap_space; diff -puN include/linux/pci_ids.h~gregkh-pci-pci-bus-parity-status-broken-hardware-attribute-edac-foundation include/linux/pci_ids.h --- devel/include/linux/pci_ids.h~gregkh-pci-pci-bus-parity-status-broken-hardware-attribute-edac-foundation 2006-06-09 15:21:28.000000000 -0700 +++ devel-akpm/include/linux/pci_ids.h 2006-06-09 15:21:28.000000000 -0700 @@ -1961,6 +1961,7 @@ #define PCI_VENDOR_ID_MELLANOX 0x15b3 #define PCI_DEVICE_ID_MELLANOX_TAVOR 0x5a44 +#define PCI_DEVICE_ID_MELLANOX_TAVOR_BRIDGE 0x5a46 #define PCI_DEVICE_ID_MELLANOX_ARBEL_COMPAT 0x6278 #define PCI_DEVICE_ID_MELLANOX_ARBEL 0x6282 #define PCI_DEVICE_ID_MELLANOX_SINAI_OLD 0x5e8c _