2009-08-22 12:46:12 +00:00
|
|
|
--- a/drivers/pci/Kconfig
|
|
|
|
|
+++ b/drivers/pci/Kconfig
|
|
|
|
|
@@ -51,6 +51,12 @@ config PCI_STUB
|
|
|
|
|
|
|
|
|
|
When in doubt, say N.
|
|
|
|
|
|
|
|
|
|
+config PCI_DISABLE_COMMON_QUIRKS
|
|
|
|
|
+ bool "PCI disable common quirks"
|
|
|
|
|
+ depends on PCI
|
|
|
|
|
+ help
|
|
|
|
|
+ If you don't know what to do here, say N.
|
|
|
|
|
+
|
|
|
|
|
config HT_IRQ
|
|
|
|
|
bool "Interrupts on hypertransport devices"
|
|
|
|
|
default y
|
|
|
|
|
--- a/drivers/pci/quirks.c
|
|
|
|
|
+++ b/drivers/pci/quirks.c
|
|
|
|
|
@@ -98,6 +98,7 @@ static void __devinit quirk_resource_ali
|
|
|
|
|
}
|
|
|
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_resource_alignment);
|
|
|
|
|
|
|
|
|
|
+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
|
|
|
|
|
/* 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.
|
2009-09-26 13:29:13 +00:00
|
|
|
@@ -1867,7 +1868,9 @@ static void __devinit fixup_rev1_53c810(
|
2009-08-22 12:46:12 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
|
|
|
|
|
+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
|
|
|
|
|
|
|
|
|
|
+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
|
|
|
|
|
/* Enable 1k I/O space granularity on the Intel P64H2 */
|
|
|
|
|
static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
|
|
|
|
|
{
|
2009-09-26 13:29:13 +00:00
|
|
|
@@ -2498,6 +2501,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
|
|
|
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150d, quirk_i82576_sriov);
|
2009-08-22 12:46:12 +00:00
|
|
|
|
|
|
|
|
#endif /* CONFIG_PCI_IOV */
|
|
|
|
|
+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
|
|
|
|
|
|
|
|
|
|
static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,
|
|
|
|
|
struct pci_fixup *end)
|
