usb: dwc3: gadget: Refactor TRB completion handler

To prepare for handling of XferComplete event, let's refactor and split
up dwc3_gadget_endpoint_transfer_in_progress() to handle TRBs completion
for different events. The handling of TRBs completion will be the same,
but the status of XferComplete event is different than XferInProgress.
No functional change in this commit.

Signed-off-by: Thinh Nguyen <thinhn@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 3bb6f847a8656f656cf2151c008050ef1b035d96..5f98b424f20b54b42bc49ce4b0c91e93e129b153 100644 (file)
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -2654,34 +2654,22 @@ static void dwc3_gadget_endpoint_frame_from_event(struct dwc3_ep *dep,
        dep->frame_number = event->parameters;
 }
 
-static void dwc3_gadget_endpoint_transfer_in_progress(struct dwc3_ep *dep,
-               const struct dwc3_event_depevt *event)
+static bool dwc3_gadget_endpoint_trbs_complete(struct dwc3_ep *dep,
+               const struct dwc3_event_depevt *event, int status)
 {
        struct dwc3             *dwc = dep->dwc;
-       unsigned                status = 0;
-       bool                    stop = false;
-
-       dwc3_gadget_endpoint_frame_from_event(dep, event);
-
-       if (event->status & DEPEVT_STATUS_BUSERR)
-               status = -ECONNRESET;
-
-       if (event->status & DEPEVT_STATUS_MISSED_ISOC) {
-               status = -EXDEV;
-
-               if (list_empty(&dep->started_list))
-                       stop = true;
-       }
+       bool                    no_started_trb = true;
 
        dwc3_gadget_ep_cleanup_completed_requests(dep, event, status);
 
        if (dep->flags & DWC3_EP_END_TRANSFER_PENDING)
                goto out;
 
-       if (stop)
+       if (status == -EXDEV && list_empty(&dep->started_list))
                dwc3_stop_active_transfer(dep, true, true);
        else if (dwc3_gadget_ep_should_continue(dep))
-               __dwc3_gadget_kick_transfer(dep);
+               if (__dwc3_gadget_kick_transfer(dep) == 0)
+                       no_started_trb = false;
 
 out:
        /*
@@ -2699,7 +2687,7 @@ out:
                                continue;
 
                        if (!list_empty(&dep->started_list))
-                               return;
+                               return no_started_trb;
                }
 
                reg = dwc3_readl(dwc->regs, DWC3_DCTL);
@@ -2708,6 +2696,25 @@ out:
 
                dwc->u1u2 = 0;
        }
+
+       return no_started_trb;
+}
+
+static void dwc3_gadget_endpoint_transfer_in_progress(struct dwc3_ep *dep,
+               const struct dwc3_event_depevt *event)
+{
+       int status = 0;
+
+       if (usb_endpoint_xfer_isoc(dep->endpoint.desc))
+               dwc3_gadget_endpoint_frame_from_event(dep, event);
+
+       if (event->status & DEPEVT_STATUS_BUSERR)
+               status = -ECONNRESET;
+
+       if (event->status & DEPEVT_STATUS_MISSED_ISOC)
+               status = -EXDEV;
+
+       dwc3_gadget_endpoint_trbs_complete(dep, event, status);
 }
 
 static void dwc3_gadget_endpoint_transfer_not_ready(struct dwc3_ep *dep,