Commit e27d9629 authored Aug 20, 2019 by Andrey Smirnov Committed by Herbert Xu Aug 30, 2019

crypto: caam - move cpu_to_caam_dma() selection to runtime



Instead of selecting the implementation of
cpu_to_caam_dma()/caam_dma_to_cpu() at build time using the
preprocessor, convert the code to do that at run-time using IS_ENABLED
macro. This is needed to add support for i.MX8MQ. No functional change
intended.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.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: Herbert Xu <herbert@gondor.apana.org.au>

parent 1a3daadc

drivers/crypto/caam/regs.h

+15 −7

Original line number	Diff line number	Diff line
		@@ -188,13 +188,21 @@ static inline u64 caam_dma64_to_cpu(u64 value)
		return caam64_to_cpu(value);
		}

		#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
		#define cpu_to_caam_dma(value) cpu_to_caam_dma64(value)
		#define caam_dma_to_cpu(value) caam_dma64_to_cpu(value)
		#else
		#define cpu_to_caam_dma(value) cpu_to_caam32(value)
		#define caam_dma_to_cpu(value) caam32_to_cpu(value)
		#endif /* CONFIG_ARCH_DMA_ADDR_T_64BIT */
		static inline u64 cpu_to_caam_dma(u64 value)
		{
		if (IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT))
		return cpu_to_caam_dma64(value);
		else
		return cpu_to_caam32(value);
		}

		static inline u64 caam_dma_to_cpu(u64 value)
		{
		if (IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT))
		return caam_dma64_to_cpu(value);
		else
		return caam32_to_cpu(value);
		}

		/*
		* jr_outentry

Admin message