cryptodev: remove crypto device type enumeration

[dpdk.git] / drivers / crypto / aesni_gcm / aesni_gcm_pmd_ops.c

diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c
index 7b68a20..85c7485 100644 (file)
--- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c
+++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2016 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2016-2017 Intel Corporation. All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
@@ -49,32 +49,33 @@ static const struct rte_cryptodev_capabilities aesni_gcm_pmd_capabilities[] = {
                                .key_size = {
                                        .min = 16,
                                        .max = 32,
-                                       .increment = 16
+                                       .increment = 8
                                },
                                .digest_size = {
                                        .min = 8,
                                        .max = 16,
                                        .increment = 4
                                },
-                               .aad_size = {
-                                       .min = 0,
-                                       .max = 65535,
-                                       .increment = 1
+                               .aad_size = { 0 },
+                               .iv_size = {
+                                       .min = 12,
+                                       .max = 12,
+                                       .increment = 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,
                                        .max = 32,
-                                       .increment = 16
+                                       .increment = 8
                                },
                                .digest_size = {
                                        .min = 8,
@@ -85,21 +86,6 @@ static const struct rte_cryptodev_capabilities aesni_gcm_pmd_capabilities[] = {
                                        .min = 0,
                                        .max = 65535,
                                        .increment = 1
-                               }
-                       }, }
-               }, }
-       },
-       {       /* 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 = 16
                                },
                                .iv_size = {
                                        .min = 12,
@@ -181,7 +167,7 @@ aesni_gcm_pmd_info_get(struct rte_cryptodev *dev,
        struct aesni_gcm_private *internals = dev->data->dev_private;
 
        if (dev_info != NULL) {
-               dev_info->dev_type = dev->dev_type;
+               dev_info->driver_id = dev->driver_id;
                dev_info->feature_flags = dev->feature_flags;
                dev_info->capabilities = aesni_gcm_pmd_capabilities;
 
@@ -247,6 +233,7 @@ aesni_gcm_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
                 int socket_id)
 {
        struct aesni_gcm_qp *qp = NULL;
+       struct aesni_gcm_private *internals = dev->data->dev_private;
 
        /* Free memory prior to re-allocation if needed. */
        if (dev->data->queue_pairs[qp_id] != NULL)
@@ -264,6 +251,8 @@ aesni_gcm_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
        if (aesni_gcm_pmd_qp_set_unique_name(dev, qp))
                goto qp_setup_cleanup;
 
+       qp->ops = (const struct aesni_gcm_ops *)gcm_ops[internals->vector_mode];
+
        qp->processed_pkts = aesni_gcm_pmd_qp_create_processed_pkts_ring(qp,
                        qp_conf->nb_descriptors, socket_id);
        if (qp->processed_pkts == NULL)
@@ -314,15 +303,18 @@ aesni_gcm_pmd_session_get_size(struct rte_cryptodev *dev __rte_unused)
 
 /** Configure a aesni gcm session from a crypto xform chain */
 static void *
-aesni_gcm_pmd_session_configure(struct rte_cryptodev *dev __rte_unused,
+aesni_gcm_pmd_session_configure(struct rte_cryptodev *dev,
                struct rte_crypto_sym_xform *xform,     void *sess)
 {
+       struct aesni_gcm_private *internals = dev->data->dev_private;
+
        if (unlikely(sess == NULL)) {
                GCM_LOG_ERR("invalid session struct");
                return NULL;
        }
 
-       if (aesni_gcm_set_session_parameters(sess, xform) != 0) {
+       if (aesni_gcm_set_session_parameters(gcm_ops[internals->vector_mode],
+                       sess, xform) != 0) {
                GCM_LOG_ERR("failed configure session parameters");
                return NULL;
        }