Commit a6e097df authored Sep 14, 2012 by Michael Spang Committed by Sarah Sharp Sep 24, 2012

Increase XHCI suspend timeout to 16ms



The Intel XHCI specification says that after clearing the run/stop bit
the controller may take up to 16ms to halt. We've seen a device take
14ms, which with the current timeout of 10ms causes the kernel to
abort the suspend. Increasing the timeout to the recommended value
fixes the problem.

This patch should be backported to kernels as old as 2.6.37, that
contain the commit 5535b1d5 "USB: xHCI:
PCI power management implementation".

Signed-off-by: Michael Spang <spang@chromium.org>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable@vger.kernel.org

parent f3f4bf5c

drivers/usb/host/xhci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -888,7 +888,7 @@ int xhci_suspend(struct xhci_hcd *xhci)
		command &= ~CMD_RUN;
		xhci_writel(xhci, command, &xhci->op_regs->command);
		if (handshake(xhci, &xhci->op_regs->status,
		STS_HALT, STS_HALT, 100*100)) {
		STS_HALT, STS_HALT, XHCI_MAX_HALT_USEC)) {
		xhci_warn(xhci, "WARN: xHC CMD_RUN timeout\n");
		spin_unlock_irq(&xhci->lock);
		return -ETIMEDOUT;

Admin message