b92ec82235
Removed upstreamed: generic/backport-5.10/350-v5.18-MIPS-pgalloc-fix-memory-leak-caused-by-pgd_free.patch generic/pending-5.10/850-0014-PCI-aardvark-Fix-reading-PCI_EXP_RTSTA_PME-bit-on-em.patch ipq40xx/patches-5.10/105-ipq40xx-fix-sleep-clock.patch All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Compile-/run-tested: ath79/generic (Archer C7 v2). Signed-off-by: John Audia <graysky@archlinux.us>
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
|
|
@@ -279,6 +279,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
|
|
@@ -425,10 +425,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
|
|
@@ -1895,6 +1895,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;
|