Register a logtype for this bus driver and stop logging as CRYPTODEV.
Signed-off-by: David Marchand <david.march...@redhat.com>
---
drivers/crypto/ccp/ccp_crypto.c | 4 ++--
drivers/crypto/ccp/ccp_pmd_private.h | 15 +++++----------
drivers/crypto/ccp/rte_ccp_pmd.c | 2 ++
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/drivers/crypto/ccp/ccp_crypto.c b/drivers/crypto/ccp/ccp_crypto.c
index 4b84b3303e..5899d83bae 100644
--- a/drivers/crypto/ccp/ccp_crypto.c
+++ b/drivers/crypto/ccp/ccp_crypto.c
@@ -1829,7 +1829,7 @@ ccp_perform_sha3_hmac(struct rte_crypto_op *op,
append_ptr = (uint8_t *)rte_pktmbuf_append(op->sym->m_src,
session->auth.ctx_len);
if (!append_ptr) {
- CCP_LOG_ERR("CCP MBUF append failed\n");
+ CCP_LOG_ERR("CCP MBUF append failed");
return -1;
}
dest_addr = (phys_addr_t)rte_mem_virt2iova((void *)append_ptr);
@@ -1966,7 +1966,7 @@ ccp_perform_sha3(struct rte_crypto_op *op,
append_ptr = (uint8_t *)rte_pktmbuf_append(op->sym->m_src,
session->auth.ctx_len);
if (!append_ptr) {
- CCP_LOG_ERR("CCP MBUF append failed\n");
+ CCP_LOG_ERR("CCP MBUF append failed");
return -1;
}
dest_addr = (phys_addr_t)rte_mem_virt2iova((void *)append_ptr);
diff --git a/drivers/crypto/ccp/ccp_pmd_private.h
b/drivers/crypto/ccp/ccp_pmd_private.h
index 390442ff19..94c8fec46d 100644
--- a/drivers/crypto/ccp/ccp_pmd_private.h
+++ b/drivers/crypto/ccp/ccp_pmd_private.h
@@ -8,23 +8,18 @@
#include <rte_cryptodev.h>
#include "ccp_crypto.h"
-#define CRYPTODEV_NAME_CCP_PMD crypto_ccp
+extern int crypto_ccp_logtype;
+#define RTE_LOGTYPE_CRYPTO_CCP crypto_ccp_logtype
#define CCP_LOG_ERR(fmt, args...) \
- RTE_LOG(ERR, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \
- RTE_STR(CRYPTODEV_NAME_CCP_PMD), \
- __func__, __LINE__, ## args)
+ RTE_LOG_LINE(ERR, CRYPTO_CCP, "%s() line %u: " fmt, __func__, __LINE__,
## args)
#ifdef RTE_LIBRTE_CCP_DEBUG
#define CCP_LOG_INFO(fmt, args...) \
- RTE_LOG(INFO, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \
- RTE_STR(CRYPTODEV_NAME_CCP_PMD), \
- __func__, __LINE__, ## args)
+ RTE_LOG_LINE(INFO, CRYPTO_CCP, "%s() line %u: " fmt, __func__,
__LINE__, ## args)
#define CCP_LOG_DBG(fmt, args...) \
- RTE_LOG(DEBUG, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \
- RTE_STR(CRYPTODEV_NAME_CCP_PMD), \
- __func__, __LINE__, ## args)
+ RTE_LOG_LINE(DEBUG, CRYPTO_CCP, "%s() line %u: " fmt, __func__,
__LINE__, ## args)
#else
#define CCP_LOG_INFO(fmt, args...)
#define CCP_LOG_DBG(fmt, args...)
diff --git a/drivers/crypto/ccp/rte_ccp_pmd.c b/drivers/crypto/ccp/rte_ccp_pmd.c
index 869399597e..022c1df182 100644
--- a/drivers/crypto/ccp/rte_ccp_pmd.c
+++ b/drivers/crypto/ccp/rte_ccp_pmd.c
@@ -22,6 +22,7 @@
static unsigned int ccp_pmd_init_done;
uint8_t ccp_cryptodev_driver_id;
uint8_t cryptodev_cnt;
+int crypto_ccp_logtype;
struct ccp_pmd_init_params {
struct rte_cryptodev_pmd_init_params def_p;
@@ -320,3 +321,4 @@ RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_CCP_PMD,
"ccp_auth_opt=<int>");
RTE_PMD_REGISTER_CRYPTO_DRIVER(ccp_crypto_drv, cryptodev_ccp_pmd_drv.driver,
ccp_cryptodev_driver_id);
+RTE_LOG_REGISTER_DEFAULT(crypto_ccp_logtype, NOTICE);
--
2.45.2
