Commit c9d24c97 authored by Robert Elliott's avatar Robert Elliott Committed by Herbert Xu
Browse files

crypto: Kconfig - move s390 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: default avatarEric Biggers <ebiggers@kernel.org>
Signed-off-by: default avatarRobert Elliott <elliott@hpe.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 6a490a4e

arch/s390/crypto/Kconfig

0 → 100644
+120 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



menu "Accelerated Cryptographic Algorithms for CPU (s390)"



config CRYPTO_CRC32_S390

	tristate "CRC-32 algorithms"

	depends on S390

	select CRYPTO_HASH

	select CRC32

	help

	  Select this option if you want to use hardware accelerated

	  implementations of CRC algorithms.  With this option, you

	  can optimize the computation of CRC-32 (IEEE 802.3 Ethernet)

	  and CRC-32C (Castagnoli).



	  It is available with IBM z13 or later.



config CRYPTO_SHA512_S390

	tristate "SHA384 and SHA512 digest algorithm"

	depends on S390

	select CRYPTO_HASH

	help

	  This is the s390 hardware accelerated implementation of the

	  SHA512 secure hash standard.



	  It is available as of z10.



config CRYPTO_SHA1_S390

	tristate "SHA1 digest algorithm"

	depends on S390

	select CRYPTO_HASH

	help

	  This is the s390 hardware accelerated implementation of the

	  SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).



	  It is available as of z990.



config CRYPTO_SHA256_S390

	tristate "SHA256 digest algorithm"

	depends on S390

	select CRYPTO_HASH

	help

	  This is the s390 hardware accelerated implementation of the

	  SHA256 secure hash standard (DFIPS 180-2).



	  It is available as of z9.



config CRYPTO_SHA3_256_S390

	tristate "SHA3_224 and SHA3_256 digest algorithm"

	depends on S390

	select CRYPTO_HASH

	help

	  This is the s390 hardware accelerated implementation of the

	  SHA3_256 secure hash standard.



	  It is available as of z14.



config CRYPTO_SHA3_512_S390

	tristate "SHA3_384 and SHA3_512 digest algorithm"

	depends on S390

	select CRYPTO_HASH

	help

	  This is the s390 hardware accelerated implementation of the

	  SHA3_512 secure hash standard.



	  It is available as of z14.



config CRYPTO_GHASH_S390

	tristate "GHASH hash function"

	depends on S390

	select CRYPTO_HASH

	help

	  This is the s390 hardware accelerated implementation of GHASH,

	  the hash function used in GCM (Galois/Counter mode).



	  It is available as of z196.



config CRYPTO_AES_S390

	tristate "AES cipher algorithms"

	depends on S390

	select CRYPTO_ALGAPI

	select CRYPTO_SKCIPHER

	help

	  This is the s390 hardware accelerated implementation of the

	  AES cipher algorithms (FIPS-197).



	  As of z9 the ECB and CBC modes are hardware accelerated

	  for 128 bit keys.

	  As of z10 the ECB and CBC modes are hardware accelerated

	  for all AES key sizes.

	  As of z196 the CTR mode is hardware accelerated for all AES

	  key sizes and XTS mode is hardware accelerated for 256 and

	  512 bit keys.



config CRYPTO_DES_S390

	tristate "DES and Triple DES cipher algorithms"

	depends on S390

	select CRYPTO_ALGAPI

	select CRYPTO_SKCIPHER

	select CRYPTO_LIB_DES

	help

	  This is the s390 hardware accelerated implementation of the

	  DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).



	  As of z990 the ECB and CBC mode are hardware accelerated.

	  As of z196 the CTR mode is hardware accelerated.



config CRYPTO_CHACHA_S390

	tristate "ChaCha20 stream cipher"

	depends on S390

	select CRYPTO_SKCIPHER

	select CRYPTO_LIB_CHACHA_GENERIC

	select CRYPTO_ARCH_HAVE_LIB_CHACHA

	help

	  This is the s390 SIMD implementation of the ChaCha20 stream

	  cipher (RFC 7539).



	  It is available as of z13.



endmenu

crypto/Kconfig

+3 −115
Original line number Diff line number Diff line
@@ -688,19 +688,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_S390

	tristate "CRC-32 algorithms"

	depends on S390

	select CRYPTO_HASH

	select CRC32

	help

	  Select this option if you want to use hardware accelerated

	  implementations of CRC algorithms.  With this option, you

	  can optimize the computation of CRC-32 (IEEE 802.3 Ethernet)

	  and CRC-32C (Castagnoli).



	  It is available with IBM z13 or later.



config CRYPTO_XXHASH

	tristate "xxHash hash algorithm"

	select CRYPTO_HASH
@@ -893,16 +880,6 @@ config CRYPTO_SHA512_SSSE3 
	  Extensions version 1 (AVX1), or Advanced Vector Extensions

	  version 2 (AVX2) instructions, when available.



config CRYPTO_SHA512_S390

	tristate "SHA384 and SHA512 digest algorithm"

	depends on S390

	select CRYPTO_HASH

	help

	  This is the s390 hardware accelerated implementation of the

	  SHA512 secure hash standard.



	  It is available as of z10.



config CRYPTO_SHA1_SPARC64

	tristate "SHA1 digest algorithm (SPARC64)"

	depends on SPARC64
@@ -912,16 +889,6 @@ config CRYPTO_SHA1_SPARC64 
	  SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2) implemented

	  using sparc64 crypto instructions, when available.



config CRYPTO_SHA1_S390

	tristate "SHA1 digest algorithm"

	depends on S390

	select CRYPTO_HASH

	help

	  This is the s390 hardware accelerated implementation of the

	  SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).



	  It is available as of z990.



config CRYPTO_SHA256

	tristate "SHA224 and SHA256 digest algorithm"

	select CRYPTO_HASH
@@ -944,16 +911,6 @@ config CRYPTO_SHA256_SPARC64 
	  SHA-256 secure hash standard (DFIPS 180-2) implemented

	  using sparc64 crypto instructions, when available.



config CRYPTO_SHA256_S390

	tristate "SHA256 digest algorithm"

	depends on S390

	select CRYPTO_HASH

	help

	  This is the s390 hardware accelerated implementation of the

	  SHA256 secure hash standard (DFIPS 180-2).



	  It is available as of z9.



config CRYPTO_SHA512

	tristate "SHA384 and SHA512 digest algorithms"

	select CRYPTO_HASH
@@ -985,26 +942,6 @@ config CRYPTO_SHA3 
	  References:

	  http://keccak.noekeon.org/



config CRYPTO_SHA3_256_S390

	tristate "SHA3_224 and SHA3_256 digest algorithm"

	depends on S390

	select CRYPTO_HASH

	help

	  This is the s390 hardware accelerated implementation of the

	  SHA3_256 secure hash standard.



	  It is available as of z14.



config CRYPTO_SHA3_512_S390

	tristate "SHA3_384 and SHA3_512 digest algorithm"

	depends on S390

	select CRYPTO_HASH

	help

	  This is the s390 hardware accelerated implementation of the

	  SHA3_512 secure hash standard.



	  It is available as of z14.



config CRYPTO_SM3

	tristate
@@ -1065,16 +1002,6 @@ config CRYPTO_GHASH_CLMUL_NI_INTEL 
	  This is the x86_64 CLMUL-NI accelerated implementation of

	  GHASH, the hash function used in GCM (Galois/Counter mode).



config CRYPTO_GHASH_S390

	tristate "GHASH hash function"

	depends on S390

	select CRYPTO_HASH

	help

	  This is the s390 hardware accelerated implementation of GHASH,

	  the hash function used in GCM (Galois/Counter mode).



	  It is available as of z196.



comment "Ciphers"



config CRYPTO_AES
@@ -1176,23 +1103,6 @@ config CRYPTO_AES_SPARC64 
	  for some popular block cipher mode is supported too, including

	  ECB and CBC.



config CRYPTO_AES_S390

	tristate "AES cipher algorithms"

	depends on S390

	select CRYPTO_ALGAPI

	select CRYPTO_SKCIPHER

	help

	  This is the s390 hardware accelerated implementation of the

	  AES cipher algorithms (FIPS-197).



	  As of z9 the ECB and CBC modes are hardware accelerated

	  for 128 bit keys.

	  As of z10 the ECB and CBC modes are hardware accelerated

	  for all AES key sizes.

	  As of z196 the CTR mode is hardware accelerated for all AES

	  key sizes and XTS mode is hardware accelerated for 256 and

	  512 bit keys.



config CRYPTO_ANUBIS

	tristate "Anubis cipher algorithm"

	depends on CRYPTO_USER_API_ENABLE_OBSOLETE
@@ -1423,19 +1333,6 @@ config CRYPTO_DES3_EDE_X86_64 
	  algorithm are provided; regular processing one input block and

	  one that processes three blocks parallel.



config CRYPTO_DES_S390

	tristate "DES and Triple DES cipher algorithms"

	depends on S390

	select CRYPTO_ALGAPI

	select CRYPTO_SKCIPHER

	select CRYPTO_LIB_DES

	help

	  This is the s390 hardware accelerated implementation of the

	  DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).



	  As of z990 the ECB and CBC mode are hardware accelerated.

	  As of z196 the CTR mode is hardware accelerated.



config CRYPTO_FCRYPT

	tristate "FCrypt cipher algorithm"

	select CRYPTO_ALGAPI
@@ -1489,18 +1386,6 @@ config CRYPTO_CHACHA20_X86_64 
	  SSSE3, AVX2, and AVX-512VL optimized implementations of the ChaCha20,

	  XChaCha20, and XChaCha12 stream ciphers.



config CRYPTO_CHACHA_S390

	tristate "ChaCha20 stream cipher"

	depends on S390

	select CRYPTO_SKCIPHER

	select CRYPTO_LIB_CHACHA_GENERIC

	select CRYPTO_ARCH_HAVE_LIB_CHACHA

	help

	  This is the s390 SIMD implementation of the ChaCha20 stream

	  cipher (RFC 7539).



	  It is available as of z13.



config CRYPTO_SEED

	tristate "SEED cipher algorithm"

	depends on CRYPTO_USER_API_ENABLE_OBSOLETE
@@ -2006,6 +1891,9 @@ endif 
if PPC

source "arch/powerpc/crypto/Kconfig"

endif

if S390

source "arch/s390/crypto/Kconfig"

endif



source "drivers/crypto/Kconfig"

source "crypto/asymmetric_keys/Kconfig"