* [PATCH] crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation
@ 2022-04-11 3:13 ` Tianjia Zhang
0 siblings, 0 replies; 12+ messages in thread
From: Tianjia Zhang @ 2022-04-11 3:13 UTC (permalink / raw)
To: Herbert Xu, David S. Miller, Catalin Marinas, Will Deacon,
Jason A . Donenfeld, linux-crypto, linux-arm-kernel,
linux-kernel
Cc: Tianjia Zhang
Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
moved the sm4 library implementation from the lib/crypto directory to
the crypto directory and configured the name as CRYPTO_SM4. The arm64
SM4 NEON/CE implementation depends on this and needs to be modified
uniformly.
Fixes: 4f1aef9b806f ("crypto: arm64/sm4 - add ARMv8 NEON implementation")
Fixes: 5b33e0ec881c ("crypto: arm64/sm4 - add ARMv8 Crypto Extensions implementation")
Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
---
arch/arm64/crypto/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/crypto/Kconfig b/arch/arm64/crypto/Kconfig
index 4fe7037d2347..ac85682c013c 100644
--- a/arch/arm64/crypto/Kconfig
+++ b/arch/arm64/crypto/Kconfig
@@ -57,13 +57,13 @@ config CRYPTO_SM4_ARM64_CE_BLK
tristate "SM4 in ECB/CBC/CFB/CTR modes using ARMv8 Crypto Extensions"
depends on KERNEL_MODE_NEON
select CRYPTO_SKCIPHER
- select CRYPTO_LIB_SM4
+ select CRYPTO_SM4
config CRYPTO_SM4_ARM64_NEON_BLK
tristate "SM4 in ECB/CBC/CFB/CTR modes using NEON instructions"
depends on KERNEL_MODE_NEON
select CRYPTO_SKCIPHER
- select CRYPTO_LIB_SM4
+ select CRYPTO_SM4
config CRYPTO_GHASH_ARM64_CE
tristate "GHASH/AES-GCM using ARMv8 Crypto Extensions"
--
2.24.3 (Apple Git-128)
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH] crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation
@ 2022-04-11 3:13 ` Tianjia Zhang
0 siblings, 0 replies; 12+ messages in thread
From: Tianjia Zhang @ 2022-04-11 3:13 UTC (permalink / raw)
To: Herbert Xu, David S. Miller, Catalin Marinas, Will Deacon,
Jason A . Donenfeld, linux-crypto, linux-arm-kernel,
linux-kernel
Cc: Tianjia Zhang
Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
moved the sm4 library implementation from the lib/crypto directory to
the crypto directory and configured the name as CRYPTO_SM4. The arm64
SM4 NEON/CE implementation depends on this and needs to be modified
uniformly.
Fixes: 4f1aef9b806f ("crypto: arm64/sm4 - add ARMv8 NEON implementation")
Fixes: 5b33e0ec881c ("crypto: arm64/sm4 - add ARMv8 Crypto Extensions implementation")
Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
---
arch/arm64/crypto/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/crypto/Kconfig b/arch/arm64/crypto/Kconfig
index 4fe7037d2347..ac85682c013c 100644
--- a/arch/arm64/crypto/Kconfig
+++ b/arch/arm64/crypto/Kconfig
@@ -57,13 +57,13 @@ config CRYPTO_SM4_ARM64_CE_BLK
tristate "SM4 in ECB/CBC/CFB/CTR modes using ARMv8 Crypto Extensions"
depends on KERNEL_MODE_NEON
select CRYPTO_SKCIPHER
- select CRYPTO_LIB_SM4
+ select CRYPTO_SM4
config CRYPTO_SM4_ARM64_NEON_BLK
tristate "SM4 in ECB/CBC/CFB/CTR modes using NEON instructions"
depends on KERNEL_MODE_NEON
select CRYPTO_SKCIPHER
- select CRYPTO_LIB_SM4
+ select CRYPTO_SM4
config CRYPTO_GHASH_ARM64_CE
tristate "GHASH/AES-GCM using ARMv8 Crypto Extensions"
--
2.24.3 (Apple Git-128)
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH] crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation
2022-04-11 3:13 ` Tianjia Zhang
@ 2022-04-13 10:22 ` Will Deacon
-1 siblings, 0 replies; 12+ messages in thread
From: Will Deacon @ 2022-04-13 10:22 UTC (permalink / raw)
To: Tianjia Zhang
Cc: Herbert Xu, David S. Miller, Catalin Marinas,
Jason A . Donenfeld, linux-crypto, linux-arm-kernel,
linux-kernel
On Mon, Apr 11, 2022 at 11:13:13AM +0800, Tianjia Zhang wrote:
> Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
> moved the sm4 library implementation from the lib/crypto directory to
> the crypto directory and configured the name as CRYPTO_SM4. The arm64
> SM4 NEON/CE implementation depends on this and needs to be modified
> uniformly.
d2825fa9365d doesn't appear in my tree -- is this something in linux-next?
Will
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH] crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation
@ 2022-04-13 10:22 ` Will Deacon
0 siblings, 0 replies; 12+ messages in thread
From: Will Deacon @ 2022-04-13 10:22 UTC (permalink / raw)
To: Tianjia Zhang
Cc: Herbert Xu, David S. Miller, Catalin Marinas,
Jason A . Donenfeld, linux-crypto, linux-arm-kernel,
linux-kernel
On Mon, Apr 11, 2022 at 11:13:13AM +0800, Tianjia Zhang wrote:
> Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
> moved the sm4 library implementation from the lib/crypto directory to
> the crypto directory and configured the name as CRYPTO_SM4. The arm64
> SM4 NEON/CE implementation depends on this and needs to be modified
> uniformly.
d2825fa9365d doesn't appear in my tree -- is this something in linux-next?
Will
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH] crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation
2022-04-13 10:22 ` Will Deacon
@ 2022-04-13 11:48 ` Jason A. Donenfeld
-1 siblings, 0 replies; 12+ messages in thread
From: Jason A. Donenfeld @ 2022-04-13 11:48 UTC (permalink / raw)
To: Will Deacon
Cc: Tianjia Zhang, Herbert Xu, David S. Miller, Catalin Marinas,
linux-crypto, linux-arm-kernel, linux-kernel
Hi Will,
On Wed, Apr 13, 2022 at 11:22:09AM +0100, Will Deacon wrote:
> On Mon, Apr 11, 2022 at 11:13:13AM +0800, Tianjia Zhang wrote:
> > Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
> > moved the sm4 library implementation from the lib/crypto directory to
> > the crypto directory and configured the name as CRYPTO_SM4. The arm64
> > SM4 NEON/CE implementation depends on this and needs to be modified
> > uniformly.
>
> d2825fa9365d doesn't appear in my tree -- is this something in linux-next?
This is in Herbert's tree for next:
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git/commit/?id=d2825fa9365d
Jason
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH] crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation
@ 2022-04-13 11:48 ` Jason A. Donenfeld
0 siblings, 0 replies; 12+ messages in thread
From: Jason A. Donenfeld @ 2022-04-13 11:48 UTC (permalink / raw)
To: Will Deacon
Cc: Tianjia Zhang, Herbert Xu, David S. Miller, Catalin Marinas,
linux-crypto, linux-arm-kernel, linux-kernel
Hi Will,
On Wed, Apr 13, 2022 at 11:22:09AM +0100, Will Deacon wrote:
> On Mon, Apr 11, 2022 at 11:13:13AM +0800, Tianjia Zhang wrote:
> > Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
> > moved the sm4 library implementation from the lib/crypto directory to
> > the crypto directory and configured the name as CRYPTO_SM4. The arm64
> > SM4 NEON/CE implementation depends on this and needs to be modified
> > uniformly.
>
> d2825fa9365d doesn't appear in my tree -- is this something in linux-next?
This is in Herbert's tree for next:
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git/commit/?id=d2825fa9365d
Jason
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH] crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation
2022-04-13 11:48 ` Jason A. Donenfeld
@ 2022-04-14 9:34 ` Will Deacon
-1 siblings, 0 replies; 12+ messages in thread
From: Will Deacon @ 2022-04-14 9:34 UTC (permalink / raw)
To: Jason A. Donenfeld
Cc: Tianjia Zhang, Herbert Xu, David S. Miller, Catalin Marinas,
linux-crypto, linux-arm-kernel, linux-kernel
On Wed, Apr 13, 2022 at 01:48:53PM +0200, Jason A. Donenfeld wrote:
> On Wed, Apr 13, 2022 at 11:22:09AM +0100, Will Deacon wrote:
> > On Mon, Apr 11, 2022 at 11:13:13AM +0800, Tianjia Zhang wrote:
> > > Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
> > > moved the sm4 library implementation from the lib/crypto directory to
> > > the crypto directory and configured the name as CRYPTO_SM4. The arm64
> > > SM4 NEON/CE implementation depends on this and needs to be modified
> > > uniformly.
> >
> > d2825fa9365d doesn't appear in my tree -- is this something in linux-next?
>
> This is in Herbert's tree for next:
> https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git/commit/?id=d2825fa9365d
Cheers, then I'll leave this fix for Herbert to pick up.
Will
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH] crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation
@ 2022-04-14 9:34 ` Will Deacon
0 siblings, 0 replies; 12+ messages in thread
From: Will Deacon @ 2022-04-14 9:34 UTC (permalink / raw)
To: Jason A. Donenfeld
Cc: Tianjia Zhang, Herbert Xu, David S. Miller, Catalin Marinas,
linux-crypto, linux-arm-kernel, linux-kernel
On Wed, Apr 13, 2022 at 01:48:53PM +0200, Jason A. Donenfeld wrote:
> On Wed, Apr 13, 2022 at 11:22:09AM +0100, Will Deacon wrote:
> > On Mon, Apr 11, 2022 at 11:13:13AM +0800, Tianjia Zhang wrote:
> > > Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
> > > moved the sm4 library implementation from the lib/crypto directory to
> > > the crypto directory and configured the name as CRYPTO_SM4. The arm64
> > > SM4 NEON/CE implementation depends on this and needs to be modified
> > > uniformly.
> >
> > d2825fa9365d doesn't appear in my tree -- is this something in linux-next?
>
> This is in Herbert's tree for next:
> https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git/commit/?id=d2825fa9365d
Cheers, then I'll leave this fix for Herbert to pick up.
Will
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH] crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation
2022-04-14 9:34 ` Will Deacon
@ 2022-04-14 9:43 ` Herbert Xu
-1 siblings, 0 replies; 12+ messages in thread
From: Herbert Xu @ 2022-04-14 9:43 UTC (permalink / raw)
To: Will Deacon
Cc: Jason A. Donenfeld, Tianjia Zhang, David S. Miller,
Catalin Marinas, linux-crypto, linux-arm-kernel, linux-kernel
On Thu, Apr 14, 2022 at 10:34:45AM +0100, Will Deacon wrote:
>
> Cheers, then I'll leave this fix for Herbert to pick up.
Sorry, I think it was my merge error that created this bug
in the first place. I'll pick up the fix.
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation
@ 2022-04-14 9:43 ` Herbert Xu
0 siblings, 0 replies; 12+ messages in thread
From: Herbert Xu @ 2022-04-14 9:43 UTC (permalink / raw)
To: Will Deacon
Cc: Jason A. Donenfeld, Tianjia Zhang, David S. Miller,
Catalin Marinas, linux-crypto, linux-arm-kernel, linux-kernel
On Thu, Apr 14, 2022 at 10:34:45AM +0100, Will Deacon wrote:
>
> Cheers, then I'll leave this fix for Herbert to pick up.
Sorry, I think it was my merge error that created this bug
in the first place. I'll pick up the fix.
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] 12+ messages in thread
* Re: [PATCH] crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation
2022-04-11 3:13 ` Tianjia Zhang
@ 2022-04-15 8:41 ` Herbert Xu
-1 siblings, 0 replies; 12+ messages in thread
From: Herbert Xu @ 2022-04-15 8:41 UTC (permalink / raw)
To: Tianjia Zhang
Cc: David S. Miller, Catalin Marinas, Will Deacon,
Jason A . Donenfeld, linux-crypto, linux-arm-kernel,
linux-kernel
On Mon, Apr 11, 2022 at 11:13:13AM +0800, Tianjia Zhang wrote:
> Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
> moved the sm4 library implementation from the lib/crypto directory to
> the crypto directory and configured the name as CRYPTO_SM4. The arm64
> SM4 NEON/CE implementation depends on this and needs to be modified
> uniformly.
>
> Fixes: 4f1aef9b806f ("crypto: arm64/sm4 - add ARMv8 NEON implementation")
> Fixes: 5b33e0ec881c ("crypto: arm64/sm4 - add ARMv8 Crypto Extensions implementation")
> Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
> ---
> arch/arm64/crypto/Kconfig | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
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] 12+ messages in thread* Re: [PATCH] crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation
@ 2022-04-15 8:41 ` Herbert Xu
0 siblings, 0 replies; 12+ messages in thread
From: Herbert Xu @ 2022-04-15 8:41 UTC (permalink / raw)
To: Tianjia Zhang
Cc: David S. Miller, Catalin Marinas, Will Deacon,
Jason A . Donenfeld, linux-crypto, linux-arm-kernel,
linux-kernel
On Mon, Apr 11, 2022 at 11:13:13AM +0800, Tianjia Zhang wrote:
> Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
> moved the sm4 library implementation from the lib/crypto directory to
> the crypto directory and configured the name as CRYPTO_SM4. The arm64
> SM4 NEON/CE implementation depends on this and needs to be modified
> uniformly.
>
> Fixes: 4f1aef9b806f ("crypto: arm64/sm4 - add ARMv8 NEON implementation")
> Fixes: 5b33e0ec881c ("crypto: arm64/sm4 - add ARMv8 Crypto Extensions implementation")
> Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
> ---
> arch/arm64/crypto/Kconfig | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2022-04-15 8:42 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-11 3:13 [PATCH] crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation Tianjia Zhang
2022-04-11 3:13 ` Tianjia Zhang
2022-04-13 10:22 ` Will Deacon
2022-04-13 10:22 ` Will Deacon
2022-04-13 11:48 ` Jason A. Donenfeld
2022-04-13 11:48 ` Jason A. Donenfeld
2022-04-14 9:34 ` Will Deacon
2022-04-14 9:34 ` Will Deacon
2022-04-14 9:43 ` Herbert Xu
2022-04-14 9:43 ` Herbert Xu
2022-04-15 8:41 ` Herbert Xu
2022-04-15 8:41 ` Herbert Xu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.