Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

crypto: caam - set coherent_dma_mask

Browse source 
Replace dma_set_mask with dma_set_mask_and_coherent, since both
streaming and coherent DMA mappings are being used.

Signed-off-by: Horia Geanta <horia.geanta@freescale.com>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Horia Geanta 2014-07-11 15:34:47 +03:00 committed by Herbert Xu
parent 29b77e5dd8
commit a2ac287e9e
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/crypto/caam/ctrl.c
View file

@ -453,11 +453,11 @@ static int caam_probe(struct platform_device *pdev)
if (sizeof(dma_addr_t) == sizeof(u64)) if (sizeof(dma_addr_t) == sizeof(u64))
if (of_device_is_compatible(nprop, "fsl,sec-v5.0")) if (of_device_is_compatible(nprop, "fsl,sec-v5.0"))
dma_set_mask(dev, DMA_BIT_MASK(40)); dma_set_mask_and_coherent(dev, DMA_BIT_MASK(40));
else else
dma_set_mask(dev, DMA_BIT_MASK(36)); dma_set_mask_and_coherent(dev, DMA_BIT_MASK(36));
else else
dma_set_mask(dev, DMA_BIT_MASK(32)); dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
/* /*
* Detect and enable JobRs * Detect and enable JobRs

6
drivers/crypto/caam/jr.c
View file

@ -476,11 +476,11 @@ static int caam_jr_probe(struct platform_device *pdev)
if (sizeof(dma_addr_t) == sizeof(u64)) if (sizeof(dma_addr_t) == sizeof(u64))
if (of_device_is_compatible(nprop, "fsl,sec-v5.0-job-ring")) if (of_device_is_compatible(nprop, "fsl,sec-v5.0-job-ring"))
dma_set_mask(jrdev, DMA_BIT_MASK(40)); dma_set_mask_and_coherent(jrdev, DMA_BIT_MASK(40));
else else
dma_set_mask(jrdev, DMA_BIT_MASK(36)); dma_set_mask_and_coherent(jrdev, DMA_BIT_MASK(36));
else else
dma_set_mask(jrdev, DMA_BIT_MASK(32)); dma_set_mask_and_coherent(jrdev, DMA_BIT_MASK(32));
/* Identify the interrupt */ /* Identify the interrupt */
jrpriv->irq = irq_of_parse_and_map(nprop, 0); jrpriv->irq = irq_of_parse_and_map(nprop, 0);