2 --- a/drivers/usb/host/pci-quirks.c
3 +++ b/drivers/usb/host/pci-quirks.c
5 #define USB_INTEL_USB3_PSSEN 0xD8
6 #define USB_INTEL_USB3PRM 0xDC
8 +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
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)
15 EXPORT_SYMBOL_GPL(usb_amd_dev_put);
17 +#endif /* CONFIG_PCI_DISABLE_COMMON_QUIRKS */
19 +#if IS_ENABLED(CONFIG_USB_UHCI_HCD)
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);
29 +int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base)
35 EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
37 +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
39 static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
42 @@ -974,3 +989,4 @@ static void quirk_usb_early_handoff(stru
44 DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
45 PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
47 --- a/drivers/usb/host/pci-quirks.h
48 +++ b/drivers/usb/host/pci-quirks.h
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 +bool usb_is_intel_switchable_xhci(struct pci_dev *pdev);
54 +void usb_enable_xhci_ports(struct pci_dev *xhci_pdev);
55 +void usb_disable_xhci_ports(struct pci_dev *xhci_pdev);
57 +static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {}
58 +#endif /* CONFIG_PCI */
60 +#if defined(CONFIG_PCI) && !defined(CONFIG_PCI_DISABLE_COMMON_QUIRKS)
61 int usb_amd_find_chipset_info(void);
62 void usb_amd_dev_put(void);
63 void usb_amd_quirk_pll_disable(void);
64 void usb_amd_quirk_pll_enable(void);
65 -bool usb_is_intel_switchable_xhci(struct pci_dev *pdev);
66 -void usb_enable_xhci_ports(struct pci_dev *xhci_pdev);
67 -void usb_disable_xhci_ports(struct pci_dev *xhci_pdev);
69 +static inline int usb_amd_find_chipset_info(void)
73 static inline void usb_amd_quirk_pll_disable(void) {}
74 static inline void usb_amd_quirk_pll_enable(void) {}
75 static inline void usb_amd_dev_put(void) {}
76 -static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {}
77 -#endif /* CONFIG_PCI */
80 #endif /* __LINUX_USB_PCI_QUIRKS_H */