xhci: Kill streams URBs when the host dies. (21d0e51b) · Commits · 戴 / test

If the host controller stops responding to commands, we need to kill all the URBs that were queued to all endpoints. The current code would only kill URBs that had been queued to the endpoint rings. ep->ring is set to NULL if streams has been enabled for the endpoint, which means URBs submitted with a non-zero stream_id would never get killed. Fix this. Signed-off-by:

Sarah Sharp <sarah.a.sharp@linux.intel.com>

drivers/usb/host/xhci-ring.c

+21 −7

Original line number	Diff line number	Diff line
		@@ -922,6 +922,19 @@ static void xhci_kill_endpoint_urbs(struct xhci_hcd *xhci,
		struct xhci_ring *ring;

		ep = &xhci->devs[slot_id]->eps[ep_index];
		if ((ep->ep_state & EP_HAS_STREAMS) \|\|
		(ep->ep_state & EP_GETTING_NO_STREAMS)) {
		int stream_id;

		for (stream_id = 0; stream_id < ep->stream_info->num_streams;
		stream_id++) {
		xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb,
		"Killing URBs for slot ID %u, ep index %u, stream %u",
		slot_id, ep_index, stream_id + 1);
		xhci_kill_ring_urbs(xhci,
		ep->stream_info->stream_rings[stream_id]);
		}
		} else {
		ring = ep->ring;
		if (!ring)
		return;
		@@ -929,6 +942,7 @@ static void xhci_kill_endpoint_urbs(struct xhci_hcd *xhci,
		"Killing URBs for slot ID %u, ep index %u",
		slot_id, ep_index);
		xhci_kill_ring_urbs(xhci, ring);
		}
		while (!list_empty(&ep->cancelled_td_list)) {
		cur_td = list_first_entry(&ep->cancelled_td_list,
		struct xhci_td, cancelled_td_list);

Admin message