1 files changed, 71 insertions, 22 deletions

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index ea0b3863ad0f..e0b25de1e339 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -74,6 +74,8 @@ config ZCRYPT
           + PCI-X Cryptographic Coprocessor (PCIXCC)
           + Crypto Express2 Coprocessor (CEX2C)
           + Crypto Express2 Accelerator (CEX2A)
+          + Crypto Express3 Coprocessor (CEX3C)
+          + Crypto Express3 Accelerator (CEX3A)
 
 config ZCRYPT_MONOLITHIC
         bool "Monolithic zcrypt module"
@@ -91,6 +93,8 @@ config CRYPTO_SHA1_S390
           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
@@ -99,8 +103,7 @@ config CRYPTO_SHA256_S390
           This is the s390 hardware accelerated implementation of the
           SHA256 secure hash standard (DFIPS 180-2).
 
-          This version of SHA implements a 256 bit hash with 128 bits of
-          security against collision attacks.
+          It is available as of z9.
 
 config CRYPTO_SHA512_S390
         tristate "SHA384 and SHA512 digest algorithm"
@@ -110,10 +113,7 @@ config CRYPTO_SHA512_S390
           This is the s390 hardware accelerated implementation of the
           SHA512 secure hash standard.
 
-          This version of SHA implements a 512 bit hash with 256 bits of
-          security against collision attacks. The code also includes SHA-384,
-          a 384 bit hash with 192 bits of security against collision attacks.
-
+          It is available as of z10.
 
 config CRYPTO_DES_S390
         tristate "DES and Triple DES cipher algorithms"
@@ -121,9 +121,12 @@ config CRYPTO_DES_S390
         select CRYPTO_ALGAPI
         select CRYPTO_BLKCIPHER
         help
-          This us the s390 hardware accelerated implementation of the
+          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_AES_S390
         tristate "AES cipher algorithms"
         depends on S390
@@ -131,20 +134,15 @@ config CRYPTO_AES_S390
         select CRYPTO_BLKCIPHER
         help
           This is the s390 hardware accelerated implementation of the
-          AES cipher algorithms (FIPS-197). AES uses the Rijndael
-          algorithm.
+          AES cipher algorithms (FIPS-197).
 
-          Rijndael appears to be consistently a very good performer in
-          both hardware and software across a wide range of computing
-          environments regardless of its use in feedback or non-feedback
-          modes. Its key setup time is excellent, and its key agility is
-          good. Rijndael's very low memory requirements make it very well
-          suited for restricted-space environments, in which it also
-          demonstrates excellent performance. Rijndael's operations are
-          among the easiest to defend against power and timing attacks.
-
-          On s390 the System z9-109 currently only supports the key size
-          of 128 bit.
+          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 S390_PRNG
         tristate "Pseudo random number generator device driver"
@@ -154,8 +152,20 @@ config S390_PRNG
           Select this option if you want to use the s390 pseudo random number
           generator. The PRNG is part of the cryptographic processor functions
           and uses triple-DES to generate secure random numbers like the
-          ANSI X9.17 standard. The PRNG is usable via the char device
-          /dev/prandom.
+          ANSI X9.17 standard. User-space programs access the
+          pseudo-random-number device through the char device /dev/prandom.
+
+          It is available as of z9.
+
+config CRYPTO_GHASH_S390
+        tristate "GHASH digest algorithm"
+        depends on S390
+        select CRYPTO_HASH
+        help
+          This is the s390 hardware accelerated implementation of the
+          GHASH message digest algorithm for GCM (Galois/Counter Mode).
+
+          It is available as of z196.
 
 config CRYPTO_DEV_MV_CESA
         tristate "Marvell's Cryptographic Engine"
@@ -172,6 +182,7 @@ config CRYPTO_DEV_MV_CESA
 
 config CRYPTO_DEV_NIAGARA2
        tristate "Niagara2 Stream Processing Unit driver"
+       select CRYPTO_DES
        select CRYPTO_ALGAPI
        depends on SPARC64
        help
@@ -199,6 +210,8 @@ config CRYPTO_DEV_HIFN_795X_RNG
           Select this option if you want to enable the random number generator
           on the HIFN 795x crypto adapters.
 
+source drivers/crypto/caam/Kconfig
+
 config CRYPTO_DEV_TALITOS
         tristate "Talitos Freescale Security Engine (SEC)"
         select CRYPTO_ALGAPI
@@ -243,4 +256,40 @@ config CRYPTO_DEV_OMAP_SHAM
           OMAP processors have SHA1/MD5 hw accelerator. Select this if you
           want to use the OMAP module for SHA1/MD5 algorithms.
 
+config CRYPTO_DEV_OMAP_AES
+        tristate "Support for OMAP AES hw engine"
+        depends on ARCH_OMAP2 || ARCH_OMAP3
+        select CRYPTO_AES
+        help
+          OMAP processors have AES module accelerator. Select this if you
+          want to use the OMAP module for AES algorithms.
+
+config CRYPTO_DEV_PICOXCELL
+        tristate "Support for picoXcell IPSEC and Layer2 crypto engines"
+        depends on ARCH_PICOXCELL
+        select CRYPTO_AES
+        select CRYPTO_AUTHENC
+        select CRYPTO_ALGAPI
+        select CRYPTO_DES
+        select CRYPTO_CBC
+        select CRYPTO_ECB
+        select CRYPTO_SEQIV
+        help
+          This option enables support for the hardware offload engines in the
+          Picochip picoXcell SoC devices. Select this for IPSEC ESP offload
+          and for 3gpp Layer 2 ciphering support.
+
+          Saying m here will build a module named pipcoxcell_crypto.
+
+config CRYPTO_DEV_S5P
+        tristate "Support for Samsung S5PV210 crypto accelerator"
+        depends on ARCH_S5PV210
+        select CRYPTO_AES
+        select CRYPTO_ALGAPI
+        select CRYPTO_BLKCIPHER
+        help
+          This option allows you to have support for S5P crypto acceleration.
+          Select this to offload Samsung S5PV210 or S5PC110 from AES
+          algorithms execution.
+
 endif # CRYPTO_HW