crypto: Kconfig - move mips entries to a submenu

Move CPU-specific crypto/Kconfig entries to arch/xxx/crypto/Kconfig
and create a submenu for them under the Crypto API menu.

Suggested-by: Eric Biggers <ebiggers@kernel.org>
Signed-off-by: Robert Elliott <elliott@hpe.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/mips/crypto/Kconfig b/arch/mips/crypto/Kconfig
new file mode 100644 (file)
index 0000000..7c07611
--- /dev/null
+++ b/arch/mips/crypto/Kconfig
@@ -0,0 +1,60 @@
+# SPDX-License-Identifier: GPL-2.0
+
+menu "Accelerated Cryptographic Algorithms for CPU (mips)"
+
+config CRYPTO_CRC32_MIPS
+       tristate "CRC32c and CRC32 CRC algorithm (MIPS)"
+       depends on MIPS_CRC_SUPPORT
+       select CRYPTO_HASH
+       help
+         CRC32c and CRC32 CRC algorithms implemented using mips crypto
+         instructions, when available.
+
+config CRYPTO_POLY1305_MIPS
+       tristate "Poly1305 authenticator algorithm (MIPS optimized)"
+       depends on MIPS
+       select CRYPTO_ARCH_HAVE_LIB_POLY1305
+
+config CRYPTO_MD5_OCTEON
+       tristate "MD5 digest algorithm (OCTEON)"
+       depends on CPU_CAVIUM_OCTEON
+       select CRYPTO_MD5
+       select CRYPTO_HASH
+       help
+         MD5 message digest algorithm (RFC1321) implemented
+         using OCTEON crypto instructions, when available.
+
+config CRYPTO_SHA1_OCTEON
+       tristate "SHA1 digest algorithm (OCTEON)"
+       depends on CPU_CAVIUM_OCTEON
+       select CRYPTO_SHA1
+       select CRYPTO_HASH
+       help
+         SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2) implemented
+         using OCTEON crypto instructions, when available.
+
+config CRYPTO_SHA256_OCTEON
+       tristate "SHA224 and SHA256 digest algorithm (OCTEON)"
+       depends on CPU_CAVIUM_OCTEON
+       select CRYPTO_SHA256
+       select CRYPTO_HASH
+       help
+         SHA-256 secure hash standard (DFIPS 180-2) implemented
+         using OCTEON crypto instructions, when available.
+
+config CRYPTO_SHA512_OCTEON
+       tristate "SHA384 and SHA512 digest algorithms (OCTEON)"
+       depends on CPU_CAVIUM_OCTEON
+       select CRYPTO_SHA512
+       select CRYPTO_HASH
+       help
+         SHA-512 secure hash standard (DFIPS 180-2) implemented
+         using OCTEON crypto instructions, when available.
+
+config CRYPTO_CHACHA_MIPS
+       tristate "ChaCha stream cipher algorithms (MIPS 32r2 optimized)"
+       depends on CPU_MIPS32_R2
+       select CRYPTO_SKCIPHER
+       select CRYPTO_ARCH_HAVE_LIB_CHACHA
+
+endmenu

diff --git a/crypto/Kconfig b/crypto/Kconfig
index b1ccf87..85fa86f 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -699,14 +699,6 @@ config CRYPTO_CRC32_PCLMUL
          which will enable any routine to use the CRC-32-IEEE 802.3 checksum
          and gain better performance as compared with the table implementation.
 
-config CRYPTO_CRC32_MIPS
-       tristate "CRC32c and CRC32 CRC algorithm (MIPS)"
-       depends on MIPS_CRC_SUPPORT
-       select CRYPTO_HASH
-       help
-         CRC32c and CRC32 CRC algorithms implemented using mips crypto
-         instructions, when available.
-
 config CRYPTO_CRC32_S390
        tristate "CRC-32 algorithms"
        depends on S390
@@ -841,11 +833,6 @@ config CRYPTO_POLY1305_X86_64
          in IETF protocols. This is the x86_64 assembler implementation using SIMD
          instructions.
 
-config CRYPTO_POLY1305_MIPS
-       tristate "Poly1305 authenticator algorithm (MIPS optimized)"
-       depends on MIPS
-       select CRYPTO_ARCH_HAVE_LIB_POLY1305
-
 config CRYPTO_MD4
        tristate "MD4 digest algorithm"
        select CRYPTO_HASH
@@ -858,15 +845,6 @@ config CRYPTO_MD5
        help
          MD5 message digest algorithm (RFC1321).
 
-config CRYPTO_MD5_OCTEON
-       tristate "MD5 digest algorithm (OCTEON)"
-       depends on CPU_CAVIUM_OCTEON
-       select CRYPTO_MD5
-       select CRYPTO_HASH
-       help
-         MD5 message digest algorithm (RFC1321) implemented
-         using OCTEON crypto instructions, when available.
-
 config CRYPTO_MD5_PPC
        tristate "MD5 digest algorithm (PPC)"
        depends on PPC
@@ -961,15 +939,6 @@ config CRYPTO_SHA512_S390
 
          It is available as of z10.
 
-config CRYPTO_SHA1_OCTEON
-       tristate "SHA1 digest algorithm (OCTEON)"
-       depends on CPU_CAVIUM_OCTEON
-       select CRYPTO_SHA1
-       select CRYPTO_HASH
-       help
-         SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2) implemented
-         using OCTEON crypto instructions, when available.
-
 config CRYPTO_SHA1_SPARC64
        tristate "SHA1 digest algorithm (SPARC64)"
        depends on SPARC64
@@ -1025,15 +994,6 @@ config CRYPTO_SHA256_PPC_SPE
          SHA224 and SHA256 secure hash standard (DFIPS 180-2)
          implemented using powerpc SPE SIMD instruction set.
 
-config CRYPTO_SHA256_OCTEON
-       tristate "SHA224 and SHA256 digest algorithm (OCTEON)"
-       depends on CPU_CAVIUM_OCTEON
-       select CRYPTO_SHA256
-       select CRYPTO_HASH
-       help
-         SHA-256 secure hash standard (DFIPS 180-2) implemented
-         using OCTEON crypto instructions, when available.
-
 config CRYPTO_SHA256_SPARC64
        tristate "SHA224 and SHA256 digest algorithm (SPARC64)"
        depends on SPARC64
@@ -1065,15 +1025,6 @@ config CRYPTO_SHA512
          This code also includes SHA-384, a 384 bit hash with 192 bits
          of security against collision attacks.
 
-config CRYPTO_SHA512_OCTEON
-       tristate "SHA384 and SHA512 digest algorithms (OCTEON)"
-       depends on CPU_CAVIUM_OCTEON
-       select CRYPTO_SHA512
-       select CRYPTO_HASH
-       help
-         SHA-512 secure hash standard (DFIPS 180-2) implemented
-         using OCTEON crypto instructions, when available.
-
 config CRYPTO_SHA512_SPARC64
        tristate "SHA384 and SHA512 digest algorithm (SPARC64)"
        depends on SPARC64
@@ -1611,12 +1562,6 @@ config CRYPTO_CHACHA20_X86_64
          SSSE3, AVX2, and AVX-512VL optimized implementations of the ChaCha20,
          XChaCha20, and XChaCha12 stream ciphers.
 
-config CRYPTO_CHACHA_MIPS
-       tristate "ChaCha stream cipher algorithms (MIPS 32r2 optimized)"
-       depends on CPU_MIPS32_R2
-       select CRYPTO_SKCIPHER
-       select CRYPTO_ARCH_HAVE_LIB_CHACHA
-
 config CRYPTO_CHACHA_S390
        tristate "ChaCha20 stream cipher"
        depends on S390
@@ -2128,6 +2073,10 @@ config CRYPTO_STATS
 config CRYPTO_HASH_INFO
        bool
 
+if MIPS
+source "arch/mips/crypto/Kconfig"
+endif
+
 source "drivers/crypto/Kconfig"
 source "crypto/asymmetric_keys/Kconfig"
 source "certs/Kconfig"