forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

UPSTREAM: xhci: fix giving back URB with incorrect status regression in 5.12

Browse source 
5.12 kernel changes how xhci handles cancelled URBs and halted
endpoints. Among these changes cancelled and stalled URBs are no longer
given back before they are cleared from xHC hardware cache.

These changes unfortunately cleared the -EPIPE status of a stalled
transfer in one case before giving bak the URB, causing a USB card reader
to fail from working.

Fixes: 674f8438c1 ("xhci: split handling halted endpoints into two steps")
Cc: <stable@vger.kernel.org> # 5.12
Reported-by: Peter Ganzhorn <peter.ganzhorn@googlemail.com>
Tested-by: Peter Ganzhorn <peter.ganzhorn@googlemail.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20210525074100.1154090-2-mathias.nyman@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit a80c203c3f)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I127653518a3f3290d67a6603215ec7f53c432c9a
This commit is contained in:
Mathias Nyman 2021-05-25 10:40:59 +03:00 • committed by Greg Kroah-Hartman
commit fb808d7c18
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/usb/host/xhci-ring.c
View file

@ -830,14 +830,10 @@ static void xhci_giveback_invalidated_tds(struct xhci_virt_ep *ep)
list_for_each_entry_safe(td, tmp_td, &ep->cancelled_td_list,
cancelled_td_list) {
/*
* Doesn't matter what we pass for status, since the core will
* just overwrite it (because the URB has been unlinked).
*/
ring = xhci_urb_to_transfer_ring(ep->xhci, td->urb);
if (td->cancel_status == TD_CLEARED)
xhci_td_cleanup(ep->xhci, td, ring, 0);
xhci_td_cleanup(ep->xhci, td, ring, td->status);
if (ep->xhci->xhc_state & XHCI_STATE_DYING)
return;