git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
event/octeontx2: fix crypto adapter queue pair operations
[dpdk.git]
/
drivers
/
crypto
/
octeontx
/
otx_cryptodev.c
diff --git
a/drivers/crypto/octeontx/otx_cryptodev.c
b/drivers/crypto/octeontx/otx_cryptodev.c
index
b201e0a
..
5ce1cf8
100644
(file)
--- a/
drivers/crypto/octeontx/otx_cryptodev.c
+++ b/
drivers/crypto/octeontx/otx_cryptodev.c
@@
-9,13
+9,12
@@
#include <rte_log.h>
#include <rte_pci.h>
#include <rte_log.h>
#include <rte_pci.h>
-/* CPT common headers */
-#include "cpt_pmd_logs.h"
-
#include "otx_cryptodev.h"
#include "otx_cryptodev_ops.h"
#include "otx_cryptodev.h"
#include "otx_cryptodev_ops.h"
-static int otx_cryptodev_logtype;
+#include "cpt_pmd_logs.h"
+
+uint8_t otx_cryptodev_driver_id;
static struct rte_pci_id pci_id_cpt_table[] = {
{
static struct rte_pci_id pci_id_cpt_table[] = {
{
@@
-27,12
+26,6
@@
static struct rte_pci_id pci_id_cpt_table[] = {
},
};
},
};
-static void
-otx_cpt_logtype_init(void)
-{
- cpt_logtype = otx_cryptodev_logtype;
-}
-
static int
otx_cpt_pci_probe(struct rte_pci_driver *pci_drv,
struct rte_pci_device *pci_dev)
static int
otx_cpt_pci_probe(struct rte_pci_driver *pci_drv,
struct rte_pci_device *pci_dev)
@@
-57,9
+50,6
@@
otx_cpt_pci_probe(struct rte_pci_driver *pci_drv,
/* init user callbacks */
TAILQ_INIT(&(cryptodev->link_intr_cbs));
/* init user callbacks */
TAILQ_INIT(&(cryptodev->link_intr_cbs));
- /* init logtype used in common */
- otx_cpt_logtype_init();
-
/* Invoke PMD device initialization function */
retval = otx_cpt_dev_create(cryptodev);
if (retval == 0)
/* Invoke PMD device initialization function */
retval = otx_cpt_dev_create(cryptodev);
if (retval == 0)
@@
-104,9
+94,6
@@
otx_cpt_pci_remove(struct rte_pci_device *pci_dev)
cryptodev->device = NULL;
cryptodev->data = NULL;
cryptodev->device = NULL;
cryptodev->data = NULL;
- /* free metapool memory */
- cleanup_global_resources();
-
return 0;
}
return 0;
}
@@
-121,13
+108,7
@@
static struct cryptodev_driver otx_cryptodev_drv;
RTE_PMD_REGISTER_PCI(CRYPTODEV_NAME_OCTEONTX_PMD, otx_cryptodev_pmd);
RTE_PMD_REGISTER_PCI_TABLE(CRYPTODEV_NAME_OCTEONTX_PMD, pci_id_cpt_table);
RTE_PMD_REGISTER_PCI(CRYPTODEV_NAME_OCTEONTX_PMD, otx_cryptodev_pmd);
RTE_PMD_REGISTER_PCI_TABLE(CRYPTODEV_NAME_OCTEONTX_PMD, pci_id_cpt_table);
+RTE_PMD_REGISTER_KMOD_DEP(CRYPTODEV_NAME_OCTEONTX_PMD, "vfio-pci");
RTE_PMD_REGISTER_CRYPTO_DRIVER(otx_cryptodev_drv, otx_cryptodev_pmd.driver,
otx_cryptodev_driver_id);
RTE_PMD_REGISTER_CRYPTO_DRIVER(otx_cryptodev_drv, otx_cryptodev_pmd.driver,
otx_cryptodev_driver_id);
-
-RTE_INIT(otx_cpt_init_log)
-{
- /* Bus level logs */
- otx_cryptodev_logtype = rte_log_register("pmd.crypto.octeontx");
- if (otx_cryptodev_logtype >= 0)
- rte_log_set_level(otx_cryptodev_logtype, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(otx_cpt_logtype, pmd.crypto.octeontx, NOTICE);