Skip to content

Commit

Permalink
usb: xhci: workaround for bogus SET_DEQ_PENDING endpoint state
Browse files Browse the repository at this point in the history
See #3981

An unknown unsafe memory access can result in the ep_state variable
in xhci_virt_ep being trampled with a stuck SET_DEQ_PENDING state
despite successful completion of a Set TR Deq Pointer command.

All URB enqueue/dequeue calls for the endpoint will fail in this state
so no transfers are possible until the device is reconnected.

As a workaround, clear the flag if we see it set and issue a new Set
TR Deq command anyway - this should be harmless, as a prior Set TR Deq
command will only have been issued in the Stopped state, and if the
endpoint is Running then the controller is required to ignore it and
respond with a Context State Error event TRB.

Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  • Loading branch information
P33M authored and popcornmix committed Feb 6, 2024
1 parent d1569ee commit 2e3c0f3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/usb/host/xhci-ring.c
Expand Up @@ -733,9 +733,9 @@ static int xhci_move_dequeue_past_td(struct xhci_hcd *xhci,
}

if ((ep->ep_state & SET_DEQ_PENDING)) {
xhci_warn(xhci, "Set TR Deq already pending, don't submit for 0x%pad\n",
&addr);
return -EBUSY;
xhci_warn(xhci, "WARN A Set TR Deq Ptr command is pending for slot %u ep %u\n",
slot_id, ep_index);
ep->ep_state &= ~SET_DEQ_PENDING;
}

/* This function gets called from contexts where it cannot sleep */
Expand Down

0 comments on commit 2e3c0f3

Please sign in to comment.