diff options
Diffstat (limited to 'target/linux/generic/patches-3.7')
| -rw-r--r-- | target/linux/generic/patches-3.7/810-pci_disable_common_quirks.patch | 34 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch | 60 |
2 files changed, 79 insertions, 15 deletions
diff --git a/target/linux/generic/patches-3.7/810-pci_disable_common_quirks.patch b/target/linux/generic/patches-3.7/810-pci_disable_common_quirks.patch index 255b33ed8e..ecbcfb685f 100644 --- a/target/linux/generic/patches-3.7/810-pci_disable_common_quirks.patch +++ b/target/linux/generic/patches-3.7/810-pci_disable_common_quirks.patch @@ -23,21 +23,29 @@ /* 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. -@@ -1933,7 +1934,9 @@ static void __devinit fixup_rev1_53c810( +@@ -2844,6 +2845,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata); + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata); + ++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */ + + static ktime_t fixup_debug_start(struct pci_dev *dev, + void (*fn)(struct pci_dev *dev)) +@@ -2875,6 +2877,8 @@ static void fixup_debug_report(struct pc } } - 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) - { -@@ -2605,6 +2608,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT - DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATTANSIC, 0x1083, - quirk_msi_intx_disable_bug); - #endif /* CONFIG_PCI_MSI */ -+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */ ++ + /* + * Some BIOS implementations leave the Intel GPU interrupts enabled, + * even though no one is handling them (f.e. i915 driver is never loaded). +@@ -2909,6 +2913,8 @@ static void __devinit disable_igfx_irq(s + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq); + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq); - /* Allow manual resource allocation for PCI hotplug bridges - * via pci=hpmemsize=nnM and pci=hpiosize=nnM parameters. For ++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */ ++ + /* + * Some devices may pass our check in pci_intx_mask_supported if + * PCI_COMMAND_INTX_DISABLE works though they actually do not properly diff --git a/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch index abe0230fd3..56d4743df1 100644 --- a/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch @@ -1,17 +1,73 @@ --- a/drivers/usb/host/pci-quirks.c +++ b/drivers/usb/host/pci-quirks.c -@@ -434,6 +434,8 @@ reset_needed: +@@ -79,6 +79,8 @@ + #define USB_INTEL_USB3_PSSEN 0xD8 + #define USB_INTEL_USB3PRM 0xDC + ++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS ++ + static struct amd_chipset_info { + struct pci_dev *nb_dev; + struct pci_dev *smbus_dev; +@@ -353,6 +355,10 @@ void usb_amd_dev_put(void) + } + EXPORT_SYMBOL_GPL(usb_amd_dev_put); + ++#endif /* CONFIG_PCI_DISABLE_COMMON_QUIRKS */ ++ ++#if IS_ENABLED(CONFIG_USB_UHCI_HCD) ++ + /* + * Make sure the controller is completely inactive, unable to + * generate interrupts or do DMA. +@@ -434,6 +440,10 @@ reset_needed: } EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc); ++#endif ++ +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS + static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) { u16 cmd; -@@ -971,3 +973,4 @@ static void __devinit quirk_usb_early_ha +@@ -971,3 +981,4 @@ static void __devinit quirk_usb_early_ha } DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff); +#endif +--- a/drivers/usb/host/pci-quirks.h ++++ b/drivers/usb/host/pci-quirks.h +@@ -4,18 +4,26 @@ + #ifdef CONFIG_PCI + void uhci_reset_hc(struct pci_dev *pdev, unsigned long base); + int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base); ++bool usb_is_intel_switchable_xhci(struct pci_dev *pdev); ++void usb_enable_xhci_ports(struct pci_dev *xhci_pdev); ++void usb_disable_xhci_ports(struct pci_dev *xhci_pdev); ++#else ++static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {} ++#endif /* CONFIG_PCI */ ++ ++#if defined(CONFIG_PCI) && !defined(CONFIG_PCI_DISABLE_COMMON_QUIRKS) + int usb_amd_find_chipset_info(void); + void usb_amd_dev_put(void); + void usb_amd_quirk_pll_disable(void); + void usb_amd_quirk_pll_enable(void); +-bool usb_is_intel_switchable_xhci(struct pci_dev *pdev); +-void usb_enable_xhci_ports(struct pci_dev *xhci_pdev); +-void usb_disable_xhci_ports(struct pci_dev *xhci_pdev); + #else ++static inline int usb_amd_find_chipset_info(void) ++{ ++ return 0; ++} + static inline void usb_amd_quirk_pll_disable(void) {} + static inline void usb_amd_quirk_pll_enable(void) {} + static inline void usb_amd_dev_put(void) {} +-static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {} +-#endif /* CONFIG_PCI */ ++#endif + + #endif /* __LINUX_USB_PCI_QUIRKS_H */ |