From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: linux-crypto@vger.kernel.org
Cc: "Andrey Smirnov" <andrew.smirnov@gmail.com>,
"Horia Geantă" <horia.geanta@nxp.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>,
"Aymen Sghaier" <aymen.sghaier@nxp.com>,
"Leonard Crestez" <leonard.crestez@nxp.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v8 06/16] crypto: caam - use ioread64*_hi_lo in rd_reg64
Date: Tue, 20 Aug 2019 13:23:52 -0700 [thread overview]
Message-ID: <20190820202402.24951-7-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190820202402.24951-1-andrew.smirnov@gmail.com>
Following the same transformation logic as outlined in previous commit
converting wr_reg64, convert rd_reg64 to use helpers from
<linux/io-64-nonatomic-hi-lo.h> first. No functional change intended.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Reviewed-by: Horia 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
---
drivers/crypto/caam/regs.h | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h
index 6acfef30a90c..4efc10534873 100644
--- a/drivers/crypto/caam/regs.h
+++ b/drivers/crypto/caam/regs.h
@@ -172,12 +172,20 @@ static inline void wr_reg64(void __iomem *reg, u64 data)
static inline u64 rd_reg64(void __iomem *reg)
{
- if (!caam_imx && caam_little_end)
- return ((u64)rd_reg32((u32 __iomem *)(reg) + 1) << 32 |
- (u64)rd_reg32((u32 __iomem *)(reg)));
+ if (caam_little_end) {
+ if (caam_imx) {
+ u32 low, high;
- return ((u64)rd_reg32((u32 __iomem *)(reg)) << 32 |
- (u64)rd_reg32((u32 __iomem *)(reg) + 1));
+ high = ioread32(reg);
+ low = ioread32(reg + sizeof(u32));
+
+ return low + ((u64)high << 32);
+ } else {
+ return ioread64(reg);
+ }
+ } else {
+ return ioread64be(reg);
+ }
}
#endif /* CONFIG_64BIT */
--
2.21.0
next prev parent reply other threads:[~2019-08-20 20:26 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-20 20:23 [PATCH v8 00/16] crypto: caam - Add i.MX8MQ support Andrey Smirnov
2019-08-20 20:23 ` [PATCH v8 01/16] crypto: caam - move DMA mask selection into a function Andrey Smirnov
2019-08-20 20:23 ` [PATCH v8 02/16] crypto: caam - simplfy clock initialization Andrey Smirnov
2019-08-20 20:23 ` [PATCH v8 03/16] crypto: caam - convert caam_jr_init() to use devres Andrey Smirnov
2019-08-20 20:23 ` [PATCH v8 04/16] crypto: caam - request JR IRQ as the last step Andrey Smirnov
2019-08-20 20:23 ` [PATCH v8 05/16] crytpo: caam - make use of iowrite64*_hi_lo in wr_reg64 Andrey Smirnov
2019-08-20 20:23 ` Andrey Smirnov [this message]
2019-08-20 20:23 ` [PATCH v8 07/16] crypto: caam - drop 64-bit only wr/rd_reg64() Andrey Smirnov
2019-08-20 20:23 ` [PATCH v8 08/16] crypto: caam - share definition for MAX_SDLEN Andrey Smirnov
2019-08-20 20:23 ` [PATCH v8 09/16] crypto: caam - make CAAM_PTR_SZ dynamic Andrey Smirnov
2019-08-20 20:23 ` [PATCH v8 10/16] crypto: caam - move cpu_to_caam_dma() selection to runtime Andrey Smirnov
2019-08-20 20:23 ` [PATCH v8 11/16] crypto: caam - drop explicit usage of struct jr_outentry Andrey Smirnov
2019-08-20 20:23 ` [PATCH v8 12/16] crypto: caam - don't hardcode inpentry size Andrey Smirnov
2019-08-20 20:23 ` [PATCH v8 13/16] crypto: caam - select DMA address size at runtime Andrey Smirnov
2019-08-20 20:29 ` Andrey Smirnov
2019-08-20 20:24 ` [PATCH v8 14/16] crypto: caam - always select job ring via RSR on i.MX8MQ Andrey Smirnov
2019-08-20 20:24 ` [PATCH v8 15/16] crypto: caam - add clock entry for i.MX8MQ Andrey Smirnov
2019-08-20 20:24 ` [PATCH v8 16/16] arm64: dts: imx8mq: Add CAAM node Andrey Smirnov
2019-08-26 8:38 ` [PATCH v8 00/16] crypto: caam - Add i.MX8MQ support Iuliana Prodan
2019-08-30 8:23 ` Herbert Xu
2019-08-30 9:15 ` Iuliana Prodan
2019-08-30 13:15 ` Herbert Xu
2019-08-30 13:35 ` Iuliana Prodan
2019-08-30 20:36 ` 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=20190820202402.24951-7-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).