mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-11 07:03:09 -04:00
Merge "usb: xhci: Reduce command abort handshake timeout"
This commit is contained in:
commit
216a9df69f
1 changed files with 3 additions and 3 deletions
|
|
@ -351,13 +351,13 @@ static int xhci_abort_cmd_ring(struct xhci_hcd *xhci, unsigned long flags)
|
|||
&xhci->op_regs->cmd_ring);
|
||||
|
||||
/* Section 4.6.1.2 of xHCI 1.0 spec says software should also time the
|
||||
* completion of the Command Abort operation. If CRR is not negated in 5
|
||||
* seconds then driver handles it as if host died (-ENODEV).
|
||||
* completion of the Command Abort operation. If CRR is not negated in a
|
||||
* timely manner then driver handles it as if host died (-ENODEV).
|
||||
* In the future we should distinguish between -ENODEV and -ETIMEDOUT
|
||||
* and try to recover a -ETIMEDOUT with a host controller reset.
|
||||
*/
|
||||
ret = xhci_handshake(&xhci->op_regs->cmd_ring,
|
||||
CMD_RING_RUNNING, 0, 5 * 1000 * 1000);
|
||||
CMD_RING_RUNNING, 0, 1000 * 1000);
|
||||
if (ret < 0) {
|
||||
xhci_err(xhci, "Abort failed to stop command ring: %d\n", ret);
|
||||
xhci_halt(xhci);
|
||||
|
|
|
|||
Loading…
Reference in a new issue