From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: linux-crypto@vger.kernel.org
Cc: "Andrey Smirnov" <andrew.smirnov@gmail.com>,
"Chris Spencer" <christopher.spencer@sea.co.uk>,
"Cory Tusar" <cory.tusar@zii.aero>,
"Chris Healy" <cphealy@gmail.com>,
"Lucas Stach" <l.stach@pengutronix.de>,
"Horia Geantă" <horia.geanta@nxp.com>,
"Aymen Sghaier" <aymen.sghaier@nxp.com>,
"Leonard Crestez" <leonard.crestez@nxp.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v6 09/14] crypto: caam - move cpu_to_caam_dma() selection to runtime
Date: Wed, 17 Jul 2019 08:24:53 -0700 [thread overview]
Message-ID: <20190717152458.22337-10-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190717152458.22337-1-andrew.smirnov@gmail.com>
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
---
drivers/crypto/caam/regs.h | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h
index fb494d14f262..511e28ba740a 100644
--- a/drivers/crypto/caam/regs.h
+++ b/drivers/crypto/caam/regs.h
@@ -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
--
2.21.0
next prev parent reply other threads:[~2019-07-17 15:25 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-17 15:24 [PATCH v6 00/14] crypto: caam - Add i.MX8MQ support Andrey Smirnov
2019-07-17 15:24 ` [PATCH v6 01/14] crypto: caam - move DMA mask selection into a function Andrey Smirnov
2019-07-17 15:24 ` [PATCH v6 02/14] crypto: caam - simplfy clock initialization Andrey Smirnov
2019-07-23 14:17 ` Horia Geanta
2019-08-12 17:56 ` Andrey Smirnov
2019-07-17 15:24 ` [PATCH v6 03/14] crypto: caam - convert caam_jr_init() to use devres Andrey Smirnov
2019-07-23 15:48 ` Horia Geanta
2019-07-17 15:24 ` [PATCH v6 04/14] crypto: caam - request JR IRQ as the last step Andrey Smirnov
2019-07-23 16:02 ` Horia Geanta
2019-08-12 17:59 ` Andrey Smirnov
2019-07-17 15:24 ` [PATCH v6 05/14] crytpo: caam - make use of iowrite64*_hi_lo in wr_reg64 Andrey Smirnov
2019-07-29 15:29 ` Horia Geanta
2019-07-17 15:24 ` [PATCH v6 06/14] crypto: caam - use ioread64*_hi_lo in rd_reg64 Andrey Smirnov
2019-07-29 15:32 ` Horia Geanta
2019-07-17 15:24 ` [PATCH v6 07/14] crypto: caam - drop 64-bit only wr/rd_reg64() Andrey Smirnov
2019-07-29 15:32 ` Horia Geanta
2019-07-17 15:24 ` [PATCH v6 08/14] crypto: caam - make CAAM_PTR_SZ dynamic Andrey Smirnov
2019-07-23 9:57 ` Horia Geanta
2019-08-12 17:56 ` Andrey Smirnov
2019-07-17 15:24 ` Andrey Smirnov [this message]
2019-07-17 15:24 ` [PATCH v6 10/14] crypto: caam - drop explicit usage of struct jr_outentry Andrey Smirnov
2019-07-17 15:24 ` [PATCH v6 11/14] crypto: caam - don't hardcode inpentry size Andrey Smirnov
2019-07-17 15:24 ` [PATCH v6 12/14] crypto: caam - force DMA address to 32-bit on 64-bit i.MX SoCs Andrey Smirnov
2019-08-05 8:23 ` Horia Geanta
2019-08-12 19:27 ` Andrey Smirnov
2019-08-13 13:38 ` Horia Geanta
2019-08-13 18:50 ` Andrey Smirnov
2019-07-17 15:24 ` [PATCH v6 13/14] crypto: caam - always select job ring via RSR on i.MX8MQ Andrey Smirnov
2019-07-17 15:24 ` [PATCH v6 14/14] crypto: caam - add clock entry for i.MX8MQ Andrey Smirnov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190717152458.22337-10-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=aymen.sghaier@nxp.com \
--cc=christopher.spencer@sea.co.uk \
--cc=cory.tusar@zii.aero \
--cc=cphealy@gmail.com \
--cc=horia.geanta@nxp.com \
--cc=l.stach@pengutronix.de \
--cc=leonard.crestez@nxp.com \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).