diff mbox series

[2/2] usb: xhci: apply XHCI_SUSPEND_DELAY to AMD XHCI controller 1022:145c

Message ID 20200306150858.21904-3-mathias.nyman@linux.intel.com (mailing list archive)
State Superseded
Commit 16263abc12d09871156a1c8650fb651f0e552f5e
Headers show
Series xhci fixes for usb-linus | expand

Commit Message

Mathias Nyman March 6, 2020, 3:08 p.m. UTC 
From: Alberto Mattea <alberto@mattea.info>

This controller timeouts during suspend (S3) with
[  240.521724] xhci_hcd 0000:30:00.3: WARN: xHC save state timeout
[  240.521729] xhci_hcd 0000:30:00.3: ERROR mismatched command completion event
thus preventing the system from entering S3.
Moreover it remains in an undefined state where some connected devices stop
working until a reboot.
Apply the XHCI_SUSPEND_DELAY quirk to make it suspend properly.

CC: stable@vger.kernel.org
Signed-off-by: Alberto Mattea <alberto@mattea.info>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
---
 drivers/usb/host/xhci-pci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Sasha Levin March 7, 2020, 11:20 p.m. UTC | #1 
Hi

[This is an automated email]

This commit has been processed because it contains a -stable tag.
The stable tag indicates that it's relevant for the following trees: all

The bot has tested the following trees: v5.5.8, v5.4.24, v4.19.108, v4.14.172, v4.9.215, v4.4.215.

v5.5.8: Build OK!
v5.4.24: Build OK!
v4.19.108: Build OK!
v4.14.172: Build OK!
v4.9.215: Failed to apply! Possible dependencies:
    191edc5e2e51 ("xhci: Fix front USB ports on ASUS PRIME B350M-A")
    4750bc78efdb ("usb: host: xhci support option to disable the xHCI USB2 HW LPM")
    488dc164914f ("xhci: remove WARN_ON if dma mask is not set for platform devices")
    4c39d4b949d3 ("usb: xhci: use bus->sysdev for DMA configuration")
    621faf4f6a18 ("xhci: Fix USB ports for Dell Inspiron 5775")

v4.4.215: Failed to apply! Possible dependencies:
    191edc5e2e51 ("xhci: Fix front USB ports on ASUS PRIME B350M-A")
    21939f003ad0 ("usb: host: xhci-plat: enable BROKEN_PED quirk if platform requested")
    41135de1e7fd ("usb: xhci: add quirk flag for broken PED bits")
    4750bc78efdb ("usb: host: xhci support option to disable the xHCI USB2 HW LPM")
    488dc164914f ("xhci: remove WARN_ON if dma mask is not set for platform devices")
    4c39d4b949d3 ("usb: xhci: use bus->sysdev for DMA configuration")
    4efb2f694114 ("usb: host: xhci-plat: add struct xhci_plat_priv")
    621faf4f6a18 ("xhci: Fix USB ports for Dell Inspiron 5775")
    69307ccb9ad7 ("usb: xhci: bInterval quirk for TI TUSB73x0")
    76f9502fe761 ("xhci: plat: adapt to unified device property interface")
    9da5a1092b13 ("xhci: Bad Ethernet performance plugged in ASM1042A host")
    a3aef3793071 ("xhci: get rid of platform data")
    dec08194ffec ("xhci: Limit USB2 port wake support for AMD Promontory hosts")
    def4e6f7b419 ("xhci: refactor and cleanup endpoint initialization.")


NOTE: The patch will not be queued to stable trees until it is upstream.

How should we proceed with this patch?
diff mbox series

Patch

diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 5e9b537df631..1fddc41fa1f3 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -136,7 +136,8 @@  static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
 		xhci->quirks |= XHCI_AMD_PLL_FIX;
 
 	if (pdev->vendor == PCI_VENDOR_ID_AMD &&
-		(pdev->device == 0x15e0 ||
+		(pdev->device == 0x145c ||
+		 pdev->device == 0x15e0 ||
 		 pdev->device == 0x15e1 ||
 		 pdev->device == 0x43bb))
 		xhci->quirks |= XHCI_SUSPEND_DELAY;