Commit e0a08ed2 authored by Frank Li's avatar Frank Li Committed by Vinod Koul
Browse files

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



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: default avatarFrank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/r/20231221153528.1588049-4-Frank.Li@nxp.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 537df9ab

drivers/dma/fsl-edma-common.c

+3 −3
Original line number Diff line number Diff line
@@ -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

		 * already in use will be forced to 0.

		 */

		if (!edma_readl_chreg(fsl_chan, ch_mux))

			edma_writel_chreg(fsl_chan, fsl_chan->srcid, ch_mux);

		if (!edma_readl(fsl_chan->edma, fsl_chan->mux_addr))

			edma_writel(fsl_chan->edma, fsl_chan->srcid, fsl_chan->mux_addr);

	}



	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);



	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;

	edma_writel_chreg(fsl_chan, val, ch_csr);

drivers/dma/fsl-edma-common.h

+3 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ struct fsl_edma_chan { 
	enum dma_data_direction		dma_dir;

	char				chan_name[32];

	struct fsl_edma_hw_tcd __iomem *tcd;

	void __iomem			*mux_addr;

	u32				real_count;

	struct work_struct		issue_worker;

	struct platform_device		*pdev;
@@ -206,6 +207,8 @@ struct fsl_edma_drvdata { 
	u32			chreg_off;

	u32			chreg_space_sz;

	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,

					     struct fsl_edma_engine *fsl_edma);

};

drivers/dma/fsl-edma-main.c

+3 −0
Original line number Diff line number Diff line
@@ -359,6 +359,8 @@ static struct fsl_edma_drvdata imx93_data4 = { 
	.flags = FSL_EDMA_DRV_HAS_CHMUX | FSL_EDMA_DRV_HAS_DMACLK | FSL_EDMA_DRV_EDMA4,

	.chreg_space_sz = 0x8000,

	.chreg_off = 0x10000,

	.mux_off = 0x10000 + offsetof(struct fsl_edma3_ch_reg, ch_mux),

	.mux_skip = 0x8000,

	.setup_irq = fsl_edma3_irq_init,

};
@@ -532,6 +534,7 @@ static int fsl_edma_probe(struct platform_device *pdev) 
				offsetof(struct fsl_edma3_ch_reg, tcd) : 0;

		fsl_chan->tcd = fsl_edma->membase

				+ 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;

		vchan_init(&fsl_chan->vchan, &fsl_edma->dma_dev);