Commit 7cc68b70 authored May 12, 2021 by Maximilian Luz Committed by Greg Kroah-Hartman May 22, 2021

usb: xhci: Increase timeout for HC halt



commit ca09b1bea63ab83f4cca3a2ae8bc4f597ec28851 upstream.

On some devices (specifically the SC8180x based Surface Pro X with
QCOM04A6) HC halt / xhci_halt() times out during boot. Manually binding
the xhci-hcd driver at some point later does not exhibit this behavior.
To work around this, double XHCI_MAX_HALT_USEC, which also resolves this
issue.

Cc: <stable@vger.kernel.org>
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20210512080816.866037-5-mathias.nyman@linux.intel.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent ccda47fb

drivers/usb/host/xhci-ext-caps.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,9 @@
		* Author: Sarah Sharp
		* Some code borrowed from the Linux EHCI driver.
		*/
		/* Up to 16 ms to halt an HC */
		#define XHCI_MAX_HALT_USEC (16*1000)

		/* HC should halt within 16 ms, but use 32 ms as some hosts take longer */
		#define XHCI_MAX_HALT_USEC (32 * 1000)
		/* HC not running - set to 1 when run/stop bit is cleared. */
		#define XHCI_STS_HALT (1<<0)