aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/crypto
diff options
context:
space:
mode:
authorGerald Schaefer <gerald.schaefer@de.ibm.com>2011-05-04 01:09:44 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2011-05-04 01:09:44 -0400
commit0200f3ecc19660bebeabbcbaf212957fcf1dbf8f (patch)
tree584b5b936a58f3d9db09fca73ed10bdf20f942f5 /drivers/crypto
parent9996e3421cae20a17c99881b2ac0f7562f760e04 (diff)
crypto: s390 - add System z hardware support for CTR mode
This patch adds System z hardware acceleration support for AES, DES and 3DES in CTR mode. The hardware support is available starting with System z196. Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com> Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/Kconfig8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index dc601ff4bcfd..c64c3807f516 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -119,9 +119,12 @@ config CRYPTO_DES_S390
119 select CRYPTO_ALGAPI 119 select CRYPTO_ALGAPI
120 select CRYPTO_BLKCIPHER 120 select CRYPTO_BLKCIPHER
121 help 121 help
122 This us the s390 hardware accelerated implementation of the 122 This is the s390 hardware accelerated implementation of the
123 DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3). 123 DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
124 124
125 As of z990 the ECB and CBC mode are hardware accelerated.
126 As of z196 the CTR mode is hardware accelerated.
127
125config CRYPTO_AES_S390 128config CRYPTO_AES_S390
126 tristate "AES cipher algorithms" 129 tristate "AES cipher algorithms"
127 depends on S390 130 depends on S390
@@ -135,7 +138,8 @@ config CRYPTO_AES_S390
135 for 128 bit keys. 138 for 128 bit keys.
136 As of z10 the ECB and CBC modes are hardware accelerated 139 As of z10 the ECB and CBC modes are hardware accelerated
137 for all AES key sizes. 140 for all AES key sizes.
138 As of z196 the XTS mode is hardware accelerated for 256 and 141 As of z196 the CTR mode is hardware accelerated for all AES
142 key sizes and XTS mode is hardware accelerated for 256 and
139 512 bit keys. 143 512 bit keys.
140 144
141config S390_PRNG 145config S390_PRNG