crypto/ipsec_mb: move kasumi PMD

[dpdk.git] / drivers / crypto / snow3g / rte_snow3g_pmd_ops.c

diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c b/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c
index e5c7a86..3f46014 100644 (file)
--- a/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c
+++ b/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c
@@ -6,9 +6,9 @@
 
 #include <rte_common.h>
 #include <rte_malloc.h>
-#include <rte_cryptodev_pmd.h>
+#include <cryptodev_pmd.h>
 
-#include "rte_snow3g_pmd_private.h"
+#include "snow3g_pmd_private.h"
 
 static const struct rte_cryptodev_capabilities snow3g_pmd_capabilities[] = {
        {       /* SNOW 3G (UIA2) */
@@ -142,6 +142,11 @@ static int
 snow3g_pmd_qp_release(struct rte_cryptodev *dev, uint16_t qp_id)
 {
        if (dev->data->queue_pairs[qp_id] != NULL) {
+               struct snow3g_qp *qp = dev->data->queue_pairs[qp_id];
+
+               if (qp->processed_ops)
+                       rte_ring_free(qp->processed_ops);
+
                rte_free(dev->data->queue_pairs[qp_id]);
                dev->data->queue_pairs[qp_id] = NULL;
        }
@@ -193,9 +198,10 @@ snow3g_pmd_qp_create_processed_ops_ring(struct snow3g_qp *qp,
 static int
 snow3g_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
                const struct rte_cryptodev_qp_conf *qp_conf,
-               int socket_id, struct rte_mempool *session_pool)
+               int socket_id)
 {
        struct snow3g_qp *qp = NULL;
+       struct snow3g_private *internals = dev->data->dev_private;
 
        /* Free memory prior to re-allocation if needed. */
        if (dev->data->queue_pairs[qp_id] != NULL)
@@ -218,7 +224,9 @@ snow3g_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
        if (qp->processed_ops == NULL)
                goto qp_setup_cleanup;
 
-       qp->sess_mp = session_pool;
+       qp->mgr = internals->mgr;
+       qp->sess_mp = qp_conf->mp_session;
+       qp->sess_mp_priv = qp_conf->mp_session_private;
 
        memset(&qp->qp_stats, 0, sizeof(qp->qp_stats));
 
@@ -231,45 +239,23 @@ qp_setup_cleanup:
        return -1;
 }
 
-/** Start queue pair */
-static int
-snow3g_pmd_qp_start(__rte_unused struct rte_cryptodev *dev,
-               __rte_unused uint16_t queue_pair_id)
-{
-       return -ENOTSUP;
-}
-
-/** Stop queue pair */
-static int
-snow3g_pmd_qp_stop(__rte_unused struct rte_cryptodev *dev,
-               __rte_unused uint16_t queue_pair_id)
-{
-       return -ENOTSUP;
-}
-
-/** Return the number of allocated queue pairs */
-static uint32_t
-snow3g_pmd_qp_count(struct rte_cryptodev *dev)
-{
-       return dev->data->nb_queue_pairs;
-}
-
 /** Returns the size of the SNOW 3G session structure */
 static unsigned
-snow3g_pmd_session_get_size(struct rte_cryptodev *dev __rte_unused)
+snow3g_pmd_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)
 {
        return sizeof(struct snow3g_session);
 }
 
 /** Configure a SNOW 3G session from a crypto xform chain */
 static int
-snow3g_pmd_session_configure(struct rte_cryptodev *dev __rte_unused,
+snow3g_pmd_sym_session_configure(struct rte_cryptodev *dev,
                struct rte_crypto_sym_xform *xform,
                struct rte_cryptodev_sym_session *sess,
                struct rte_mempool *mempool)
 {
        void *sess_private_data;
        int ret;
+       struct snow3g_private *internals = dev->data->dev_private;
 
        if (unlikely(sess == NULL)) {
                SNOW3G_LOG(ERR, "invalid session struct");
@@ -282,7 +268,8 @@ snow3g_pmd_session_configure(struct rte_cryptodev *dev __rte_unused,
                return -ENOMEM;
        }
 
-       ret = snow3g_set_session_parameters(sess_private_data, xform);
+       ret = snow3g_set_session_parameters(internals->mgr,
+                                       sess_private_data, xform);
        if (ret != 0) {
                SNOW3G_LOG(ERR, "failed configure session parameters");
 
@@ -291,7 +278,7 @@ snow3g_pmd_session_configure(struct rte_cryptodev *dev __rte_unused,
                return ret;
        }
 
-       set_session_private_data(sess, dev->driver_id,
+       set_sym_session_private_data(sess, dev->driver_id,
                sess_private_data);
 
        return 0;
@@ -299,17 +286,17 @@ snow3g_pmd_session_configure(struct rte_cryptodev *dev __rte_unused,
 
 /** Clear the memory of session so it doesn't leave key material behind */
 static void
-snow3g_pmd_session_clear(struct rte_cryptodev *dev,
+snow3g_pmd_sym_session_clear(struct rte_cryptodev *dev,
                struct rte_cryptodev_sym_session *sess)
 {
        uint8_t index = dev->driver_id;
-       void *sess_priv = get_session_private_data(sess, index);
+       void *sess_priv = get_sym_session_private_data(sess, index);
 
        /* Zero out the whole structure */
        if (sess_priv) {
                memset(sess_priv, 0, sizeof(struct snow3g_session));
                struct rte_mempool *sess_mp = rte_mempool_from_obj(sess_priv);
-               set_session_private_data(sess, index, NULL);
+               set_sym_session_private_data(sess, index, NULL);
                rte_mempool_put(sess_mp, sess_priv);
        }
 }
@@ -327,13 +314,10 @@ struct rte_cryptodev_ops snow3g_pmd_ops = {
 
                .queue_pair_setup   = snow3g_pmd_qp_setup,
                .queue_pair_release = snow3g_pmd_qp_release,
-               .queue_pair_start   = snow3g_pmd_qp_start,
-               .queue_pair_stop    = snow3g_pmd_qp_stop,
-               .queue_pair_count   = snow3g_pmd_qp_count,
 
-               .session_get_size   = snow3g_pmd_session_get_size,
-               .session_configure  = snow3g_pmd_session_configure,
-               .session_clear      = snow3g_pmd_session_clear
+               .sym_session_get_size   = snow3g_pmd_sym_session_get_size,
+               .sym_session_configure  = snow3g_pmd_sym_session_configure,
+               .sym_session_clear      = snow3g_pmd_sym_session_clear
 };
 
 struct rte_cryptodev_ops *rte_snow3g_pmd_ops = &snow3g_pmd_ops;