MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-11 20:05:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

dmaengine: fsl-edma: add address for channel mux register in fsl_edma_chan

Browse Source 
[ Upstream commit e0a08ed254 ]

iMX95 move channel mux register to management page address space. This
prepare to support iMX95.

Add mux_addr in struct fsl_edma_chan. No function change.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/r/20231221153528.1588049-4-Frank.Li@nxp.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Stable-dep-of: 8ddad55899 ("dmaengine: fsl-edma: change the memory access from local into remote mode in i.MX 8QM")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Frank Li 2023-12-21 10:35:25 -05:00 committed by Greg Kroah-Hartman
parent 4239571c5d
commit 5f8de773d4
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/dma/fsl-edma-common.c
View File

@ -97,8 +97,8 @@ static void fsl_edma3_enable_request(struct fsl_edma_chan *fsl_chan)
* ch_mux: With the exception of 0, attempts to write a value * ch_mux: With the exception of 0, attempts to write a value
* already in use will be forced to 0. * already in use will be forced to 0.
*/ */
if (!edma_readl_chreg(fsl_chan, ch_mux)) if (!edma_readl(fsl_chan->edma, fsl_chan->mux_addr))
edma_writel_chreg(fsl_chan, fsl_chan->srcid, ch_mux); edma_writel(fsl_chan->edma, fsl_chan->srcid, fsl_chan->mux_addr);
} }
val = edma_readl_chreg(fsl_chan, ch_csr); val = edma_readl_chreg(fsl_chan, ch_csr);
@ -134,7 +134,7 @@ static void fsl_edma3_disable_request(struct fsl_edma_chan *fsl_chan)
flags = fsl_edma_drvflags(fsl_chan); flags = fsl_edma_drvflags(fsl_chan);
if (flags & FSL_EDMA_DRV_HAS_CHMUX) if (flags & FSL_EDMA_DRV_HAS_CHMUX)
edma_writel_chreg(fsl_chan, 0, ch_mux); edma_writel(fsl_chan->edma, 0, fsl_chan->mux_addr);
val &= ~EDMA_V3_CH_CSR_ERQ; val &= ~EDMA_V3_CH_CSR_ERQ;
edma_writel_chreg(fsl_chan, val, ch_csr); edma_writel_chreg(fsl_chan, val, ch_csr);

3
drivers/dma/fsl-edma-common.h
View File

@ -146,6 +146,7 @@ struct fsl_edma_chan {
enum dma_data_direction dma_dir; enum dma_data_direction dma_dir;
char chan_name[32]; char chan_name[32];
struct fsl_edma_hw_tcd __iomem *tcd; struct fsl_edma_hw_tcd __iomem *tcd;
void __iomem *mux_addr;
u32 real_count; u32 real_count;
struct work_struct issue_worker; struct work_struct issue_worker;
struct platform_device *pdev; struct platform_device *pdev;
@ -207,6 +208,8 @@ struct fsl_edma_drvdata {
u32 chreg_off; u32 chreg_off;
u32 chreg_space_sz; u32 chreg_space_sz;
u32 flags; u32 flags;
u32 mux_off; /* channel mux register offset */
u32 mux_skip; /* how much skip for each channel */
int (*setup_irq)(struct platform_device *pdev, int (*setup_irq)(struct platform_device *pdev,
struct fsl_edma_engine *fsl_edma); struct fsl_edma_engine *fsl_edma);
}; };

3
drivers/dma/fsl-edma-main.c
View File

@ -364,6 +364,8 @@ static struct fsl_edma_drvdata imx93_data4 = {
.flags = FSL_EDMA_DRV_HAS_CHMUX | FSL_EDMA_DRV_HAS_DMACLK | FSL_EDMA_DRV_EDMA4, .flags = FSL_EDMA_DRV_HAS_CHMUX | FSL_EDMA_DRV_HAS_DMACLK | FSL_EDMA_DRV_EDMA4,
.chreg_space_sz = 0x8000, .chreg_space_sz = 0x8000,
.chreg_off = 0x10000, .chreg_off = 0x10000,
.mux_off = 0x10000 + offsetof(struct fsl_edma3_ch_reg, ch_mux),
.mux_skip = 0x8000,
.setup_irq = fsl_edma3_irq_init, .setup_irq = fsl_edma3_irq_init,
}; };
@ -540,6 +542,7 @@ static int fsl_edma_probe(struct platform_device *pdev)
offsetof(struct fsl_edma3_ch_reg, tcd) : 0; offsetof(struct fsl_edma3_ch_reg, tcd) : 0;
fsl_chan->tcd = fsl_edma->membase fsl_chan->tcd = fsl_edma->membase
+ i * drvdata->chreg_space_sz + drvdata->chreg_off + len; + i * drvdata->chreg_space_sz + drvdata->chreg_off + len;
fsl_chan->mux_addr = fsl_edma->membase + drvdata->mux_off + i * drvdata->mux_skip;
fsl_chan->pdev = pdev; fsl_chan->pdev = pdev;
vchan_init(&fsl_chan->vchan, &fsl_edma->dma_dev); vchan_init(&fsl_chan->vchan, &fsl_edma->dma_dev);