2017-09-06 19:19:45 +08:00
|
|
|
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
|
kernel: bump to 4.14.193, 4.19.138, 5.4.59 (#5350)
kernel: bump to 4.14.193, 4.19.138, 5.4.59 (#5350)
431fb8c mac80211: add AQL improvements
6bdd4c9 mac80211: add missing backports for building with 4.14 kernels
0106820 mac80211: add missing return code checks in AQL improvements
e7f7101 mac80211: rework encapsulation offload support
[package]
base-files: add function for generating random MAC
dnsmasq: abort dhcp_check on interface state
boot: sync upstream source code
ath10k-ct-firmware/mt76/sch_cake: update to latest git HEAD
[script]
download: add China Mirror Station
[target]
Sync: arc770, ath79, bcm63xx, kirkwood, lantiq, layerscape,
mediatek, mvebu, octeon, oxnas, pistachio, uml
Sync most of the target patches.
Run-compiled-on: ipq40xx (4.19 & 5.4), ramips
2020-08-26 11:31:50 +08:00
|
|
|
@@ -278,6 +278,7 @@ static void xhci_pci_quirks(struct devic
|
2020-07-02 23:30:56 +08:00
|
|
|
pdev->device == 0x0015) {
|
|
|
|
|
xhci->quirks |= XHCI_RESET_ON_RESUME;
|
|
|
|
|
xhci->quirks |= XHCI_ZERO_64B_REGS;
|
|
|
|
|
+ xhci->quirks |= XHCI_FORCE_MSI;
|
|
|
|
|
}
|
2017-09-06 19:19:45 +08:00
|
|
|
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
|
2020-07-02 23:30:56 +08:00
|
|
|
@@ -423,10 +423,14 @@ static int xhci_try_enable_msi(struct us
|
2017-09-06 19:19:45 +08:00
|
|
|
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);
|
|
|
|
|
+ }
|
|
|
|
|
|
2018-01-15 18:26:41 +08:00
|
|
|
if (!ret) {
|
|
|
|
|
hcd->msi_enabled = 1;
|
2017-09-06 19:19:45 +08:00
|
|
|
--- a/drivers/usb/host/xhci.h
|
|
|
|
|
+++ b/drivers/usb/host/xhci.h
|
2020-07-02 23:30:56 +08:00
|
|
|
@@ -1880,6 +1880,7 @@ struct xhci_hcd {
|
|
|
|
|
struct xhci_hub usb2_rhub;
|
|
|
|
|
struct xhci_hub usb3_rhub;
|
2017-09-06 19:19:45 +08:00
|
|
|
/* support xHCI 1.0 spec USB2 hardware LPM */
|
|
|
|
|
+#define XHCI_FORCE_MSI (1 << 24)
|
|
|
|
|
unsigned hw_lpm_support:1;
|
2019-01-11 11:25:40 +08:00
|
|
|
/* Broken Suspend flag for SNPS Suspend resume issue */
|
|
|
|
|
unsigned broken_suspend:1;
|
