dmaengine: fsl-qdma: fixed the source/destination descriptor format
PATCH v2 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 V2:
- Fix descriptor spelling
drivers/dma/fsl-qdma.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-)
drivers/dma/fsl-qdma.c +17 -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
@@ -214,6 +215,12 @@ struct fsl_qdma_engine { }; +static inline void +qdma_sddf_set_cmd (struct fsl_qdma_format *sddf,u32 val) +{ + sddf->data =QDMA_SDDF_CMD (val); +} +static inline u64 qdma_ccdf_addr_get64 (const struct fsl_qdma_format *ccdf) {
@@ -341,6 +348,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;
@@ -353,6 +361,7 @@ static void fsl_qdma_comp_fill_memcpy(struct fsl_qdma_comp *fsl_comp,memset (fsl_comp->virt_addr,0 ,FSL_QDMA_COMMAND_BUFFER_SIZE );memset (fsl_comp->desc_virt_addr,0 ,FSL_QDMA_DESCRIPTOR_BUFFER_SIZE ); +/* Head Command Descriptor(Frame Descriptor) */ qdma_desc_addr_set64 (ccdf, fsl_comp->bus_addr +16 );qdma_ccdf_set_format (ccdf,qdma_ccdf_get_offset (ccdf));
@@ -369,14 +378,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 ); +qdma_sddf_set_cmd (sdf, 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 ); +qdma_sddf_set_cmd (ddf, cmd); }/*
Signature · 1 line
1.7.1
PATCH v2 2/2 dmaengine: fsl-qdma: Add improvement
When an error occurs we should clean the error register then to return
---
changed for V2:
- Separate one patch to two patchs
drivers/dma/fsl-qdma.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
drivers/dma/fsl-qdma.c +1 -3
@@ -710,10 +710,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
Re: [V2 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
Applied, thanks
Signature · 1 line
~Vinod
Vinod Koul
maintainerQuoted 24 lines · Peng Ma
CMD of Source/Destination descriptor format should be lower of struct
fsl_qdma_enginenumber data address.Signed-off-by Peng Ma <[email protected]>---
changed for V2:
- Fix descriptor spellingdrivers/dma/fsl-qdma.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-)drivers/dma/fsl-qdma.c +1
-0@@ -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
drivers/dma/fsl-qdma.c struct fsl_qdma_engine { · line 222
Quoted 8 lines
drivers/dma/fsl-qdma.c +5
-0@@ -214,6 +215,12 @@ struct fsl_qdma_engine { }; +static inline void +qdma_sddf_set_cmd (struct fsl_qdma_format *sddf,u32 val) +{ + sddf->data =QDMA_SDDF_CMD (val); +}
Do you really need this helper which calls another macro!
Quoted 13 lines
drivers/dma/fsl-qdma.c +2
-0+static inline u64 qdma_ccdf_addr_get64 (const struct fsl_qdma_format *ccdf) {@@ -341,6 +348,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;
drivers/dma/fsl-qdma.c static void fsl_qdma_comp_fill_memcpy(struct fsl_qdma_comp *fsl_comp, · line 364
Quoted 4 lines
drivers/dma/fsl-qdma.c +1
-0@@ -353,6 +361,7 @@ static void fsl_qdma_comp_fill_memcpy(struct fsl_qdma_comp *fsl_comp,memset (fsl_comp->virt_addr,0 ,FSL_QDMA_COMMAND_BUFFER_SIZE );memset (fsl_comp->desc_virt_addr,0 ,FSL_QDMA_DESCRIPTOR_BUFFER_SIZE ); +
why did you add a blank line in this 'fix', it does not belong here!
Quoted 8 lines
drivers/dma/fsl-qdma.c +0
-1/* Head Command Descriptor(Frame Descriptor) */ qdma_desc_addr_set64 (ccdf, fsl_comp->bus_addr +16 );qdma_ccdf_set_format (ccdf,qdma_ccdf_get_offset (ccdf));@@ -369,14 +378,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 =
drivers/dma/fsl-qdma.c static void fsl_qdma_comp_fill_memcpy(struct fsl_qdma_comp *fsl_comp, · line 383
Quoted 10 lines
drivers/dma/fsl-qdma.c +3
-7-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 ); +qdma_sddf_set_cmd (sdf, cmd);
why not do sddf->data = QDMA_SDDF_CMD(cmd);
Quoted 10 lines
drivers/dma/fsl-qdma.c +5
-0+ + 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 ); +qdma_sddf_set_cmd (ddf, cmd); }/* Signature · 1 line
1.7.1
Signature · 1 line
~Vinod