[PATCH] s390: sha256 support

Add support for the hardware accelerated sha256 crypto algorithm.

Signed-off-by: Jan Glauber <jan.glauber@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/s390/crypto/Makefile b/arch/s390/crypto/Makefile
index 50843f8..3fccf61 100644 (file)
--- a/arch/s390/crypto/Makefile
+++ b/arch/s390/crypto/Makefile
@@ -3,6 +3,7 @@
 #
 
 obj-$(CONFIG_CRYPTO_SHA1_S390) += sha1_s390.o
+obj-$(CONFIG_CRYPTO_SHA256_S390) += sha256_s390.o
 obj-$(CONFIG_CRYPTO_DES_S390) += des_s390.o des_check_key.o
 
 obj-$(CONFIG_CRYPTO_TEST) += crypt_s390_query.o

diff --git a/arch/s390/crypto/crypt_s390.h b/arch/s390/crypto/crypt_s390.h
index 4d24f66..b70a410 100644 (file)
--- a/arch/s390/crypto/crypt_s390.h
+++ b/arch/s390/crypto/crypt_s390.h
@@ -61,6 +61,7 @@ enum crypt_s390_kmc_func {
 enum crypt_s390_kimd_func {
        KIMD_QUERY   = CRYPT_S390_KIMD | 0,
        KIMD_SHA_1   = CRYPT_S390_KIMD | 1,
+       KIMD_SHA_256 = CRYPT_S390_KIMD | 2,
 };
 
 /* function codes for KLMD (COMPUTE LAST MESSAGE DIGEST)
@@ -69,6 +70,7 @@ enum crypt_s390_kimd_func {
 enum crypt_s390_klmd_func {
        KLMD_QUERY   = CRYPT_S390_KLMD | 0,
        KLMD_SHA_1   = CRYPT_S390_KLMD | 1,
+       KLMD_SHA_256 = CRYPT_S390_KLMD | 2,
 };
 
 /* function codes for KMAC (COMPUTE MESSAGE AUTHENTICATION CODE)

diff --git a/arch/s390/crypto/crypt_s390_query.c b/arch/s390/crypto/crypt_s390_query.c
index 0fa6bdf..67081b8 100644 (file)
--- a/arch/s390/crypto/crypt_s390_query.c
+++ b/arch/s390/crypto/crypt_s390_query.c
@@ -48,16 +48,20 @@ static void query_available_functions(void)
                crypt_s390_func_available(KIMD_QUERY));
        printk(KERN_INFO "KIMD_SHA_1: %d\n",
                crypt_s390_func_available(KIMD_SHA_1));
+       printk(KERN_INFO "KIMD_SHA_256: %d\n",
+               crypt_s390_func_available(KIMD_SHA_256));
 
        /* query available KLMD functions */
        printk(KERN_INFO "KLMD_QUERY: %d\n",
                crypt_s390_func_available(KLMD_QUERY));
        printk(KERN_INFO "KLMD_SHA_1: %d\n",
                crypt_s390_func_available(KLMD_SHA_1));
+       printk(KERN_INFO "KLMD_SHA_256: %d\n",
+               crypt_s390_func_available(KLMD_SHA_256));
 
        /* query available KMAC functions */
        printk(KERN_INFO "KMAC_QUERY: %d\n",
-               crypt_s3990_func_available(KMAC_QUERY));
+               crypt_s390_func_available(KMAC_QUERY));
        printk(KERN_INFO "KMAC_DEA: %d\n",
                crypt_s390_func_available(KMAC_DEA));
        printk(KERN_INFO "KMAC_TDEA_128: %d\n",

diff --cc arch/s390/crypto/sha256_s390.c
Simple merge

diff --cc arch/s390/defconfig
Simple merge

diff --cc crypto/Kconfig
Simple merge