summaryrefslogtreecommitdiffstats
path: root/drivers/usb/dwc2/hcd.c
diff options
context:
space:
mode:
authorMinas Harutyunyan <hminas@synopsys.com>2018-01-19 14:43:53 +0400
committerFelipe Balbi <felipe.balbi@linux.intel.com>2018-03-13 10:47:43 +0200
commita82c7abdf8fc3b09c4a0ed2eee6d43ecef2ccdb0 (patch)
tree0649a947e3efbe873e950de6b696a3216660fbe2 /drivers/usb/dwc2/hcd.c
parent9d729a7a7ac531b1de335d7b9ae8bd4de8036ab9 (diff)
downloadlinux-stable-a82c7abdf8fc3b09c4a0ed2eee6d43ecef2ccdb0.tar.gz
linux-stable-a82c7abdf8fc3b09c4a0ed2eee6d43ecef2ccdb0.tar.bz2
linux-stable-a82c7abdf8fc3b09c4a0ed2eee6d43ecef2ccdb0.zip
usb: dwc2: hcd: Fix host channel halt flow
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>
Diffstat (limited to 'drivers/usb/dwc2/hcd.c')
-rw-r--r--drivers/usb/dwc2/hcd.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index d4b61330dfbb..2cb4f4f3981f 100644
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -977,6 +977,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);