| Message ID | 20250417182623.67808-9-ebiggers@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Finish disentangling ChaCha, Poly1305, and BLAKE2s from CRYPTO | expand |
On Thu, 17 Apr 2025 11:26:16 PDT (-0700), ebiggers@kernel.org wrote: > From: Eric Biggers <ebiggers@google.com> > > Continue disentangling the crypto library functions from the generic > crypto infrastructure by removing the unnecessary CRYPTO dependency of > CRYPTO_CHACHA_RISCV64. To do this, make arch/riscv/crypto/Kconfig be > sourced regardless of CRYPTO, and explicitly list the CRYPTO dependency > in the symbols that do need it. > > Signed-off-by: Eric Biggers <ebiggers@google.com> > --- > arch/riscv/Kconfig | 2 ++ > arch/riscv/crypto/Kconfig | 12 ++++++------ > crypto/Kconfig | 3 --- > 3 files changed, 8 insertions(+), 9 deletions(-) > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > index bbec87b79309..baa7b8d98ed8 100644 > --- a/arch/riscv/Kconfig > +++ b/arch/riscv/Kconfig > @@ -1349,8 +1349,10 @@ source "drivers/cpuidle/Kconfig" > > source "drivers/cpufreq/Kconfig" > > endmenu # "CPU Power Management" > > +source "arch/riscv/crypto/Kconfig" > + > source "arch/riscv/kvm/Kconfig" > > source "drivers/acpi/Kconfig" > diff --git a/arch/riscv/crypto/Kconfig b/arch/riscv/crypto/Kconfig > index 27a1f26d41bd..08547694937c 100644 > --- a/arch/riscv/crypto/Kconfig > +++ b/arch/riscv/crypto/Kconfig > @@ -2,11 +2,11 @@ > > menu "Accelerated Cryptographic Algorithms for CPU (riscv)" > > config CRYPTO_AES_RISCV64 > tristate "Ciphers: AES, modes: ECB, CBC, CTS, CTR, XTS" > - depends on 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO > + depends on CRYPTO && 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO > select CRYPTO_ALGAPI > select CRYPTO_LIB_AES > select CRYPTO_SKCIPHER > help > Block cipher: AES cipher algorithms > @@ -25,43 +25,43 @@ config CRYPTO_CHACHA_RISCV64 > select CRYPTO_LIB_CHACHA_GENERIC > default CRYPTO_LIB_CHACHA_INTERNAL > > config CRYPTO_GHASH_RISCV64 > tristate "Hash functions: GHASH" > - depends on 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO > + depends on CRYPTO && 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO > select CRYPTO_GCM > help > GCM GHASH function (NIST SP 800-38D) > > Architecture: riscv64 using: > - Zvkg vector crypto extension > > config CRYPTO_SHA256_RISCV64 > tristate "Hash functions: SHA-224 and SHA-256" > - depends on 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO > + depends on CRYPTO && 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO > select CRYPTO_SHA256 > help > SHA-224 and SHA-256 secure hash algorithm (FIPS 180) > > Architecture: riscv64 using: > - Zvknha or Zvknhb vector crypto extensions > - Zvkb vector crypto extension > > config CRYPTO_SHA512_RISCV64 > tristate "Hash functions: SHA-384 and SHA-512" > - depends on 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO > + depends on CRYPTO && 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO > select CRYPTO_SHA512 > help > SHA-384 and SHA-512 secure hash algorithm (FIPS 180) > > Architecture: riscv64 using: > - Zvknhb vector crypto extension > - Zvkb vector crypto extension > > config CRYPTO_SM3_RISCV64 > tristate "Hash functions: SM3 (ShangMi 3)" > - depends on 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO > + depends on CRYPTO && 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO > select CRYPTO_HASH > select CRYPTO_LIB_SM3 > help > SM3 (ShangMi 3) secure hash function (OSCCA GM/T 0004-2012) > > @@ -69,11 +69,11 @@ config CRYPTO_SM3_RISCV64 > - Zvksh vector crypto extension > - Zvkb vector crypto extension > > config CRYPTO_SM4_RISCV64 > tristate "Ciphers: SM4 (ShangMi 4)" > - depends on 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO > + depends on CRYPTO && 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO > select CRYPTO_ALGAPI > select CRYPTO_SM4 > help > SM4 block cipher algorithm (OSCCA GB/T 32907-2016, > ISO/IEC 18033-3:2010/Amd 1:2021) > diff --git a/crypto/Kconfig b/crypto/Kconfig > index 2467dba73372..8c334c9f2081 100644 > --- a/crypto/Kconfig > +++ b/crypto/Kconfig > @@ -1424,13 +1424,10 @@ endmenu > > config CRYPTO_HASH_INFO > bool > > if !KMSAN # avoid false positives from assembly > -if RISCV > -source "arch/riscv/crypto/Kconfig" > -endif > if S390 > source "arch/s390/crypto/Kconfig" > endif > if SPARC > source "arch/sparc/crypto/Kconfig" Acked-by: Palmer Dabbelt <palmer@rivosinc.com> I'm assuming you want to take this with the rest, thanks!
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index bbec87b79309..baa7b8d98ed8 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -1349,8 +1349,10 @@ source "drivers/cpuidle/Kconfig" source "drivers/cpufreq/Kconfig" endmenu # "CPU Power Management" +source "arch/riscv/crypto/Kconfig" + source "arch/riscv/kvm/Kconfig" source "drivers/acpi/Kconfig" diff --git a/arch/riscv/crypto/Kconfig b/arch/riscv/crypto/Kconfig index 27a1f26d41bd..08547694937c 100644 --- a/arch/riscv/crypto/Kconfig +++ b/arch/riscv/crypto/Kconfig @@ -2,11 +2,11 @@ menu "Accelerated Cryptographic Algorithms for CPU (riscv)" config CRYPTO_AES_RISCV64 tristate "Ciphers: AES, modes: ECB, CBC, CTS, CTR, XTS" - depends on 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO + depends on CRYPTO && 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO select CRYPTO_ALGAPI select CRYPTO_LIB_AES select CRYPTO_SKCIPHER help Block cipher: AES cipher algorithms @@ -25,43 +25,43 @@ config CRYPTO_CHACHA_RISCV64 select CRYPTO_LIB_CHACHA_GENERIC default CRYPTO_LIB_CHACHA_INTERNAL config CRYPTO_GHASH_RISCV64 tristate "Hash functions: GHASH" - depends on 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO + depends on CRYPTO && 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO select CRYPTO_GCM help GCM GHASH function (NIST SP 800-38D) Architecture: riscv64 using: - Zvkg vector crypto extension config CRYPTO_SHA256_RISCV64 tristate "Hash functions: SHA-224 and SHA-256" - depends on 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO + depends on CRYPTO && 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO select CRYPTO_SHA256 help SHA-224 and SHA-256 secure hash algorithm (FIPS 180) Architecture: riscv64 using: - Zvknha or Zvknhb vector crypto extensions - Zvkb vector crypto extension config CRYPTO_SHA512_RISCV64 tristate "Hash functions: SHA-384 and SHA-512" - depends on 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO + depends on CRYPTO && 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO select CRYPTO_SHA512 help SHA-384 and SHA-512 secure hash algorithm (FIPS 180) Architecture: riscv64 using: - Zvknhb vector crypto extension - Zvkb vector crypto extension config CRYPTO_SM3_RISCV64 tristate "Hash functions: SM3 (ShangMi 3)" - depends on 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO + depends on CRYPTO && 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO select CRYPTO_HASH select CRYPTO_LIB_SM3 help SM3 (ShangMi 3) secure hash function (OSCCA GM/T 0004-2012) @@ -69,11 +69,11 @@ config CRYPTO_SM3_RISCV64 - Zvksh vector crypto extension - Zvkb vector crypto extension config CRYPTO_SM4_RISCV64 tristate "Ciphers: SM4 (ShangMi 4)" - depends on 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO + depends on CRYPTO && 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO select CRYPTO_ALGAPI select CRYPTO_SM4 help SM4 block cipher algorithm (OSCCA GB/T 32907-2016, ISO/IEC 18033-3:2010/Amd 1:2021) diff --git a/crypto/Kconfig b/crypto/Kconfig index 2467dba73372..8c334c9f2081 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -1424,13 +1424,10 @@ endmenu config CRYPTO_HASH_INFO bool if !KMSAN # avoid false positives from assembly -if RISCV -source "arch/riscv/crypto/Kconfig" -endif if S390 source "arch/s390/crypto/Kconfig" endif if SPARC source "arch/sparc/crypto/Kconfig"