2019-07-26 11:46:01

by Fuqian Huang

Subject: [PATCH] dmaengine: pl330: use the same attributes when freeing pl330->mcode_cpu

In function dmac_alloc_resources(), pl330->mcode_cpu is allocated using
dma_alloc_attrs() but freed with dma_free_coherent().
Use the correct dma_free_attrs() function to free pl330->mcode_cpu.

Signed-off-by: Fuqian Huang <[email protected]>
---
drivers/dma/pl330.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 1163af2ba4a3..6cce9ef61b29 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -1922,9 +1922,10 @@ static int dmac_alloc_resources(struct pl330_dmac *pl330)
if (ret) {
dev_err(pl330->ddma.dev, "%s:%d Can't to create channels for DMAC!\n",
__func__, __LINE__);
- dma_free_coherent(pl330->ddma.dev,
+ dma_free_attrs(pl330->ddma.dev,
chans * pl330->mcbufsz,
- pl330->mcode_cpu, pl330->mcode_bus);
+ pl330->mcode_cpu, pl330->mcode_bus,
+ DMA_ATTR_PRIVILEGED);
return ret;
}

@@ -2003,9 +2004,9 @@ static void pl330_del(struct pl330_dmac *pl330)
/* Free DMAC resources */
dmac_free_threads(pl330);

- dma_free_coherent(pl330->ddma.dev,
+ dma_free_attrs(pl330->ddma.dev,
pl330->pcfg.num_chan * pl330->mcbufsz, pl330->mcode_cpu,
- pl330->mcode_bus);
+ pl330->mcode_bus, DMA_ATTR_PRIVILEGED);
}

/* forward declaration */
--
2.11.0

2019-08-08 13:24:00

by Vinod Koul

Subject: Re: [PATCH] dmaengine: pl330: use the same attributes when freeing pl330->mcode_cpu

On 26-07-19, 18:59, Fuqian Huang wrote:
> In function dmac_alloc_resources(), pl330->mcode_cpu is allocated using
> dma_alloc_attrs() but freed with dma_free_coherent().
> Use the correct dma_free_attrs() function to free pl330->mcode_cpu.

Applied, thanks

--
~Vinod