usb: xhci: Don't try to recover an endpoint if port is in error state.

A USB3 device needs to be reset and re-enumarated if the port it
connects to goes to a error state, with link state inactive.

There is no use in trying to recover failed transactions by resetting
endpoints at this stage. Tests show that in rare cases, after multiple
endpoint resets of a roothub port the whole host controller might stop
completely.

Several retries to recover from transaction error can happen as
it can take a long time before the hub thread discovers the USB3
port error and inactive link.

We can't reliably detect the port error from slot or endpoint context
due to a limitation in xhci, see xhci specs section 4.8.3:
"There are several cases where the EP State field in the Output
Endpoint Context may not reflect the current state of an endpoint"
and
"Software should maintain an accurate value for EP State, by tracking it
with an internal variable that is driven by Events and Doorbell accesses"

Same appears to be true for slot state.

set a flag to the corresponding slot if a USB3 roothub port link goes
inactive to prevent both queueing new URBs and resetting endpoints.

Reported-by: Rapolu Chiranjeevi <chiranjeevi.rapolu@intel.com>
Tested-by: Rapolu Chiranjeevi <chiranjeevi.rapolu@intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index feffceb31e8ac6ec2a5c3c88d666455eb89b1fac..121782e22c01d3dafba32443860a43fb2f4e1dad 100644 (file)
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -1612,8 +1612,13 @@ static void handle_port_status(struct xhci_hcd *xhci,
                usb_hcd_resume_root_hub(hcd);
        }
 
-       if (hcd->speed >= HCD_USB3 && (portsc & PORT_PLS_MASK) == XDEV_INACTIVE)
+       if (hcd->speed >= HCD_USB3 &&
+           (portsc & PORT_PLS_MASK) == XDEV_INACTIVE) {
+               slot_id = xhci_find_slot_id_by_port(hcd, xhci, hcd_portnum + 1);
+               if (slot_id && xhci->devs[slot_id])
+                       xhci->devs[slot_id]->flags |= VDEV_PORT_ERROR;
                bus_state->port_remote_wakeup &= ~(1 << hcd_portnum);
+       }
 
        if ((portsc & PORT_PLC) && (portsc & PORT_PLS_MASK) == XDEV_RESUME) {
                xhci_dbg(xhci, "port resume event for port %d\n", port_id);
@@ -1801,6 +1806,14 @@ static void xhci_cleanup_halted_endpoint(struct xhci_hcd *xhci,
 {
        struct xhci_virt_ep *ep = &xhci->devs[slot_id]->eps[ep_index];
        struct xhci_command *command;
+
+       /*
+        * Avoid resetting endpoint if link is inactive. Can cause host hang.
+        * Device will be reset soon to recover the link so don't do anything
+        */
+       if (xhci->devs[slot_id]->flags & VDEV_PORT_ERROR)
+               return;
+
        command = xhci_alloc_command(xhci, false, GFP_ATOMIC);
        if (!command)
                return;

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 20db378a60123ccae997948408385b64c8410b1b..78a2a937dd839087c47a682caff16f571269ccdd 100644 (file)
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -1466,6 +1466,10 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag
                        xhci_dbg(xhci, "urb submitted during PCI suspend\n");
                return -ESHUTDOWN;
        }
+       if (xhci->devs[slot_id]->flags & VDEV_PORT_ERROR) {
+               xhci_dbg(xhci, "Can't queue urb, port error, link inactive\n");
+               return -ENODEV;
+       }
 
        if (usb_endpoint_xfer_isoc(&urb->ep->desc))
                num_tds = urb->number_of_packets;
@@ -3754,6 +3758,7 @@ static int xhci_discover_or_reset_device(struct usb_hcd *hcd,
        }
        /* If necessary, update the number of active TTs on this root port */
        xhci_update_tt_active_eps(xhci, virt_dev, old_active_eps);
+       virt_dev->flags = 0;
        ret = 0;
 
 command_cleanup:

diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 7f8b950d1a73efc8d3491068cbdd8e571309d31f..92e764c54154fcfc3a317758f5ae319d3ee23f76 100644 (file)
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1010,6 +1010,15 @@ struct xhci_virt_device {
        u8                              real_port;
        struct xhci_interval_bw_table   *bw_table;
        struct xhci_tt_bw_info          *tt_info;
+       /*
+        * flags for state tracking based on events and issued commands.
+        * Software can not rely on states from output contexts because of
+        * latency between events and xHC updating output context values.
+        * See xhci 1.1 section 4.8.3 for more details
+        */
+       unsigned long                   flags;
+#define VDEV_PORT_ERROR                        BIT(0) /* Port error, link inactive */
+
        /* The current max exit latency for the enabled USB3 link states. */
        u16                             current_mel;
        /* Used for the debugfs interfaces. */