Browse Source

usb: musb: musb_cppi41: Workaround DMA stall issue during teardown

The DMA may hang up if a teardown is initiated while an endpoint is still
active (Advisory 2.3.27 of DA8xx errata).
To workaround this issue, add a delay before to initiate the teardown.

Signed-off-by: Alexandre Bailon <abailon@baylibre.com>
Signed-off-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Alexandre Bailon 8 years ago
parent
commit
593bc4622a
3 changed files with 6 additions and 1 deletions
  1. 1 1
      drivers/usb/musb/da8xx.c
  2. 1 0
      drivers/usb/musb/musb_core.h
  3. 4 0
      drivers/usb/musb/musb_cppi41.c

+ 1 - 1
drivers/usb/musb/da8xx.c

@@ -483,7 +483,7 @@ da8xx_dma_controller_create(struct musb *musb, void __iomem *base)
 
 
 static const struct musb_platform_ops da8xx_ops = {
 static const struct musb_platform_ops da8xx_ops = {
 	.quirks		= MUSB_INDEXED_EP | MUSB_PRESERVE_SESSION |
 	.quirks		= MUSB_INDEXED_EP | MUSB_PRESERVE_SESSION |
-			  MUSB_DMA_CPPI41,
+			  MUSB_DMA_CPPI41 | MUSB_DA8XX,
 	.init		= da8xx_musb_init,
 	.init		= da8xx_musb_init,
 	.exit		= da8xx_musb_exit,
 	.exit		= da8xx_musb_exit,
 
 

+ 1 - 0
drivers/usb/musb/musb_core.h

@@ -172,6 +172,7 @@ struct musb_io;
  */
  */
 struct musb_platform_ops {
 struct musb_platform_ops {
 
 
+#define MUSB_DA8XX		BIT(8)
 #define MUSB_PRESERVE_SESSION	BIT(7)
 #define MUSB_PRESERVE_SESSION	BIT(7)
 #define MUSB_DMA_UX500		BIT(6)
 #define MUSB_DMA_UX500		BIT(6)
 #define MUSB_DMA_CPPI41		BIT(5)
 #define MUSB_DMA_CPPI41		BIT(5)

+ 4 - 0
drivers/usb/musb/musb_cppi41.c

@@ -571,6 +571,10 @@ static int cppi41_dma_channel_abort(struct dma_channel *channel)
 		}
 		}
 	}
 	}
 
 
+	/* DA8xx Advisory 2.3.27: wait 250 ms before to start the teardown */
+	if (musb->io.quirks & MUSB_DA8XX)
+		mdelay(250);
+
 	tdbit = 1 << cppi41_channel->port_num;
 	tdbit = 1 << cppi41_channel->port_num;
 	if (is_tx)
 	if (is_tx)
 		tdbit <<= 16;
 		tdbit <<= 16;