Commit 7956b826 authored May 15, 2014 by Zhuang Jin Can Committed by Dov Levenglick Jun 19, 2014

usb: dwc3: gadget: check link trb after free_slot is increased



In ISOC transfers, when free_slot points to the last TRB (i.e. Link
TRB), and all queued requests meet Missed Interval Isoc error, busy_slot
points to trb0.
	busy_slot->trb0
		   trb1
		   ...
	free_slot->trb31(Link TRB)

After end transfer and receiving the XferNotReady event, trb_left is
caculated as 1 which is wrong, and no TRB will be primed to the
endpoint.

The root cause is free_slot is not increased the same way as busy_slot.
When busy_slot is increased by one, it checks if points to a link TRB
after increasement, but free_slot checks it before increasement.
free_slot should behave the same as busy_slot to make the trb_left
caculation correct.

Change-Id: I73fea6d2faec370f0426c47f8bc6c82f21fc70e6
Signed-off-by: Zhuang Jin Can <jin.can.zhuang@intel.com>
Signed-off-by: Jiebing Li <jiebing.li@intel.com>
Patch-mainline: linux-usb @ 2014-05-15 9:58:49
[dovl@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Dov Levenglick <dovl@codeaurora.org>

parent 7a91470b

drivers/usb/dwc3/gadget.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -871,10 +871,6 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
		length, last ? " last" : "",
		chain ? " chain" : "");

		/* Skip the LINK-TRB on ISOC */
		if (((dep->free_slot & DWC3_TRB_MASK) == DWC3_TRB_NUM - 1) &&
		usb_endpoint_xfer_isoc(dep->endpoint.desc))
		dep->free_slot++;

		trb = &dep->trb_pool[dep->free_slot & DWC3_TRB_MASK];

		@@ -886,6 +882,10 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
		}

		dep->free_slot++;
		/* Skip the LINK-TRB on ISOC */
		if (((dep->free_slot & DWC3_TRB_MASK) == DWC3_TRB_NUM - 1) &&
		usb_endpoint_xfer_isoc(dep->endpoint.desc))
		dep->free_slot++;

		update_trb:
		trb->size = DWC3_TRB_SIZE_LENGTH(length);