| From fd857d66c98bff2b6ff14440314f98c913bbfe9b Mon Sep 17 00:00:00 2001 |
| From: Jagadish Krishnamoorthy <jagadish.krishnamoorthy@intel.com> |
| Date: Tue, 20 Oct 2015 12:29:06 -0700 |
| Subject: [PATCH] CHROMIUM: HACK: xhci: Increase the reset handshake timeout |
| |
| There are few occasions where the xhci controller |
| is found to require more than 10s to complete |
| the reset operation. |
| |
| BRANCH=None |
| BUG=chrome-os-partner:46559,chrome-os-partner:46294 |
| TEST=Verified CherryView / Braswell platforms go through over |
| firmware_ConsecutiveBoot test |
| |
| Change-Id: I5f2c018d5c5e3fa914eb6988debb0d8079b1917a |
| Signed-off-by: Jagadish Krishnamoorthy <jagadish.krishnamoorthy@intel.com> |
| Signed-off-by: Freddy Paul <freddy.paul@intel.com> |
| Reviewed-on: https://chromium-review.googlesource.com/307394 |
| Commit-Ready: Bernie Thompson <bhthompson@chromium.org> |
| Reviewed-by: Aaron Durbin <adurbin@chromium.org> |
| [rebase44(groeck): Resolved conflicts] |
| Signed-off-by: Guenter Roeck <groeck@chromium.org> |
| --- |
| drivers/usb/host/xhci.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c |
| index 79d7931c048a8cd785101adb064c2f0ea8908f2a..a9d88861fbc5d82a3373e1fdfdfe2175dc5c0b35 100644 |
| --- a/drivers/usb/host/xhci.c |
| +++ b/drivers/usb/host/xhci.c |
| @@ -200,7 +200,8 @@ int xhci_reset(struct xhci_hcd *xhci, u64 timeout_us) |
| if (xhci->quirks & XHCI_INTEL_HOST) |
| udelay(1000); |
| |
| - ret = xhci_handshake(&xhci->op_regs->command, CMD_RESET, 0, timeout_us); |
| + ret = xhci_handshake(&xhci->op_regs->command, |
| + CMD_RESET, 0, 20 * 1000 * 1000); |
| if (ret) |
| return ret; |
| |
| -- |
| 2.38.1.584.g0f3c55d4c2-goog |
| |
