Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 760973d2 authored by Sarah Sharp's avatar Sarah Sharp
Browse files

xhci: Fix isoc TD encoding. 



An isochronous TD is comprised of one isochronous TRB chained to zero or
more normal TRBs.  Only the isoc TRB has the TBC and TLBPC fields.  The
normal TRBs must set those fields to zeroes.  The code was setting the
TBC and TLBPC fields for both isoc and normal TRBs.  Fix this.

This should be backported to stable kernels as old as 3.0, that contain
the commit b61d378f " xhci 1.0: Set
transfer burst last packet count field."

Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable@vger.kernel.org
parent dba63b2f

drivers/usb/host/xhci-ring.c

+3 −1
Original line number Diff line number Diff line
@@ -3664,9 +3664,11 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags, 
		td = urb_priv->td[i];

		for (j = 0; j < trbs_per_td; j++) {

			u32 remainder = 0;

			field = TRB_TBC(burst_count) | TRB_TLBPC(residue);

			field = 0;



			if (first_trb) {

				field = TRB_TBC(burst_count) |

					TRB_TLBPC(residue);

				/* Queue the isoc TRB */

				field |= TRB_TYPE(TRB_ISOC);

				/* Assume URB_ISO_ASAP is set */