kernel: update to linux 4.1.3
[openwrt/openwrt.git] / target / linux / generic / patches-4.1 / 810-pci_disable_common_quirks.patch
1 --- a/drivers/pci/Kconfig
2 +++ b/drivers/pci/Kconfig
3 @@ -68,6 +68,12 @@ config XEN_PCIDEV_FRONTEND
4 The PCI device frontend driver allows the kernel to import arbitrary
5 PCI devices from a PCI backend to support PCI driver domains.
6
7 +config PCI_DISABLE_COMMON_QUIRKS
8 + bool "PCI disable common quirks"
9 + depends on PCI
10 + help
11 + If you don't know what to do here, say N.
12 +
13 config HT_IRQ
14 bool "Interrupts on hypertransport devices"
15 default y
16 --- a/drivers/pci/quirks.c
17 +++ b/drivers/pci/quirks.c
18 @@ -41,6 +41,7 @@ static void quirk_mmio_always_on(struct
19 DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID,
20 PCI_CLASS_BRIDGE_HOST, 8, quirk_mmio_always_on);
21
22 +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
23 /* The Mellanox Tavor device gives false positive parity errors
24 * Mark this device with a broken_parity_status, to allow
25 * PCI scanning code to "skip" this now blacklisted device.
26 @@ -2925,6 +2926,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
27 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
28 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
29
30 +#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
31
32 /*
33 * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum. To
34 @@ -2981,6 +2983,8 @@ static void fixup_debug_report(struct pc
35 }
36 }
37
38 +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
39 +
40 /*
41 * Some BIOS implementations leave the Intel GPU interrupts enabled,
42 * even though no one is handling them (f.e. i915 driver is never loaded).
43 @@ -3015,6 +3019,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
44 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
45 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
46
47 +#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
48 +
49 /*
50 * PCI devices which are on Intel chips can skip the 10ms delay
51 * before entering D3 mode.