| From 680b9bb243bbf56ead60a01325455e1eee666066 Mon Sep 17 00:00:00 2001 |
| From: Alberto Mattea <alberto@mattea.info> |
| Date: Fri, 6 Mar 2020 17:08:58 +0200 |
| Subject: [PATCH] usb: xhci: apply XHCI_SUSPEND_DELAY to AMD XHCI controller |
| 1022:145c |
| |
| commit 16263abc12d09871156a1c8650fb651f0e552f5e upstream. |
| |
| 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> |
| Link: https://lore.kernel.org/r/20200306150858.21904-3-mathias.nyman@linux.intel.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c |
| index cae9e45a2ded..2f67353d3cac 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; |
| -- |
| 2.7.4 |
| |
