KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kernel: fix disabling common usb quirks on 4.14

Browse source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2018-02-20 22:16:27 +01:00
parent 3cb38368e2
commit c38fb58576
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
target/linux/generic/pending-4.14/811-pci_disable_usb_common_quirks.patch
View file

@ -48,14 +48,11 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
{ {
u16 cmd; u16 cmd;
@@ -1158,6 +1173,7 @@ static void quirk_usb_early_handoff(stru @@ -1178,3 +1193,4 @@ bool usb_xhci_needs_pci_reset(struct pci
return false;
} }
DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, EXPORT_SYMBOL_GPL(usb_xhci_needs_pci_reset);
PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
+#endif +#endif
bool usb_xhci_needs_pci_reset(struct pci_dev *pdev)
{
--- a/drivers/usb/host/pci-quirks.h --- a/drivers/usb/host/pci-quirks.h
+++ b/drivers/usb/host/pci-quirks.h +++ b/drivers/usb/host/pci-quirks.h
@@ -5,6 +5,9 @@ @@ -5,6 +5,9 @@
@ -68,7 +65,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
int usb_amd_find_chipset_info(void); int usb_amd_find_chipset_info(void);
int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *pdev); int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *pdev);
bool usb_amd_hang_symptom_quirk(void); bool usb_amd_hang_symptom_quirk(void);
@@ -19,12 +22,25 @@ void sb800_prefetch(struct device *dev, @@ -19,12 +22,26 @@ void sb800_prefetch(struct device *dev,
bool usb_xhci_needs_pci_reset(struct pci_dev *pdev); bool usb_xhci_needs_pci_reset(struct pci_dev *pdev);
#else #else
struct pci_dev; struct pci_dev;
@ -91,6 +88,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {} static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {}
static inline void sb800_prefetch(struct device *dev, int on) {} static inline void sb800_prefetch(struct device *dev, int on) {}
+static inline void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) {} +static inline void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) {}
+static inline bool usb_xhci_needs_pci_reset(struct pci_dev *pdev) {}
#endif /* CONFIG_USB_PCI */ #endif /* CONFIG_USB_PCI */
#endif /* __LINUX_USB_PCI_QUIRKS_H */ #endif /* __LINUX_USB_PCI_QUIRKS_H */