crypto/cnxk: add probe and remove

Add probe & remove for cn9k & cn10k crypto PMDs.

Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
Signed-off-by: Anoob Joseph <anoobj@marvell.com>
Signed-off-by: Archana Muniganti <marchana@marvell.com>
Signed-off-by: Tejasree Kondoj <ktejasree@marvell.com>
Acked-by: Akhil Goyal <gakhil@marvell.com>

diff --git a/drivers/crypto/cnxk/cn10k_cryptodev.c b/drivers/crypto/cnxk/cn10k_cryptodev.c
index 4d2140c..a66b777 100644 (file)
--- a/drivers/crypto/cnxk/cn10k_cryptodev.c
+++ b/drivers/crypto/cnxk/cn10k_cryptodev.c
@@ -11,6 +11,8 @@
 #include <rte_pci.h>
 
 #include "cn10k_cryptodev.h"
+#include "cn10k_cryptodev_ops.h"
+#include "cnxk_cryptodev.h"
 #include "roc_api.h"
 
 uint8_t cn10k_cryptodev_driver_id;
@@ -26,11 +28,103 @@ static struct rte_pci_id pci_id_cpt_table[] = {
        },
 };
 
+static int
+cn10k_cpt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+                   struct rte_pci_device *pci_dev)
+{
+       struct rte_cryptodev_pmd_init_params init_params = {
+               .name = "",
+               .socket_id = rte_socket_id(),
+               .private_data_size = sizeof(struct cnxk_cpt_vf)
+       };
+       char name[RTE_CRYPTODEV_NAME_MAX_LEN];
+       struct rte_cryptodev *dev;
+       struct roc_cpt *roc_cpt;
+       struct cnxk_cpt_vf *vf;
+       int rc;
+
+       rc = roc_plt_init();
+       if (rc < 0) {
+               plt_err("Failed to initialize platform model");
+               return rc;
+       }
+
+       rte_pci_device_name(&pci_dev->addr, name, sizeof(name));
+
+       dev = rte_cryptodev_pmd_create(name, &pci_dev->device, &init_params);
+       if (dev == NULL) {
+               rc = -ENODEV;
+               goto exit;
+       }
+
+       /* Get private data space allocated */
+       vf = dev->data->dev_private;
+
+       roc_cpt = &vf->cpt;
+
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+               roc_cpt->pci_dev = pci_dev;
+               rc = roc_cpt_dev_init(roc_cpt);
+               if (rc) {
+                       plt_err("Failed to initialize roc cpt rc=%d", rc);
+                       goto pmd_destroy;
+               }
+
+               rc = cnxk_cpt_eng_grp_add(roc_cpt);
+               if (rc) {
+                       plt_err("Failed to add engine group rc=%d", rc);
+                       goto dev_fini;
+               }
+       }
+
+       dev->dev_ops = &cn10k_cpt_ops;
+       dev->driver_id = cn10k_cryptodev_driver_id;
+
+       return 0;
+
+dev_fini:
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+               roc_cpt_dev_fini(roc_cpt);
+pmd_destroy:
+       rte_cryptodev_pmd_destroy(dev);
+exit:
+       plt_err("Could not create device (vendor_id: 0x%x device_id: 0x%x)",
+               pci_dev->id.vendor_id, pci_dev->id.device_id);
+       return rc;
+}
+
+static int
+cn10k_cpt_pci_remove(struct rte_pci_device *pci_dev)
+{
+       char name[RTE_CRYPTODEV_NAME_MAX_LEN];
+       struct rte_cryptodev *dev;
+       struct cnxk_cpt_vf *vf;
+       int ret;
+
+       if (pci_dev == NULL)
+               return -EINVAL;
+
+       rte_pci_device_name(&pci_dev->addr, name, sizeof(name));
+
+       dev = rte_cryptodev_pmd_get_named_dev(name);
+       if (dev == NULL)
+               return -ENODEV;
+
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+               vf = dev->data->dev_private;
+               ret = roc_cpt_dev_fini(&vf->cpt);
+               if (ret)
+                       return ret;
+       }
+
+       return rte_cryptodev_pmd_destroy(dev);
+}
+
 static struct rte_pci_driver cn10k_cryptodev_pmd = {
        .id_table = pci_id_cpt_table,
        .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_NEED_IOVA_AS_VA,
-       .probe = NULL,
-       .remove = NULL,
+       .probe = cn10k_cpt_pci_probe,
+       .remove = cn10k_cpt_pci_remove,
 };
 
 static struct cryptodev_driver cn10k_cryptodev_drv;

diff --git a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c
new file mode 100644 (file)
index 0000000..6f80f74
--- /dev/null
+++ b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c
@@ -0,0 +1,34 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#include <rte_cryptodev.h>
+#include <rte_cryptodev_pmd.h>
+
+#include "cn10k_cryptodev.h"
+#include "cn10k_cryptodev_ops.h"
+
+struct rte_cryptodev_ops cn10k_cpt_ops = {
+       /* Device control ops */
+       .dev_configure = NULL,
+       .dev_start = NULL,
+       .dev_stop = NULL,
+       .dev_close = NULL,
+       .dev_infos_get = NULL,
+
+       .stats_get = NULL,
+       .stats_reset = NULL,
+       .queue_pair_setup = NULL,
+       .queue_pair_release = NULL,
+
+       /* Symmetric crypto ops */
+       .sym_session_get_size = NULL,
+       .sym_session_configure = NULL,
+       .sym_session_clear = NULL,
+
+       /* Asymmetric crypto ops */
+       .asym_session_get_size = NULL,
+       .asym_session_configure = NULL,
+       .asym_session_clear = NULL,
+
+};

diff --git a/drivers/crypto/cnxk/cn10k_cryptodev_ops.h b/drivers/crypto/cnxk/cn10k_cryptodev_ops.h
new file mode 100644 (file)
index 0000000..24611bf
--- /dev/null
+++ b/drivers/crypto/cnxk/cn10k_cryptodev_ops.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#ifndef _CN10K_CRYPTODEV_OPS_H_
+#define _CN10K_CRYPTODEV_OPS_H_
+
+#include <rte_cryptodev.h>
+#include <rte_cryptodev_pmd.h>
+
+extern struct rte_cryptodev_ops cn10k_cpt_ops;
+
+#endif /* _CN10K_CRYPTODEV_OPS_H_ */

diff --git a/drivers/crypto/cnxk/cn9k_cryptodev.c b/drivers/crypto/cnxk/cn9k_cryptodev.c
index 7654c53..46ad33f 100644 (file)
--- a/drivers/crypto/cnxk/cn9k_cryptodev.c
+++ b/drivers/crypto/cnxk/cn9k_cryptodev.c
@@ -11,6 +11,8 @@
 #include <rte_pci.h>
 
 #include "cn9k_cryptodev.h"
+#include "cn9k_cryptodev_ops.h"
+#include "cnxk_cryptodev.h"
 #include "roc_api.h"
 
 uint8_t cn9k_cryptodev_driver_id;
@@ -24,11 +26,103 @@ static struct rte_pci_id pci_id_cpt_table[] = {
        },
 };
 
+static int
+cn9k_cpt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+                  struct rte_pci_device *pci_dev)
+{
+       struct rte_cryptodev_pmd_init_params init_params = {
+               .name = "",
+               .socket_id = rte_socket_id(),
+               .private_data_size = sizeof(struct cnxk_cpt_vf)
+       };
+       char name[RTE_CRYPTODEV_NAME_MAX_LEN];
+       struct rte_cryptodev *dev;
+       struct roc_cpt *roc_cpt;
+       struct cnxk_cpt_vf *vf;
+       int rc;
+
+       rc = roc_plt_init();
+       if (rc < 0) {
+               plt_err("Failed to initialize platform model");
+               return rc;
+       }
+
+       rte_pci_device_name(&pci_dev->addr, name, sizeof(name));
+
+       dev = rte_cryptodev_pmd_create(name, &pci_dev->device, &init_params);
+       if (dev == NULL) {
+               rc = -ENODEV;
+               goto exit;
+       }
+
+       /* Get private data space allocated */
+       vf = dev->data->dev_private;
+
+       roc_cpt = &vf->cpt;
+
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+               roc_cpt->pci_dev = pci_dev;
+               rc = roc_cpt_dev_init(roc_cpt);
+               if (rc) {
+                       plt_err("Failed to initialize roc cpt rc=%d", rc);
+                       goto pmd_destroy;
+               }
+
+               rc = cnxk_cpt_eng_grp_add(roc_cpt);
+               if (rc) {
+                       plt_err("Failed to add engine group rc=%d", rc);
+                       goto dev_fini;
+               }
+       }
+
+       dev->dev_ops = &cn9k_cpt_ops;
+       dev->driver_id = cn9k_cryptodev_driver_id;
+
+       return 0;
+
+dev_fini:
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+               roc_cpt_dev_fini(roc_cpt);
+pmd_destroy:
+       rte_cryptodev_pmd_destroy(dev);
+exit:
+       plt_err("Could not create device (vendor_id: 0x%x device_id: 0x%x)",
+               pci_dev->id.vendor_id, pci_dev->id.device_id);
+       return rc;
+}
+
+static int
+cn9k_cpt_pci_remove(struct rte_pci_device *pci_dev)
+{
+       char name[RTE_CRYPTODEV_NAME_MAX_LEN];
+       struct rte_cryptodev *dev;
+       struct cnxk_cpt_vf *vf;
+       int ret;
+
+       if (pci_dev == NULL)
+               return -EINVAL;
+
+       rte_pci_device_name(&pci_dev->addr, name, sizeof(name));
+
+       dev = rte_cryptodev_pmd_get_named_dev(name);
+       if (dev == NULL)
+               return -ENODEV;
+
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+               vf = dev->data->dev_private;
+               ret = roc_cpt_dev_fini(&vf->cpt);
+               if (ret)
+                       return ret;
+       }
+
+       return rte_cryptodev_pmd_destroy(dev);
+}
+
 static struct rte_pci_driver cn9k_cryptodev_pmd = {
        .id_table = pci_id_cpt_table,
        .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_NEED_IOVA_AS_VA,
-       .probe = NULL,
-       .remove = NULL,
+       .probe = cn9k_cpt_pci_probe,
+       .remove = cn9k_cpt_pci_remove,
 };
 
 static struct cryptodev_driver cn9k_cryptodev_drv;

diff --git a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c
new file mode 100644 (file)
index 0000000..51f9845
--- /dev/null
+++ b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c
@@ -0,0 +1,34 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#include <rte_cryptodev.h>
+#include <rte_cryptodev_pmd.h>
+
+#include "cn9k_cryptodev.h"
+#include "cn9k_cryptodev_ops.h"
+
+struct rte_cryptodev_ops cn9k_cpt_ops = {
+       /* Device control ops */
+       .dev_configure = NULL,
+       .dev_start = NULL,
+       .dev_stop = NULL,
+       .dev_close = NULL,
+       .dev_infos_get = NULL,
+
+       .stats_get = NULL,
+       .stats_reset = NULL,
+       .queue_pair_setup = NULL,
+       .queue_pair_release = NULL,
+
+       /* Symmetric crypto ops */
+       .sym_session_get_size = NULL,
+       .sym_session_configure = NULL,
+       .sym_session_clear = NULL,
+
+       /* Asymmetric crypto ops */
+       .asym_session_get_size = NULL,
+       .asym_session_configure = NULL,
+       .asym_session_clear = NULL,
+
+};

diff --git a/drivers/crypto/cnxk/cn9k_cryptodev_ops.h b/drivers/crypto/cnxk/cn9k_cryptodev_ops.h
new file mode 100644 (file)
index 0000000..72fc297
--- /dev/null
+++ b/drivers/crypto/cnxk/cn9k_cryptodev_ops.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#ifndef _CN9K_CRYPTODEV_OPS_H_
+#define _CN9K_CRYPTODEV_OPS_H_
+
+#include <rte_cryptodev_pmd.h>
+
+extern struct rte_cryptodev_ops cn9k_cpt_ops;
+
+#endif /* _CN9K_CRYPTODEV_OPS_H_ */

diff --git a/drivers/crypto/cnxk/cnxk_cryptodev.c b/drivers/crypto/cnxk/cnxk_cryptodev.c
new file mode 100644 (file)
index 0000000..0ffe9d0
--- /dev/null
+++ b/drivers/crypto/cnxk/cnxk_cryptodev.c
@@ -0,0 +1,33 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#include "roc_cpt.h"
+
+#include "cnxk_cryptodev.h"
+
+int
+cnxk_cpt_eng_grp_add(struct roc_cpt *roc_cpt)
+{
+       int ret;
+
+       ret = roc_cpt_eng_grp_add(roc_cpt, CPT_ENG_TYPE_SE);
+       if (ret < 0) {
+               plt_err("Could not add CPT SE engines");
+               return -ENOTSUP;
+       }
+
+       ret = roc_cpt_eng_grp_add(roc_cpt, CPT_ENG_TYPE_IE);
+       if (ret < 0) {
+               plt_err("Could not add CPT IE engines");
+               return -ENOTSUP;
+       }
+
+       ret = roc_cpt_eng_grp_add(roc_cpt, CPT_ENG_TYPE_AE);
+       if (ret < 0) {
+               plt_err("Could not add CPT AE engines");
+               return -ENOTSUP;
+       }
+
+       return 0;
+}

diff --git a/drivers/crypto/cnxk/cnxk_cryptodev.h b/drivers/crypto/cnxk/cnxk_cryptodev.h
new file mode 100644 (file)
index 0000000..5b84f0b
--- /dev/null
+++ b/drivers/crypto/cnxk/cnxk_cryptodev.h
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#ifndef _CNXK_CRYPTODEV_H_
+#define _CNXK_CRYPTODEV_H_
+
+#include <rte_cryptodev.h>
+
+#include "roc_cpt.h"
+
+/**
+ * Device private data
+ */
+struct cnxk_cpt_vf {
+       struct roc_cpt cpt;
+};
+
+int cnxk_cpt_eng_grp_add(struct roc_cpt *roc_cpt);
+
+#endif /* _CNXK_CRYPTODEV_H_ */

diff --git a/drivers/crypto/cnxk/meson.build b/drivers/crypto/cnxk/meson.build
index 197b94c..4150ae6 100644 (file)
--- a/drivers/crypto/cnxk/meson.build
+++ b/drivers/crypto/cnxk/meson.build
@@ -10,7 +10,10 @@ endif
 
 sources = files(
         'cn9k_cryptodev.c',
+        'cn9k_cryptodev_ops.c',
         'cn10k_cryptodev.c',
+        'cn10k_cryptodev_ops.c',
+        'cnxk_cryptodev.c',
 )
 
 deps += ['bus_pci', 'common_cnxk']