New upstream version 17.08

[deb_dpdk.git] / drivers / crypto / qat / qat_crypto_capabilities.h

diff --git a/drivers/crypto/qat/qat_crypto_capabilities.h b/drivers/crypto/qat/qat_crypto_capabilities.h
index 1294f24..7012007 100644 (file)
--- a/drivers/crypto/qat/qat_crypto_capabilities.h
+++ b/drivers/crypto/qat/qat_crypto_capabilities.h
@@ -34,7 +34,7 @@
 #ifndef _QAT_CRYPTO_CAPABILITIES_H_
 #define _QAT_CRYPTO_CAPABILITIES_H_
 
-#define QAT_BASE_CPM16_SYM_CAPABILITIES                                        \
+#define QAT_BASE_GEN1_SYM_CAPABILITIES                                 \
        {       /* SHA1 HMAC */                                         \
                .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,                     \
                {.sym = {                                               \
@@ -43,16 +43,16 @@
                                .algo = RTE_CRYPTO_AUTH_SHA1_HMAC,      \
                                .block_size = 64,                       \
                                .key_size = {                           \
-                                       .min = 64,                      \
+                                       .min = 1,                       \
                                        .max = 64,                      \
-                                       .increment = 0                  \
+                                       .increment = 1                  \
                                },                                      \
                                .digest_size = {                        \
                                        .min = 20,                      \
                                        .max = 20,                      \
                                        .increment = 0                  \
                                },                                      \
-                               .aad_size = { 0 }                       \
+                               .iv_size = { 0 }                        \
                        }, }                                            \
                }, }                                                    \
        },                                                              \
@@ -64,16 +64,16 @@
                                .algo = RTE_CRYPTO_AUTH_SHA224_HMAC,    \
                                .block_size = 64,                       \
                                .key_size = {                           \
-                                       .min = 64,                      \
+                                       .min = 1,                       \
                                        .max = 64,                      \
-                                       .increment = 0                  \
+                                       .increment = 1                  \
                                },                                      \
                                .digest_size = {                        \
                                        .min = 28,                      \
                                        .max = 28,                      \
                                        .increment = 0                  \
                                },                                      \
-                               .aad_size = { 0 }                       \
+                               .iv_size = { 0 }                        \
                        }, }                                            \
                }, }                                                    \
        },                                                              \
@@ -85,16 +85,16 @@
                                .algo = RTE_CRYPTO_AUTH_SHA256_HMAC,    \
                                .block_size = 64,                       \
                                .key_size = {                           \
-                                       .min = 64,                      \
+                                       .min = 1,                       \
                                        .max = 64,                      \
-                                       .increment = 0                  \
+                                       .increment = 1                  \
                                },                                      \
                                .digest_size = {                        \
                                        .min = 32,                      \
                                        .max = 32,                      \
                                        .increment = 0                  \
                                },                                      \
-                               .aad_size = { 0 }                       \
+                               .iv_size = { 0 }                        \
                        }, }                                            \
                }, }                                                    \
        },                                                              \
@@ -104,18 +104,18 @@
                        .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,        \
                        {.auth = {                                      \
                                .algo = RTE_CRYPTO_AUTH_SHA384_HMAC,    \
-                               .block_size = 64,                       \
+                               .block_size = 128,                      \
                                .key_size = {                           \
-                                       .min = 128,                     \
+                                       .min = 1,                       \
                                        .max = 128,                     \
-                                       .increment = 0                  \
+                                       .increment = 1                  \
                                },                                      \
                                .digest_size = {                        \
                                        .min = 48,                      \
                                        .max = 48,                      \
                                        .increment = 0                  \
-                                       },                              \
-                               .aad_size = { 0 }                       \
+                               },                                      \
+                               .iv_size = { 0 }                        \
                        }, }                                            \
                }, }                                                    \
        },                                                              \
@@ -127,16 +127,16 @@
                                .algo = RTE_CRYPTO_AUTH_SHA512_HMAC,    \
                                .block_size = 128,                      \
                                .key_size = {                           \
-                                       .min = 128,                     \
+                                       .min = 1,                       \
                                        .max = 128,                     \
-                                       .increment = 0                  \
+                                       .increment = 1                  \
                                },                                      \
                                .digest_size = {                        \
                                        .min = 64,                      \
                                        .max = 64,                      \
                                        .increment = 0                  \
                                },                                      \
-                               .aad_size = { 0 }                       \
+                               .iv_size = { 0 }                        \
                        }, }                                            \
                }, }                                                    \
        },                                                              \
@@ -148,16 +148,16 @@
                                .algo = RTE_CRYPTO_AUTH_MD5_HMAC,       \
                                .block_size = 64,                       \
                                .key_size = {                           \
-                                       .min = 8,                       \
+                                       .min = 1,                       \
                                        .max = 64,                      \
-                                       .increment = 8                  \
+                                       .increment = 1                  \
                                },                                      \
                                .digest_size = {                        \
                                        .min = 16,                      \
                                        .max = 16,                      \
                                        .increment = 0                  \
                                },                                      \
-                               .aad_size = { 0 }                       \
+                               .iv_size = { 0 }                        \
                        }, }                                            \
                }, }                                                    \
        },                                                              \
@@ -178,16 +178,17 @@
                                        .max = 16,                      \
                                        .increment = 0                  \
                                },                                      \
-                               .aad_size = { 0 }                       \
+                               .aad_size = { 0 },                      \
+                               .iv_size = { 0 }                        \
                        }, }                                            \
                }, }                                                    \
        },                                                              \
-       {       /* AES GCM (AUTH) */                                    \
+       {       /* AES GCM */                                           \
                .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,                     \
                {.sym = {                                               \
-                       .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,        \
-                       {.auth = {                                      \
-                               .algo = RTE_CRYPTO_AUTH_AES_GCM,        \
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_AEAD,        \
+                       {.aead = {                                      \
+                               .algo = RTE_CRYPTO_AEAD_AES_GCM,        \
                                .block_size = 16,                       \
                                .key_size = {                           \
                                        .min = 16,                      \
@@ -203,7 +204,12 @@
                                        .min = 0,                       \
                                        .max = 240,                     \
                                        .increment = 1                  \
-                               }                                       \
+                               },                                      \
+                               .iv_size = {                            \
+                                       .min = 12,                      \
+                                       .max = 12,                      \
+                                       .increment = 0                  \
+                               },                                      \
                        }, }                                            \
                }, }                                                    \
        },                                                              \
@@ -224,10 +230,10 @@
                                        .max = 16,                      \
                                        .increment = 4                  \
                                },                                      \
-                               .aad_size = {                           \
-                                       .min = 1,                       \
-                                       .max = 65535,                   \
-                                       .increment = 1                  \
+                               .iv_size = {                            \
+                                       .min = 12,                      \
+                                       .max = 12,                      \
+                                       .increment = 0                  \
                                }                                       \
                        }, }                                            \
                }, }                                                    \
@@ -249,7 +255,7 @@
                                        .max = 4,                       \
                                        .increment = 0                  \
                                },                                      \
-                               .aad_size = {                           \
+                               .iv_size = {                            \
                                        .min = 16,                      \
                                        .max = 16,                      \
                                        .increment = 0                  \
@@ -257,26 +263,6 @@
                        }, }                                            \
                }, }                                                    \
        },                                                              \
-       {       /* AES GCM (CIPHER) */                                  \
-               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,                     \
-               {.sym = {                                               \
-                       .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,      \
-                       {.cipher = {                                    \
-                               .algo = RTE_CRYPTO_CIPHER_AES_GCM,      \
-                               .block_size = 16,                       \
-                               .key_size = {                           \
-                                       .min = 16,                      \
-                                       .max = 32,                      \
-                                       .increment = 8                  \
-                               },                                      \
-                               .iv_size = {                            \
-                                       .min = 12,                      \
-                                       .max = 12,                      \
-                                       .increment = 0                  \
-                               }                                       \
-                       }, }                                            \
-               }, }                                                    \
-       },                                                              \
        {       /* AES CBC */                                           \
                .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,                     \
                {.sym = {                                               \
@@ -374,7 +360,7 @@
                                        .max = 0,                       \
                                        .increment = 0                  \
                                },                                      \
-                               .aad_size = { 0 }                       \
+                               .iv_size = { 0 }                        \
                        }, },                                           \
                }, },                                                   \
        },                                                              \
@@ -435,11 +421,7 @@
                                        .max = 4,                       \
                                        .increment = 0                  \
                                },                                      \
-                               .aad_size = {                           \
-                                       .min = 8,                       \
-                                       .max = 8,                       \
-                                       .increment = 0                  \
-                               }                                       \
+                               .iv_size = { 0 }                        \
                        }, }                                            \
                }, }                                                    \
        },                                                              \
@@ -524,7 +506,7 @@
                }, }                                                    \
        }
 
-#define QAT_EXTRA_CPM17_SYM_CAPABILITIES                               \
+#define QAT_EXTRA_GEN2_SYM_CAPABILITIES                                        \
        {       /* ZUC (EEA3) */                                        \
                .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,                     \
                {.sym = {                                               \
@@ -562,7 +544,7 @@
                                        .max = 4,                       \
                                        .increment = 0                  \
                                },                                      \
-                               .aad_size = {                           \
+                               .iv_size = {                            \
                                        .min = 16,                      \
                                        .max = 16,                      \
                                        .increment = 0                  \