Skip to content

Commit 0e660d8

Browse files
matnymangregkh
authored andcommitted
xhci: dbc: fix bogus 1024 byte prefix if ttyDBC read races with stall event
[ Upstream commit f3d12ec ] DbC may add 1024 bogus bytes to the beginneing of the receiving endpoint if DbC hw triggers a STALL event before any Transfer Blocks (TRBs) for incoming data are queued, but driver handles the event after it queued the TRBs. This is possible as xHCI DbC hardware may trigger spurious STALL transfer events even if endpoint is empty. The STALL event contains a pointer to the stalled TRB, and "remaining" untransferred data length. As there are no TRBs queued yet the STALL event will just point to first TRB position of the empty ring, with '0' bytes remaining untransferred. DbC driver is polling for events, and may not handle the STALL event before /dev/ttyDBC0 is opened and incoming data TRBs are queued. The DbC event handler will now assume the first queued TRB (length 1024) has stalled with '0' bytes remaining untransferred, and copies the data This race situation can be practically mitigated by making sure the event handler handles all pending transfer events when DbC reaches configured state, and only then create dev/ttyDbC0, and start queueing transfers. The event handler can this way detect the STALL events on empty rings and discard them before any transfers are queued. This does in practice solve the issue, but still leaves a small possible gap for the race to trigger. We still need a way to distinguish spurious STALLs on empty rings with '0' bytes remaing, from actual STALL events with all bytes transmitted. Cc: stable <stable@kernel.org> Fixes: dfba217 ("usb: xhci: Add DbC support in xHCI driver") Tested-by: Łukasz Bartosik <ukaszb@chromium.org> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 3aa367e commit 0e660d8

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

drivers/usb/host/xhci-dbgcap.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,8 @@ static enum evtreturn xhci_dbc_do_handle_events(struct xhci_dbc *dbc)
880880
dev_info(dbc->dev, "DbC configured\n");
881881
portsc = readl(&dbc->regs->portsc);
882882
writel(portsc, &dbc->regs->portsc);
883-
return EVT_GSER;
883+
ret = EVT_GSER;
884+
break;
884885
}
885886

886887
return EVT_DONE;
@@ -940,7 +941,8 @@ static enum evtreturn xhci_dbc_do_handle_events(struct xhci_dbc *dbc)
940941
break;
941942
case TRB_TYPE(TRB_TRANSFER):
942943
dbc_handle_xfer_event(dbc, evt);
943-
ret = EVT_XFER_DONE;
944+
if (ret != EVT_GSER)
945+
ret = EVT_XFER_DONE;
944946
break;
945947
default:
946948
break;

0 commit comments

Comments
 (0)