cryptodev: move vdev functions to a separate file

[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 0b63c20..fefd6cc 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>
@@ -89,7 +90,8 @@ 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)
 {
        struct rte_cryptodev *dev;
        struct scheduler_ctx *sched_ctx;
@@ -101,9 +103,10 @@ cryptodev_scheduler_create(const char *name,
                                sizeof(init_params->def_p.name),
                                "%s", name);
 
-       dev = rte_cryptodev_pmd_virtual_dev_init(init_params->def_p.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);
@@ -219,22 +222,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,
@@ -390,12 +377,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:
@@ -439,6 +420,7 @@ cryptodev_scheduler_probe(struct rte_vdev_device *vdev)
                        init_params.def_p.name);
 
        return cryptodev_scheduler_create(name,
+                                       vdev,
                                        &init_params);
 }