dmaengine: fsl-edma: Add eDMA support for QorIQ LS1028A platform
Subsystems (2)
PATCH v3 1/1 dmaengine: fsl-edma: Add eDMA support for QorIQ LS1028A platform
Our platforms(such as LS1021A, LS1012A, LS1043A, LS1046A, LS1028A) with below registers(CHCFG0 - CHCFG15) of eDMA as follows:
*-----------------------------------------------------------*
| Offset | OTHERS | LS1028A | |--------------|--------------------|-----------------------| | 0x0 | CHCFG0 | CHCFG3 | |--------------|--------------------|-----------------------| | 0x1 | CHCFG1 | CHCFG2 | |--------------|--------------------|-----------------------| | 0x2 | CHCFG2 | CHCFG1 | |--------------|--------------------|-----------------------| | 0x3 | CHCFG3 | CHCFG0 | |--------------|--------------------|-----------------------| | ... | ...... | ...... | |--------------|--------------------|-----------------------| | 0xC | CHCFG12 | CHCFG15 | |--------------|--------------------|-----------------------| | 0xD | CHCFG13 | CHCFG14 | |--------------|--------------------|-----------------------| | 0xE | CHCFG14 | CHCFG13 | |--------------|--------------------|-----------------------| | 0xF | CHCFG15 | CHCFG12 |
*-----------------------------------------------------------*
This patch is to improve edma driver to fit LS1028A platform.
---
Changed for v3:
- Rename struct soc_device_attribute
drivers/dma/fsl-edma-common.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/dma/fsl-edma-common.c +12 -0
@@ -7,6 +7,7 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/dma-mapping.h> +#include <linux/sys_soc.h> #include "fsl-edma-common.h"
@@ -42,6 +43,11 @@#define EDMA_TCD 0x1000 +static struct soc_device_attribute mux_byte_swap_quirk[] = { + { .family ="QorIQ LS1028A" }, + { }, +}; +static void fsl_edma_enable_request (struct fsl_edma_chan *fsl_chan) {struct edma_regs *regs = &fsl_chan->edma->regs;
@@ -109,10 +115,16 @@ void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan,u32 ch = fsl_chan->vchan.chan.chan_id;void __iomem *muxaddr;unsigned int chans_per_mux, ch_off; +int endian_diff[4 ] = {3 ,1 ,-1 ,-3 };u32 dmamux_nr = fsl_chan->edma->drvdata->dmamuxs; chans_per_mux = fsl_chan->edma->n_chans / dmamux_nr; ch_off = fsl_chan->vchan.chan.chan_id % chans_per_mux; + +if (!fsl_chan->edma->big_endian && +soc_device_match (mux_byte_swap_quirk)) + ch_off += endian_diff[ch_off %4 ]; + muxaddr = fsl_chan->edma->muxbase[ch / chans_per_mux]; slot =EDMAMUX_CHCFG_SOURCE (slot);
Signature · 1 line
2.9.5
Quoted 47 lines · On 2019/12/9 17:03 Peng Ma <[email protected]> wrote:
Our
platforms(such as LS1021A, LS1012A, LS1043A, LS1046A, LS1028A)with below registers(CHCFG0 - CHCFG15) of eDMA as follows:
*-----------------------------------------------------------*| Offset | OTHERS | LS1028A | |--------------|--------------------|-----------------------| | 0x0 | CHCFG0 | CHCFG3 | |--------------|--------------------|-----------------------| | 0x1 | CHCFG1 | CHCFG2 | |--------------|--------------------|-----------------------| | 0x2 | CHCFG2 | CHCFG1 | |--------------|--------------------|-----------------------| | 0x3 | CHCFG3 | CHCFG0 | |--------------|--------------------|-----------------------| | ... | ...... | ...... | |--------------|--------------------|-----------------------| | 0xC | CHCFG12 | CHCFG15 | |--------------|--------------------|-----------------------| | 0xD | CHCFG13 | CHCFG14 | |--------------|--------------------|-----------------------| | 0xE | CHCFG14 | CHCFG13 | |--------------|--------------------|-----------------------| | 0xF | CHCFG15 | CHCFG12 |*-----------------------------------------------------------*
This patch is to improve edma driver to fit LS1028A platform.
Signed-off-by Peng Ma <[email protected]>---
Changed for v3:
- Rename structsoc_device_attributedrivers/dma/fsl-edma-common.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)(quoted diff) +0
-0
b/drivers/dma/fsl-edma-common.cindex b1a7ca9..10234e1 100644drivers/dma/fsl-edma-common.c +1
-0@@ -7,6 +7,7 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/dma-mapping.h> +#include <linux/sys_soc.h> #include "fsl-edma-common.h"
drivers/dma/fsl-edma-common.c line 50
Quoted 8 lines
drivers/dma/fsl-edma-common.c +5
-0@@ -42,6 +43,11 @@#define EDMA_TCD 0x1000 +static struct soc_device_attribute mux_byte_swap_quirk[] = { + { .family ="QorIQ LS1028A" }, + { }, +}; +
How about add 'mux_swap' into 'struct fsl_edma_drvdata' instead
of involving any soc type into the common fsl-edma-common.c? Then soc type could be added into chip level driver fsl-edma.c like "fsl,vf610-edma"/ "fsl,imx7ulp-edma".
Quoted 21 lines
drivers/dma/fsl-edma-common.c +0
-0static void fsl_edma_enable_request (struct fsl_edma_chan *fsl_chan) { struct edma_regs *regs = &fsl_chan->edma->regs; @@ -109,10 +115,16 @@ void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan,drivers/dma/fsl-edma-common.c +6
-1u32 ch = fsl_chan->vchan.chan.chan_id;void __iomem *muxaddr;unsigned int chans_per_mux, ch_off; +int endian_diff[4 ] = {3 ,1 ,-1 ,-3 };u32 dmamux_nr = fsl_chan->edma->drvdata->dmamuxs; chans_per_mux = fsl_chan->edma->n_chans / dmamux_nr; ch_off = fsl_chan->vchan.chan.chan_id % chans_per_mux; + +if (!fsl_chan->edma->big_endian && +soc_device_match (mux_byte_swap_quirk)) + ch_off += endian_diff[ch_off %4 ]; + muxaddr = fsl_chan->edma->muxbase[ch / chans_per_mux]; slot =EDMAMUX_CHCFG_SOURCE (slot); --2.9.5