Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6809ffd authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: give command abortion one more chance before killing xhci 



We want to give the command abortion an additional try to stop
the command ring before we completely hose xhci.

Cc: <stable@vger.kernel.org>
Tested-by: default avatarVincent Pelletier <plr.vincent@gmail.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ff30cbc8

drivers/usb/host/xhci-ring.c

+9 −0
Original line number Diff line number Diff line
@@ -302,6 +302,15 @@ static int xhci_abort_cmd_ring(struct xhci_hcd *xhci) 
	ret = xhci_handshake(&xhci->op_regs->cmd_ring,

			CMD_RING_RUNNING, 0, 5 * 1000 * 1000);

	if (ret < 0) {

		/* we are about to kill xhci, give it one more chance */

		xhci_write_64(xhci, temp_64 | CMD_RING_ABORT,

			      &xhci->op_regs->cmd_ring);

		udelay(1000);

		ret = xhci_handshake(&xhci->op_regs->cmd_ring,

				     CMD_RING_RUNNING, 0, 3 * 1000 * 1000);

		if (ret == 0)

			return 0;



		xhci_err(xhci, "Stopped the command ring failed, "

				"maybe the host is dead\n");

		xhci->xhc_state |= XHCI_STATE_DYING;