| From 2d7b92bfd7d062880c31dc8276a01a6a9aecd502 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 | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c |
| index 884b0898d9c9577c4554ac9559a3a064caefd936..c86f26946b032b9c656fd98553e39702db464c91 100644 |
| --- a/drivers/usb/host/xhci.c |
| +++ b/drivers/usb/host/xhci.c |
| @@ -225,7 +225,7 @@ int xhci_reset(struct xhci_hcd *xhci, u64 timeout_us) |
| udelay(1000); |
| |
| ret = xhci_handshake_check_state(xhci, &xhci->op_regs->command, |
| - CMD_RESET, 0, timeout_us, XHCI_STATE_REMOVING); |
| + CMD_RESET, 0, 20 * 1000 * 1000, XHCI_STATE_REMOVING); |
| if (ret) |
| return ret; |
| |
| -- |
| 2.43.0.rc2.451.g8631bc7472-goog |
| |
