From 1771bca0cfd98ae5b6f178293f10d5cebe96c736 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Fri, 22 Mar 2019 09:47:14 +0000 Subject: [PATCH] usb: xhci: Disable the XHCI 5 second timeout raspberrypi inclusion category: feature bugzilla: 50432 -------------------------------- If the VL805 EEPROM has not been programmed then boot will hang for five seconds. The timeout seems to be arbitrary and is an unecessary delay on the first boot. Remove the timeout. This is common code and probably can't be upstreamed unless the timeout can be configurable somehow or perhaps the XHCI driver can be skipped on the first boot. Signed-off-by: Fang Yafen Signed-off-by: Zheng Zengkai --- drivers/usb/host/xhci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index d17bbb162810..d53b651685ec 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -196,8 +196,9 @@ 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, 10 * 1000 * 1000); + CMD_RESET, 0, 500 * 1000); if (ret) return ret; -- GitLab