Commit a2ac287e authored by Horia Geanta's avatar Horia Geanta Committed by Herbert Xu
Browse files

crypto: caam - set coherent_dma_mask 



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

Signed-off-by: default avatarHoria Geanta <horia.geanta@freescale.com>
Acked-by: default avatarKim Phillips <kim.phillips@freescale.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 29b77e5d

drivers/crypto/caam/ctrl.c

+3 −3
Original line number Diff line number Diff line
@@ -453,11 +453,11 @@ static int caam_probe(struct platform_device *pdev) 


	if (sizeof(dma_addr_t) == sizeof(u64))

		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

			dma_set_mask(dev, DMA_BIT_MASK(36));

			dma_set_mask_and_coherent(dev, DMA_BIT_MASK(36));

	else

		dma_set_mask(dev, DMA_BIT_MASK(32));

		dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));



	/*

	 * Detect and enable JobRs

drivers/crypto/caam/jr.c

+3 −3
Original line number Diff line number Diff line
@@ -476,11 +476,11 @@ static int caam_jr_probe(struct platform_device *pdev) 


	if (sizeof(dma_addr_t) == sizeof(u64))

		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

			dma_set_mask(jrdev, DMA_BIT_MASK(36));

			dma_set_mask_and_coherent(jrdev, DMA_BIT_MASK(36));

	else

		dma_set_mask(jrdev, DMA_BIT_MASK(32));

		dma_set_mask_and_coherent(jrdev, DMA_BIT_MASK(32));



	/* Identify the interrupt */

	jrpriv->irq = irq_of_parse_and_map(nprop, 0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE