dmaengine: fsl-qdma: fixed the source/destination descriptor format
PATCH v3 1/2 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.
---
changed for V3:
- Delete macro to simplify code.
drivers/dma/fsl-qdma.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-)
drivers/dma/fsl-qdma.c +10 -8
@@ -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); }/*
Signature · 1 line
1.7.1
PATCH v3 2/2 dmaengine: fsl-qdma: Add improvement
When an error occurs we should clean the error register then to return
---
changed for V3:
- no changed.
drivers/dma/fsl-qdma.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
drivers/dma/fsl-qdma.c +1 -3
@@ -703,10 +703,8 @@ static irqreturn_t fsl_qdma_error_handler(int irq, void *dev_id) intr =qdma_readl (fsl_qdma, status +FSL_QDMA_DEDR ); -if (intr) { +if (intr)dev_err (fsl_qdma->dma_dev.dev,"DMA transaction error!\n" ); -return IRQ_NONE ; - }qdma_writel (fsl_qdma,FSL_QDMA_DEDR_CLEAR , status +FSL_QDMA_DEDR );return IRQ_HANDLED ;
Signature · 1 line
1.7.1
Vinod Koul
maintainerRe: [V3 2/2] dmaengine: fsl-qdma: Add improvement
Quoted 1 line · Peng Ma
When an error occurs we should clean the error register then to return
The patch title is supposed to tell us about the change. "Add
improvement: is a very generic term!
I have change title to "Continue to clear register on error" and applied
Quoted 27 lines
Signed-off-by Peng Ma <[email protected]>---
changed for V3:
- no changed.drivers/dma/fsl-qdma.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)drivers/dma/fsl-qdma.c +1
-3@@ -703,10 +703,8 @@ static irqreturn_t fsl_qdma_error_handler(int irq, void *dev_id) intr =qdma_readl (fsl_qdma, status +FSL_QDMA_DEDR ); -if (intr) { +if (intr)dev_err (fsl_qdma->dma_dev.dev,"DMA transaction error!\n" ); -return IRQ_NONE ; - }qdma_writel (fsl_qdma,FSL_QDMA_DEDR_CLEAR , status +FSL_QDMA_DEDR );return IRQ_HANDLED ;Signature · 1 line
1.7.1
Signature · 1 line
~Vinod
Quoted 2 lines · Peng Ma
CMD of Source/Destination descriptor format should be lower of struct
fsl_qdma_enginenumber data address.
Applied, thanks
Signature · 1 line
~Vinod