target/linux/generic/patches-2.6.38/030-pci_disable_common_quirks.patch

   1 Index: linux-2.6.38.1/drivers/pci/Kconfig
   2 ===================================================================
   3 --- linux-2.6.38.1.orig/drivers/pci/Kconfig     2011-03-23 21:04:47.000000000 +0100
   4 +++ linux-2.6.38.1/drivers/pci/Kconfig  2011-03-28 16:48:00.052118712 +0200
   5 @@ -62,6 +62,12 @@ config XEN_PCIDEV_FE_DEBUG
   6
   7           When in doubt, say N.
   8
   9 +config PCI_DISABLE_COMMON_QUIRKS
  10 +       bool "PCI disable common quirks"
  11 +       depends on PCI
  12 +       help
  13 +         If you don't know what to do here, say N.
  14 +
  15  config HT_IRQ
  16         bool "Interrupts on hypertransport devices"
  17         default y
  18 Index: linux-2.6.38.1/drivers/pci/quirks.c
  19 ===================================================================
  20 --- linux-2.6.38.1.orig/drivers/pci/quirks.c    2011-03-23 21:04:47.000000000 +0100
  21 +++ linux-2.6.38.1/drivers/pci/quirks.c 2011-03-28 16:48:13.130041612 +0200
  22 @@ -104,6 +104,7 @@ static void __devinit quirk_mmio_always_
  23  }
  24  DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, quirk_mmio_always_on);
  25
  26 +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
  27  /* The Mellanox Tavor device gives false positive parity errors
  28   * Mark this device with a broken_parity_status, to allow
  29   * PCI scanning code to "skip" this now blacklisted device.
  30 @@ -1989,7 +1990,9 @@ static void __devinit fixup_rev1_53c810(
  31         }
  32  }
  33  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
  34 +#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
  35
  36 +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
  37  /* Enable 1k I/O space granularity on the Intel P64H2 */
  38  static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
  39  {
  40 @@ -2662,6 +2665,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT
  41                         quirk_msi_intx_disable_bug);
  42
  43  #endif /* CONFIG_PCI_MSI */
  44 +#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
  45
  46  /* Allow manual resource allocation for PCI hotplug bridges
  47   * via pci=hpmemsize=nnM and pci=hpiosize=nnM parameters. For