1 From: Felix Fietkau <nbd@nbd.name>
2 Subject: debloat: disable common USB quirks
4 Signed-off-by: Felix Fietkau <nbd@nbd.name>
6 drivers/usb/host/pci-quirks.c | 16 ++++++++++++++++
7 drivers/usb/host/pci-quirks.h | 18 +++++++++++++++++-
8 include/linux/usb/hcd.h | 7 +++++++
9 3 files changed, 40 insertions(+), 1 deletion(-)
11 Index: linux-4.9.40/drivers/usb/host/pci-quirks.c
12 ===================================================================
13 --- linux-4.9.40.orig/drivers/usb/host/pci-quirks.c
14 +++ linux-4.9.40/drivers/usb/host/pci-quirks.c
15 @@ -106,6 +106,8 @@ struct amd_chipset_type {
19 +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
21 static struct amd_chipset_info {
22 struct pci_dev *nb_dev;
23 struct pci_dev *smbus_dev;
24 @@ -503,6 +505,10 @@ void usb_amd_dev_put(void)
26 EXPORT_SYMBOL_GPL(usb_amd_dev_put);
28 +#endif /* CONFIG_PCI_DISABLE_COMMON_QUIRKS */
30 +#if IS_ENABLED(CONFIG_USB_UHCI_HCD)
33 * Make sure the controller is completely inactive, unable to
34 * generate interrupts or do DMA.
35 @@ -582,8 +588,17 @@ reset_needed:
36 uhci_reset_hc(pdev, base);
40 +int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base)
46 EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
48 +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
50 static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
53 @@ -1150,3 +1165,4 @@ static void quirk_usb_early_handoff(stru
55 DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
56 PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
58 Index: linux-4.9.40/drivers/usb/host/pci-quirks.h
59 ===================================================================
60 --- linux-4.9.40.orig/drivers/usb/host/pci-quirks.h
61 +++ linux-4.9.40/drivers/usb/host/pci-quirks.h
64 void uhci_reset_hc(struct pci_dev *pdev, unsigned long base);
65 int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base);
66 +#endif /* CONFIG_PCI */
68 +#if defined(CONFIG_PCI) && !defined(CONFIG_PCI_DISABLE_COMMON_QUIRKS)
69 int usb_amd_find_chipset_info(void);
70 int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *pdev);
71 bool usb_amd_hang_symptom_quirk(void);
72 @@ -17,12 +20,25 @@ void usb_disable_xhci_ports(struct pci_d
73 void sb800_prefetch(struct device *dev, int on);
76 +static inline int usb_amd_find_chipset_info(void)
80 +static inline bool usb_amd_hang_symptom_quirk(void)
84 +static inline bool usb_amd_prefetch_quirk(void)
88 static inline void usb_amd_quirk_pll_disable(void) {}
89 static inline void usb_amd_quirk_pll_enable(void) {}
90 static inline void usb_asmedia_modifyflowcontrol(struct pci_dev *pdev) {}
91 static inline void usb_amd_dev_put(void) {}
92 static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {}
93 static inline void sb800_prefetch(struct device *dev, int on) {}
94 +static inline void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) {}
95 #endif /* CONFIG_PCI */
97 #endif /* __LINUX_USB_PCI_QUIRKS_H */
98 Index: linux-4.9.40/include/linux/usb/hcd.h
99 ===================================================================
100 --- linux-4.9.40.orig/include/linux/usb/hcd.h
101 +++ linux-4.9.40/include/linux/usb/hcd.h
102 @@ -461,7 +461,14 @@ extern int usb_hcd_pci_probe(struct pci_
103 extern void usb_hcd_pci_remove(struct pci_dev *dev);
104 extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
106 +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
107 extern int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev);
109 +static inline int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev)
116 extern const struct dev_pm_ops usb_hcd_pci_pm_ops;