From 734f88ba2f25fccad6ad1653e649acf1a57e5761 Mon Sep 17 00:00:00 2001 From: Pratham Pratap Date: Thu, 26 Dec 2019 17:30:00 +0530 Subject: [PATCH] usb: xhci: Increase xhci halt timeout Currently xhci halt timeout is 16ms which sometimes leads to controller halt failure. This results in controller accessing addresses which are unmapped leading to SMMU faults. This change increases the timeout to 32ms so that controller has enough time to complete the pending transactions. Change-Id: Id3435e8577923536b767da42d24d528ea91e8988 Signed-off-by: Pratham Pratap --- drivers/usb/host/xhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 838593bb2bff..1176b001e3dd 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -115,7 +115,7 @@ int xhci_halt(struct xhci_hcd *xhci) xhci_quiesce(xhci); ret = xhci_handshake(&xhci->op_regs->status, - STS_HALT, STS_HALT, XHCI_MAX_HALT_USEC); + STS_HALT, STS_HALT, 2 * XHCI_MAX_HALT_USEC); if (ret) { xhci_warn(xhci, "Host halt failed, %d\n", ret); return ret;