1 files changed, 108 insertions, 4 deletions

diff --git a/arch/s390/crypto/crypt_s390.h b/arch/s390/crypto/crypt_s390.h
index 0ef9829f2ad6..49676771bd66 100644
--- a/arch/s390/crypto/crypt_s390.h
+++ b/arch/s390/crypto/crypt_s390.h
@@ -24,13 +24,18 @@
 #define CRYPT_S390_PRIORITY 300
 #define CRYPT_S390_COMPOSITE_PRIORITY 400
 
+#define CRYPT_S390_MSA  0x1
+#define CRYPT_S390_MSA3 0x2
+#define CRYPT_S390_MSA4 0x4
+
 /* s390 cryptographic operations */
 enum crypt_s390_operations {
         CRYPT_S390_KM   = 0x0100,
         CRYPT_S390_KMC  = 0x0200,
         CRYPT_S390_KIMD = 0x0300,
         CRYPT_S390_KLMD = 0x0400,
-        CRYPT_S390_KMAC = 0x0500
+        CRYPT_S390_KMAC = 0x0500,
+        CRYPT_S390_KMCTR = 0x0600
 };
 
 /*
@@ -51,6 +56,10 @@ enum crypt_s390_km_func {
         KM_AES_192_DECRYPT  = CRYPT_S390_KM | 0x13 | 0x80,
         KM_AES_256_ENCRYPT  = CRYPT_S390_KM | 0x14,
         KM_AES_256_DECRYPT  = CRYPT_S390_KM | 0x14 | 0x80,
+        KM_XTS_128_ENCRYPT  = CRYPT_S390_KM | 0x32,
+        KM_XTS_128_DECRYPT  = CRYPT_S390_KM | 0x32 | 0x80,
+        KM_XTS_256_ENCRYPT  = CRYPT_S390_KM | 0x34,
+        KM_XTS_256_DECRYPT  = CRYPT_S390_KM | 0x34 | 0x80,
 };
 
 /*
@@ -75,6 +84,26 @@ enum crypt_s390_kmc_func {
 };
 
 /*
+ * function codes for KMCTR (CIPHER MESSAGE WITH COUNTER)
+ * instruction
+ */
+enum crypt_s390_kmctr_func {
+        KMCTR_QUERY            = CRYPT_S390_KMCTR | 0x0,
+        KMCTR_DEA_ENCRYPT      = CRYPT_S390_KMCTR | 0x1,
+        KMCTR_DEA_DECRYPT      = CRYPT_S390_KMCTR | 0x1 | 0x80,
+        KMCTR_TDEA_128_ENCRYPT = CRYPT_S390_KMCTR | 0x2,
+        KMCTR_TDEA_128_DECRYPT = CRYPT_S390_KMCTR | 0x2 | 0x80,
+        KMCTR_TDEA_192_ENCRYPT = CRYPT_S390_KMCTR | 0x3,
+        KMCTR_TDEA_192_DECRYPT = CRYPT_S390_KMCTR | 0x3 | 0x80,
+        KMCTR_AES_128_ENCRYPT  = CRYPT_S390_KMCTR | 0x12,
+        KMCTR_AES_128_DECRYPT  = CRYPT_S390_KMCTR | 0x12 | 0x80,
+        KMCTR_AES_192_ENCRYPT  = CRYPT_S390_KMCTR | 0x13,
+        KMCTR_AES_192_DECRYPT  = CRYPT_S390_KMCTR | 0x13 | 0x80,
+        KMCTR_AES_256_ENCRYPT  = CRYPT_S390_KMCTR | 0x14,
+        KMCTR_AES_256_DECRYPT  = CRYPT_S390_KMCTR | 0x14 | 0x80,
+};
+
+/*
  * function codes for KIMD (COMPUTE INTERMEDIATE MESSAGE DIGEST)
  * instruction
  */
@@ -83,6 +112,7 @@ enum crypt_s390_kimd_func {
         KIMD_SHA_1   = CRYPT_S390_KIMD | 1,
         KIMD_SHA_256 = CRYPT_S390_KIMD | 2,
         KIMD_SHA_512 = CRYPT_S390_KIMD | 3,
+        KIMD_GHASH   = CRYPT_S390_KIMD | 65,
 };
 
 /*
@@ -284,6 +314,45 @@ static inline int crypt_s390_kmac(long func, void *param,
 }
 
 /**
+ * crypt_s390_kmctr:
+ * @func: the function code passed to KMCTR; see crypt_s390_kmctr_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
+ * @counter: address of counter value
+ *
+ * Executes the KMCTR (CIPHER MESSAGE WITH COUNTER) operation of the CPU.
+ *
+ * Returns -1 for failure, 0 for the query func, number of processed
+ * bytes for encryption/decryption funcs
+ */
+static inline int crypt_s390_kmctr(long func, void *param, u8 *dest,
+                                 const u8 *src, long src_len, u8 *counter)
+{
+        register long __func asm("0") = func & CRYPT_S390_FUNC_MASK;
+        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 *__ctr asm("6") = counter;
+        int ret = -1;
+
+        asm volatile(
+                "0:     .insn   rrf,0xb92d0000,%3,%1,%4,0 \n" /* KMCTR opcode */
+                "1:     brc     1,0b \n" /* handle partial completion */
+                "       la      %0,0\n"
+                "2:\n"
+                EX_TABLE(0b,2b) EX_TABLE(1b,2b)
+                : "+d" (ret), "+a" (__src), "+d" (__src_len), "+a" (__dest),
+                  "+a" (__ctr)
+                : "d" (__func), "a" (__param) : "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
  *
@@ -291,13 +360,17 @@ static inline int crypt_s390_kmac(long func, void *param,
  *
  * 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 int facility_mask)
 {
         unsigned char status[16];
         int ret;
 
-        /* check if CPACF facility (bit 17) is available */
-        if (!(stfl() & 1ULL << (31 - 17)))
+        if (facility_mask & CRYPT_S390_MSA && !test_facility(17))
+                return 0;
+        if (facility_mask & CRYPT_S390_MSA3 && !test_facility(76))
+                return 0;
+        if (facility_mask & CRYPT_S390_MSA4 && !test_facility(77))
                 return 0;
 
         switch (func & CRYPT_S390_OP_MASK) {
@@ -316,6 +389,10 @@ static inline int crypt_s390_func_available(int func)
         case CRYPT_S390_KMAC:
                 ret = crypt_s390_kmac(KMAC_QUERY, &status, NULL, 0);
                 break;
+        case CRYPT_S390_KMCTR:
+                ret = crypt_s390_kmctr(KMCTR_QUERY, &status, NULL, NULL, 0,
+                                       NULL);
+                break;
         default:
                 return 0;
         }
@@ -326,4 +403,31 @@ static inline int crypt_s390_func_available(int func)
         return (status[func >> 3] & (0x80 >> (func & 7))) != 0;
 }
 
+/**
+ * crypt_s390_pcc:
+ * @func: the function code passed to KM; see crypt_s390_km_func
+ * @param: address of parameter block; see POP for details on each func
+ *
+ * Executes the PCC (PERFORM CRYPTOGRAPHIC COMPUTATION) operation of the CPU.
+ *
+ * Returns -1 for failure, 0 for success.
+ */
+static inline int crypt_s390_pcc(long func, void *param)
+{
+        register long __func asm("0") = func & 0x7f; /* encrypt or decrypt */
+        register void *__param asm("1") = param;
+        int ret = -1;
+
+        asm volatile(
+                "0:     .insn   rre,0xb92c0000,0,0 \n" /* PCC opcode */
+                "1:     brc     1,0b \n" /* handle partial completion */
+                "       la      %0,0\n"
+                "2:\n"
+                EX_TABLE(0b,2b) EX_TABLE(1b,2b)
+                : "+d" (ret)
+                : "d" (__func), "a" (__param) : "cc", "memory");
+        return ret;
+}
+
+
 #endif  /* _CRYPTO_ARCH_S390_CRYPT_S390_H */