mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
da98603597
This PR is a blend of several kernel bumps authored by ldir taken from his
staging tree w/ some further adjustments made by me and update_kernel.sh
Summary:
Deleted upstreamed patches:
generic:
742-v5.5-net-sfp-add-support-for-module-quirks.patch
743-v5.5-net-sfp-add-some-quirks-for-GPON-modules.patch
bcm63xx:
022-v5.8-mtd-rawnand-brcmnand-correctly-verify-erased-pages.patch
024-v5.8-mtd-rawnand-brcmnand-fix-CS0-layout.patch
mediatek:
0402-net-ethernet-mtk_eth_soc-Always-call-mtk_gmac0_rgmii.patch
Deleted patches applied differently upstream:
generic:
641-sch_cake-fix-IP-protocol-handling-in-the-presence-of.patch
Manually merged patches:
generic:
395-v5.8-net-sch_cake-Take-advantage-of-skb-hash-where-appropriate.patch
bcm27xx:
950-0132-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch
layerscape:
701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch
Build system: x86_64
Build-tested: ath79/generic, bcm27xx/bcm2708, bcm27xx/bcm2711,
imx6, mvebu/cortexa9, sunxi/a53
Run-tested: Netgear R7800 (ipq806x)
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Tested-By: Lucian Cristian <Lucian.cristian@gmail.com> [mvebu]
Tested-By: Curtis Deptuck <curtdept@me.com> [x86/64]
[do not remove 395-v5.8-net-sch_cake-Take-advantage-... patch,
adjust and refresh patches, adjust commit message]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Tested-By: John Audia <graysky@archlinux.us> [ipq806x]
54 lines
1.6 KiB
Diff
54 lines
1.6 KiB
Diff
From a0dc613140bab907a3d5787a7ae7b0638bf674d0 Mon Sep 17 00:00:00 2001
|
|
From: Christian Lamparter <chunkeey@gmail.com>
|
|
Date: Thu, 23 Jun 2016 20:28:20 +0200
|
|
Subject: [PATCH] usb: xhci: force MSI for uPD720201 and
|
|
uPD720202
|
|
|
|
The APM82181 does not support MSI-X. When probed, it will
|
|
produce a noisy warning.
|
|
|
|
---
|
|
drivers/usb/host/pci-quirks.c | 362 ++++++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 362 insertions(+)
|
|
|
|
--- a/drivers/usb/host/xhci-pci.c
|
|
+++ b/drivers/usb/host/xhci-pci.c
|
|
@@ -278,6 +278,7 @@ static void xhci_pci_quirks(struct devic
|
|
pdev->device == 0x0015) {
|
|
xhci->quirks |= XHCI_RESET_ON_RESUME;
|
|
xhci->quirks |= XHCI_ZERO_64B_REGS;
|
|
+ xhci->quirks |= XHCI_FORCE_MSI;
|
|
}
|
|
if (pdev->vendor == PCI_VENDOR_ID_VIA)
|
|
xhci->quirks |= XHCI_RESET_ON_RESUME;
|
|
--- a/drivers/usb/host/xhci.c
|
|
+++ b/drivers/usb/host/xhci.c
|
|
@@ -423,10 +423,14 @@ static int xhci_try_enable_msi(struct us
|
|
free_irq(hcd->irq, hcd);
|
|
hcd->irq = 0;
|
|
|
|
- ret = xhci_setup_msix(xhci);
|
|
- if (ret)
|
|
- /* fall back to msi*/
|
|
+ if (xhci->quirks & XHCI_FORCE_MSI) {
|
|
ret = xhci_setup_msi(xhci);
|
|
+ } else {
|
|
+ ret = xhci_setup_msix(xhci);
|
|
+ if (ret)
|
|
+ /* fall back to msi*/
|
|
+ ret = xhci_setup_msi(xhci);
|
|
+ }
|
|
|
|
if (!ret) {
|
|
hcd->msi_enabled = 1;
|
|
--- a/drivers/usb/host/xhci.h
|
|
+++ b/drivers/usb/host/xhci.h
|
|
@@ -1880,6 +1880,7 @@ struct xhci_hcd {
|
|
struct xhci_hub usb2_rhub;
|
|
struct xhci_hub usb3_rhub;
|
|
/* support xHCI 1.0 spec USB2 hardware LPM */
|
|
+#define XHCI_FORCE_MSI (1 << 24)
|
|
unsigned hw_lpm_support:1;
|
|
/* Broken Suspend flag for SNPS Suspend resume issue */
|
|
unsigned broken_suspend:1;
|