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

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

xhci: Fix command ring stop regression in 4.11 



In 4.11 TRB completion codes were renamed to match spec.

Completion codes for command ring stopped and endpoint stopped
were mixed, leading to failures while handling a stopped command ring.

Use the correct completion code for command ring stopped events.

Fixes: 0b7c105a ("usb: host: xhci: rename completion codes to match spec")
Cc: <stable@vger.kernel.org> # 4.11
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5db851cf

drivers/usb/host/xhci-hub.c

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ static int xhci_stop_device(struct xhci_hcd *xhci, int slot_id, int suspend) 
	wait_for_completion(cmd->completion);



	if (cmd->status == COMP_COMMAND_ABORTED ||

			cmd->status == COMP_STOPPED) {

	    cmd->status == COMP_COMMAND_RING_STOPPED) {

		xhci_warn(xhci, "Timeout while waiting for stop endpoint command\n");

		ret = -ETIME;

	}

drivers/usb/host/xhci-ring.c

+4 −4
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ static void xhci_handle_stopped_cmd_ring(struct xhci_hcd *xhci, 
		if (i_cmd->status != COMP_COMMAND_ABORTED)

			continue;



		i_cmd->status = COMP_STOPPED;

		i_cmd->status = COMP_COMMAND_RING_STOPPED;



		xhci_dbg(xhci, "Turn aborted command %p to no-op\n",

			 i_cmd->command_trb);
@@ -1380,7 +1380,7 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, 
	cmd_comp_code = GET_COMP_CODE(le32_to_cpu(event->status));



	/* If CMD ring stopped we own the trbs between enqueue and dequeue */

	if (cmd_comp_code == COMP_STOPPED) {

	if (cmd_comp_code == COMP_COMMAND_RING_STOPPED) {

		complete_all(&xhci->cmd_ring_stop_completion);

		return;

	}
@@ -1436,8 +1436,8 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, 
		break;

	case TRB_CMD_NOOP:

		/* Is this an aborted command turned to NO-OP? */

		if (cmd->status == COMP_STOPPED)

			cmd_comp_code = COMP_STOPPED;

		if (cmd->status == COMP_COMMAND_RING_STOPPED)

			cmd_comp_code = COMP_COMMAND_RING_STOPPED;

		break;

	case TRB_RESET_EP:

		WARN_ON(slot_id != TRB_TO_SLOT_ID(

drivers/usb/host/xhci.c

+4 −4
Original line number Diff line number Diff line
@@ -1764,7 +1764,7 @@ static int xhci_configure_endpoint_result(struct xhci_hcd *xhci, 


	switch (*cmd_status) {

	case COMP_COMMAND_ABORTED:

	case COMP_STOPPED:

	case COMP_COMMAND_RING_STOPPED:

		xhci_warn(xhci, "Timeout while waiting for configure endpoint command\n");

		ret = -ETIME;

		break;
@@ -1814,7 +1814,7 @@ static int xhci_evaluate_context_result(struct xhci_hcd *xhci, 


	switch (*cmd_status) {

	case COMP_COMMAND_ABORTED:

	case COMP_STOPPED:

	case COMP_COMMAND_RING_STOPPED:

		xhci_warn(xhci, "Timeout while waiting for evaluate context command\n");

		ret = -ETIME;

		break;
@@ -3433,7 +3433,7 @@ static int xhci_discover_or_reset_device(struct usb_hcd *hcd, 
	ret = reset_device_cmd->status;

	switch (ret) {

	case COMP_COMMAND_ABORTED:

	case COMP_STOPPED:

	case COMP_COMMAND_RING_STOPPED:

		xhci_warn(xhci, "Timeout waiting for reset device command\n");

		ret = -ETIME;

		goto command_cleanup;
@@ -3818,7 +3818,7 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev, 
	 */

	switch (command->status) {

	case COMP_COMMAND_ABORTED:

	case COMP_STOPPED:

	case COMP_COMMAND_RING_STOPPED:

		xhci_warn(xhci, "Timeout while waiting for setup device command\n");

		ret = -ETIME;

		break;