cryptodev: remove crypto device type enumeration

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

diff --git a/drivers/crypto/scheduler/scheduler_pmd.c b/drivers/crypto/scheduler/scheduler_pmd.c
index c03f1ca..b385851 100644 (file)
--- a/drivers/crypto/scheduler/scheduler_pmd.c
+++ b/drivers/crypto/scheduler/scheduler_pmd.c
@@ -33,6 +33,7 @@
 #include <rte_hexdump.h>
 #include <rte_cryptodev.h>
 #include <rte_cryptodev_pmd.h>
+#include <rte_cryptodev_vdev.h>
 #include <rte_vdev.h>
 #include <rte_malloc.h>
 #include <rte_cpuflags.h>
@@ -41,6 +42,8 @@
 #include "rte_cryptodev_scheduler.h"
 #include "scheduler_pmd_private.h"
 
+uint8_t cryptodev_driver_id;
+
 struct scheduler_init_params {
        struct rte_crypto_vdev_init_params def_p;
        uint32_t nb_slaves;
@@ -89,38 +92,30 @@ const struct scheduler_parse_map scheduler_ordering_map[] = {
 
 static int
 cryptodev_scheduler_create(const char *name,
-       struct scheduler_init_params *init_params)
+               struct rte_vdev_device *vdev,
+               struct scheduler_init_params *init_params)
 {
-       char crypto_dev_name[RTE_CRYPTODEV_NAME_MAX_LEN] = {0};
        struct rte_cryptodev *dev;
        struct scheduler_ctx *sched_ctx;
        uint32_t i;
        int ret;
 
-       if (init_params->def_p.name[0] == '\0') {
-               ret = rte_cryptodev_pmd_create_dev_name(
-                               crypto_dev_name,
-                               RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD));
-
-               if (ret < 0) {
-                       CS_LOG_ERR("failed to create unique name");
-                       return ret;
-               }
-       } else {
-               strncpy(crypto_dev_name, init_params->def_p.name,
-                               RTE_CRYPTODEV_NAME_MAX_LEN - 1);
-       }
+       if (init_params->def_p.name[0] == '\0')
+               snprintf(init_params->def_p.name,
+                               sizeof(init_params->def_p.name),
+                               "%s", name);
 
-       dev = rte_cryptodev_pmd_virtual_dev_init(crypto_dev_name,
+       dev = rte_cryptodev_vdev_pmd_init(init_params->def_p.name,
                        sizeof(struct scheduler_ctx),
-                       init_params->def_p.socket_id);
+                       init_params->def_p.socket_id,
+                       vdev);
        if (dev == NULL) {
                CS_LOG_ERR("driver %s: failed to create cryptodev vdev",
                        name);
                return -EFAULT;
        }
 
-       dev->dev_type = RTE_CRYPTODEV_SCHEDULER_PMD;
+       dev->driver_id = cryptodev_driver_id;
        dev->dev_ops = rte_crypto_scheduler_pmd_ops;
 
        sched_ctx = dev->data->dev_private;
@@ -181,6 +176,20 @@ cryptodev_scheduler_create(const char *name,
                sched_ctx->nb_init_slaves++;
        }
 
+       /*
+        * Initialize capabilities structure as an empty structure,
+        * in case device information is requested when no slaves are attached
+        */
+       sched_ctx->capabilities = rte_zmalloc_socket(NULL,
+                       sizeof(struct rte_cryptodev_capabilities),
+                       0, SOCKET_ID_ANY);
+
+       if (!sched_ctx->capabilities) {
+               RTE_LOG(ERR, PMD, "Not enough memory for capability "
+                               "information\n");
+               return -ENOMEM;
+       }
+
        return 0;
 }
 
@@ -215,22 +224,6 @@ cryptodev_scheduler_remove(struct rte_vdev_device *vdev)
        return 0;
 }
 
-static uint8_t
-number_of_sockets(void)
-{
-       int sockets = 0;
-       int i;
-       const struct rte_memseg *ms = rte_eal_get_physmem_layout();
-
-       for (i = 0; ((i < RTE_MAX_MEMSEG) && (ms[i].addr != NULL)); i++) {
-               if (sockets < ms[i].socket_id)
-                       sockets = ms[i].socket_id;
-       }
-
-       /* Number of sockets = maximum socket_id + 1 */
-       return ++sockets;
-}
-
 /** Parse integer from integer argument */
 static int
 parse_integer_arg(const char *key __rte_unused,
@@ -386,12 +379,6 @@ scheduler_parse_init_params(struct scheduler_init_params *params,
                                &parse_ordering_arg, params);
                if (ret < 0)
                        goto free_kvlist;
-
-               if (params->def_p.socket_id >= number_of_sockets()) {
-                       CDEV_LOG_ERR("Invalid socket id specified to create "
-                               "the virtual crypto device on");
-                       goto free_kvlist;
-               }
        }
 
 free_kvlist:
@@ -434,8 +421,9 @@ cryptodev_scheduler_probe(struct rte_vdev_device *vdev)
                RTE_LOG(INFO, PMD, "  User defined name = %s\n",
                        init_params.def_p.name);
 
-       return cryptodev_scheduler_create(rte_vdev_device_name(vdev),
-                                         &init_params);
+       return cryptodev_scheduler_create(name,
+                                       vdev,
+                                       &init_params);
 }
 
 static struct rte_vdev_driver cryptodev_scheduler_pmd_drv = {
@@ -450,3 +438,5 @@ RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_SCHEDULER_PMD,
        "max_nb_sessions=<int> "
        "socket_id=<int> "
        "slave=<name>");
+RTE_PMD_REGISTER_CRYPTO_DRIVER(cryptodev_scheduler_pmd_drv,
+               cryptodev_driver_id);