cryptodev: remove attach/detach session API

[dpdk.git] / lib / librte_cryptodev / rte_cryptodev.c

diff --git a/lib/librte_cryptodev/rte_cryptodev.c b/lib/librte_cryptodev/rte_cryptodev.c
index 7e58212..745ea1c 100644 (file)
--- a/lib/librte_cryptodev/rte_cryptodev.c
+++ b/lib/librte_cryptodev/rte_cryptodev.c
@@ -361,8 +361,16 @@ rte_cryptodev_get_feature_name(uint64_t flag)
                return "CPU_AESNI";
        case RTE_CRYPTODEV_FF_HW_ACCELERATED:
                return "HW_ACCELERATED";
-       case RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER:
-               return "MBUF_SCATTER_GATHER";
+       case RTE_CRYPTODEV_FF_IN_PLACE_SGL:
+               return "IN_PLACE_SGL";
+       case RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT:
+               return "OOP_SGL_IN_SGL_OUT";
+       case RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT:
+               return "OOP_SGL_IN_LB_OUT";
+       case RTE_CRYPTODEV_FF_OOP_LB_IN_SGL_OUT:
+               return "OOP_LB_IN_SGL_OUT";
+       case RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT:
+               return "OOP_LB_IN_LB_OUT";
        case RTE_CRYPTODEV_FF_CPU_NEON:
                return "CPU_NEON";
        case RTE_CRYPTODEV_FF_CPU_ARM_CE:
@@ -702,50 +710,6 @@ rte_cryptodev_queue_pairs_config(struct rte_cryptodev *dev, uint16_t nb_qpairs,
        return 0;
 }
 
-int
-rte_cryptodev_queue_pair_start(uint8_t dev_id, uint16_t queue_pair_id)
-{
-       struct rte_cryptodev *dev;
-
-       if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
-               CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id);
-               return -EINVAL;
-       }
-
-       dev = &rte_crypto_devices[dev_id];
-       if (queue_pair_id >= dev->data->nb_queue_pairs) {
-               CDEV_LOG_ERR("Invalid queue_pair_id=%d", queue_pair_id);
-               return -EINVAL;
-       }
-
-       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_pair_start, -ENOTSUP);
-
-       return dev->dev_ops->queue_pair_start(dev, queue_pair_id);
-
-}
-
-int
-rte_cryptodev_queue_pair_stop(uint8_t dev_id, uint16_t queue_pair_id)
-{
-       struct rte_cryptodev *dev;
-
-       if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
-               CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id);
-               return -EINVAL;
-       }
-
-       dev = &rte_crypto_devices[dev_id];
-       if (queue_pair_id >= dev->data->nb_queue_pairs) {
-               CDEV_LOG_ERR("Invalid queue_pair_id=%d", queue_pair_id);
-               return -EINVAL;
-       }
-
-       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_pair_stop, -ENOTSUP);
-
-       return dev->dev_ops->queue_pair_stop(dev, queue_pair_id);
-
-}
-
 int
 rte_cryptodev_configure(uint8_t dev_id, struct rte_cryptodev_config *config)
 {
@@ -966,6 +930,7 @@ rte_cryptodev_info_get(uint8_t dev_id, struct rte_cryptodev_info *dev_info)
        (*dev->dev_ops->dev_infos_get)(dev, dev_info);
 
        dev_info->driver_name = dev->device->driver->name;
+       dev_info->device = dev->device;
 }
 
 
@@ -1130,60 +1095,6 @@ rte_cryptodev_sym_session_create(struct rte_mempool *mp)
        return sess;
 }
 
-int
-rte_cryptodev_queue_pair_attach_sym_session(uint8_t dev_id, uint16_t qp_id,
-               struct rte_cryptodev_sym_session *sess)
-{
-       struct rte_cryptodev *dev;
-
-       if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
-               CDEV_LOG_ERR("Invalid dev_id=%d", dev_id);
-               return -EINVAL;
-       }
-
-       dev = &rte_crypto_devices[dev_id];
-
-       /* The API is optional, not returning error if driver do not suuport */
-       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->qp_attach_session, 0);
-
-       void *sess_priv = get_session_private_data(sess, dev->driver_id);
-
-       if (dev->dev_ops->qp_attach_session(dev, qp_id, sess_priv)) {
-               CDEV_LOG_ERR("dev_id %d failed to attach qp: %d with session",
-                               dev_id, qp_id);
-               return -EPERM;
-       }
-
-       return 0;
-}
-
-int
-rte_cryptodev_queue_pair_detach_sym_session(uint8_t dev_id, uint16_t qp_id,
-               struct rte_cryptodev_sym_session *sess)
-{
-       struct rte_cryptodev *dev;
-
-       if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
-               CDEV_LOG_ERR("Invalid dev_id=%d", dev_id);
-               return -EINVAL;
-       }
-
-       dev = &rte_crypto_devices[dev_id];
-
-       /* The API is optional, not returning error if driver do not suuport */
-       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->qp_detach_session, 0);
-
-       void *sess_priv = get_session_private_data(sess, dev->driver_id);
-
-       if (dev->dev_ops->qp_detach_session(dev, qp_id, sess_priv)) {
-               CDEV_LOG_ERR("dev_id %d failed to detach qp: %d from session",
-                               dev_id, qp_id);
-               return -EPERM;
-       }
-
-       return 0;
-}
-
 int
 rte_cryptodev_sym_session_clear(uint8_t dev_id,
                struct rte_cryptodev_sym_session *sess)
@@ -1224,12 +1135,6 @@ rte_cryptodev_sym_session_free(struct rte_cryptodev_sym_session *sess)
        return 0;
 }
 
-unsigned int
-rte_cryptodev_get_header_session_size(void)
-{
-       return rte_cryptodev_sym_get_header_session_size();
-}
-
 unsigned int
 rte_cryptodev_sym_get_header_session_size(void)
 {
@@ -1241,12 +1146,6 @@ rte_cryptodev_sym_get_header_session_size(void)
        return ((sizeof(void *) * nb_drivers) + sizeof(uint8_t));
 }
 
-unsigned int
-rte_cryptodev_get_private_session_size(uint8_t dev_id)
-{
-       return rte_cryptodev_sym_get_private_session_size(dev_id);
-}
-
 unsigned int
 rte_cryptodev_sym_get_private_session_size(uint8_t dev_id)
 {