linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 v5 06/14] crypto: caam - use ioread64*_hi_lo in rd_reg64
Date: Mon, 15 Jul 2019 13:19:34 -0700	[thread overview]
Message-ID: <20190715201942.17309-7-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190715201942.17309-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>
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 6e8352ac0d92..afdc0d1aa338 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


  parent reply	other threads:[~2019-07-15 20:20 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-15 20:19 [PATCH v5 00/14] crypto: caam - Add i.MX8MQ support Andrey Smirnov
2019-07-15 20:19 ` [PATCH v5 01/14] crypto: caam - move DMA mask selection into a function Andrey Smirnov
2019-07-15 20:19 ` [PATCH v5 02/14] crypto: caam - simplfy clock initialization Andrey Smirnov
2019-07-17  7:08   ` Iuliana Prodan
2019-07-15 20:19 ` [PATCH v5 03/14] crypto: caam - convert caam_jr_init() to use devres Andrey Smirnov
2019-07-15 20:19 ` [PATCH v5 04/14] crypto: caam - request JR IRQ as the last step Andrey Smirnov
2019-07-15 20:19 ` [PATCH v5 05/14] crytpo: caam - make use of iowrite64*_hi_lo in wr_reg64 Andrey Smirnov
2019-07-15 20:19 ` Andrey Smirnov [this message]
2019-07-15 20:19 ` [PATCH v5 07/14] crypto: caam - drop 64-bit only wr/rd_reg64() Andrey Smirnov
2019-07-15 20:19 ` [PATCH v5 08/14] crypto: caam - make CAAM_PTR_SZ dynamic Andrey Smirnov
2019-07-15 20:19 ` [PATCH v5 09/14] crypto: caam - move cpu_to_caam_dma() selection to runtime Andrey Smirnov
2019-07-15 20:19 ` [PATCH v5 10/14] crypto: caam - drop explicit usage of struct jr_outentry Andrey Smirnov
2019-07-15 20:19 ` [PATCH v5 11/14] crypto: caam - don't hardcode inpentry size Andrey Smirnov
2019-07-16  1:45   ` Andrey Smirnov
2019-07-15 20:19 ` [PATCH v5 12/14] crypto: caam - force DMA address to 32-bit on 64-bit i.MX SoCs Andrey Smirnov
2019-07-15 20:19 ` [PATCH v5 13/14] crypto: caam - always select job ring via RSR on i.MX8MQ Andrey Smirnov
2019-07-15 20:19 ` [PATCH v5 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=20190715201942.17309-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).