From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx4+Z1YBvwbXOs23fZvHNs+CrujpS69qLzBu8UjBFwx8NfOH0Moow3fIX/iSInN5/SnpoiI/P ARC-Seal: i=1; a=rsa-sha256; t=1522192128; cv=none; d=google.com; s=arc-20160816; b=1FStwWG8646DzxWtXZ3/54fC+gZi/6IjLShHF7qI+I8dC/8L7t24CSnLfCYd8eJHkW rEXjvxEMFRgCE0TmlSXqWkgqgVA9qsjFbiv3+sNDfcahqroCRQNTzhH1QyAokrGMsVTU CnP6NUDjxjAtM9eApk40tGVrIkhC52NufAP+rccrIZIIAWHOm8VZKoCx6dBxg+xW8GtO zyajEEW79eYJ4a/At1izNJG+6VCb1cACGu+yUCOyf7mSASb6ly8e2LF8VawmnJZAfM/R x97HLViASsefPC4dZVok75pf+YFDmpyjFeDk5qUzSXGYX41nSWV+g6BLoUtZ1dBI9LWq aUHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=subject:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:cc:to:from:arc-authentication-results; bh=I0mQAG6uuC+hyAVaFbO7lBUDJGoy/57bE5IwTmzt9Gs=; b=lyBZStVCZQcnr31Hs2XeF6oFw99wMp2tK+ezKj8TDTHr7IyGKRRE9OiRgJFnUJO65H cLbD5Frv5qTDjkfC1XG1Hb/qDun0MVxuTzK/fIxMFvhvsuvDgYM5LSeEsXzBP6e1km/a +NJMl23EVGzFS+y32ROLfEO7eRblpke+vK4jRlRVUw8LEYotOvC7pMXbhY/rYSySsVH7 LON9Hp4172NpKCU+vGa0upOGYiTRRN19995u/4/huaLKh4PkPGTIbYrIqIjk6+cyjjec RdSrxkzI5pbqZxsC9U3rF5C8uixDPbLgl1kg17ipatLyaoLsh8d/p92PLx41+i8tsvqR OSeA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of gunthorp@deltatee.com designates 207.54.116.67 as permitted sender) smtp.mailfrom=gunthorp@deltatee.com Authentication-Results: mx.google.com; spf=pass (google.com: domain of gunthorp@deltatee.com designates 207.54.116.67 as permitted sender) smtp.mailfrom=gunthorp@deltatee.com From: Logan Gunthorpe To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-ntb@googlegroups.com, linux-crypto@vger.kernel.org, Greg Kroah-Hartman Cc: Arnd Bergmann , Andy Shevchenko , =?UTF-8?q?Horia=20Geant=C4=83?= , Logan Gunthorpe , Dan Douglass , Herbert Xu , "David S. Miller" Date: Tue, 27 Mar 2018 17:08:33 -0600 Message-Id: <20180327230834.5931-9-logang@deltatee.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180327230834.5931-1-logang@deltatee.com> References: <20180327230834.5931-1-logang@deltatee.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 172.16.1.31 X-SA-Exim-Rcpt-To: linux-ntb@googlegroups.com, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-crypto@vger.kernel.org, gregkh@linuxfoundation.org, arnd@arndb.de, andy.shevchenko@gmail.com, logang@deltatee.com, horia.geanta@nxp.com, dan.douglass@nxp.com, herbert@gondor.apana.org.au, davem@davemloft.net X-SA-Exim-Mail-From: gunthorp@deltatee.com Subject: [PATCH v15 8/9] crypto: caam: cleanup CONFIG_64BIT ifdefs when using io{read|write}64 X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on ale.deltatee.com) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1596134133370212558?= X-GMAIL-MSGID: =?utf-8?q?1596134133370212558?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Clean up the extra ifdefs which defined the wr_reg64 and rd_reg64 functions in non-64bit cases in favour of the new common io-64-nonatomic-lo-hi header. To be consistent with CAAM engine HW spec: in case of 64-bit registers, irrespective of device endianness, the lower address should be read from / written to first, followed by the upper address. Indeed the I/O accessors in CAAM driver currently don't follow the spec, however this is a good opportunity to fix the code. Signed-off-by: Logan Gunthorpe Reviewed-by: Horia Geantă Reviewed-by: Andy Shevchenko Cc: Dan Douglass Cc: Herbert Xu Cc: "David S. Miller" --- drivers/crypto/caam/regs.h | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h index fee363865d88..f887b371040f 100644 --- a/drivers/crypto/caam/regs.h +++ b/drivers/crypto/caam/regs.h @@ -10,7 +10,7 @@ #include #include -#include +#include /* * Architecture-specific register access methods @@ -136,10 +136,9 @@ static inline void clrsetbits_32(void __iomem *reg, u32 clear, u32 set) * base + 0x0000 : least-significant 32 bits * base + 0x0004 : most-significant 32 bits */ -#ifdef CONFIG_64BIT static inline void wr_reg64(void __iomem *reg, u64 data) { - if (caam_little_end) + if (!caam_imx && caam_little_end) iowrite64(data, reg); else iowrite64be(data, reg); @@ -147,35 +146,12 @@ static inline void wr_reg64(void __iomem *reg, u64 data) static inline u64 rd_reg64(void __iomem *reg) { - if (caam_little_end) + if (!caam_imx && caam_little_end) return ioread64(reg); else return ioread64be(reg); } -#else /* CONFIG_64BIT */ -static inline void wr_reg64(void __iomem *reg, u64 data) -{ - if (!caam_imx && caam_little_end) { - wr_reg32((u32 __iomem *)(reg) + 1, data >> 32); - wr_reg32((u32 __iomem *)(reg), data); - } else { - wr_reg32((u32 __iomem *)(reg), data >> 32); - wr_reg32((u32 __iomem *)(reg) + 1, 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))); - - return ((u64)rd_reg32((u32 __iomem *)(reg)) << 32 | - (u64)rd_reg32((u32 __iomem *)(reg) + 1)); -} -#endif /* CONFIG_64BIT */ - static inline u64 cpu_to_caam_dma64(dma_addr_t value) { if (caam_imx) -- 2.11.0