summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWeitao Wang <WeitaoWang-oc@zhaoxin.com>2023-06-02 17:40:06 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-07-23 13:47:53 +0200
commit328b18a42a57ef68d6c5c6285a8bd0f0ccce9413 (patch)
treeb922188c18abe500495babcf64c46331fc85fd98
parentd9c91ef5d8da899ca44c1293fe1e822d46835b62 (diff)
downloadlinux-328b18a42a57ef68d6c5c6285a8bd0f0ccce9413.tar.gz
linux-328b18a42a57ef68d6c5c6285a8bd0f0ccce9413.tar.bz2
linux-328b18a42a57ef68d6c5c6285a8bd0f0ccce9413.zip
xhci: Fix resume issue of some ZHAOXIN hosts
commit f927728186f0de1167262d6a632f9f7e96433d1a upstream. On ZHAOXIN ZX-100 project, xHCI can't work normally after resume from system Sx state. To fix this issue, when resume from system Sx state, reinitialize xHCI instead of restore. So, Add XHCI_RESET_ON_RESUME quirk for ZX-100 to fix issue of resuming from system Sx state. Cc: stable@vger.kernel.org Signed-off-by: Weitao Wang <WeitaoWang-oc@zhaoxin.com> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Message-ID: <20230602144009.1225632-9-mathias.nyman@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/host/xhci-pci.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 131a6dc2ecff..632f85575d1d 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -336,6 +336,11 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_4))
xhci->quirks |= XHCI_NO_SOFT_RETRY;
+ if (pdev->vendor == PCI_VENDOR_ID_ZHAOXIN) {
+ if (pdev->device == 0x9202)
+ xhci->quirks |= XHCI_RESET_ON_RESUME;
+ }
+
/* xHC spec requires PCI devices to support D3hot and D3cold */
if (xhci->hci_version >= 0x120)
xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW;