usb: dwc3: gadget: Refactor EP0 forced stall/restart into a separate API

Several sequences utilize the same routine for forcing the control endpoint
back into the SETUP phase.  This is required, because those operations need
to ensure that EP0 is back in the default state.

Acked-by: Thinh Nguyen <[email protected]>
Signed-off-by: Wesley Cheng <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index dd6057bad37e83059083ef93b9f75807bf21892b..c0ca4d12f95d96b189128456d1b7c33455c02723 100644 (file)
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -139,6 +139,24 @@ int dwc3_gadget_set_link_state(struct dwc3 *dwc, enum dwc3_link_state state)
        return -ETIMEDOUT;
 }
 
+static void dwc3_ep0_reset_state(struct dwc3 *dwc)
+{
+       unsigned int    dir;
+
+       if (dwc->ep0state != EP0_SETUP_PHASE) {
+               dir = !!dwc->ep0_expect_in;
+               if (dwc->ep0state == EP0_DATA_PHASE)
+                       dwc3_ep0_end_control_data(dwc, dwc->eps[dir]);
+               else
+                       dwc3_ep0_end_control_data(dwc, dwc->eps[!dir]);
+
+               dwc->eps[0]->trb_enqueue = 0;
+               dwc->eps[1]->trb_enqueue = 0;
+
+               dwc3_ep0_stall_and_restart(dwc);
+       }
+}
+
 /**
  * dwc3_ep_inc_trb - increment a trb index.
  * @index: Pointer to the TRB index to increment.
@@ -2652,16 +2670,9 @@ static int dwc3_gadget_soft_disconnect(struct dwc3 *dwc)
                ret = wait_for_completion_timeout(&dwc->ep0_in_setup,
                                msecs_to_jiffies(DWC3_PULL_UP_TIMEOUT));
                if (ret == 0) {
-                       unsigned int    dir;
-
                        dev_warn(dwc->dev, "wait for SETUP phase timed out\n");
                        spin_lock_irqsave(&dwc->lock, flags);
-                       dir = !!dwc->ep0_expect_in;
-                       if (dwc->ep0state == EP0_DATA_PHASE)
-                               dwc3_ep0_end_control_data(dwc, dwc->eps[dir]);
-                       else
-                               dwc3_ep0_end_control_data(dwc, dwc->eps[!dir]);
-                       dwc3_ep0_stall_and_restart(dwc);
+                       dwc3_ep0_reset_state(dwc);
                        spin_unlock_irqrestore(&dwc->lock, flags);
                }
        }
@@ -3944,16 +3955,7 @@ static void dwc3_gadget_disconnect_interrupt(struct dwc3 *dwc)
        dwc3_gadget_enable_linksts_evts(dwc, false);
        usb_gadget_set_state(dwc->gadget, USB_STATE_NOTATTACHED);
 
-       if (dwc->ep0state != EP0_SETUP_PHASE) {
-               unsigned int    dir;
-
-               dir = !!dwc->ep0_expect_in;
-               if (dwc->ep0state == EP0_DATA_PHASE)
-                       dwc3_ep0_end_control_data(dwc, dwc->eps[dir]);
-               else
-                       dwc3_ep0_end_control_data(dwc, dwc->eps[!dir]);
-               dwc3_ep0_stall_and_restart(dwc);
-       }
+       dwc3_ep0_reset_state(dwc);
 }
 
 static void dwc3_gadget_reset_interrupt(struct dwc3 *dwc)
@@ -4007,20 +4009,7 @@ static void dwc3_gadget_reset_interrupt(struct dwc3 *dwc)
         * phase. So ensure that EP0 is in setup phase by issuing a stall
         * and restart if EP0 is not in setup phase.
         */
-       if (dwc->ep0state != EP0_SETUP_PHASE) {
-               unsigned int    dir;
-
-               dir = !!dwc->ep0_expect_in;
-               if (dwc->ep0state == EP0_DATA_PHASE)
-                       dwc3_ep0_end_control_data(dwc, dwc->eps[dir]);
-               else
-                       dwc3_ep0_end_control_data(dwc, dwc->eps[!dir]);
-
-               dwc->eps[0]->trb_enqueue = 0;
-               dwc->eps[1]->trb_enqueue = 0;
-
-               dwc3_ep0_stall_and_restart(dwc);
-       }
+       dwc3_ep0_reset_state(dwc);
 
        /*
         * In the Synopsis DesignWare Cores USB3 Databook Rev. 3.30a