Commit 7de60546 authored Jan 23, 2017 by Xin Long Committed by Chandana Kishori Chiluveru Mar 22, 2019

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: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: Iae8a07885087943ec046d708312667c830c24e1b
Git-commit: 1cc6d8617b9107f22ab86cec168f7f53f5ef42be
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Signed-off-by: Chandana Kishori Chiluveru <cchiluve@codeaurora.org>

parent b6a6377d

drivers/usb/host/xhci-ring.c

+6 −14

Original line number	Diff line number	Diff line
		@@ -363,21 +363,13 @@ static int xhci_abort_cmd_ring(struct xhci_hcd *xhci, unsigned long flags)
		ret = xhci_handshake_check_state(xhci, &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_check_state(xhci, &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_quiesce(xhci);
		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