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

Commit 1cc6d861 authored by Lu Baolu's avatar Lu Baolu Committed by Greg Kroah-Hartman
Browse files

usb: xhci: remove unnecessary second abort try 



The second try was a workaround for (what we thought was) command
ring failing to stop in the first place. But this turns out to be
due to the race that we have fixed(see "xhci: Fix race related to
abort operation"). With that fix, it is time to remove the second
try.

Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6b02e974

drivers/usb/host/xhci-ring.c

+5 −13
Original line number Diff line number Diff line
@@ -362,20 +362,12 @@ static int xhci_abort_cmd_ring(struct xhci_hcd *xhci, unsigned long flags) 
	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) {

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

				 "maybe the host is dead\n");

		xhci_err(xhci,

			 "Stop command ring failed, maybe the host is dead\n");

		xhci->xhc_state |= XHCI_STATE_DYING;

		xhci_halt(xhci);

		return -ESHUTDOWN;

	}

	}

	/*

	 * Writing the CMD_RING_ABORT bit should cause a cmd completion event,

	 * however on some host hw the CMD_RING_RUNNING bit is correctly cleared