[S390] move crypto options and some cleanup.

This patch moves the config options for the s390 crypto instructions
to the standard "Hardware crypto devices" menu. In addition some
cleanup has been done: use a flag for supported keylengths, add a
warning about machien limitation, return ENOTSUPP in case the
hardware has no support, remove superfluous printks and update
email addresses.

Signed-off-by: Jan Glauber <jan.glauber@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 138 insertions, 142 deletions

diff --git a/arch/s390/crypto/crypt_s390.h b/arch/s390/crypto/crypt_s390.h
index 2b137089f625..2b92c2fd12d4 100644
--- a/arch/s390/crypto/crypt_s390.h
+++ b/arch/s390/crypto/crypt_s390.h
@@ -3,8 +3,9 @@
  *
  * Support for s390 cryptographic instructions.
  *
- *   Copyright (C) 2003 IBM Deutschland GmbH, IBM Corporation
- *   Author(s): Thomas Spatzier (tspat@de.ibm.com)
+ *   Copyright IBM Corp. 2003,2007
+ *   Author(s): Thomas Spatzier
+ *              Jan Glauber (jan.glauber@de.ibm.com)
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -32,7 +33,8 @@ enum crypt_s390_operations {
         CRYPT_S390_KMAC = 0x0500
 };
 
-/* function codes for KM (CIPHER MESSAGE) instruction
+/*
+ * function codes for KM (CIPHER MESSAGE) instruction
  * 0x80 is the decipher modifier bit
  */
 enum crypt_s390_km_func {
@@ -51,7 +53,8 @@ enum crypt_s390_km_func {
         KM_AES_256_DECRYPT  = CRYPT_S390_KM | 0x14 | 0x80,
 };
 
-/* function codes for KMC (CIPHER MESSAGE WITH CHAINING)
+/*
+ * function codes for KMC (CIPHER MESSAGE WITH CHAINING)
  * instruction
  */
 enum crypt_s390_kmc_func {
@@ -70,7 +73,8 @@ enum crypt_s390_kmc_func {
         KMC_AES_256_DECRYPT  = CRYPT_S390_KMC | 0x14 | 0x80,
 };
 
-/* function codes for KIMD (COMPUTE INTERMEDIATE MESSAGE DIGEST)
+/*
+ * function codes for KIMD (COMPUTE INTERMEDIATE MESSAGE DIGEST)
  * instruction
  */
 enum crypt_s390_kimd_func {
@@ -79,7 +83,8 @@ enum crypt_s390_kimd_func {
         KIMD_SHA_256 = CRYPT_S390_KIMD | 2,
 };
 
-/* function codes for KLMD (COMPUTE LAST MESSAGE DIGEST)
+/*
+ * function codes for KLMD (COMPUTE LAST MESSAGE DIGEST)
  * instruction
  */
 enum crypt_s390_klmd_func {
@@ -88,7 +93,8 @@ enum crypt_s390_klmd_func {
         KLMD_SHA_256 = CRYPT_S390_KLMD | 2,
 };
 
-/* function codes for KMAC (COMPUTE MESSAGE AUTHENTICATION CODE)
+/*
+ * function codes for KMAC (COMPUTE MESSAGE AUTHENTICATION CODE)
  * instruction
  */
 enum crypt_s390_kmac_func {
@@ -98,229 +104,219 @@ enum crypt_s390_kmac_func {
         KMAC_TDEA_192 = CRYPT_S390_KMAC | 3
 };
 
-/* status word for s390 crypto instructions' QUERY functions */
-struct crypt_s390_query_status {
-        u64 high;
-        u64 low;
-};
-
-/*
+/**
+ * crypt_s390_km:
+ * @func: the function code passed to KM; see crypt_s390_km_func
+ * @param: address of parameter block; see POP for details on each func
+ * @dest: address of destination memory area
+ * @src: address of source memory area
+ * @src_len: length of src operand in bytes
+ *
  * Executes the KM (CIPHER MESSAGE) operation of the CPU.
- * @param func: the function code passed to KM; see crypt_s390_km_func
- * @param param: address of parameter block; see POP for details on each func
- * @param dest: address of destination memory area
- * @param src: address of source memory area
- * @param src_len: length of src operand in bytes
- * @returns < zero for failure, 0 for the query func, number of processed bytes
- *      for encryption/decryption funcs
+ *
+ * Returns -1 for failure, 0 for the query func, number of processed
+ * bytes for encryption/decryption funcs
  */
-static inline int
-crypt_s390_km(long func, void* param, u8* dest, const u8* src, long src_len)
+static inline int crypt_s390_km(long func, void *param,
+                                u8 *dest, const u8 *src, long src_len)
 {
         register long __func asm("0") = func & CRYPT_S390_FUNC_MASK;
-        register void* __param asm("1") = param;
-        register const u8* __src asm("2") = src;
+        register void *__param asm("1") = param;
+        register const u8 *__src asm("2") = src;
         register long __src_len asm("3") = src_len;
-        register u8* __dest asm("4") = dest;
+        register u8 *__dest asm("4") = dest;
         int ret;
 
         asm volatile(
                 "0:     .insn   rre,0xb92e0000,%3,%1 \n" /* KM opcode */
                 "1:     brc     1,0b \n" /* handle partial completion */
-                "       ahi     %0,%h7\n"
-                "2:     ahi     %0,%h8\n"
-                "3:\n"
-                EX_TABLE(0b,3b) EX_TABLE(1b,2b)
+                "       la      %0,0\n"
+                "2:\n"
+                EX_TABLE(0b,2b) EX_TABLE(1b,2b)
                 : "=d" (ret), "+a" (__src), "+d" (__src_len), "+a" (__dest)
-                : "d" (__func), "a" (__param), "0" (-EFAULT),
-                  "K" (ENOSYS), "K" (-ENOSYS + EFAULT) : "cc", "memory");
+                : "d" (__func), "a" (__param), "0" (-1) : "cc", "memory");
         if (ret < 0)
                 return ret;
         return (func & CRYPT_S390_FUNC_MASK) ? src_len - __src_len : __src_len;
 }
 
-/*
+/**
+ * crypt_s390_kmc:
+ * @func: the function code passed to KM; see crypt_s390_kmc_func
+ * @param: address of parameter block; see POP for details on each func
+ * @dest: address of destination memory area
+ * @src: address of source memory area
+ * @src_len: length of src operand in bytes
+ *
  * Executes the KMC (CIPHER MESSAGE WITH CHAINING) operation of the CPU.
- * @param func: the function code passed to KM; see crypt_s390_kmc_func
- * @param param: address of parameter block; see POP for details on each func
- * @param dest: address of destination memory area
- * @param src: address of source memory area
- * @param src_len: length of src operand in bytes
- * @returns < zero for failure, 0 for the query func, number of processed bytes
- *      for encryption/decryption funcs
+ *
+ * Returns -1 for failure, 0 for the query func, number of processed
+ * bytes for encryption/decryption funcs
  */
-static inline int
-crypt_s390_kmc(long func, void* param, u8* dest, const u8* src, long src_len)
+static inline int crypt_s390_kmc(long func, void *param,
+                                 u8 *dest, const u8 *src, long src_len)
 {
         register long __func asm("0") = func & CRYPT_S390_FUNC_MASK;
-        register void* __param asm("1") = param;
-        register const u8* __src asm("2") = src;
+        register void *__param asm("1") = param;
+        register const u8 *__src asm("2") = src;
         register long __src_len asm("3") = src_len;
-        register u8* __dest asm("4") = dest;
+        register u8 *__dest asm("4") = dest;
         int ret;
 
         asm volatile(
                 "0:     .insn   rre,0xb92f0000,%3,%1 \n" /* KMC opcode */
                 "1:     brc     1,0b \n" /* handle partial completion */
-                "       ahi     %0,%h7\n"
-                "2:     ahi     %0,%h8\n"
-                "3:\n"
-                EX_TABLE(0b,3b) EX_TABLE(1b,2b)
+                "       la      %0,0\n"
+                "2:\n"
+                EX_TABLE(0b,2b) EX_TABLE(1b,2b)
                 : "=d" (ret), "+a" (__src), "+d" (__src_len), "+a" (__dest)
-                : "d" (__func), "a" (__param), "0" (-EFAULT),
-                  "K" (ENOSYS), "K" (-ENOSYS + EFAULT) : "cc", "memory");
+                : "d" (__func), "a" (__param), "0" (-1) : "cc", "memory");
         if (ret < 0)
                 return ret;
         return (func & CRYPT_S390_FUNC_MASK) ? src_len - __src_len : __src_len;
 }
 
-/*
+/**
+ * crypt_s390_kimd:
+ * @func: the function code passed to KM; see crypt_s390_kimd_func
+ * @param: address of parameter block; see POP for details on each func
+ * @src: address of source memory area
+ * @src_len: length of src operand in bytes
+ *
  * Executes the KIMD (COMPUTE INTERMEDIATE MESSAGE DIGEST) operation
  * of the CPU.
- * @param func: the function code passed to KM; see crypt_s390_kimd_func
- * @param param: address of parameter block; see POP for details on each func
- * @param src: address of source memory area
- * @param src_len: length of src operand in bytes
- * @returns < zero for failure, 0 for the query func, number of processed bytes
- *      for digest funcs
+ *
+ * Returns -1 for failure, 0 for the query func, number of processed
+ * bytes for digest funcs
  */
-static inline int
-crypt_s390_kimd(long func, void* param, const u8* src, long src_len)
+static inline int crypt_s390_kimd(long func, void *param,
+                                  const u8 *src, long src_len)
 {
         register long __func asm("0") = func & CRYPT_S390_FUNC_MASK;
-        register void* __param asm("1") = param;
-        register const u8* __src asm("2") = src;
+        register void *__param asm("1") = param;
+        register const u8 *__src asm("2") = src;
         register long __src_len asm("3") = src_len;
         int ret;
 
         asm volatile(
                 "0:     .insn   rre,0xb93e0000,%1,%1 \n" /* KIMD opcode */
                 "1:     brc     1,0b \n" /* handle partial completion */
-                "       ahi     %0,%h6\n"
-                "2:     ahi     %0,%h7\n"
-                "3:\n"
-                EX_TABLE(0b,3b) EX_TABLE(1b,2b)
+                "       la      %0,0\n"
+                "2:\n"
+                EX_TABLE(0b,2b) EX_TABLE(1b,2b)
                 : "=d" (ret), "+a" (__src), "+d" (__src_len)
-                : "d" (__func), "a" (__param), "0" (-EFAULT),
-                  "K" (ENOSYS), "K" (-ENOSYS + EFAULT) : "cc", "memory");
+                : "d" (__func), "a" (__param), "0" (-1) : "cc", "memory");
         if (ret < 0)
                 return ret;
         return (func & CRYPT_S390_FUNC_MASK) ? src_len - __src_len : __src_len;
 }
 
-/*
+/**
+ * crypt_s390_klmd:
+ * @func: the function code passed to KM; see crypt_s390_klmd_func
+ * @param: address of parameter block; see POP for details on each func
+ * @src: address of source memory area
+ * @src_len: length of src operand in bytes
+ *
  * Executes the KLMD (COMPUTE LAST MESSAGE DIGEST) operation of the CPU.
- * @param func: the function code passed to KM; see crypt_s390_klmd_func
- * @param param: address of parameter block; see POP for details on each func
- * @param src: address of source memory area
- * @param src_len: length of src operand in bytes
- * @returns < zero for failure, 0 for the query func, number of processed bytes
- *      for digest funcs
+ *
+ * Returns -1 for failure, 0 for the query func, number of processed
+ * bytes for digest funcs
  */
-static inline int
-crypt_s390_klmd(long func, void* param, const u8* src, long src_len)
+static inline int crypt_s390_klmd(long func, void *param,
+                                  const u8 *src, long src_len)
 {
         register long __func asm("0") = func & CRYPT_S390_FUNC_MASK;
-        register void* __param asm("1") = param;
-        register const u8* __src asm("2") = src;
+        register void *__param asm("1") = param;
+        register const u8 *__src asm("2") = src;
         register long __src_len asm("3") = src_len;
         int ret;
 
         asm volatile(
                 "0:     .insn   rre,0xb93f0000,%1,%1 \n" /* KLMD opcode */
                 "1:     brc     1,0b \n" /* handle partial completion */
-                "       ahi     %0,%h6\n"
-                "2:     ahi     %0,%h7\n"
-                "3:\n"
-                EX_TABLE(0b,3b) EX_TABLE(1b,2b)
+                "       la      %0,0\n"
+                "2:\n"
+                EX_TABLE(0b,2b) EX_TABLE(1b,2b)
                 : "=d" (ret), "+a" (__src), "+d" (__src_len)
-                : "d" (__func), "a" (__param), "0" (-EFAULT),
-                  "K" (ENOSYS), "K" (-ENOSYS + EFAULT) : "cc", "memory");
+                : "d" (__func), "a" (__param), "0" (-1) : "cc", "memory");
         if (ret < 0)
                 return ret;
         return (func & CRYPT_S390_FUNC_MASK) ? src_len - __src_len : __src_len;
 }
 
-/*
+/**
+ * crypt_s390_kmac:
+ * @func: the function code passed to KM; see crypt_s390_klmd_func
+ * @param: address of parameter block; see POP for details on each func
+ * @src: address of source memory area
+ * @src_len: length of src operand in bytes
+ *
  * Executes the KMAC (COMPUTE MESSAGE AUTHENTICATION CODE) operation
  * of the CPU.
- * @param func: the function code passed to KM; see crypt_s390_klmd_func
- * @param param: address of parameter block; see POP for details on each func
- * @param src: address of source memory area
- * @param src_len: length of src operand in bytes
- * @returns < zero for failure, 0 for the query func, number of processed bytes
- *      for digest funcs
+ *
+ * Returns -1 for failure, 0 for the query func, number of processed
+ * bytes for digest funcs
  */
-static inline int
-crypt_s390_kmac(long func, void* param, const u8* src, long src_len)
+static inline int crypt_s390_kmac(long func, void *param,
+                                  const u8 *src, long src_len)
 {
         register long __func asm("0") = func & CRYPT_S390_FUNC_MASK;
-        register void* __param asm("1") = param;
-        register const u8* __src asm("2") = src;
+        register void *__param asm("1") = param;
+        register const u8 *__src asm("2") = src;
         register long __src_len asm("3") = src_len;
         int ret;
 
         asm volatile(
                 "0:     .insn   rre,0xb91e0000,%1,%1 \n" /* KLAC opcode */
                 "1:     brc     1,0b \n" /* handle partial completion */
-                "       ahi     %0,%h6\n"
-                "2:     ahi     %0,%h7\n"
-                "3:\n"
-                EX_TABLE(0b,3b) EX_TABLE(1b,2b)
+                "       la      %0,0\n"
+                "2:\n"
+                EX_TABLE(0b,2b) EX_TABLE(1b,2b)
                 : "=d" (ret), "+a" (__src), "+d" (__src_len)
-                : "d" (__func), "a" (__param), "0" (-EFAULT),
-                  "K" (ENOSYS), "K" (-ENOSYS + EFAULT) : "cc", "memory");
+                : "d" (__func), "a" (__param), "0" (-1) : "cc", "memory");
         if (ret < 0)
                 return ret;
         return (func & CRYPT_S390_FUNC_MASK) ? src_len - __src_len : __src_len;
 }
 
 /**
+ * crypt_s390_func_available:
+ * @func: the function code of the specific function; 0 if op in general
+ *
  * Tests if a specific crypto function is implemented on the machine.
- * @param func: the function code of the specific function; 0 if op in general
- * @return      1 if func available; 0 if func or op in general not available
+ *
+ * Returns 1 if func available; 0 if func or op in general not available
  */
-static inline int
-crypt_s390_func_available(int func)
+static inline int crypt_s390_func_available(int func)
 {
+        unsigned char status[16];
         int ret;
 
-        struct crypt_s390_query_status status = {
-                .high = 0,
-                .low = 0
-        };
-        switch (func & CRYPT_S390_OP_MASK){
-                case CRYPT_S390_KM:
-                        ret = crypt_s390_km(KM_QUERY, &status, NULL, NULL, 0);
-                        break;
-                case CRYPT_S390_KMC:
-                        ret = crypt_s390_kmc(KMC_QUERY, &status, NULL, NULL, 0);
-                        break;
-                case CRYPT_S390_KIMD:
-                        ret = crypt_s390_kimd(KIMD_QUERY, &status, NULL, 0);
-                        break;
-                case CRYPT_S390_KLMD:
-                        ret = crypt_s390_klmd(KLMD_QUERY, &status, NULL, 0);
-                        break;
-                case CRYPT_S390_KMAC:
-                        ret = crypt_s390_kmac(KMAC_QUERY, &status, NULL, 0);
-                        break;
-                default:
-                        ret = 0;
-                        return ret;
-        }
-        if (ret >= 0){
-                func &= CRYPT_S390_FUNC_MASK;
-                func &= 0x7f; //mask modifier bit
-                if (func < 64){
-                        ret = (status.high >> (64 - func - 1)) & 0x1;
-                } else {
-                        ret = (status.low >> (128 - func - 1)) & 0x1;
-                }
-        } else {
-                ret = 0;
+        switch (func & CRYPT_S390_OP_MASK) {
+        case CRYPT_S390_KM:
+                ret = crypt_s390_km(KM_QUERY, &status, NULL, NULL, 0);
+                break;
+        case CRYPT_S390_KMC:
+                ret = crypt_s390_kmc(KMC_QUERY, &status, NULL, NULL, 0);
+                break;
+        case CRYPT_S390_KIMD:
+                ret = crypt_s390_kimd(KIMD_QUERY, &status, NULL, 0);
+                break;
+        case CRYPT_S390_KLMD:
+                ret = crypt_s390_klmd(KLMD_QUERY, &status, NULL, 0);
+                break;
+        case CRYPT_S390_KMAC:
+                ret = crypt_s390_kmac(KMAC_QUERY, &status, NULL, 0);
+                break;
+        default:
+                return 0;
         }
-        return ret;
+        if (ret < 0)
+                return 0;
+        func &= CRYPT_S390_FUNC_MASK;
+        func &= 0x7f;           /* mask modifier bit */
+        return (status[func >> 3] & (0x80 >> (func & 7))) != 0;
 }
 
-#endif // _CRYPTO_ARCH_S390_CRYPT_S390_H
+#endif  /* _CRYPTO_ARCH_S390_CRYPT_S390_H */