kernel/3.8: update pci_disable_usb_common_quirks patch
[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.8 / 811-pci_disable_usb_common_quirks.patch
1
2 --- a/drivers/usb/host/pci-quirks.c
3 +++ b/drivers/usb/host/pci-quirks.c
4 @@ -79,6 +79,8 @@
5 #define USB_INTEL_USB3_PSSEN 0xD8
6 #define USB_INTEL_USB3PRM 0xDC
7
8 +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
9 +
10 static struct amd_chipset_info {
11 struct pci_dev *nb_dev;
12 struct pci_dev *smbus_dev;
13 @@ -353,6 +355,10 @@ void usb_amd_dev_put(void)
14 }
15 EXPORT_SYMBOL_GPL(usb_amd_dev_put);
16
17 +#endif /* CONFIG_PCI_DISABLE_COMMON_QUIRKS */
18 +
19 +#if IS_ENABLED(CONFIG_USB_UHCI_HCD)
20 +
21 /*
22 * Make sure the controller is completely inactive, unable to
23 * generate interrupts or do DMA.
24 @@ -432,8 +438,17 @@ reset_needed:
25 uhci_reset_hc(pdev, base);
26 return 1;
27 }
28 +#else
29 +int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base)
30 +{
31 + return 0;
32 +}
33 +
34 +#endif
35 EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
36
37 +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
38 +
39 static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
40 {
41 u16 cmd;
42 @@ -974,3 +989,4 @@ static void quirk_usb_early_handoff(stru
43 }
44 DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
45 PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
46 +#endif /* CONFIG_PCI_DISABLE_COMMON_QUIRKS */
47 --- a/drivers/usb/host/pci-quirks.h
48 +++ b/drivers/usb/host/pci-quirks.h
49 @@ -4,6 +4,9 @@
50 #ifdef CONFIG_PCI
51 void uhci_reset_hc(struct pci_dev *pdev, unsigned long base);
52 int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base);
53 +#endif /* CONFIG_PCI */
54 +
55 +#if defined(CONFIG_PCI) && !defined(CONFIG_PCI_DISABLE_COMMON_QUIRKS)
56 int usb_amd_find_chipset_info(void);
57 void usb_amd_dev_put(void);
58 void usb_amd_quirk_pll_disable(void);
59 @@ -12,10 +15,20 @@ bool usb_is_intel_switchable_xhci(struct
60 void usb_enable_xhci_ports(struct pci_dev *xhci_pdev);
61 void usb_disable_xhci_ports(struct pci_dev *xhci_pdev);
62 #else
63 +static inline int usb_amd_find_chipset_info(void)
64 +{
65 + return 0;
66 +}
67 static inline void usb_amd_quirk_pll_disable(void) {}
68 static inline void usb_amd_quirk_pll_enable(void) {}
69 static inline void usb_amd_dev_put(void) {}
70 +
71 +static inline bool usb_is_intel_switchable_xhci(struct pci_dev *pdev)
72 +{
73 + return false;
74 +}
75 +static inline void usb_enable_xhci_ports(struct pci_dev *xhci_pdev) {}
76 static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {}
77 -#endif /* CONFIG_PCI */
78 +#endif
79
80 #endif /* __LINUX_USB_PCI_QUIRKS_H */