usb: dwc2: hcd: Fix host channel halt flow

BugLink: http://bugs.launchpad.net/bugs/1783418
[ Upstream commit a82c7abdf8fc3b09c4a0ed2eee6d43ecef2ccdb0 ]

According databook in Buffer and External DMA mode
non-split periodic channels can't be halted.

Acked-by: John Youn <johnyoun@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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index 7b6eb0ad513b26b33610c9b08531f8accac4a89f..eb5ea58cd23b02053085aa8c33a358b897d048dc 100644 (file)
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -985,6 +985,24 @@ void dwc2_hc_halt(struct dwc2_hsotg *hsotg, struct dwc2_host_chan *chan,
 
        if (dbg_hc(chan))
                dev_vdbg(hsotg->dev, "%s()\n", __func__);
+
+       /*
+        * In buffer DMA or external DMA mode channel can't be halted
+        * for non-split periodic channels. At the end of the next
+        * uframe/frame (in the worst case), the core generates a channel
+        * halted and disables the channel automatically.
+        */
+       if ((hsotg->params.g_dma && !hsotg->params.g_dma_desc) ||
+           hsotg->hw_params.arch == GHWCFG2_EXT_DMA_ARCH) {
+               if (!chan->do_split &&
+                   (chan->ep_type == USB_ENDPOINT_XFER_ISOC ||
+                    chan->ep_type == USB_ENDPOINT_XFER_INT)) {
+                       dev_err(hsotg->dev, "%s() Channel can't be halted\n",
+                               __func__);
+                       return;
+               }
+       }
+
        if (halt_status == DWC2_HC_XFER_NO_HALT_STATUS)
                dev_err(hsotg->dev, "!!! halt_status = %d !!!\n", halt_status);