dmaengine: fsl-qdma: fixed the source/destination descriptor format

CMD of Source/Destination descriptor format should be lower of
struct fsl_qdma_engine number data address.

Signed-off-by: Peng Ma <peng.ma@nxp.com>
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/fsl-qdma.c b/drivers/dma/fsl-qdma.c
index aa1d0ae..da8fdf5 100644 (file)
--- a/drivers/dma/fsl-qdma.c
+++ b/drivers/dma/fsl-qdma.c
@@ -113,6 +113,7 @@
 /* Field definition for Descriptor offset */
 #define QDMA_CCDF_STATUS               20
 #define QDMA_CCDF_OFFSET               20
+#define QDMA_SDDF_CMD(x)               (((u64)(x)) << 32)
 
 /* Field definition for safe loop count*/
 #define FSL_QDMA_HALT_COUNT            1500
@@ -341,6 +342,7 @@ static void fsl_qdma_free_chan_resources(struct dma_chan *chan)
 static void fsl_qdma_comp_fill_memcpy(struct fsl_qdma_comp *fsl_comp,
                                      dma_addr_t dst, dma_addr_t src, u32 len)
 {
+       u32 cmd;
        struct fsl_qdma_format *sdf, *ddf;
        struct fsl_qdma_format *ccdf, *csgf_desc, *csgf_src, *csgf_dest;
 
@@ -369,14 +371,14 @@ static void fsl_qdma_comp_fill_memcpy(struct fsl_qdma_comp *fsl_comp,
        /* This entry is the last entry. */
        qdma_csgf_set_f(csgf_dest, len);
        /* Descriptor Buffer */
-       sdf->data =
-               cpu_to_le64(FSL_QDMA_CMD_RWTTYPE <<
-                           FSL_QDMA_CMD_RWTTYPE_OFFSET);
-       ddf->data =
-               cpu_to_le64(FSL_QDMA_CMD_RWTTYPE <<
-                           FSL_QDMA_CMD_RWTTYPE_OFFSET);
-       ddf->data |=
-               cpu_to_le64(FSL_QDMA_CMD_LWC << FSL_QDMA_CMD_LWC_OFFSET);
+       cmd = cpu_to_le32(FSL_QDMA_CMD_RWTTYPE <<
+                         FSL_QDMA_CMD_RWTTYPE_OFFSET);
+       sdf->data = QDMA_SDDF_CMD(cmd);
+
+       cmd = cpu_to_le32(FSL_QDMA_CMD_RWTTYPE <<
+                         FSL_QDMA_CMD_RWTTYPE_OFFSET);
+       cmd |= cpu_to_le32(FSL_QDMA_CMD_LWC << FSL_QDMA_CMD_LWC_OFFSET);
+       ddf->data = QDMA_SDDF_CMD(cmd);
 }
 
 /*