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.

Signed-off-by: Razmik Karapetyan <raz...@synopsys.com>
---
 drivers/usb/dwc2/gadget.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 543ecf1..52f7db9 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -3492,16 +3492,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);
@@ -3509,8 +3517,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;
+                       }
                }
        }
 
-- 
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to