From ca09b1bea63ab83f4cca3a2ae8bc4f597ec28851 Mon Sep 17 00:00:00 2001

From: Maximilian Luz <luzmaximilian@gmail.com>

Date: Wed, 12 May 2021 11:08:15 +0300

Subject: [PATCH] usb: xhci: Increase timeout for HC halt

Git-commit: ca09b1bea63ab83f4cca3a2ae8bc4f597ec28851

References: git-fixes

Patch-mainline: v5.13-rc2

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>

Signed-off-by: Oliver Neukum <oneukum@suse.com>

---

 drivers/usb/host/xhci-ext-caps.h |    5 +++--

 1 file changed, 3 insertions(+), 2 deletions(-)

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

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

@@ -19,8 +19,9 @@

  * along with this program; if not, write to the Free Software Foundation,

  * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

  */

-/* 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)