crypto/qat: fix message for CCM when setting unused counter

[dpdk.git] / drivers / crypto / scheduler / scheduler_pmd_ops.c

diff --git a/drivers/crypto/scheduler/scheduler_pmd_ops.c b/drivers/crypto/scheduler/scheduler_pmd_ops.c
index 8742058..939105a 100644 (file)
--- a/drivers/crypto/scheduler/scheduler_pmd_ops.c
+++ b/drivers/crypto/scheduler/scheduler_pmd_ops.c
@@ -321,8 +321,9 @@ scheduler_pmd_info_get(struct rte_cryptodev *dev,
                struct rte_cryptodev_info *dev_info)
 {
        struct scheduler_ctx *sched_ctx = dev->data->dev_private;
-       uint32_t max_nb_sessions = sched_ctx->nb_slaves ?
-                       UINT32_MAX : RTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_SESSIONS;
+       uint32_t max_nb_sess = 0;
+       uint16_t headroom_sz = 0;
+       uint16_t tailroom_sz = 0;
        uint32_t i;
 
        if (!dev_info)
@@ -338,17 +339,32 @@ scheduler_pmd_info_get(struct rte_cryptodev *dev,
                struct rte_cryptodev_info slave_info;
 
                rte_cryptodev_info_get(slave_dev_id, &slave_info);
-               max_nb_sessions = slave_info.sym.max_nb_sessions <
-                               max_nb_sessions ?
-                               slave_info.sym.max_nb_sessions :
-                               max_nb_sessions;
+               uint32_t dev_max_sess = slave_info.sym.max_nb_sessions;
+               if (dev_max_sess != 0) {
+                       if (max_nb_sess == 0 || dev_max_sess < max_nb_sess)
+                               max_nb_sess = slave_info.sym.max_nb_sessions;
+               }
+
+               /* Get the max headroom requirement among slave PMDs */
+               headroom_sz = slave_info.min_mbuf_headroom_req >
+                               headroom_sz ?
+                               slave_info.min_mbuf_headroom_req :
+                               headroom_sz;
+
+               /* Get the max tailroom requirement among slave PMDs */
+               tailroom_sz = slave_info.min_mbuf_tailroom_req >
+                               tailroom_sz ?
+                               slave_info.min_mbuf_tailroom_req :
+                               tailroom_sz;
        }
 
        dev_info->driver_id = dev->driver_id;
        dev_info->feature_flags = dev->feature_flags;
        dev_info->capabilities = sched_ctx->capabilities;
        dev_info->max_nb_queue_pairs = sched_ctx->max_nb_queue_pairs;
-       dev_info->sym.max_nb_sessions = max_nb_sessions;
+       dev_info->min_mbuf_headroom_req = headroom_sz;
+       dev_info->min_mbuf_tailroom_req = tailroom_sz;
+       dev_info->sym.max_nb_sessions = max_nb_sess;
 }
 
 /** Release queue pair */
@@ -439,22 +455,6 @@ scheduler_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
        return 0;
 }
 
-/** Start queue pair */
-static int
-scheduler_pmd_qp_start(__rte_unused struct rte_cryptodev *dev,
-               __rte_unused uint16_t queue_pair_id)
-{
-       return -ENOTSUP;
-}
-
-/** Stop queue pair */
-static int
-scheduler_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
 scheduler_pmd_qp_count(struct rte_cryptodev *dev)
@@ -463,7 +463,7 @@ scheduler_pmd_qp_count(struct rte_cryptodev *dev)
 }
 
 static uint32_t
-scheduler_pmd_session_get_size(struct rte_cryptodev *dev __rte_unused)
+scheduler_pmd_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)
 {
        struct scheduler_ctx *sched_ctx = dev->data->dev_private;
        uint8_t i = 0;
@@ -473,7 +473,7 @@ scheduler_pmd_session_get_size(struct rte_cryptodev *dev __rte_unused)
        for (i = 0; i < sched_ctx->nb_slaves; i++) {
                uint8_t slave_dev_id = sched_ctx->slaves[i].dev_id;
                struct rte_cryptodev *dev = &rte_cryptodevs[slave_dev_id];
-               uint32_t priv_sess_size = (*dev->dev_ops->session_get_size)(dev);
+               uint32_t priv_sess_size = (*dev->dev_ops->sym_session_get_size)(dev);
 
                if (max_priv_sess_size < priv_sess_size)
                        max_priv_sess_size = priv_sess_size;
@@ -483,7 +483,7 @@ scheduler_pmd_session_get_size(struct rte_cryptodev *dev __rte_unused)
 }
 
 static int
-scheduler_pmd_session_configure(struct rte_cryptodev *dev,
+scheduler_pmd_sym_session_configure(struct rte_cryptodev *dev,
        struct rte_crypto_sym_xform *xform,
        struct rte_cryptodev_sym_session *sess,
        struct rte_mempool *mempool)
@@ -508,7 +508,7 @@ scheduler_pmd_session_configure(struct rte_cryptodev *dev,
 
 /** Clear the memory of session so it doesn't leave key material behind */
 static void
-scheduler_pmd_session_clear(struct rte_cryptodev *dev,
+scheduler_pmd_sym_session_clear(struct rte_cryptodev *dev,
                struct rte_cryptodev_sym_session *sess)
 {
        struct scheduler_ctx *sched_ctx = dev->data->dev_private;
@@ -522,7 +522,7 @@ scheduler_pmd_session_clear(struct rte_cryptodev *dev,
        }
 }
 
-struct rte_cryptodev_ops scheduler_pmd_ops = {
+static struct rte_cryptodev_ops scheduler_pmd_ops = {
                .dev_configure          = scheduler_pmd_config,
                .dev_start              = scheduler_pmd_start,
                .dev_stop               = scheduler_pmd_stop,
@@ -535,13 +535,11 @@ struct rte_cryptodev_ops scheduler_pmd_ops = {
 
                .queue_pair_setup       = scheduler_pmd_qp_setup,
                .queue_pair_release     = scheduler_pmd_qp_release,
-               .queue_pair_start       = scheduler_pmd_qp_start,
-               .queue_pair_stop        = scheduler_pmd_qp_stop,
                .queue_pair_count       = scheduler_pmd_qp_count,
 
-               .session_get_size       = scheduler_pmd_session_get_size,
-               .session_configure      = scheduler_pmd_session_configure,
-               .session_clear          = scheduler_pmd_session_clear,
+               .sym_session_get_size   = scheduler_pmd_sym_session_get_size,
+               .sym_session_configure  = scheduler_pmd_sym_session_configure,
+               .sym_session_clear      = scheduler_pmd_sym_session_clear,
 };
 
 struct rte_cryptodev_ops *rte_crypto_scheduler_pmd_ops = &scheduler_pmd_ops;