The driver has macro and logtype but not used in a couple places.
Also, remove extraneous newlines.
Fixes: af7c9b5e9ce7 ("crypto/caam_jr: introduce basic driver")
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
drivers/crypto/caam_jr/caam_jr.c | 46 +++++++++++++---------------
drivers/crypto/caam_jr/caam_jr_log.h | 12 ++++----
drivers/crypto/caam_jr/caam_jr_uio.c | 4 +--
3 files changed, 29 insertions(+), 33 deletions(-)
diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c
index b55258689b49..d3b42d8e1b91 100644
--- a/drivers/crypto/caam_jr/caam_jr.c
+++ b/drivers/crypto/caam_jr/caam_jr.c
@@ -123,10 +123,8 @@ void caam_jr_stats_get(struct rte_cryptodev *dev,
stats->dequeued_count += qp[i]->rx_pkts;
stats->enqueue_err_count += qp[i]->tx_errs;
stats->dequeue_err_count += qp[i]->rx_errs;
- CAAM_JR_INFO("extra stats:\n\tRX Poll ERR = %" PRIu64
- "\n\tTX Ring Full = %" PRIu64,
- qp[i]->rx_poll_err,
- qp[i]->tx_ring_full);
+ CAAM_JR_INFO("extra stats: RX Poll ERR = %" PRIu64 "TX Ring
Full = %" PRIu64,
+ qp[i]->rx_poll_err, qp[i]->tx_ring_full);
}
}
@@ -309,7 +307,7 @@ caam_jr_prep_cdb(struct caam_jr_session *ses)
cdb = caam_jr_dma_mem_alloc(L1_CACHE_BYTES, sizeof(struct sec_cdb));
if (!cdb) {
- CAAM_JR_ERR("failed to allocate memory for cdb\n");
+ CAAM_JR_ERR("failed to allocate memory for cdb");
return -1;
}
@@ -606,7 +604,7 @@ hw_poll_job_ring(struct sec_job_ring_t *job_ring,
/*TODO for multiple ops, packets*/
ctx = container_of(current_desc, struct caam_jr_op_ctx, jobdes);
if (unlikely(sec_error_code)) {
- CAAM_JR_ERR("desc at cidx %d generated error 0x%x\n",
+ CAAM_JR_ERR("desc at cidx %d generated error 0x%x",
job_ring->cidx, sec_error_code);
hw_handle_job_ring_error(job_ring, sec_error_code);
//todo improve with exact errors
@@ -1368,7 +1366,7 @@ caam_jr_enqueue_op(struct rte_crypto_op *op, struct
caam_jr_qp *qp)
}
if (unlikely(!ses->qp || ses->qp != qp)) {
- CAAM_JR_DP_DEBUG("Old:sess->qp=%p New qp = %p\n", ses->qp, qp);
+ CAAM_JR_DP_DEBUG("Old:sess->qp=%p New qp = %p", ses->qp, qp);
ses->qp = qp;
caam_jr_prep_cdb(ses);
}
@@ -1554,7 +1552,7 @@ caam_jr_cipher_init(struct rte_cryptodev *dev
__rte_unused,
session->cipher_key.data = rte_zmalloc(NULL, xform->cipher.key.length,
RTE_CACHE_LINE_SIZE);
if (session->cipher_key.data == NULL && xform->cipher.key.length > 0) {
- CAAM_JR_ERR("No Memory for cipher key\n");
+ CAAM_JR_ERR("No Memory for cipher key");
return -ENOMEM;
}
session->cipher_key.length = xform->cipher.key.length;
@@ -1576,7 +1574,7 @@ caam_jr_auth_init(struct rte_cryptodev *dev __rte_unused,
session->auth_key.data = rte_zmalloc(NULL, xform->auth.key.length,
RTE_CACHE_LINE_SIZE);
if (session->auth_key.data == NULL && xform->auth.key.length > 0) {
- CAAM_JR_ERR("No Memory for auth key\n");
+ CAAM_JR_ERR("No Memory for auth key");
return -ENOMEM;
}
session->auth_key.length = xform->auth.key.length;
@@ -1602,7 +1600,7 @@ caam_jr_aead_init(struct rte_cryptodev *dev __rte_unused,
session->aead_key.data = rte_zmalloc(NULL, xform->aead.key.length,
RTE_CACHE_LINE_SIZE);
if (session->aead_key.data == NULL && xform->aead.key.length > 0) {
- CAAM_JR_ERR("No Memory for aead key\n");
+ CAAM_JR_ERR("No Memory for aead key");
return -ENOMEM;
}
session->aead_key.length = xform->aead.key.length;
@@ -1755,7 +1753,7 @@ caam_jr_set_ipsec_session(__rte_unused struct
rte_cryptodev *dev,
RTE_CACHE_LINE_SIZE);
if (session->cipher_key.data == NULL &&
cipher_xform->key.length > 0) {
- CAAM_JR_ERR("No Memory for cipher key\n");
+ CAAM_JR_ERR("No Memory for cipher key");
return -ENOMEM;
}
@@ -1765,7 +1763,7 @@ caam_jr_set_ipsec_session(__rte_unused struct
rte_cryptodev *dev,
RTE_CACHE_LINE_SIZE);
if (session->auth_key.data == NULL &&
auth_xform->key.length > 0) {
- CAAM_JR_ERR("No Memory for auth key\n");
+ CAAM_JR_ERR("No Memory for auth key");
rte_free(session->cipher_key.data);
return -ENOMEM;
}
@@ -1810,11 +1808,11 @@ caam_jr_set_ipsec_session(__rte_unused struct
rte_cryptodev *dev,
case RTE_CRYPTO_AUTH_KASUMI_F9:
case RTE_CRYPTO_AUTH_AES_CBC_MAC:
case RTE_CRYPTO_AUTH_ZUC_EIA3:
- CAAM_JR_ERR("Crypto: Unsupported auth alg %u\n",
+ CAAM_JR_ERR("Crypto: Unsupported auth alg %u",
auth_xform->algo);
goto out;
default:
- CAAM_JR_ERR("Crypto: Undefined Auth specified %u\n",
+ CAAM_JR_ERR("Crypto: Undefined Auth specified %u",
auth_xform->algo);
goto out;
}
@@ -1834,11 +1832,11 @@ caam_jr_set_ipsec_session(__rte_unused struct
rte_cryptodev *dev,
case RTE_CRYPTO_CIPHER_3DES_ECB:
case RTE_CRYPTO_CIPHER_AES_ECB:
case RTE_CRYPTO_CIPHER_KASUMI_F8:
- CAAM_JR_ERR("Crypto: Unsupported Cipher alg %u\n",
+ CAAM_JR_ERR("Crypto: Unsupported Cipher alg %u",
cipher_xform->algo);
goto out;
default:
- CAAM_JR_ERR("Crypto: Undefined Cipher specified %u\n",
+ CAAM_JR_ERR("Crypto: Undefined Cipher specified %u",
cipher_xform->algo);
goto out;
}
@@ -1962,7 +1960,7 @@ caam_jr_dev_configure(struct rte_cryptodev *dev,
NULL, NULL, NULL, NULL,
SOCKET_ID_ANY, 0);
if (!internals->ctx_pool) {
- CAAM_JR_ERR("%s create failed\n", str);
+ CAAM_JR_ERR("%s create failed", str);
return -ENOMEM;
}
} else
@@ -2180,7 +2178,7 @@ init_job_ring(void *reg_base_addr, int irq_id)
}
}
if (job_ring == NULL) {
- CAAM_JR_ERR("No free job ring\n");
+ CAAM_JR_ERR("No free job ring");
return NULL;
}
@@ -2301,7 +2299,7 @@ caam_jr_dev_init(const char *name,
job_ring->uio_fd);
if (!dev->data->dev_private) {
- CAAM_JR_ERR("Ring memory allocation failed\n");
+ CAAM_JR_ERR("Ring memory allocation failed");
goto cleanup2;
}
@@ -2334,7 +2332,7 @@ caam_jr_dev_init(const char *name,
security_instance = rte_malloc("caam_jr",
sizeof(struct rte_security_ctx), 0);
if (security_instance == NULL) {
- CAAM_JR_ERR("memory allocation failed\n");
+ CAAM_JR_ERR("memory allocation failed");
//todo error handling.
goto cleanup2;
}
@@ -2346,7 +2344,7 @@ caam_jr_dev_init(const char *name,
rte_cryptodev_pmd_probing_finish(dev);
- RTE_LOG(INFO, PMD, "%s cryptodev init\n", dev->data->name);
+ CAAM_JR_INFO("%s cryptodev init", dev->data->name);
return 0;
@@ -2386,8 +2384,7 @@ cryptodev_caam_jr_probe(struct rte_vdev_device *vdev)
ret = of_init();
if (ret) {
- RTE_LOG(ERR, PMD,
- "of_init failed\n");
+ CAAM_JR_ERR("of_init failed");
return -EINVAL;
}
/* if sec device version is not configured */
@@ -2407,8 +2404,7 @@ cryptodev_caam_jr_probe(struct rte_vdev_device *vdev)
}
#ifdef RTE_LIBRTE_PMD_CAAM_JR_BE
if (rta_get_sec_era() > RTA_SEC_ERA_8) {
- RTE_LOG(ERR, PMD,
- "CAAM is compiled in BE mode for device with sec era > 8???\n");
+ CAAM_JR_ERR("CAAM is compiled in BE mode for device with sec
era > 8???");
return -EINVAL;
}
#endif
diff --git a/drivers/crypto/caam_jr/caam_jr_log.h
b/drivers/crypto/caam_jr/caam_jr_log.h
index 8f6aa50e2a4a..3d32b75e3a01 100644
--- a/drivers/crypto/caam_jr/caam_jr_log.h
+++ b/drivers/crypto/caam_jr/caam_jr_log.h
@@ -10,13 +10,13 @@
extern int caam_jr_logtype;
#define RTE_LOGTYPE_CAAM_JR caam_jr_logtype
-#define CAAM_JR_LOG(level, fmt, args...) \
- rte_log(RTE_LOG_ ## level, caam_jr_logtype, "caam_jr: " \
- fmt "\n", ##args)
+#define CAAM_JR_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, caam_jr_logtype, \
+ "caam_jr: " fmt "\n", ##args)
-#define CAAM_JR_DEBUG(fmt, args...) \
- rte_log(RTE_LOG_DEBUG, caam_jr_logtype, "caam_jr: %s(): " \
- fmt "\n", __func__, ##args)
+#define CAAM_JR_DEBUG(fmt, args...) \
+ rte_log(RTE_LOG_DEBUG, caam_jr_logtype, \
+ "caam_jr: %s(): " fmt "\n", __func__, ##args)
#define PMD_INIT_FUNC_TRACE() CAAM_JR_DEBUG(" >>")
diff --git a/drivers/crypto/caam_jr/caam_jr_uio.c
b/drivers/crypto/caam_jr/caam_jr_uio.c
index 583ba3b523af..4d9acfbe9196 100644
--- a/drivers/crypto/caam_jr/caam_jr_uio.c
+++ b/drivers/crypto/caam_jr/caam_jr_uio.c
@@ -338,7 +338,7 @@ free_job_ring(int uio_fd)
}
if (job_ring == NULL) {
- CAAM_JR_ERR("JR not available for fd = %x\n", uio_fd);
+ CAAM_JR_ERR("JR not available for fd = %x", uio_fd);
return;
}
@@ -441,7 +441,7 @@ sec_configure(void)
dir->d_name, "name", uio_name);
CAAM_JR_INFO("sec device uio name: %s", uio_name);
if (ret != 0) {
- CAAM_JR_ERR("file_read_first_line failed\n");
+ CAAM_JR_ERR("file_read_first_line failed");
closedir(d);
return -1;
}
--
2.43.0
