New upstream version 18.08
[deb_dpdk.git] / drivers / crypto / null / null_crypto_pmd_ops.c
index f8e5f61..bb2b6e1 100644 (file)
@@ -121,7 +121,8 @@ null_crypto_pmd_info_get(struct rte_cryptodev *dev,
        if (dev_info != NULL) {
                dev_info->driver_id = dev->driver_id;
                dev_info->max_nb_queue_pairs = internals->max_nb_qpairs;
-               dev_info->sym.max_nb_sessions = internals->max_nb_sessions;
+               /* No limit of number of sessions */
+               dev_info->sym.max_nb_sessions = 0;
                dev_info->feature_flags = dev->feature_flags;
                dev_info->capabilities = null_crypto_pmd_capabilities;
        }
@@ -163,15 +164,15 @@ null_crypto_pmd_qp_create_processed_pkts_ring(struct null_crypto_qp *qp,
        r = rte_ring_lookup(qp->name);
        if (r) {
                if (rte_ring_get_size(r) >= ring_size) {
-                       NULL_CRYPTO_LOG_INFO(
-                               "Reusing existing ring %s for processed packets",
-                               qp->name);
+                       NULL_LOG(INFO,
+                                       "Reusing existing ring %s for "
+                                       " processed packets", qp->name);
                        return r;
                }
 
-               NULL_CRYPTO_LOG_INFO(
-                       "Unable to reuse existing ring %s for processed packets",
-                        qp->name);
+               NULL_LOG(INFO,
+                               "Unable to reuse existing ring %s for "
+                               " processed packets", qp->name);
                return NULL;
        }
 
@@ -190,7 +191,7 @@ null_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
        int retval;
 
        if (qp_id >= internals->max_nb_qpairs) {
-               NULL_CRYPTO_LOG_ERR("Invalid qp_id %u, greater than maximum "
+               NULL_LOG(ERR, "Invalid qp_id %u, greater than maximum "
                                "number of queue pairs supported (%u).",
                                qp_id, internals->max_nb_qpairs);
                return (-EINVAL);
@@ -204,7 +205,7 @@ null_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
        qp = rte_zmalloc_socket("Null Crypto PMD Queue Pair", sizeof(*qp),
                                        RTE_CACHE_LINE_SIZE, socket_id);
        if (qp == NULL) {
-               NULL_CRYPTO_LOG_ERR("Failed to allocate queue pair memory");
+               NULL_LOG(ERR, "Failed to allocate queue pair memory");
                return (-ENOMEM);
        }
 
@@ -213,15 +214,16 @@ null_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
 
        retval = null_crypto_pmd_qp_set_unique_name(dev, qp);
        if (retval) {
-               NULL_CRYPTO_LOG_ERR("Failed to create unique name for null "
+               NULL_LOG(ERR, "Failed to create unique name for null "
                                "crypto device");
+
                goto qp_setup_cleanup;
        }
 
        qp->processed_pkts = null_crypto_pmd_qp_create_processed_pkts_ring(qp,
                        qp_conf->nb_descriptors, socket_id);
        if (qp->processed_pkts == NULL) {
-               NULL_CRYPTO_LOG_ERR("Failed to create unique name for null "
+               NULL_LOG(ERR, "Failed to create unique name for null "
                                "crypto device");
                goto qp_setup_cleanup;
        }
@@ -239,22 +241,6 @@ qp_setup_cleanup:
        return -1;
 }
 
-/** Start queue pair */
-static int
-null_crypto_pmd_qp_start(__rte_unused struct rte_cryptodev *dev,
-               __rte_unused uint16_t queue_pair_id)
-{
-       return -ENOTSUP;
-}
-
-/** Stop queue pair */
-static int
-null_crypto_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
 null_crypto_pmd_qp_count(struct rte_cryptodev *dev)
@@ -264,14 +250,14 @@ null_crypto_pmd_qp_count(struct rte_cryptodev *dev)
 
 /** Returns the size of the NULL crypto session structure */
 static unsigned
-null_crypto_pmd_session_get_size(struct rte_cryptodev *dev __rte_unused)
+null_crypto_pmd_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)
 {
        return sizeof(struct null_crypto_session);
 }
 
 /** Configure a null crypto session from a crypto xform chain */
 static int
-null_crypto_pmd_session_configure(struct rte_cryptodev *dev __rte_unused,
+null_crypto_pmd_sym_session_configure(struct rte_cryptodev *dev __rte_unused,
                struct rte_crypto_sym_xform *xform,
                struct rte_cryptodev_sym_session *sess,
                struct rte_mempool *mp)
@@ -280,26 +266,26 @@ null_crypto_pmd_session_configure(struct rte_cryptodev *dev __rte_unused,
        int ret;
 
        if (unlikely(sess == NULL)) {
-               NULL_CRYPTO_LOG_ERR("invalid session struct");
+               NULL_LOG(ERR, "invalid session struct");
                return -EINVAL;
        }
 
        if (rte_mempool_get(mp, &sess_private_data)) {
-               CDEV_LOG_ERR(
-                       "Couldn't get object from session mempool");
+               NULL_LOG(ERR,
+                               "Couldn't get object from session mempool");
                return -ENOMEM;
        }
 
        ret = null_crypto_set_session_parameters(sess_private_data, xform);
        if (ret != 0) {
-               NULL_CRYPTO_LOG_ERR("failed configure session parameters");
+               NULL_LOG(ERR, "failed configure session parameters");
 
                /* Return session to mempool */
                rte_mempool_put(mp, sess_private_data);
                return ret;
        }
 
-       set_session_private_data(sess, dev->driver_id,
+       set_sym_session_private_data(sess, dev->driver_id,
                sess_private_data);
 
        return 0;
@@ -307,17 +293,17 @@ null_crypto_pmd_session_configure(struct rte_cryptodev *dev __rte_unused,
 
 /** Clear the memory of session so it doesn't leave key material behind */
 static void
-null_crypto_pmd_session_clear(struct rte_cryptodev *dev,
+null_crypto_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 null_crypto_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);
        }
 }
@@ -335,13 +321,11 @@ struct rte_cryptodev_ops pmd_ops = {
 
                .queue_pair_setup       = null_crypto_pmd_qp_setup,
                .queue_pair_release     = null_crypto_pmd_qp_release,
-               .queue_pair_start       = null_crypto_pmd_qp_start,
-               .queue_pair_stop        = null_crypto_pmd_qp_stop,
                .queue_pair_count       = null_crypto_pmd_qp_count,
 
-               .session_get_size       = null_crypto_pmd_session_get_size,
-               .session_configure      = null_crypto_pmd_session_configure,
-               .session_clear          = null_crypto_pmd_session_clear
+               .sym_session_get_size   = null_crypto_pmd_sym_session_get_size,
+               .sym_session_configure  = null_crypto_pmd_sym_session_configure,
+               .sym_session_clear      = null_crypto_pmd_sym_session_clear
 };
 
 struct rte_cryptodev_ops *null_crypto_pmd_ops = &pmd_ops;