usb: xhci: Fix sum_trb_lengths()

This function is supposed to sum the lengths of all transfer TRBs in
a TD up to a point, but it starts summing at the current dequeue since
it only ever gets called on the first pending TD.

This won't work when there are cancelled TDs at the beginning of the
ring. The function tries to exclude No-Ops from the count, but not all
cancelled TDs are No-Op'ed - not those the HW stopped on.

The absolutely obvious fix is to start counting at the TD's first TRB.
And remove the now-useless 'ring' parameter, and 'xhci' too.

Signed-off-by: Michal Pecio <michal.pecio@gmail.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20241106101459.775897-4-mathias.nyman@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 36ccf0dac7faf6f4807cf4d1116b7b5baf670b1a..f1176c270c43a89254712c372825f77570caf391 100644 (file)
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -2263,13 +2263,12 @@ static int finish_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep,
        return xhci_td_cleanup(xhci, td, ep_ring, td->status);
 }
 
-/* sum trb lengths from ring dequeue up to stop_trb, _excluding_ stop_trb */
-static int sum_trb_lengths(struct xhci_hcd *xhci, struct xhci_ring *ring,
-                          union xhci_trb *stop_trb)
+/* sum trb lengths from the first trb up to stop_trb, _excluding_ stop_trb */
+static u32 sum_trb_lengths(struct xhci_td *td, union xhci_trb *stop_trb)
 {
        u32 sum;
-       union xhci_trb *trb = ring->dequeue;
-       struct xhci_segment *seg = ring->deq_seg;
+       union xhci_trb *trb = td->first_trb;
+       struct xhci_segment *seg = td->start_seg;
 
        for (sum = 0; trb != stop_trb; next_trb(&seg, &trb)) {
                if (!trb_is_noop(trb) && !trb_is_link(trb))
@@ -2460,7 +2459,7 @@ static int process_isoc_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep,
                goto finish_td;
 
        if (sum_trbs_for_length)
-               frame->actual_length = sum_trb_lengths(xhci, ep->ring, ep_trb) +
+               frame->actual_length = sum_trb_lengths(td, ep_trb) +
                        ep_trb_len - remaining;
        else
                frame->actual_length = requested;
@@ -2540,7 +2539,7 @@ static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep,
                goto finish_td;
        case COMP_STOPPED_LENGTH_INVALID:
                /* stopped on ep trb with invalid length, exclude it */
-               td->urb->actual_length = sum_trb_lengths(xhci, ep_ring, ep_trb);
+               td->urb->actual_length = sum_trb_lengths(td, ep_trb);
                goto finish_td;
        case COMP_USB_TRANSACTION_ERROR:
                if (xhci->quirks & XHCI_NO_SOFT_RETRY ||
@@ -2561,7 +2560,7 @@ static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep,
                td->urb->actual_length = requested - remaining;
        else
                td->urb->actual_length =
-                       sum_trb_lengths(xhci, ep_ring, ep_trb) +
+                       sum_trb_lengths(td, ep_trb) +
                        ep_trb_len - remaining;
 finish_td:
        if (remaining > requested) {