p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto: marvell/cesa - Fix DMA API misuse 

phys_to_dma() is an internal helper for certain DMA API implementations,
and is not appropriate for drivers to use. It appears that what the CESA
driver really wants to be using is dma_map_resource() - admittedly that
didn't exist when the offending code was first merged, but it does now.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Robin Murphy 2018-01-10 15:15:43 +00:00 committed by Herbert Xu
parent 2273f42df1
commit 37d728f76c
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/crypto/marvell/cesa.c
View File

@ -15,6 +15,7 @@
*/ */
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/dma-mapping.h>
#include <linux/genalloc.h> #include <linux/genalloc.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/io.h> #include <linux/io.h>
@ -409,8 +410,11 @@ static int mv_cesa_get_sram(struct platform_device *pdev, int idx)
if (IS_ERR(engine->sram)) if (IS_ERR(engine->sram))
return PTR_ERR(engine->sram); return PTR_ERR(engine->sram);
engine->sram_dma = phys_to_dma(cesa->dev, engine->sram_dma = dma_map_resource(cesa->dev, res->start,
(phys_addr_t)res->start); cesa->sram_size,
DMA_BIDIRECTIONAL, 0);
if (dma_mapping_error(cesa->dev, engine->sram_dma))
return -ENOMEM;
return 0; return 0;
} }
@ -420,11 +424,12 @@ static void mv_cesa_put_sram(struct platform_device *pdev, int idx)
struct mv_cesa_dev *cesa = platform_get_drvdata(pdev); struct mv_cesa_dev *cesa = platform_get_drvdata(pdev);
struct mv_cesa_engine *engine = &cesa->engines[idx]; struct mv_cesa_engine *engine = &cesa->engines[idx];
if (!engine->pool) if (engine->pool)
return; gen_pool_free(engine->pool, (unsigned long)engine->sram,
cesa->sram_size);
gen_pool_free(engine->pool, (unsigned long)engine->sram, else
cesa->sram_size); dma_unmap_resource(cesa->dev, engine->sram_dma,
cesa->sram_size, DMA_BIDIRECTIONAL, 0);
} }
static int mv_cesa_probe(struct platform_device *pdev) static int mv_cesa_probe(struct platform_device *pdev)