| Message ID | 20240510030959.703663-1-joy.zou@nxp.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8ddad558997002ce67980e30c9e8dfaa696e163b |
| Headers | show |
| Series | dmaengine: fsl-edma: change the memory access from local into remote mode in i.MX 8QM | expand |
On Fri, May 10, 2024 at 11:09:34AM +0800, Joy Zou wrote: > Fix the issue where MEM_TO_MEM fail on i.MX8QM due to the requirement > that both source and destination addresses need pass through the IOMMU. > Typically, peripheral FIFO addresses bypass the IOMMU, necessitating > only one of the source or destination to go through it. > > Set "is_remote" to true to ensure both source and destination > addresses pass through the IOMMU. > > iMX8 Spec define "Local" and "Remote" bus as below. > Local bus: bypass IOMMU to directly access other peripheral register, > such as FIFO. > Remote bus: go through IOMMU to access system memory. > > The test fail log as follow: > [ 66.268506] dmatest: dma0chan0-copy0: result #1: 'test timed out' with src_off=0x100 dst_off=0x80 len=0x3ec0 (0) > [ 66.278785] dmatest: dma0chan0-copy0: summary 1 tests, 1 failures 0.32 iops 4 KB/s (0) > > Fixes: 72f5801a4e2b ("dmaengine: fsl-edma: integrate v3 support") > Signed-off-by: Joy Zou <joy.zou@nxp.com> Reviewed-by: Frank Li <Frank.Li@nxp.com> > Cc: stable@vger.kernel.org > --- > drivers/dma/fsl-edma-common.c | 3 +++ > drivers/dma/fsl-edma-common.h | 1 + > drivers/dma/fsl-edma-main.c | 2 +- > 3 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c > index d62f5f452a43..7accee488856 100644 > --- a/drivers/dma/fsl-edma-common.c > +++ b/drivers/dma/fsl-edma-common.c > @@ -756,6 +756,8 @@ struct dma_async_tx_descriptor *fsl_edma_prep_memcpy(struct dma_chan *chan, > fsl_desc->iscyclic = false; > > fsl_chan->is_sw = true; > + if (fsl_edma_drvflags(fsl_chan) & FSL_EDMA_DRV_MEM_REMOTE) > + fsl_chan->is_remote = true; > > /* To match with copy_align and max_seg_size so 1 tcd is enough */ > fsl_edma_fill_tcd(fsl_chan, fsl_desc->tcd[0].vtcd, dma_src, dma_dst, > @@ -835,6 +837,7 @@ void fsl_edma_free_chan_resources(struct dma_chan *chan) > fsl_chan->tcd_pool = NULL; > fsl_chan->is_sw = false; > fsl_chan->srcid = 0; > + fsl_chan->is_remote = false; > if (fsl_edma_drvflags(fsl_chan) & FSL_EDMA_DRV_HAS_CHCLK) > clk_disable_unprepare(fsl_chan->clk); > } > diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h > index 3f93ebb890b3..cc15c1a145eb 100644 > --- a/drivers/dma/fsl-edma-common.h > +++ b/drivers/dma/fsl-edma-common.h > @@ -194,6 +194,7 @@ struct fsl_edma_desc { > #define FSL_EDMA_DRV_HAS_PD BIT(5) > #define FSL_EDMA_DRV_HAS_CHCLK BIT(6) > #define FSL_EDMA_DRV_HAS_CHMUX BIT(7) > +#define FSL_EDMA_DRV_MEM_REMOTE BIT(8) > /* control and status register is in tcd address space, edma3 reg layout */ > #define FSL_EDMA_DRV_SPLIT_REG BIT(9) > #define FSL_EDMA_DRV_BUS_8BYTE BIT(10) > diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c > index 391e4f13dfeb..43d84cfefbe2 100644 > --- a/drivers/dma/fsl-edma-main.c > +++ b/drivers/dma/fsl-edma-main.c > @@ -342,7 +342,7 @@ static struct fsl_edma_drvdata imx7ulp_data = { > }; > > static struct fsl_edma_drvdata imx8qm_data = { > - .flags = FSL_EDMA_DRV_HAS_PD | FSL_EDMA_DRV_EDMA3, > + .flags = FSL_EDMA_DRV_HAS_PD | FSL_EDMA_DRV_EDMA3 | FSL_EDMA_DRV_MEM_REMOTE, > .chreg_space_sz = 0x10000, > .chreg_off = 0x10000, > .setup_irq = fsl_edma3_irq_init, > -- > 2.37.1 >
On Fri, 10 May 2024 11:09:34 +0800, Joy Zou wrote: > Fix the issue where MEM_TO_MEM fail on i.MX8QM due to the requirement > that both source and destination addresses need pass through the IOMMU. > Typically, peripheral FIFO addresses bypass the IOMMU, necessitating > only one of the source or destination to go through it. > > Set "is_remote" to true to ensure both source and destination > addresses pass through the IOMMU. > > [...] Applied, thanks! [1/1] dmaengine: fsl-edma: change the memory access from local into remote mode in i.MX 8QM commit: 8ddad558997002ce67980e30c9e8dfaa696e163b Best regards,
diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c index d62f5f452a43..7accee488856 100644 --- a/drivers/dma/fsl-edma-common.c +++ b/drivers/dma/fsl-edma-common.c @@ -756,6 +756,8 @@ struct dma_async_tx_descriptor *fsl_edma_prep_memcpy(struct dma_chan *chan, fsl_desc->iscyclic = false; fsl_chan->is_sw = true; + if (fsl_edma_drvflags(fsl_chan) & FSL_EDMA_DRV_MEM_REMOTE) + fsl_chan->is_remote = true; /* To match with copy_align and max_seg_size so 1 tcd is enough */ fsl_edma_fill_tcd(fsl_chan, fsl_desc->tcd[0].vtcd, dma_src, dma_dst, @@ -835,6 +837,7 @@ void fsl_edma_free_chan_resources(struct dma_chan *chan) fsl_chan->tcd_pool = NULL; fsl_chan->is_sw = false; fsl_chan->srcid = 0; + fsl_chan->is_remote = false; if (fsl_edma_drvflags(fsl_chan) & FSL_EDMA_DRV_HAS_CHCLK) clk_disable_unprepare(fsl_chan->clk); } diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h index 3f93ebb890b3..cc15c1a145eb 100644 --- a/drivers/dma/fsl-edma-common.h +++ b/drivers/dma/fsl-edma-common.h @@ -194,6 +194,7 @@ struct fsl_edma_desc { #define FSL_EDMA_DRV_HAS_PD BIT(5) #define FSL_EDMA_DRV_HAS_CHCLK BIT(6) #define FSL_EDMA_DRV_HAS_CHMUX BIT(7) +#define FSL_EDMA_DRV_MEM_REMOTE BIT(8) /* control and status register is in tcd address space, edma3 reg layout */ #define FSL_EDMA_DRV_SPLIT_REG BIT(9) #define FSL_EDMA_DRV_BUS_8BYTE BIT(10) diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c index 391e4f13dfeb..43d84cfefbe2 100644 --- a/drivers/dma/fsl-edma-main.c +++ b/drivers/dma/fsl-edma-main.c @@ -342,7 +342,7 @@ static struct fsl_edma_drvdata imx7ulp_data = { }; static struct fsl_edma_drvdata imx8qm_data = { - .flags = FSL_EDMA_DRV_HAS_PD | FSL_EDMA_DRV_EDMA3, + .flags = FSL_EDMA_DRV_HAS_PD | FSL_EDMA_DRV_EDMA3 | FSL_EDMA_DRV_MEM_REMOTE, .chreg_space_sz = 0x10000, .chreg_off = 0x10000, .setup_irq = fsl_edma3_irq_init,
Fix the issue where MEM_TO_MEM fail on i.MX8QM due to the requirement that both source and destination addresses need pass through the IOMMU. Typically, peripheral FIFO addresses bypass the IOMMU, necessitating only one of the source or destination to go through it. Set "is_remote" to true to ensure both source and destination addresses pass through the IOMMU. iMX8 Spec define "Local" and "Remote" bus as below. Local bus: bypass IOMMU to directly access other peripheral register, such as FIFO. Remote bus: go through IOMMU to access system memory. The test fail log as follow: [ 66.268506] dmatest: dma0chan0-copy0: result #1: 'test timed out' with src_off=0x100 dst_off=0x80 len=0x3ec0 (0) [ 66.278785] dmatest: dma0chan0-copy0: summary 1 tests, 1 failures 0.32 iops 4 KB/s (0) Fixes: 72f5801a4e2b ("dmaengine: fsl-edma: integrate v3 support") Signed-off-by: Joy Zou <joy.zou@nxp.com> Cc: stable@vger.kernel.org --- drivers/dma/fsl-edma-common.c | 3 +++ drivers/dma/fsl-edma-common.h | 1 + drivers/dma/fsl-edma-main.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-)