]> git.karo-electronics.de Git - linux-beck.git/commit
xhci: Fix cycle bit calculation during stall handling.
authorSarah Sharp <sarah.a.sharp@linux.intel.com>
Thu, 24 Feb 2011 02:12:29 +0000 (18:12 -0800)
committerSarah Sharp <sarah.a.sharp@linux.intel.com>
Mon, 14 Mar 2011 01:23:54 +0000 (18:23 -0700)
commit01a1fdb9a7afa5e3c14c9316d6f380732750b4e4
treea8a27f453ca6ce5e5919f77a51368020887f5674
parentbf161e85fb153c0dd5a95faca73fd6a9d237c389
xhci: Fix cycle bit calculation during stall handling.

When an endpoint stalls, we need to update the xHCI host's internal
dequeue pointer to move it past the stalled transfer.  This includes
updating the cycle bit (TRB ownership bit) if we have moved the dequeue
pointer past a link TRB with the toggle cycle bit set.

When we're trying to find the new dequeue segment, find_trb_seg() is
supposed to keep track of whether we've passed any link TRBs with the
toggle cycle bit set.  However, this while loop's body

while (cur_seg->trbs > trb ||
&cur_seg->trbs[TRBS_PER_SEGMENT - 1] < trb) {

Will never get executed if the ring only contains one segment.
find_trb_seg() will return immediately, without updating the new cycle
bit.  Since find_trb_seg() has no idea where in the segment the TD that
stalled was, make the caller, xhci_find_new_dequeue_state(), check for
this special case and update the cycle bit accordingly.

This patch should be queued to kernels all the way back to 2.6.31.

Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Tested-by: Takashi Iwai <tiwai@suse.de>
Cc: stable@kernel.org
drivers/usb/host/xhci-ring.c