projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 96005fb)
Revert "usb: xhci: Disable the XHCI 5 second timeout"
authorPhil Elwell <phil@raspberrypi.com>
Wed, 31 Mar 2021 09:33:35 +0000 (10:33 +0100)
committerPhil Elwell <8911409+pelwell@users.noreply.github.com>
Wed, 31 Mar 2021 13:09:32 +0000 (14:09 +0100)
This reverts commit 0b387d58aacc006b3cb24415c7c62baa99edf743.

drivers/usb/host/xhci.c patch | blob | history

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 2c31bfb..1054741 100644 (file)
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -196,9 +196,8 @@ int xhci_reset(struct xhci_hcd *xhci)
        if (xhci->quirks & XHCI_INTEL_HOST)
                udelay(1000);
 
-       // Hack: reduce handshake timeout from 10s 0.5s due to unprogrammed vl805
        ret = xhci_handshake(&xhci->op_regs->command,
-                       CMD_RESET, 0, 500 * 1000);
+                       CMD_RESET, 0, 10 * 1000 * 1000);
        if (ret)
                return ret;
 
Domain: System / Kernel;