Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70c0cda2 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Herbert Xu
Browse files

crypto: caam - move DMA mask selection into a function 



Exactly the same code to figure out DMA mask is repeated twice in the
driver code. To avoid repetition, move that logic into a standalone
subroutine in intern.h. While at it re-shuffle the code to make it
more readable with early returns.

Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Reviewed-by: default avatarHoria Geantă <horia.geanta@nxp.com>
Cc: Chris Spencer <christopher.spencer@sea.co.uk>
Cc: Cory Tusar <cory.tusar@zii.aero>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Horia Geantă <horia.geanta@nxp.com>
Cc: Aymen Sghaier <aymen.sghaier@nxp.com>
Cc: Leonard Crestez <leonard.crestez@nxp.com>
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 671e5038

drivers/crypto/caam/ctrl.c

+1 −10
Original line number Original line Diff line number Diff line
@@ -711,16 +711,7 @@ static int caam_probe(struct platform_device *pdev) 
			      JRSTART_JR1_START | JRSTART_JR2_START |

			      JRSTART_JR1_START | JRSTART_JR2_START |

			      JRSTART_JR3_START);

			      JRSTART_JR3_START);





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

	ret = dma_set_mask_and_coherent(dev, caam_get_dma_mask(dev));

		if (caam_dpaa2)

			ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(49));

		else if (of_device_is_compatible(nprop, "fsl,sec-v5.0"))

			ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(40));

		else

			ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(36));

	} else {

		ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));

	}

	if (ret) {

	if (ret) {

		dev_err(dev, "dma_set_mask_and_coherent failed (%d)\n", ret);

		dev_err(dev, "dma_set_mask_and_coherent failed (%d)\n", ret);

		goto disable_caam_emi_slow;

		goto disable_caam_emi_slow;

drivers/crypto/caam/intern.h

+20 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,8 @@ 
#ifndef INTERN_H

#ifndef INTERN_H

#define INTERN_H

#define INTERN_H





#include "ctrl.h"



/* Currently comes from Kconfig param as a ^2 (driver-required) */

/* Currently comes from Kconfig param as a ^2 (driver-required) */

#define JOBR_DEPTH (1 << CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE)

#define JOBR_DEPTH (1 << CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE)
@@ -215,4 +217,22 @@ DEFINE_SIMPLE_ATTRIBUTE(caam_fops_u32_ro, caam_debugfs_u32_get, NULL, "%llu\n"); 
DEFINE_SIMPLE_ATTRIBUTE(caam_fops_u64_ro, caam_debugfs_u64_get, NULL, "%llu\n");

DEFINE_SIMPLE_ATTRIBUTE(caam_fops_u64_ro, caam_debugfs_u64_get, NULL, "%llu\n");

#endif

#endif





static inline u64 caam_get_dma_mask(struct device *dev)

{

	struct device_node *nprop = dev->of_node;



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

		return DMA_BIT_MASK(32);



	if (caam_dpaa2)

		return DMA_BIT_MASK(49);



	if (of_device_is_compatible(nprop, "fsl,sec-v5.0-job-ring") ||

	    of_device_is_compatible(nprop, "fsl,sec-v5.0"))

		return DMA_BIT_MASK(40);



	return DMA_BIT_MASK(36);

}





#endif /* INTERN_H */
 
#endif /* INTERN_H */

drivers/crypto/caam/jr.c

+1 −14
Original line number Original line Diff line number Diff line
@@ -543,20 +543,7 @@ static int caam_jr_probe(struct platform_device *pdev) 




	jrpriv->rregs = (struct caam_job_ring __iomem __force *)ctrl;

	jrpriv->rregs = (struct caam_job_ring __iomem __force *)ctrl;





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

	error = dma_set_mask_and_coherent(jrdev, caam_get_dma_mask(jrdev));

		if (caam_dpaa2)

			error = dma_set_mask_and_coherent(jrdev,

							  DMA_BIT_MASK(49));

		else if (of_device_is_compatible(nprop,

						 "fsl,sec-v5.0-job-ring"))

			error = dma_set_mask_and_coherent(jrdev,

							  DMA_BIT_MASK(40));

		else

			error = dma_set_mask_and_coherent(jrdev,

							  DMA_BIT_MASK(36));

	} else {

		error = dma_set_mask_and_coherent(jrdev, DMA_BIT_MASK(32));

	}

	if (error) {

	if (error) {

		dev_err(jrdev, "dma_set_mask_and_coherent failed (%d)\n",

		dev_err(jrdev, "dma_set_mask_and_coherent failed (%d)\n",

			error);

			error);