patch "xhci: Fix command ring stop regression in 4.11" added to usb-linus
Subsystems (3)
This is a note to let you know that I've just added the patch titled
xhci: Fix command ring stop regression in 4.11
to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
Quoted 1 line
From
604d02a2a66ab7f93fd3b2bde3698c29ef057b65Mon Sep 17 00:00:00 2001
From: Mathias Nyman <[email protected]>
Date: Wed, 17 May 2017 18:32:05 +0300
Subject: 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.
--- drivers/usb/host/xhci-hub.c | 2 +- drivers/usb/host/xhci-ring.c | 8 ++++---- drivers/usb/host/xhci.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-)
drivers/usb/host/xhci-hub.c +1 -1
@@ -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
@@ -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
@@ -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 ;
Signature · 1 line
2.13.0