1 files changed, 15 insertions, 9 deletions

diff --git a/drivers/usb/musb/musb_cppi41.c b/drivers/usb/musb/musb_cppi41.c
index c39a16ad7832..be84562d021b 100644
--- a/drivers/usb/musb/musb_cppi41.c
+++ b/drivers/usb/musb/musb_cppi41.c
@@ -9,9 +9,9 @@
 
 #define RNDIS_REG(x) (0x80 + ((x - 1) * 4))
 
-#define EP_MODE_AUTOREG_NONE            0
-#define EP_MODE_AUTOREG_ALL_NEOP        1
-#define EP_MODE_AUTOREG_ALWAYS          3
+#define EP_MODE_AUTOREQ_NONE            0
+#define EP_MODE_AUTOREQ_ALL_NEOP        1
+#define EP_MODE_AUTOREQ_ALWAYS          3
 
 #define EP_MODE_DMA_TRANSPARENT         0
 #define EP_MODE_DMA_RNDIS               1
@@ -404,19 +404,19 @@ static bool cppi41_configure_channel(struct dma_channel *channel,
 
                         /* auto req */
                         cppi41_set_autoreq_mode(cppi41_channel,
-                                        EP_MODE_AUTOREG_ALL_NEOP);
+                                        EP_MODE_AUTOREQ_ALL_NEOP);
                 } else {
                         musb_writel(musb->ctrl_base,
                                         RNDIS_REG(cppi41_channel->port_num), 0);
                         cppi41_set_dma_mode(cppi41_channel,
                                         EP_MODE_DMA_TRANSPARENT);
                         cppi41_set_autoreq_mode(cppi41_channel,
-                                        EP_MODE_AUTOREG_NONE);
+                                        EP_MODE_AUTOREQ_NONE);
                 }
         } else {
                 /* fallback mode */
                 cppi41_set_dma_mode(cppi41_channel, EP_MODE_DMA_TRANSPARENT);
-                cppi41_set_autoreq_mode(cppi41_channel, EP_MODE_AUTOREG_NONE);
+                cppi41_set_autoreq_mode(cppi41_channel, EP_MODE_AUTOREQ_NONE);
                 len = min_t(u32, packet_sz, len);
         }
         cppi41_channel->prog_len = len;
@@ -549,10 +549,15 @@ static int cppi41_dma_channel_abort(struct dma_channel *channel)
                 csr &= ~MUSB_TXCSR_DMAENAB;
                 musb_writew(epio, MUSB_TXCSR, csr);
         } else {
+                cppi41_set_autoreq_mode(cppi41_channel, EP_MODE_AUTOREQ_NONE);
+
                 csr = musb_readw(epio, MUSB_RXCSR);
                 csr &= ~(MUSB_RXCSR_H_REQPKT | MUSB_RXCSR_DMAENAB);
                 musb_writew(epio, MUSB_RXCSR, csr);
 
+                /* wait to drain cppi dma pipe line */
+                udelay(50);
+
                 csr = musb_readw(epio, MUSB_RXCSR);
                 if (csr & MUSB_RXCSR_RXPKTRDY) {
                         csr |= MUSB_RXCSR_FLUSHFIFO;
@@ -566,13 +571,14 @@ static int cppi41_dma_channel_abort(struct dma_channel *channel)
                 tdbit <<= 16;
 
         do {
-                musb_writel(musb->ctrl_base, USB_TDOWN, tdbit);
+                if (is_tx)
+                        musb_writel(musb->ctrl_base, USB_TDOWN, tdbit);
                 ret = dmaengine_terminate_all(cppi41_channel->dc);
         } while (ret == -EAGAIN);
 
-        musb_writel(musb->ctrl_base, USB_TDOWN, tdbit);
-
         if (is_tx) {
+                musb_writel(musb->ctrl_base, USB_TDOWN, tdbit);
+
                 csr = musb_readw(epio, MUSB_TXCSR);
                 if (csr & MUSB_TXCSR_TXPKTRDY) {
                         csr |= MUSB_TXCSR_FLUSHFIFO;