dmaengine: mpc512x: Fix hanging DMA device transfer for MPC8308

Since the MPC8308 has no external request lines to initiate DMA transfers,
all transfers must be triggered by software.

Because of this, the current implementation of DMA transfers from and to
devices on MPC8308 SoCs using major and minor loops is faulty: After the
completion of the first major loop, the DMA engine resets the start flag in
the channel's TCD, thus halting the transfer. The driver would have to set
the start bit again to trigger the next iteration of the major loop; on
MPC512x SoCs, this is done via the external request lines, so in this case,
the driver doesn't have to interfer in any way.

This has the effect that on MPC8308s, every DMA transfer to or from a
device hangs after executing the first major loop.

The patch fixes this behavior by using just one major loop for the whole
DMA transfer on MPC8308s.

Signed-off-by: Mario Six <mario.six@gdsys.cc>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c
index aae76fb39adcf9af9fb8b752ff0e580a73e0fa93..3a9104a1041c37d581c46424b6f219036dbd1cde 100644 (file)
--- a/drivers/dma/mpc512x_dma.c
+++ b/drivers/dma/mpc512x_dma.c
@@ -760,21 +760,31 @@ mpc_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                tcd->ssize = MPC_DMA_TSIZE_4;
                tcd->dsize = MPC_DMA_TSIZE_4;
 
-               len = sg_dma_len(sg);
-               tcd->nbytes = tcd_nunits * 4;
-               if (!IS_ALIGNED(len, tcd->nbytes))
-                       goto err_prep;
-
-               iter = len / tcd->nbytes;
-               if (iter >= 1 << 15) {
-                       /* len is too big */
-                       goto err_prep;
+               if (mdma->is_mpc8308) {
+                       tcd->nbytes = sg_dma_len(sg);
+                       if (!IS_ALIGNED(tcd->nbytes, 4))
+                               goto err_prep;
+
+                       /* No major loops for MPC8303 */
+                       tcd->biter = 1;
+                       tcd->citer = 1;
+               } else {
+                       len = sg_dma_len(sg);
+                       tcd->nbytes = tcd_nunits * 4;
+                       if (!IS_ALIGNED(len, tcd->nbytes))
+                               goto err_prep;
+
+                       iter = len / tcd->nbytes;
+                       if (iter >= 1 << 15) {
+                               /* len is too big */
+                               goto err_prep;
+                       }
+                       /* citer_linkch contains the high bits of iter */
+                       tcd->biter = iter & 0x1ff;
+                       tcd->biter_linkch = iter >> 9;
+                       tcd->citer = tcd->biter;
+                       tcd->citer_linkch = tcd->biter_linkch;
                }
-               /* citer_linkch contains the high bits of iter */
-               tcd->biter = iter & 0x1ff;
-               tcd->biter_linkch = iter >> 9;
-               tcd->citer = tcd->biter;
-               tcd->citer_linkch = tcd->biter_linkch;
 
                tcd->e_sg = 0;
                tcd->d_req = 1;