From 412bf7e3dad8a20af937f3682a08116b654deb02 Mon Sep 17 00:00:00 2001 Message-Id: <412bf7e3dad8a20af937f3682a08116b654deb02.1491410224.git.hminas@synopsys.com> From: Minas Harutyunyan Date: Mon, 11 Jul 2016 03:31:17 -0700 Subject: [PATCH] usb: dwc2: hcd: Fix host channel halt flow According databook in Buffer and External DMA mode non-split periodic channels can't be halted. Change-Id: I7c7c4e16309dda7a3b5af34020d46366c357ed49 Signed-off-by: Minas Harutyunyan --- drivers/usb/dwc2/hcd.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c index f4ef159b538e..4e6ee398efb7 100644 --- a/drivers/usb/dwc2/hcd.c +++ b/drivers/usb/dwc2/hcd.c @@ -979,6 +979,25 @@ 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->core_params->dma_enable > 0 && + hsotg->core_params->dma_desc_enable <= 0) || + (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); -- 2.11.0