* [V2 1/2] dmaengine: fsl-qdma: fixed the source/destination descriptor format
@ 2019-05-06 2:21 Peng Ma
2019-05-06 2:21 ` [V2 2/2] dmaengine: fsl-qdma: Add improvement Peng Ma
2019-05-21 4:34 ` [V2 1/2] dmaengine: fsl-qdma: fixed the source/destination descriptor format Vinod Koul
0 siblings, 2 replies; 4+ messages in thread
From: Peng Ma @ 2019-05-06 2:21 UTC (permalink / raw)
To: vkoul, dan.j.williams, leoyang.li; +Cc: dmaengine, linux-kernel, Peng Ma
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>
---
changed for V2:
- Fix descriptor spelling
drivers/dma/fsl-qdma.c | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/drivers/dma/fsl-qdma.c b/drivers/dma/fsl-qdma.c
index aa1d0ae..2e8b46b 100644
--- 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
@@ -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);
}
/*
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [V2 2/2] dmaengine: fsl-qdma: Add improvement
2019-05-06 2:21 [V2 1/2] dmaengine: fsl-qdma: fixed the source/destination descriptor format Peng Ma
@ 2019-05-06 2:21 ` Peng Ma
2019-05-21 4:35 ` Vinod Koul
2019-05-21 4:34 ` [V2 1/2] dmaengine: fsl-qdma: fixed the source/destination descriptor format Vinod Koul
1 sibling, 1 reply; 4+ messages in thread
From: Peng Ma @ 2019-05-06 2:21 UTC (permalink / raw)
To: vkoul, dan.j.williams, leoyang.li; +Cc: dmaengine, linux-kernel, Peng Ma
When an error occurs we should clean the error register then to return
Signed-off-by: Peng Ma <peng.ma@nxp.com>
---
changed for V2:
- Separate one patch to two patchs
drivers/dma/fsl-qdma.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/dma/fsl-qdma.c b/drivers/dma/fsl-qdma.c
index 2e8b46b..542765a 100644
--- a/drivers/dma/fsl-qdma.c
+++ b/drivers/dma/fsl-qdma.c
@@ -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;
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [V2 1/2] dmaengine: fsl-qdma: fixed the source/destination descriptor format
2019-05-06 2:21 [V2 1/2] dmaengine: fsl-qdma: fixed the source/destination descriptor format Peng Ma
2019-05-06 2:21 ` [V2 2/2] dmaengine: fsl-qdma: Add improvement Peng Ma
@ 2019-05-21 4:34 ` Vinod Koul
1 sibling, 0 replies; 4+ messages in thread
From: Vinod Koul @ 2019-05-21 4:34 UTC (permalink / raw)
To: Peng Ma; +Cc: dan.j.williams, leoyang.li, dmaengine, linux-kernel
On 06-05-19, 10:21, Peng Ma wrote:
> 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>
> ---
> changed for V2:
> - Fix descriptor spelling
>
> drivers/dma/fsl-qdma.c | 25 +++++++++++++++++--------
> 1 files changed, 17 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/dma/fsl-qdma.c b/drivers/dma/fsl-qdma.c
> index aa1d0ae..2e8b46b 100644
> --- 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
> @@ -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!
> +
> 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);
> +
why did you add a blank line in this 'fix', it does not belong here!
> /* 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);
why not do sddf->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);
> + qdma_sddf_set_cmd(ddf, cmd);
> }
>
> /*
> --
> 1.7.1
--
~Vinod
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [V2 2/2] dmaengine: fsl-qdma: Add improvement
2019-05-06 2:21 ` [V2 2/2] dmaengine: fsl-qdma: Add improvement Peng Ma
@ 2019-05-21 4:35 ` Vinod Koul
0 siblings, 0 replies; 4+ messages in thread
From: Vinod Koul @ 2019-05-21 4:35 UTC (permalink / raw)
To: Peng Ma; +Cc: dan.j.williams, leoyang.li, dmaengine, linux-kernel
On 06-05-19, 10:21, Peng Ma wrote:
> When an error occurs we should clean the error register then to return
Applied, thanks
--
~Vinod
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-21 4:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-06 2:21 [V2 1/2] dmaengine: fsl-qdma: fixed the source/destination descriptor format Peng Ma
2019-05-06 2:21 ` [V2 2/2] dmaengine: fsl-qdma: Add improvement Peng Ma
2019-05-21 4:35 ` Vinod Koul
2019-05-21 4:34 ` [V2 1/2] dmaengine: fsl-qdma: fixed the source/destination descriptor format Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).