summaryrefslogtreecommitdiff
path: root/drivers/crypto
diff options
context:
space:
mode:
authorGerald Schaefer <gerald.schaefer@de.ibm.com>2011-05-04 15:09:44 +1000
committerHerbert Xu <herbert@gondor.apana.org.au>2011-05-04 15:09:44 +1000
commit0200f3ecc19660bebeabbcbaf212957fcf1dbf8f (patch)
tree584b5b936a58f3d9db09fca73ed10bdf20f942f5 /drivers/crypto
parent9996e3421cae20a17c99881b2ac0f7562f760e04 (diff)
downloadkernel-common-0200f3ecc19660bebeabbcbaf212957fcf1dbf8f.tar.gz
kernel-common-0200f3ecc19660bebeabbcbaf212957fcf1dbf8f.tar.bz2
kernel-common-0200f3ecc19660bebeabbcbaf212957fcf1dbf8f.zip
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
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
@@ -135,7 +138,8 @@ config CRYPTO_AES_S390
for 128 bit keys.
As of z10 the ECB and CBC modes are hardware accelerated
for all AES key sizes.
- As of z196 the XTS mode is hardware accelerated for 256 and
+ 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