UPSTREAM: usb: dwc2: host: Use periodic interrupt even with DMA

The old code in dwc2_process_periodic_channels() would only enable the
"periodic empty" interrupt if we weren't using DMA.  That wasn't right
since we can still get into cases where we have small FIFOs even on
systems that have DMA (the rk3288 is a prime example).

Let's always enable/disable the "periodic empty" when appropriate.  As
part of this:

* Always call dwc2_process_periodic_channels() even if there's nothing
  in periodic_sched_assigned (we move the queue empty check so we still
  avoid the extra work).  That will make extra certain that we will
  properly disable the "periodic empty" interrupt even if there's
  nothing queued up.

* Move the enable of "periodic empty" due to non-empty
  periodic_sched_assigned to be for slave mode (non-DMA mode) only.
  Presumably this was the original intention of the check for DMA since
  it seems to match the comments above where in slave mode we leave
  things on the assigned queue.

Note that even before this change slave mode didn't work for me, so I
can't say for sure that my understanding of slave mode is correct.
However, this shouldn't change anything for slave mode so if slave mode
worked for someone in the past it ought to still work.

With this change, I no longer get constant misses reported by my other
debugging code (and with future patches) when I've got:
* Rockchip rk3288 Chromebook, using port ff540000
  -> Pluggable 7-port Hub with Charging (powered)
     -> Microsoft Wireless Keyboard 2000 in port 1.
     -> Das Keyboard in port 2.
     -> Jabra Speaker in port 3
     -> Logitech, Inc. Webcam C600 in port 4
     -> Microsoft Sidewinder X6 Keyboard in port 5

...and I'm playing music on the USB speaker and capturing video from the
webcam.

Change-Id: I9e6a9be0bcd35e4aff4eb8b004a40c31584f02cb
Acked-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Tested-by: Heiko Stuebner <heiko@sntech.de>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit 4e50e0110c5cdc6d361b813692857e09ec918c9d)

diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index 40558478a192615a4c455fb1ab693674c317dc0d..fd731347daf7639f77ebfa2c7a5c2cfc3f5eb2b3 100644 (file)
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -1109,10 +1109,14 @@ static void dwc2_process_periodic_channels(struct dwc2_hsotg *hsotg)
        u32 fspcavail;
        u32 gintmsk;
        int status;
-       int no_queue_space = 0;
-       int no_fifo_space = 0;
+       bool no_queue_space = false;
+       bool no_fifo_space = false;
        u32 qspcavail;
 
+       /* If empty list then just adjust interrupt enables */
+       if (list_empty(&hsotg->periodic_sched_assigned))
+               goto exit;
+
        if (dbg_perio())
                dev_vdbg(hsotg->dev, "Queue periodic transactions\n");
 
@@ -1190,42 +1194,32 @@ static void dwc2_process_periodic_channels(struct dwc2_hsotg *hsotg)
                }
        }
 
-       if (hsotg->core_params->dma_enable <= 0) {
-               tx_status = dwc2_readl(hsotg->regs + HPTXSTS);
-               qspcavail = (tx_status & TXSTS_QSPCAVAIL_MASK) >>
-                           TXSTS_QSPCAVAIL_SHIFT;
-               fspcavail = (tx_status & TXSTS_FSPCAVAIL_MASK) >>
-                           TXSTS_FSPCAVAIL_SHIFT;
-               if (dbg_perio()) {
-                       dev_vdbg(hsotg->dev,
-                                "  P Tx Req Queue Space Avail (after queue): %d\n",
-                                qspcavail);
-                       dev_vdbg(hsotg->dev,
-                                "  P Tx FIFO Space Avail (after queue): %d\n",
-                                fspcavail);
-               }
-
-               if (!list_empty(&hsotg->periodic_sched_assigned) ||
-                   no_queue_space || no_fifo_space) {
-                       /*
-                        * May need to queue more transactions as the request
-                        * queue or Tx FIFO empties. Enable the periodic Tx
-                        * FIFO empty interrupt. (Always use the half-empty
-                        * level to ensure that new requests are loaded as
-                        * soon as possible.)
-                        */
-                       gintmsk = dwc2_readl(hsotg->regs + GINTMSK);
+exit:
+       if (no_queue_space || no_fifo_space ||
+           (hsotg->core_params->dma_enable <= 0 &&
+            !list_empty(&hsotg->periodic_sched_assigned))) {
+               /*
+                * May need to queue more transactions as the request
+                * queue or Tx FIFO empties. Enable the periodic Tx
+                * FIFO empty interrupt. (Always use the half-empty
+                * level to ensure that new requests are loaded as
+                * soon as possible.)
+                */
+               gintmsk = dwc2_readl(hsotg->regs + GINTMSK);
+               if (!(gintmsk & GINTSTS_PTXFEMP)) {
                        gintmsk |= GINTSTS_PTXFEMP;
                        dwc2_writel(gintmsk, hsotg->regs + GINTMSK);
-               } else {
-                       /*
-                        * Disable the Tx FIFO empty interrupt since there are
-                        * no more transactions that need to be queued right
-                        * now. This function is called from interrupt
-                        * handlers to queue more transactions as transfer
-                        * states change.
-                        */
-                       gintmsk = dwc2_readl(hsotg->regs + GINTMSK);
+               }
+       } else {
+               /*
+                * Disable the Tx FIFO empty interrupt since there are
+                * no more transactions that need to be queued right
+                * now. This function is called from interrupt
+                * handlers to queue more transactions as transfer
+                * states change.
+               */
+               gintmsk = dwc2_readl(hsotg->regs + GINTMSK);
+               if (gintmsk & GINTSTS_PTXFEMP) {
                        gintmsk &= ~GINTSTS_PTXFEMP;
                        dwc2_writel(gintmsk, hsotg->regs + GINTMSK);
                }
@@ -1372,9 +1366,8 @@ void dwc2_hcd_queue_transactions(struct dwc2_hsotg *hsotg,
        dev_vdbg(hsotg->dev, "Queue Transactions\n");
 #endif
        /* Process host channels associated with periodic transfers */
-       if ((tr_type == DWC2_TRANSACTION_PERIODIC ||
-            tr_type == DWC2_TRANSACTION_ALL) &&
-           !list_empty(&hsotg->periodic_sched_assigned))
+       if (tr_type == DWC2_TRANSACTION_PERIODIC ||
+           tr_type == DWC2_TRANSACTION_ALL)
                dwc2_process_periodic_channels(hsotg);
 
        /* Process host channels associated with non-periodic transfers */