* [PATCH] crypto: caam: fix misspelled upper_32_bits
@ 2016-06-16 9:05 Arnd Bergmann
2016-06-16 10:28 ` Horia Ioan Geanta Neag
2016-06-20 11:34 ` Herbert Xu
0 siblings, 2 replies; 3+ messages in thread
From: Arnd Bergmann @ 2016-06-16 9:05 UTC (permalink / raw)
To: Herbert Xu
Cc: Arnd Bergmann, David S. Miller, Horia Geantă,
linux-crypto, linux-kernel
An endianess fix mistakenly used higher_32_bits() instead of
upper_32_bits(), and that doesn't exist:
drivers/crypto/caam/desc_constr.h: In function 'append_ptr':
drivers/crypto/caam/desc_constr.h:84:75: error: implicit declaration of function 'higher_32_bits' [-Werror=implicit-function-declaration]
*offset = cpu_to_caam_dma(ptr);
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 261ea058f016 ("crypto: caam - handle core endianness != caam endianness")
---
drivers/crypto/caam/regs.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h
index 8c766cf9202c..b3c5016f6458 100644
--- a/drivers/crypto/caam/regs.h
+++ b/drivers/crypto/caam/regs.h
@@ -183,10 +183,10 @@ static inline u64 rd_reg64(void __iomem *reg)
#ifdef CONFIG_SOC_IMX7D
#define cpu_to_caam_dma(value) \
(((u64)cpu_to_caam32(lower_32_bits(value)) << 32) | \
- (u64)cpu_to_caam32(higher_32_bits(value)))
+ (u64)cpu_to_caam32(upper_32_bits(value)))
#define caam_dma_to_cpu(value) \
(((u64)caam32_to_cpu(lower_32_bits(value)) << 32) | \
- (u64)caam32_to_cpu(higher_32_bits(value)))
+ (u64)caam32_to_cpu(upper_32_bits(value)))
#else
#define cpu_to_caam_dma(value) cpu_to_caam64(value)
#define caam_dma_to_cpu(value) caam64_to_cpu(value)
--
2.9.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] crypto: caam: fix misspelled upper_32_bits
2016-06-16 9:05 [PATCH] crypto: caam: fix misspelled upper_32_bits Arnd Bergmann
@ 2016-06-16 10:28 ` Horia Ioan Geanta Neag
2016-06-20 11:34 ` Herbert Xu
1 sibling, 0 replies; 3+ messages in thread
From: Horia Ioan Geanta Neag @ 2016-06-16 10:28 UTC (permalink / raw)
To: Arnd Bergmann, Herbert Xu; +Cc: David S. Miller, linux-crypto, linux-kernel
On 6/16/2016 12:04 PM, Arnd Bergmann wrote:
> An endianess fix mistakenly used higher_32_bits() instead of
> upper_32_bits(), and that doesn't exist:
>
> drivers/crypto/caam/desc_constr.h: In function 'append_ptr':
> drivers/crypto/caam/desc_constr.h:84:75: error: implicit declaration of function 'higher_32_bits' [-Werror=implicit-function-declaration]
> *offset = cpu_to_caam_dma(ptr);
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: 261ea058f016 ("crypto: caam - handle core endianness != caam endianness")
Oops... thanks Arnd!
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
> ---
> drivers/crypto/caam/regs.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h
> index 8c766cf9202c..b3c5016f6458 100644
> --- a/drivers/crypto/caam/regs.h
> +++ b/drivers/crypto/caam/regs.h
> @@ -183,10 +183,10 @@ static inline u64 rd_reg64(void __iomem *reg)
> #ifdef CONFIG_SOC_IMX7D
> #define cpu_to_caam_dma(value) \
> (((u64)cpu_to_caam32(lower_32_bits(value)) << 32) | \
> - (u64)cpu_to_caam32(higher_32_bits(value)))
> + (u64)cpu_to_caam32(upper_32_bits(value)))
> #define caam_dma_to_cpu(value) \
> (((u64)caam32_to_cpu(lower_32_bits(value)) << 32) | \
> - (u64)caam32_to_cpu(higher_32_bits(value)))
> + (u64)caam32_to_cpu(upper_32_bits(value)))
> #else
> #define cpu_to_caam_dma(value) cpu_to_caam64(value)
> #define caam_dma_to_cpu(value) caam64_to_cpu(value)
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] crypto: caam: fix misspelled upper_32_bits
2016-06-16 9:05 [PATCH] crypto: caam: fix misspelled upper_32_bits Arnd Bergmann
2016-06-16 10:28 ` Horia Ioan Geanta Neag
@ 2016-06-20 11:34 ` Herbert Xu
1 sibling, 0 replies; 3+ messages in thread
From: Herbert Xu @ 2016-06-20 11:34 UTC (permalink / raw)
To: Arnd Bergmann
Cc: David S. Miller, Horia Geantă, linux-crypto, linux-kernel
On Thu, Jun 16, 2016 at 11:05:46AM +0200, Arnd Bergmann wrote:
> An endianess fix mistakenly used higher_32_bits() instead of
> upper_32_bits(), and that doesn't exist:
>
> drivers/crypto/caam/desc_constr.h: In function 'append_ptr':
> drivers/crypto/caam/desc_constr.h:84:75: error: implicit declaration of function 'higher_32_bits' [-Werror=implicit-function-declaration]
> *offset = cpu_to_caam_dma(ptr);
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: 261ea058f016 ("crypto: caam - handle core endianness != caam endianness")
Patch applied. Thanks.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-06-20 11:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-16 9:05 [PATCH] crypto: caam: fix misspelled upper_32_bits Arnd Bergmann
2016-06-16 10:28 ` Horia Ioan Geanta Neag
2016-06-20 11:34 ` Herbert Xu
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).