1 files changed, 22 insertions, 21 deletions

diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index eca2e6d8e041..51b52a79dfec 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -70,10 +70,10 @@ static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum, dma_addr_t buf_dma,
                 return 0;
         }
 
-        trb = &dwc->ep0_trb[dep->free_slot];
+        trb = &dwc->ep0_trb[dep->trb_enqueue];
 
         if (chain)
-                dep->free_slot++;
+                dep->trb_enqueue++;
 
         trb->bpl = lower_32_bits(buf_dma);
         trb->bph = upper_32_bits(buf_dma);
@@ -124,7 +124,7 @@ static int __dwc3_gadget_ep0_queue(struct dwc3_ep *dep,
         req->request.status     = -EINPROGRESS;
         req->epnum              = dep->number;
 
-        list_add_tail(&req->list, &dep->request_list);
+        list_add_tail(&req->list, &dep->pending_list);
 
         /*
          * Gadget driver might not be quick enough to queue a request
@@ -240,7 +240,7 @@ int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request,
         }
 
         /* we share one TRB for ep0/1 */
-        if (!list_empty(&dep->request_list)) {
+        if (!list_empty(&dep->pending_list)) {
                 ret = -EBUSY;
                 goto out;
         }
@@ -272,10 +272,10 @@ static void dwc3_ep0_stall_and_restart(struct dwc3 *dwc)
         dep->flags = DWC3_EP_ENABLED;
         dwc->delayed_status = false;
 
-        if (!list_empty(&dep->request_list)) {
+        if (!list_empty(&dep->pending_list)) {
                 struct dwc3_request     *req;
 
-                req = next_request(&dep->request_list);
+                req = next_request(&dep->pending_list);
                 dwc3_gadget_giveback(dep, req, -ECONNRESET);
         }
 
@@ -463,8 +463,18 @@ static int dwc3_ep0_handle_feature(struct dwc3 *dwc,
                         if (!set)
                                 return -EINVAL;
 
-                        dwc->test_mode_nr = wIndex >> 8;
-                        dwc->test_mode = true;
+                        switch (wIndex >> 8) {
+                        case TEST_J:
+                        case TEST_K:
+                        case TEST_SE0_NAK:
+                        case TEST_PACKET:
+                        case TEST_FORCE_EN:
+                                dwc->test_mode_nr = wIndex >> 8;
+                                dwc->test_mode = true;
+                                break;
+                        default:
+                                return -EINVAL;
+                        }
                         break;
                 default:
                         return -EINVAL;
@@ -586,9 +596,6 @@ static int dwc3_ep0_set_config(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl)
                         reg = dwc3_readl(dwc->regs, DWC3_DCTL);
                         reg |= (DWC3_DCTL_ACCEPTU1ENA | DWC3_DCTL_ACCEPTU2ENA);
                         dwc3_writel(dwc->regs, DWC3_DCTL, reg);
-
-                        dwc->resize_fifos = true;
-                        dwc3_trace(trace_dwc3_ep0, "resize FIFOs flag SET");
                 }
                 break;
 
@@ -809,7 +816,7 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
 
         trace_dwc3_complete_trb(ep0, trb);
 
-        r = next_request(&ep0->request_list);
+        r = next_request(&ep0->pending_list);
         if (!r)
                 return;
 
@@ -848,7 +855,7 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
                         trb++;
                         length = trb->size & DWC3_TRB_SIZE_MASK;
 
-                        ep0->free_slot = 0;
+                        ep0->trb_enqueue = 0;
                 }
 
                 transfer_size = roundup((ur->length - transfer_size),
@@ -897,8 +904,8 @@ static void dwc3_ep0_complete_status(struct dwc3 *dwc,
 
         trace_dwc3_complete_trb(dep, trb);
 
-        if (!list_empty(&dep->request_list)) {
-                r = next_request(&dep->request_list);
+        if (!list_empty(&dep->pending_list)) {
+                r = next_request(&dep->pending_list);
 
                 dwc3_gadget_giveback(dep, r, 0);
         }
@@ -1027,12 +1034,6 @@ static int dwc3_ep0_start_control_status(struct dwc3_ep *dep)
 
 static void __dwc3_ep0_do_control_status(struct dwc3 *dwc, struct dwc3_ep *dep)
 {
-        if (dwc->resize_fifos) {
-                dwc3_trace(trace_dwc3_ep0, "Resizing FIFOs");
-                dwc3_gadget_resize_tx_fifos(dwc);
-                dwc->resize_fifos = 0;
-        }
-
         WARN_ON(dwc3_ep0_start_control_status(dep));
 }