]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
usb: dwc3: gadget: don't clear EP_BUSY too early
authorFelipe Balbi <balbi@ti.com>
Fri, 29 May 2015 15:06:38 +0000 (10:06 -0500)
committerFelipe Balbi <balbi@ti.com>
Fri, 29 May 2015 15:19:51 +0000 (10:19 -0500)
In case of non-Isochronous transfers, we don't
want to clear DWC3_EP_BUSY flag until XferComplete
event. That's because XferInProgress was only enabled
so we can recycle TRBs and usb_requests quicker, but
there are still other pending requests being transferred.

In order to make sure we don't allow for another StartTransfer
command while the HW is still processing other transfers,
we must keep DWC3_EP_BUSY flag set and this what this patch
does.

Fixes: f3af36511e60 (usb: dwc3: gadget: always enable IOC on
bulk/interrupt transfers)
Cc: <stable@vger.kernel.org> # v3.15+
Reported-by: sundeep subbaraya <sundeep.lkml@gmail.com>
Tested-by: sundeep subbaraya <sundeep.lkml@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/dwc3/gadget.c

index 55b5edc1911988653f709bd92aae227649371190..333a7c0078fcf922b9effaae3deff795d8b0f63e 100644 (file)
@@ -1906,12 +1906,16 @@ static void dwc3_endpoint_transfer_complete(struct dwc3 *dwc,
 {
        unsigned                status = 0;
        int                     clean_busy;
+       u32                     is_xfer_complete;
+
+       is_xfer_complete = (event->endpoint_event == DWC3_DEPEVT_XFERCOMPLETE);
 
        if (event->status & DEPEVT_STATUS_BUSERR)
                status = -ECONNRESET;
 
        clean_busy = dwc3_cleanup_done_reqs(dwc, dep, event, status);
-       if (clean_busy)
+       if (clean_busy && (is_xfer_complete ||
+                               usb_endpoint_xfer_isoc(dep->endpoint.desc)))
                dep->flags &= ~DWC3_EP_BUSY;
 
        /*