Skip to content

Commit a5c98e8

Browse files
matnymangregkh
authored andcommitted
xhci: dbc: Fix full DbC transfer ring after several reconnects
Pending requests will be flushed on disconnect, and the corresponding TRBs will be turned into No-op TRBs, which are ignored by the xHC controller once it starts processing the ring. If the USB debug cable repeatedly disconnects before ring is started then the ring will eventually be filled with No-op TRBs. No new transfers can be queued when the ring is full, and driver will print the following error message: "xhci_hcd 0000:00:14.0: failed to queue trbs" This is a normal case for 'in' transfers where TRBs are always enqueued in advance, ready to take on incoming data. If no data arrives, and device is disconnected, then ring dequeue will remain at beginning of the ring while enqueue points to first free TRB after last cancelled No-op TRB. s Solve this by reinitializing the rings when the debug cable disconnects and DbC is leaving the configured state. Clear the whole ring buffer and set enqueue and dequeue to the beginning of ring, and set cycle bit to its initial state. Cc: stable@vger.kernel.org Fixes: dfba217 ("usb: xhci: Add DbC support in xHCI driver") Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Link: https://lore.kernel.org/r/20250902105306.877476-3-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 220a0ff commit a5c98e8

File tree

1 file changed

+21
-2
lines changed

1 file changed

+21
-2
lines changed

drivers/usb/host/xhci-dbgcap.c

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,25 @@ static void xhci_dbc_ring_init(struct xhci_ring *ring)
462462
xhci_initialize_ring_info(ring);
463463
}
464464

465+
static int xhci_dbc_reinit_ep_rings(struct xhci_dbc *dbc)
466+
{
467+
struct xhci_ring *in_ring = dbc->eps[BULK_IN].ring;
468+
struct xhci_ring *out_ring = dbc->eps[BULK_OUT].ring;
469+
470+
if (!in_ring || !out_ring || !dbc->ctx) {
471+
dev_warn(dbc->dev, "Can't re-init unallocated endpoints\n");
472+
return -ENODEV;
473+
}
474+
475+
xhci_dbc_ring_init(in_ring);
476+
xhci_dbc_ring_init(out_ring);
477+
478+
/* set ep context enqueue, dequeue, and cycle to initial values */
479+
xhci_dbc_init_ep_contexts(dbc);
480+
481+
return 0;
482+
}
483+
465484
static struct xhci_ring *
466485
xhci_dbc_ring_alloc(struct device *dev, enum xhci_ring_type type, gfp_t flags)
467486
{
@@ -885,7 +904,7 @@ static enum evtreturn xhci_dbc_do_handle_events(struct xhci_dbc *dbc)
885904
dev_info(dbc->dev, "DbC cable unplugged\n");
886905
dbc->state = DS_ENABLED;
887906
xhci_dbc_flush_requests(dbc);
888-
907+
xhci_dbc_reinit_ep_rings(dbc);
889908
return EVT_DISC;
890909
}
891910

@@ -895,7 +914,7 @@ static enum evtreturn xhci_dbc_do_handle_events(struct xhci_dbc *dbc)
895914
writel(portsc, &dbc->regs->portsc);
896915
dbc->state = DS_ENABLED;
897916
xhci_dbc_flush_requests(dbc);
898-
917+
xhci_dbc_reinit_ep_rings(dbc);
899918
return EVT_DISC;
900919
}
901920

0 commit comments

Comments
 (0)