cryptodev: move vdev functions to a separate file

[dpdk.git] / drivers / crypto / openssl / rte_openssl_pmd.c

diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c
index 5046eac..5d29171 100644 (file)
--- a/drivers/crypto/openssl/rte_openssl_pmd.c
+++ b/drivers/crypto/openssl/rte_openssl_pmd.c
@@ -34,6 +34,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>
@@ -44,7 +45,7 @@
 
 #define DES_BLOCK_SIZE 8
 
-static int cryptodev_openssl_remove(const char *name);
+static int cryptodev_openssl_remove(struct rte_vdev_device *vdev);
 
 /*----------------------------------------------------------------------------*/
 
@@ -1264,25 +1265,21 @@ openssl_pmd_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops,
 
 /** Create OPENSSL crypto device */
 static int
-cryptodev_openssl_create(struct rte_crypto_vdev_init_params *init_params)
+cryptodev_openssl_create(const char *name,
+                       struct rte_vdev_device *vdev,
+                       struct rte_crypto_vdev_init_params *init_params)
 {
        struct rte_cryptodev *dev;
        struct openssl_private *internals;
 
-       if (init_params->name[0] == '\0') {
-               int ret = rte_cryptodev_pmd_create_dev_name(
-                               init_params->name,
-                               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD));
+       if (init_params->name[0] == '\0')
+               snprintf(init_params->name, sizeof(init_params->name),
+                               "%s", name);
 
-               if (ret < 0) {
-                       OPENSSL_LOG_ERR("failed to create unique name");
-                       return ret;
-               }
-       }
-
-       dev = rte_cryptodev_pmd_virtual_dev_init(init_params->name,
+       dev = rte_cryptodev_vdev_pmd_init(init_params->name,
                        sizeof(struct openssl_private),
-                       init_params->socket_id);
+                       init_params->socket_id,
+                       vdev);
        if (dev == NULL) {
                OPENSSL_LOG_ERR("failed to create cryptodev vdev");
                goto init_error;
@@ -1312,14 +1309,13 @@ init_error:
        OPENSSL_LOG_ERR("driver %s: cryptodev_openssl_create failed",
                        init_params->name);
 
-       cryptodev_openssl_remove(init_params->name);
+       cryptodev_openssl_remove(vdev);
        return -EFAULT;
 }
 
 /** Initialise OPENSSL crypto device */
 static int
-cryptodev_openssl_probe(const char *name,
-               const char *input_args)
+cryptodev_openssl_probe(struct rte_vdev_device *vdev)
 {
        struct rte_crypto_vdev_init_params init_params = {
                RTE_CRYPTODEV_VDEV_DEFAULT_MAX_NB_QUEUE_PAIRS,
@@ -1327,8 +1323,15 @@ cryptodev_openssl_probe(const char *name,
                rte_socket_id(),
                {0}
        };
+       const char *name;
+       const char *input_args;
 
-       rte_cryptodev_parse_vdev_init_params(&init_params, input_args);
+       name = rte_vdev_device_name(vdev);
+       if (name == NULL)
+               return -EINVAL;
+       input_args = rte_vdev_device_args(vdev);
+
+       rte_cryptodev_vdev_parse_init_params(&init_params, input_args);
 
        RTE_LOG(INFO, PMD, "Initialising %s on NUMA node %d\n", name,
                        init_params.socket_id);
@@ -1340,13 +1343,16 @@ cryptodev_openssl_probe(const char *name,
        RTE_LOG(INFO, PMD, "  Max number of sessions = %d\n",
                        init_params.max_nb_sessions);
 
-       return cryptodev_openssl_create(&init_params);
+       return cryptodev_openssl_create(name, vdev, &init_params);
 }
 
 /** Uninitialise OPENSSL crypto device */
 static int
-cryptodev_openssl_remove(const char *name)
+cryptodev_openssl_remove(struct rte_vdev_device *vdev)
 {
+       const char *name;
+
+       name = rte_vdev_device_name(vdev);
        if (name == NULL)
                return -EINVAL;