Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754684AbdFWR7Y (ORCPT ); Fri, 23 Jun 2017 13:59:24 -0400 Received: from ale.deltatee.com ([207.54.116.67]:57920 "EHLO ale.deltatee.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754068AbdFWR7W (ORCPT ); Fri, 23 Jun 2017 13:59:22 -0400 To: =?UTF-8?Q?Horia_Geant=c4=83?= , "linux-kernel@vger.kernel.org" , "linux-arch@vger.kernel.org" , "linux-ntb@googlegroups.com" , "linux-alpha@vger.kernel.org" , "linuxppc-dev@lists.ozlabs.org" , "linux-crypto@vger.kernel.org" , "dri-devel@lists.freedesktop.org" References: <20170622164817.25515-1-logang@deltatee.com> <20170622164817.25515-8-logang@deltatee.com> Cc: Arnd Bergmann , Greg Kroah-Hartman , Stephen Bates , Dan Douglass , Herbert Xu , "David S. Miller" , Radu Solea , Steve Cornelius From: Logan Gunthorpe Message-ID: <411c4bb0-2709-1902-778a-bf4d7734e3e1@deltatee.com> Date: Fri, 23 Jun 2017 11:59:02 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=iso-8859-2 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 172.16.1.111 X-SA-Exim-Rcpt-To: steve.cornelius@nxp.com, radu.solea@nxp.com, davem@davemloft.net, herbert@gondor.apana.org.au, dan.douglass@nxp.com, sbates@raithlin.com, gregkh@linuxfoundation.org, arnd@arndb.de, dri-devel@lists.freedesktop.org, linux-crypto@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-alpha@vger.kernel.org, linux-ntb@googlegroups.com, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, horia.geanta@nxp.com X-SA-Exim-Mail-From: logang@deltatee.com Subject: Re: [PATCH 7/7] crypto: caam: cleanup CONFIG_64BIT ifdefs when using io{read|write}64 X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on ale.deltatee.com) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4876 Lines: 149 Thanks Horia. I'm inclined to just use your patch verbatim. I can set you as author, but no matter how I do it, I'll need your Signed-off-by. Logan On 23/06/17 12:51 AM, Horia Geant? wrote: > On 6/22/2017 7:49 PM, Logan Gunthorpe wrote: >> Now that ioread64 and iowrite64 are always available we don't >> need the ugly ifdefs to change their implementation when they >> are not. >> > Thanks Logan. > > Note however this is not equivalent - it changes the behaviour, since > CAAM engine on i.MX6S/SL/D/Q platforms is broken in terms of 64-bit > register endianness - see CONFIG_CRYPTO_DEV_FSL_CAAM_IMX usage in code > you are removing. > > [Yes, current code has its problems, as it does not differentiate b/w > i.MX platforms with and without the (unofficial) erratum, but this > should be fixed separately.] > > Below is the change that would keep current logic - still forcing i.MX > to write CAAM 64-bit registers in BE even if the engine is LE (yes, diff > is doing a poor job). > > Horia > > diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h > index 84d2f838a063..b893ebb24e65 100644 > --- a/drivers/crypto/caam/regs.h > +++ b/drivers/crypto/caam/regs.h > @@ -134,50 +134,25 @@ 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) > { > +#ifndef CONFIG_CRYPTO_DEV_FSL_CAAM_IMX > if (caam_little_end) > iowrite64(data, reg); > else > - iowrite64be(data, reg); > -} > - > -static inline u64 rd_reg64(void __iomem *reg) > -{ > - if (caam_little_end) > - return ioread64(reg); > - else > - return ioread64be(reg); > -} > - > -#else /* CONFIG_64BIT */ > -static inline void wr_reg64(void __iomem *reg, u64 data) > -{ > -#ifndef CONFIG_CRYPTO_DEV_FSL_CAAM_IMX > - if (caam_little_end) { > - wr_reg32((u32 __iomem *)(reg) + 1, data >> 32); > - wr_reg32((u32 __iomem *)(reg), data); > - } else > #endif > - { > - wr_reg32((u32 __iomem *)(reg), data >> 32); > - wr_reg32((u32 __iomem *)(reg) + 1, data); > - } > + iowrite64be(data, reg); > } > > static inline u64 rd_reg64(void __iomem *reg) > { > #ifndef CONFIG_CRYPTO_DEV_FSL_CAAM_IMX > if (caam_little_end) > - return ((u64)rd_reg32((u32 __iomem *)(reg) + 1) << 32 | > - (u64)rd_reg32((u32 __iomem *)(reg))); > + return ioread64(reg); > else > #endif > - return ((u64)rd_reg32((u32 __iomem *)(reg)) << 32 | > - (u64)rd_reg32((u32 __iomem *)(reg) + 1)); > + return ioread64be(reg); > } > -#endif /* CONFIG_64BIT */ > > #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT > #ifdef CONFIG_SOC_IMX7D > > >> Signed-off-by: Logan Gunthorpe >> Cc: "Horia Geant?" >> Cc: Dan Douglass >> Cc: Herbert Xu >> Cc: "David S. Miller" >> --- >> drivers/crypto/caam/regs.h | 29 ----------------------------- >> 1 file changed, 29 deletions(-) >> >> diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h >> index 84d2f838a063..26fc19dd0c39 100644 >> --- a/drivers/crypto/caam/regs.h >> +++ b/drivers/crypto/caam/regs.h >> @@ -134,7 +134,6 @@ 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) >> @@ -151,34 +150,6 @@ static inline u64 rd_reg64(void __iomem *reg) >> return ioread64be(reg); >> } >> >> -#else /* CONFIG_64BIT */ >> -static inline void wr_reg64(void __iomem *reg, u64 data) >> -{ >> -#ifndef CONFIG_CRYPTO_DEV_FSL_CAAM_IMX >> - if (caam_little_end) { >> - wr_reg32((u32 __iomem *)(reg) + 1, data >> 32); >> - wr_reg32((u32 __iomem *)(reg), data); >> - } else >> -#endif >> - { >> - wr_reg32((u32 __iomem *)(reg), data >> 32); >> - wr_reg32((u32 __iomem *)(reg) + 1, data); >> - } >> -} >> - >> -static inline u64 rd_reg64(void __iomem *reg) >> -{ >> -#ifndef CONFIG_CRYPTO_DEV_FSL_CAAM_IMX >> - if (caam_little_end) >> - return ((u64)rd_reg32((u32 __iomem *)(reg) + 1) << 32 | >> - (u64)rd_reg32((u32 __iomem *)(reg))); >> - else >> -#endif >> - return ((u64)rd_reg32((u32 __iomem *)(reg)) << 32 | >> - (u64)rd_reg32((u32 __iomem *)(reg) + 1)); >> -} >> -#endif /* CONFIG_64BIT */ >> - >> #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT >> #ifdef CONFIG_SOC_IMX7D >> #define cpu_to_caam_dma(value) \ >>