OSDN Git Service

usb: dwc2: Update dwc2_handle_incomplete_isoc_out() function
authorRazmik Karapetyan <razmik@synopsys.com>
Fri, 19 Jan 2018 10:41:16 +0000 (14:41 +0400)
committerFelipe Balbi <felipe.balbi@linux.intel.com>
Tue, 13 Mar 2018 08:47:41 +0000 (10:47 +0200)
In 'for' loop skipped masked and non-ISOC EPs. Also breaked 'for' loop
after setting SGOUTNAK in DCTL,when one enabled EP was detected.

This will allow to minimize incomplete ISOC OUT interrupt handling.

Acked-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Razmik Karapetyan <razmik@synopsys.com>
Signed-off-by: Minas Harutyunyan <hminas@synopsys.com>
Signed-off-by: Grigor Tovmasyan <tovmasya@synopsys.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
drivers/usb/dwc2/gadget.c

index 8e42537..2ffc380 100644 (file)
@@ -3455,16 +3455,24 @@ static void dwc2_gadget_handle_incomplete_isoc_out(struct dwc2_hsotg *hsotg)
 {
        u32 gintsts;
        u32 gintmsk;
+       u32 daintmsk;
        u32 epctrl;
        struct dwc2_hsotg_ep *hs_ep;
        int idx;
 
        dev_dbg(hsotg->dev, "%s: GINTSTS_INCOMPL_SOOUT\n", __func__);
 
+       daintmsk = dwc2_readl(hsotg->regs + DAINTMSK);
+       daintmsk >>= DAINT_OUTEP_SHIFT;
+
        for (idx = 1; idx <= hsotg->num_of_eps; idx++) {
                hs_ep = hsotg->eps_out[idx];
+               /* Proceed only unmasked ISOC EPs */
+               if (!hs_ep->isochronous || (BIT(idx) & ~daintmsk))
+                       continue;
+
                epctrl = dwc2_readl(hsotg->regs + DOEPCTL(idx));
-               if ((epctrl & DXEPCTL_EPENA) && hs_ep->isochronous &&
+               if ((epctrl & DXEPCTL_EPENA) &&
                    dwc2_gadget_target_frame_elapsed(hs_ep)) {
                        /* Unmask GOUTNAKEFF interrupt */
                        gintmsk = dwc2_readl(hsotg->regs + GINTMSK);
@@ -3472,8 +3480,10 @@ static void dwc2_gadget_handle_incomplete_isoc_out(struct dwc2_hsotg *hsotg)
                        dwc2_writel(gintmsk, hsotg->regs + GINTMSK);
 
                        gintsts = dwc2_readl(hsotg->regs + GINTSTS);
-                       if (!(gintsts & GINTSTS_GOUTNAKEFF))
+                       if (!(gintsts & GINTSTS_GOUTNAKEFF)) {
                                __orr32(hsotg->regs + DCTL, DCTL_SGOUTNAK);
+                               break;
+                       }
                }
        }