UPSTREAM: usb: dwc3: gadget: issue ENDTRANSFER conditional on resource_index

Because of recent changes to transfer handling on
DWC3, we will not get XferComplete unless we
completely fill up our TRB ring. This means that we
might get a Reset or Disconnect without getting a
XferComplete first.

In order to correctly release our allocated Transfer
Resource, we must issue ENDTRANSFER command whenever
dep->resource_index is valid.

Change-Id: I6f78a239e26d754c2472f06789f820d42261d31d
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Wu Liang feng <wulf@rock-chips.com>
(cherry picked from commit 0e146028eebf989e86d3fe9385b76434e954c84e)

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 0400d3f9ba8f9c0d3a548649e60c05691a967cda..fd37110ad6e3a512c07bd34c3a4144d81491e6d2 100644 (file)
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -607,24 +607,14 @@ static void dwc3_stop_active_transfer(struct dwc3 *dwc, u32 epnum, bool force);
 static void dwc3_remove_requests(struct dwc3 *dwc, struct dwc3_ep *dep)
 {
        struct dwc3_request             *req;
-       struct dwc3_trb                 *current_trb;
-       unsigned                        transfer_in_flight;
 
-       if (dep->number > 1)
-               current_trb = &dep->trb_pool[dep->trb_enqueue];
-       else
-               current_trb = &dwc->ep0_trb[dep->trb_enqueue];
-       transfer_in_flight = current_trb->ctrl & DWC3_TRB_CTRL_HWO;
-
-       if (transfer_in_flight && !list_empty(&dep->started_list)) {
-               dwc3_stop_active_transfer(dwc, dep->number, true);
+       dwc3_stop_active_transfer(dwc, dep->number, true);
 
-               /* - giveback all requests to gadget driver */
-               while (!list_empty(&dep->started_list)) {
-                       req = next_request(&dep->started_list);
+       /* - giveback all requests to gadget driver */
+       while (!list_empty(&dep->started_list)) {
+               req = next_request(&dep->started_list);
 
-                       dwc3_gadget_giveback(dep, req, -ESHUTDOWN);
-               }
+               dwc3_gadget_giveback(dep, req, -ESHUTDOWN);
        }
 
        while (!list_empty(&dep->pending_list)) {