Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 305886ca authored by Ajay Gupta's avatar Ajay Gupta Committed by Greg Kroah-Hartman
Browse files

usb: xhci: increase CRS timeout value 



Some controllers take almost 55ms to complete controller
restore state (CRS).
There is no timeout limit mentioned in xhci specification so
fixing the issue by increasing the timeout limit to 100ms

[reformat code comment -Mathias]
Signed-off-by: default avatarAjay Gupta <ajaykuee@gmail.com>
Signed-off-by: default avatarNagaraj Annaiah <naga.annaiah@gmail.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3431a150

drivers/usb/host/xhci.c

+6 −1
Original line number Diff line number Diff line
@@ -1078,8 +1078,13 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) 
		command = readl(&xhci->op_regs->command);

		command |= CMD_CRS;

		writel(command, &xhci->op_regs->command);

		/*

		 * Some controllers take up to 55+ ms to complete the controller

		 * restore so setting the timeout to 100ms. Xhci specification

		 * doesn't mention any timeout value.

		 */

		if (xhci_handshake(&xhci->op_regs->status,

			      STS_RESTORE, 0, 10 * 1000)) {

			      STS_RESTORE, 0, 100 * 1000)) {

			xhci_warn(xhci, "WARN: xHC restore state timeout\n");

			spin_unlock_irq(&xhci->lock);

			return -ETIMEDOUT;