* [PATCH 1/2] drivers: replace printf with log macros
@ 2023-02-15 10:29 Hemant Agrawal
2023-02-15 10:29 ` [PATCH 2/2] drivers: replace printf with fprintf for debug functions Hemant Agrawal
0 siblings, 1 reply; 5+ messages in thread
From: Hemant Agrawal @ 2023-02-15 10:29 UTC (permalink / raw)
To: dev, thomas
This patch replaces the printf with related log macros and functions at
various places in NXP dpaaX drivers.
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
drivers/bus/dpaa/base/fman/fman.c | 8 +++----
drivers/bus/dpaa/base/qbman/process.c | 29 +++++++++++++-------------
drivers/bus/dpaa/base/qbman/qman.c | 2 +-
drivers/bus/fslmc/fslmc_vfio.c | 2 +-
drivers/bus/fslmc/qbman/qbman_portal.c | 2 +-
drivers/crypto/caam_jr/caam_jr.c | 2 +-
drivers/crypto/caam_jr/caam_jr_uio.c | 2 +-
drivers/net/dpaa/dpaa_ethdev.c | 6 +++---
drivers/net/dpaa/dpaa_flow.c | 8 +++----
drivers/net/dpaa/dpaa_rxtx.c | 2 +-
drivers/net/dpaa2/dpaa2_ethdev.c | 2 +-
drivers/net/dpaa2/dpaa2_tm.c | 10 ++++-----
12 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/drivers/bus/dpaa/base/fman/fman.c b/drivers/bus/dpaa/base/fman/fman.c
index 1814372a40..2fc1e64f36 100644
--- a/drivers/bus/dpaa/base/fman/fman.c
+++ b/drivers/bus/dpaa/base/fman/fman.c
@@ -425,7 +425,7 @@ fman_if_init(const struct device_node *dpa_node)
char_prop = of_get_property(mac_node, "phy-connection-type",
NULL);
if (!char_prop) {
- printf("memac: unknown MII type assuming 1G\n");
+ FMAN_ERR(-EINVAL, "memac: unknown MII type assuming 1G\n");
/* Right now forcing memac to 1g in case of error*/
__if->__if.mac_type = fman_mac_1g;
} else {
@@ -723,10 +723,8 @@ fman_finish(void)
/* release the mapping */
_errno = munmap(__if->ccsr_map, __if->regs_size);
if (unlikely(_errno < 0))
- fprintf(stderr, "%s:%d:%s(): munmap() = %d (%s)\n",
- __FILE__, __LINE__, __func__,
- -errno, strerror(errno));
- printf("Tearing down %s\n", __if->node_path);
+ FMAN_ERR(_errno, "munmap() = (%s)\n", strerror(errno));
+ DPAA_BUS_INFO("Tearing down %s\n", __if->node_path);
list_del(&__if->__if.node);
rte_free(__if);
}
diff --git a/drivers/bus/dpaa/base/qbman/process.c b/drivers/bus/dpaa/base/qbman/process.c
index 3504ec97db..af1e459641 100644
--- a/drivers/bus/dpaa/base/qbman/process.c
+++ b/drivers/bus/dpaa/base/qbman/process.c
@@ -13,6 +13,7 @@
#include "process.h"
#include <fsl_usd.h>
+#include "rte_dpaa_logs.h"
/* As higher-level drivers will be built on top of this (dma_mem, qbman, ...),
* it's preferable that the process driver itself not provide any exported API.
@@ -99,12 +100,12 @@ void process_release(enum dpaa_id_type id_type, uint32_t base, uint32_t num)
int ret = check_fd();
if (ret) {
- fprintf(stderr, "Process FD failure\n");
+ DPAA_BUS_ERR("Process FD failure\n");
return;
}
ret = ioctl(fd, DPAA_IOCTL_ID_RELEASE, &id);
if (ret)
- fprintf(stderr, "Process FD ioctl failure type %d base 0x%x num %d\n",
+ DPAA_BUS_ERR("Process FD ioctl failure type %d base 0x%x num %d\n",
id_type, base, num);
}
@@ -333,9 +334,9 @@ int dpaa_intr_disable(char *if_name)
ret = ioctl(fd, DPAA_IOCTL_DISABLE_LINK_STATUS_INTERRUPT, if_name);
if (ret) {
if (errno == EINVAL)
- printf("Failed to disable interrupt: Not Supported\n");
+ DPAA_BUS_ERR("Failed to disable interrupt: Not Supported\n");
else
- printf("Failed to disable interrupt\n");
+ DPAA_BUS_ERR("Failed to disable interrupt\n");
return ret;
}
@@ -357,7 +358,7 @@ int dpaa_get_ioctl_version_number(void)
if (errno == EINVAL) {
version_num = 1;
} else {
- printf("Failed to get ioctl version number\n");
+ DPAA_BUS_ERR("Failed to get ioctl version number\n");
version_num = -1;
}
}
@@ -388,7 +389,7 @@ int dpaa_get_link_status(char *if_name, struct rte_eth_link *link)
ret = ioctl(fd, DPAA_IOCTL_GET_LINK_STATUS, &args);
if (ret) {
- printf("Failed to get link status\n");
+ DPAA_BUS_ERR("Failed to get link status\n");
return ret;
}
@@ -404,9 +405,9 @@ int dpaa_get_link_status(char *if_name, struct rte_eth_link *link)
ret = ioctl(fd, DPAA_IOCTL_GET_LINK_STATUS_OLD, &args);
if (ret) {
if (errno == EINVAL)
- printf("Get link status: Not Supported\n");
+ DPAA_BUS_ERR("Get link status: Not Supported\n");
else
- printf("Failed to get link status\n");
+ DPAA_BUS_ERR("Failed to get link status\n");
return ret;
}
@@ -434,9 +435,9 @@ int dpaa_update_link_status(char *if_name, int link_status)
ret = ioctl(fd, DPAA_IOCTL_UPDATE_LINK_STATUS, &args);
if (ret) {
if (errno == EINVAL)
- printf("Failed to set link status: Not Supported\n");
+ DPAA_BUS_ERR("Failed to set link status: Not Supported\n");
else
- printf("Failed to set link status");
+ DPAA_BUS_ERR("Failed to set link status");
return ret;
}
@@ -462,9 +463,9 @@ int dpaa_update_link_speed(char *if_name, int link_speed, int link_duplex)
ret = ioctl(fd, DPAA_IOCTL_UPDATE_LINK_SPEED, &args);
if (ret) {
if (errno == EINVAL)
- printf("Failed to set link speed: Not Supported\n");
+ DPAA_BUS_ERR("Failed to set link speed: Not Supported\n");
else
- printf("Failed to set link speed\n");
+ DPAA_BUS_ERR("Failed to set link speed\n");
return ret;
}
@@ -484,9 +485,9 @@ int dpaa_restart_link_autoneg(char *if_name)
ret = ioctl(fd, DPAA_IOCTL_RESTART_LINK_AUTONEG, if_name);
if (ret) {
if (errno == EINVAL)
- printf("Failed to restart autoneg: Not Supported\n");
+ DPAA_BUS_ERR("Failed to restart autoneg: Not Supported\n");
else
- printf("Failed to restart autoneg\n");
+ DPAA_BUS_ERR("Failed to restart autoneg\n");
return ret;
}
diff --git a/drivers/bus/dpaa/base/qbman/qman.c b/drivers/bus/dpaa/base/qbman/qman.c
index 3949bf8712..95c796c4b8 100644
--- a/drivers/bus/dpaa/base/qbman/qman.c
+++ b/drivers/bus/dpaa/base/qbman/qman.c
@@ -818,7 +818,7 @@ qman_ern_poll_free(void)
fd = &swapped_msg.ern.fd;
if (unlikely(verb & 0x20)) {
- printf("HW ERN notification, Nothing to do\n");
+ pr_warn("HW ERN notification, Nothing to do\n");
} else {
if ((fd->bpid & 0xff) != 0xff)
qman_free_mbuf_cb(fd);
diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
index 5966776a85..da0669d554 100644
--- a/drivers/bus/fslmc/fslmc_vfio.c
+++ b/drivers/bus/fslmc/fslmc_vfio.c
@@ -395,7 +395,7 @@ rte_fslmc_vfio_mem_dmamap(uint64_t vaddr, uint64_t iova, uint64_t size)
ret = ioctl(group->container->fd, VFIO_IOMMU_MAP_DMA,
&dma_map);
if (ret) {
- printf("Unable to map DMA address (errno = %d)\n",
+ DPAA2_BUS_ERR("Unable to map DMA address (errno = %d)\n",
errno);
return ret;
}
diff --git a/drivers/bus/fslmc/qbman/qbman_portal.c b/drivers/bus/fslmc/qbman/qbman_portal.c
index 3a7579c8a7..1f24cdce7e 100644
--- a/drivers/bus/fslmc/qbman/qbman_portal.c
+++ b/drivers/bus/fslmc/qbman/qbman_portal.c
@@ -1879,7 +1879,7 @@ void qbman_pull_desc_set_rad(struct qbman_pull_desc *d, int rad)
else
d->pull.verb &= ~(1 << QB_VDQCR_VERB_RAD_SHIFT);
} else {
- printf("The RAD feature is not valid when RLS = 0\n");
+ pr_warn("The RAD feature is not valid when RLS = 0\n");
}
}
diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c
index b55258689b..9373cee57d 100644
--- a/drivers/crypto/caam_jr/caam_jr.c
+++ b/drivers/crypto/caam_jr/caam_jr.c
@@ -587,7 +587,7 @@ hw_poll_job_ring(struct sec_job_ring_t *job_ring,
/* todo check if it is false alarm no desc present */
if (!current_desc_addr) {
false_alarm++;
- printf("false alarm %" PRIu64 "real %" PRIu64
+ CAAM_JR_ERR("false alarm %" PRIu64 "real %" PRIu64
" sec_err =0x%x cidx Index =0%d\n",
false_alarm, real_poll,
sec_error_code, job_ring->cidx);
diff --git a/drivers/crypto/caam_jr/caam_jr_uio.c b/drivers/crypto/caam_jr/caam_jr_uio.c
index 583ba3b523..586beceb14 100644
--- a/drivers/crypto/caam_jr/caam_jr_uio.c
+++ b/drivers/crypto/caam_jr/caam_jr_uio.c
@@ -418,7 +418,7 @@ sec_configure(void)
d = opendir(SEC_UIO_DEVICE_SYS_ATTR_PATH);
if (d == NULL) {
- printf("\nError opening directory '%s': %s\n",
+ CAAM_JR_ERR("Error opening directory '%s': %s\n",
SEC_UIO_DEVICE_SYS_ATTR_PATH, strerror(errno));
return -1;
}
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index a6c86113d1..59bcebd62f 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -282,9 +282,9 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev)
dpaa_interrupt_handler,
(void *)dev);
if (ret == EINVAL)
- printf("Failed to enable interrupt: Not Supported\n");
+ DPAA_PMD_ERR("Failed to enable interrupt: Not Supported\n");
else
- printf("Failed to enable interrupt\n");
+ DPAA_PMD_ERR("Failed to enable interrupt\n");
}
dev->data->dev_conf.intr_conf.lsc = 0;
dev->data->dev_flags &= ~RTE_ETH_DEV_INTR_LSC;
@@ -340,7 +340,7 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev)
dpaa_update_link_speed(__fif->node_name, speed, duplex);
} else {
/* Manual autoneg - custom advertisement speed. */
- printf("Custom Advertisement speeds not supported\n");
+ DPAA_PMD_ERR("Custom Advertisement speeds not supported\n");
}
}
diff --git a/drivers/net/dpaa/dpaa_flow.c b/drivers/net/dpaa/dpaa_flow.c
index 690ba6bcb3..5c75f4220e 100644
--- a/drivers/net/dpaa/dpaa_flow.c
+++ b/drivers/net/dpaa/dpaa_flow.c
@@ -68,7 +68,7 @@ static void fm_prev_cleanup(void)
fm_info.fman_handle = fm_open(fman_id);
if (!fm_info.fman_handle) {
- printf("\n%s- unable to open FMAN", __func__);
+ DPAA_PMD_ERR("unable to open FMAN");
return;
}
@@ -78,7 +78,7 @@ static void fm_prev_cleanup(void)
/* FM PCD Open */
fm_info.pcd_handle = fm_pcd_open(&fm_pcd_params);
if (!fm_info.pcd_handle) {
- printf("\n%s- unable to open PCD", __func__);
+ DPAA_PMD_ERR("unable to open PCD");
return;
}
@@ -108,11 +108,11 @@ static void fm_prev_cleanup(void)
continue;
if (dpaa_fm_deconfig(&dpaa_intf, NULL))
- printf("\nDPAA FM deconfig failed\n");
+ DPAA_PMD_ERR("DPAA FM deconfig failed\n");
}
if (dpaa_fm_term())
- printf("\nDPAA FM term failed\n");
+ DPAA_PMD_ERR("DPAA FM term failed\n");
memset(&fm_model, 0, sizeof(struct dpaa_fm_model));
}
diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c
index ce4f3d6c85..c2579d65ee 100644
--- a/drivers/net/dpaa/dpaa_rxtx.c
+++ b/drivers/net/dpaa/dpaa_rxtx.c
@@ -103,7 +103,7 @@ static void dpaa_display_frame_info(const struct qm_fd *fd,
for (ii = 0; ii < fd->length20; ii++) {
DISPLAY_PRINT("%02x ", ptr[ii]);
if (((ii + 1) % 16) == 0)
- printf("\n");
+ DISPLAY_PRINT("\n");
}
DISPLAY_PRINT("\n");
}
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 679f33ae1a..6f79f20d12 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -2682,7 +2682,7 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
priv->max_vlan_filters = attr.vlan_filter_entries;
priv->flags = 0;
#if defined(RTE_LIBRTE_IEEE1588)
- printf("DPDK IEEE1588 is enabled\n");
+ DPAA2_PMD_INFO("DPDK IEEE1588 is enabled\n");
priv->flags |= DPAA2_TX_CONF_ENABLE;
#endif
/* Used with ``fslmc:dpni.1,drv_tx_conf=1`` */
diff --git a/drivers/net/dpaa2/dpaa2_tm.c b/drivers/net/dpaa2/dpaa2_tm.c
index 8fe5bfa013..cd6739dcfa 100644
--- a/drivers/net/dpaa2/dpaa2_tm.c
+++ b/drivers/net/dpaa2/dpaa2_tm.c
@@ -499,7 +499,7 @@ dpaa2_node_add(struct rte_eth_dev *dev, uint32_t node_id,
node->channel_id = priv->channel_inuse;
priv->channel_inuse++;
} else {
- printf("error no channel id available\n");
+ DPAA2_PMD_ERR("error no channel id available\n");
}
}
@@ -580,7 +580,7 @@ dpaa2_tm_configure_queue(struct rte_eth_dev *dev, struct dpaa2_tm_node *node)
flow_id = 0;
if (dpaa2_q == NULL) {
- printf("Queue is not configured for node = %d\n", node->id);
+ DPAA2_PMD_ERR("Queue is not configured for node = %d\n", node->id);
return -1;
}
@@ -590,7 +590,7 @@ dpaa2_tm_configure_queue(struct rte_eth_dev *dev, struct dpaa2_tm_node *node)
((node->parent->channel_id << 8) | tc_id),
flow_id, options, &tx_flow_cfg);
if (ret) {
- printf("Error in setting the tx flow: "
+ DPAA2_PMD_ERR("Error in setting the tx flow: "
"channel id = %d tc_id= %d, param = 0x%x "
"flow=%d err=%d\n", node->parent->channel_id, tc_id,
((node->parent->channel_id << 8) | tc_id), flow_id,
@@ -605,7 +605,7 @@ dpaa2_tm_configure_queue(struct rte_eth_dev *dev, struct dpaa2_tm_node *node)
DPNI_QUEUE_TX, ((node->parent->channel_id << 8) | dpaa2_q->tc_index),
dpaa2_q->flow_id, &tx_flow_cfg, &qid);
if (ret) {
- printf("Error in getting LFQID err=%d", ret);
+ DPAA2_PMD_ERR("Error in getting LFQID err=%d", ret);
return -1;
}
dpaa2_q->fqid = qid.fqid;
@@ -636,7 +636,7 @@ dpaa2_tm_configure_queue(struct rte_eth_dev *dev, struct dpaa2_tm_node *node)
((node->parent->channel_id << 8) | tc_id),
&cong_notif_cfg);
if (ret) {
- printf("Error in setting tx congestion notification: "
+ DPAA2_PMD_ERR("Error in setting tx congestion notification: "
"err=%d", ret);
return -ret;
}
--
2.17.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] drivers: replace printf with fprintf for debug functions
2023-02-15 10:29 [PATCH 1/2] drivers: replace printf with log macros Hemant Agrawal
@ 2023-02-15 10:29 ` Hemant Agrawal
2023-02-15 15:16 ` Thomas Monjalon
2023-02-15 17:17 ` Stephen Hemminger
0 siblings, 2 replies; 5+ messages in thread
From: Hemant Agrawal @ 2023-02-15 10:29 UTC (permalink / raw)
To: dev, thomas
This patch replaces simple printf with fprintf for debug dump
related functions for various NXP dpaaX related drivers.
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
drivers/bus/dpaa/base/fman/netcfg_layer.c | 20 ++++----
drivers/crypto/caam_jr/caam_jr.c | 4 +-
drivers/crypto/caam_jr/caam_jr_desc.h | 2 +-
drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 20 ++++----
drivers/crypto/dpaa_sec/dpaa_sec.c | 52 ++++++++++-----------
drivers/net/dpaa2/dpaa2_flow.c | 40 ++++++++--------
6 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/drivers/bus/dpaa/base/fman/netcfg_layer.c b/drivers/bus/dpaa/base/fman/netcfg_layer.c
index 6a405c984d..69cee08fb9 100644
--- a/drivers/bus/dpaa/base/fman/netcfg_layer.c
+++ b/drivers/bus/dpaa/base/fman/netcfg_layer.c
@@ -33,33 +33,33 @@ dump_netcfg(struct netcfg_info *cfg_ptr)
{
int i;
- printf(".......... DPAA Configuration ..........\n\n");
+ fprintf(stdout, ".......... DPAA Configuration ..........\n\n");
/* Network interfaces */
- printf("Network interfaces: %d\n", cfg_ptr->num_ethports);
+ fprintf(stdout, "Network interfaces: %d\n", cfg_ptr->num_ethports);
for (i = 0; i < cfg_ptr->num_ethports; i++) {
struct fman_if_bpool *bpool;
struct fm_eth_port_cfg *p_cfg = &cfg_ptr->port_cfg[i];
struct fman_if *__if = p_cfg->fman_if;
- printf("\n+ Fman %d, MAC %d (%s);\n",
+ fprintf(stdout, "\n+ Fman %d, MAC %d (%s);\n",
__if->fman_idx, __if->mac_idx,
(__if->mac_type == fman_mac_1g) ? "1G" :
(__if->mac_type == fman_mac_2_5g) ? "2.5G" : "10G");
- printf("\tmac_addr: " RTE_ETHER_ADDR_PRT_FMT "\n",
+ fprintf(stdout, "\tmac_addr: " RTE_ETHER_ADDR_PRT_FMT "\n",
RTE_ETHER_ADDR_BYTES(&__if->mac_addr));
- printf("\ttx_channel_id: 0x%02x\n",
+ fprintf(stdout, "\ttx_channel_id: 0x%02x\n",
__if->tx_channel_id);
- printf("\tfqid_rx_def: 0x%x\n", p_cfg->rx_def);
- printf("\tfqid_rx_err: 0x%x\n", __if->fqid_rx_err);
+ fprintf(stdout, "\tfqid_rx_def: 0x%x\n", p_cfg->rx_def);
+ fprintf(stdout, "\tfqid_rx_err: 0x%x\n", __if->fqid_rx_err);
- printf("\tfqid_tx_err: 0x%x\n", __if->fqid_tx_err);
- printf("\tfqid_tx_confirm: 0x%x\n", __if->fqid_tx_confirm);
+ fprintf(stdout, "\tfqid_tx_err: 0x%x\n", __if->fqid_tx_err);
+ fprintf(stdout, "\tfqid_tx_confirm: 0x%x\n", __if->fqid_tx_confirm);
fman_if_for_each_bpool(bpool, __if)
- printf("\tbuffer pool: (bpid=%d, count=%"PRId64
+ fprintf(stdout, "\tbuffer pool: (bpid=%d, count=%"PRId64
" size=%"PRId64", addr=0x%"PRIx64")\n",
bpool->bpid, bpool->count, bpool->size,
bpool->addr);
diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c
index 9373cee57d..d19738b7bf 100644
--- a/drivers/crypto/caam_jr/caam_jr.c
+++ b/drivers/crypto/caam_jr/caam_jr.c
@@ -1410,9 +1410,9 @@ caam_jr_enqueue_op(struct rte_crypto_op *op, struct caam_jr_qp *qp)
rte_pktmbuf_mtod(op->sym->m_src, void *),
rte_pktmbuf_data_len(op->sym->m_src));
- printf("\n JD before conversion\n");
+ fprintf(stdout, "\n JD before conversion\n");
for (i = 0; i < 12; i++)
- printf("\n 0x%08x", ctx->jobdes.desc[i]);
+ fprintf(stdout, "\n 0x%08x", ctx->jobdes.desc[i]);
#endif
CAAM_JR_DP_DEBUG("Jr[%p] pi[%d] ci[%d].Before sending desc",
diff --git a/drivers/crypto/caam_jr/caam_jr_desc.h b/drivers/crypto/caam_jr/caam_jr_desc.h
index 135d51c392..1b6a8f9efa 100644
--- a/drivers/crypto/caam_jr/caam_jr_desc.h
+++ b/drivers/crypto/caam_jr/caam_jr_desc.h
@@ -116,7 +116,7 @@
for (__i = 0; \
__i < SEC_GET_DESC_LEN(descriptor); \
__i++) { \
- printf("0x%08x: 0x%08x\n", \
+ fprintf(stdout, "0x%08x: 0x%08x\n", \
(uint32_t)(((uint32_t *)(descriptor)) + __i), \
*(((uint32_t *)(descriptor)) + __i)); \
} \
diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index c25e40030b..c707666f35 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -1685,7 +1685,7 @@ dpaa2_sec_dump(struct rte_crypto_op *op)
goto mbuf_dump;
priv = (struct ctxt_priv *)sess->ctxt;
- printf("\n****************************************\n"
+ fprintf(stdout, "\n****************************************\n"
"session params:\n\tContext type:\t%d\n\tDirection:\t%s\n"
"\tCipher alg:\t%d\n\tAuth alg:\t%d\n\tAead alg:\t%d\n"
"\tCipher key len:\t%zd\n", sess->ctxt_type,
@@ -1696,7 +1696,7 @@ dpaa2_sec_dump(struct rte_crypto_op *op)
sess->cipher_key.length);
rte_hexdump(stdout, "auth key", sess->auth_key.data,
sess->auth_key.length);
- printf("\tAuth key len:\t%zd\n\tIV len:\t\t%d\n\tIV offset:\t%d\n"
+ fprintf(stdout, "\tAuth key len:\t%zd\n\tIV len:\t\t%d\n\tIV offset:\t%d\n"
"\tdigest length:\t%d\n\tstatus:\t\t%d\n\taead auth only"
" len:\t%d\n\taead cipher text:\t%d\n",
sess->auth_key.length, sess->iv.length, sess->iv.offset,
@@ -1704,7 +1704,7 @@ dpaa2_sec_dump(struct rte_crypto_op *op)
sess->ext_params.aead_ctxt.auth_only_len,
sess->ext_params.aead_ctxt.auth_cipher_text);
#ifdef RTE_LIBRTE_SECURITY
- printf("PDCP session params:\n"
+ fprintf(stdout, "PDCP session params:\n"
"\tDomain:\t\t%d\n\tBearer:\t\t%d\n\tpkt_dir:\t%d\n\thfn_ovd:"
"\t%d\n\tsn_size:\t%d\n\thfn_ovd_offset:\t%d\n\thfn:\t\t%d\n"
"\thfn_threshold:\t0x%x\n", sess->pdcp.domain,
@@ -1714,29 +1714,29 @@ dpaa2_sec_dump(struct rte_crypto_op *op)
#endif
bufsize = (uint8_t)priv->flc_desc[0].flc.word1_sdl;
- printf("Descriptor Dump:\n");
+ fprintf(stdout, "Descriptor Dump:\n");
for (i = 0; i < bufsize; i++)
- printf("\tDESC[%d]:0x%x\n", i, priv->flc_desc[0].desc[i]);
+ fprintf(stdout, "\tDESC[%d]:0x%x\n", i, priv->flc_desc[0].desc[i]);
- printf("\n");
+ fprintf(stdout, "\n");
mbuf_dump:
sym_op = op->sym;
if (sym_op->m_src) {
- printf("Source mbuf:\n");
+ fprintf(stdout, "Source mbuf:\n");
rte_pktmbuf_dump(stdout, sym_op->m_src, sym_op->m_src->data_len);
}
if (sym_op->m_dst) {
- printf("Destination mbuf:\n");
+ fprintf(stdout, "Destination mbuf:\n");
rte_pktmbuf_dump(stdout, sym_op->m_dst, sym_op->m_dst->data_len);
}
- printf("Session address = %p\ncipher offset: %d, length: %d\n"
+ fprintf(stdout, "Session address = %p\ncipher offset: %d, length: %d\n"
"auth offset: %d, length: %d\n aead offset: %d, length: %d\n"
, sym_op->session,
sym_op->cipher.data.offset, sym_op->cipher.data.length,
sym_op->auth.data.offset, sym_op->auth.data.length,
sym_op->aead.data.offset, sym_op->aead.data.length);
- printf("\n");
+ fprintf(stdout, "\n");
}
diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c
index db52683847..0a47c5c8ad 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
@@ -676,16 +676,16 @@ dpaa_sec_dump(struct dpaa_sec_op_ctx *ctx, struct dpaa_sec_qp *qp)
sess = SECURITY_GET_SESS_PRIV(op->sym->session);
#endif
if (sess == NULL) {
- printf("session is NULL\n");
+ fprintf(stdout, "session is NULL\n");
goto mbuf_dump;
}
cdb = &sess->cdb;
rte_memcpy(&c_cdb, cdb, sizeof(struct sec_cdb));
#ifdef RTE_LIBRTE_SECURITY
- printf("\nsession protocol type = %d\n", sess->proto_alg);
+ fprintf(stdout, "\nsession protocol type = %d\n", sess->proto_alg);
#endif
- printf("\n****************************************\n"
+ fprintf(stdout, "\n****************************************\n"
"session params:\n\tContext type:\t%d\n\tDirection:\t%s\n"
"\tCipher alg:\t%d\n\tAuth alg:\t%d\n\tAead alg:\t%d\n"
"\tCipher key len:\t%"PRIu64"\n\tCipher alg:\t%d\n"
@@ -698,7 +698,7 @@ dpaa_sec_dump(struct dpaa_sec_op_ctx *ctx, struct dpaa_sec_qp *qp)
sess->cipher_key.length);
rte_hexdump(stdout, "auth key", sess->auth_key.data,
sess->auth_key.length);
- printf("\tAuth key len:\t%"PRIu64"\n\tAuth alg:\t%d\n"
+ fprintf(stdout, "\tAuth key len:\t%"PRIu64"\n\tAuth alg:\t%d\n"
"\tAuth algmode:\t%d\n\tIV len:\t\t%d\n\tIV offset:\t%d\n"
"\tdigest length:\t%d\n\tauth only len:\t\t%d\n"
"\taead cipher text:\t%d\n",
@@ -708,7 +708,7 @@ dpaa_sec_dump(struct dpaa_sec_op_ctx *ctx, struct dpaa_sec_qp *qp)
sess->digest_length, sess->auth_only_len,
sess->auth_cipher_text);
#ifdef RTE_LIBRTE_SECURITY
- printf("PDCP session params:\n"
+ fprintf(stdout, "PDCP session params:\n"
"\tDomain:\t\t%d\n\tBearer:\t\t%d\n\tpkt_dir:\t%d\n\thfn_ovd:"
"\t%d\n\tsn_size:\t%d\n\tsdap_enabled:\t%d\n\thfn_ovd_offset:"
"\t%d\n\thfn:\t\t%d\n"
@@ -722,63 +722,63 @@ dpaa_sec_dump(struct dpaa_sec_op_ctx *ctx, struct dpaa_sec_qp *qp)
c_cdb.sh_hdr.lo.word = rte_be_to_cpu_32(c_cdb.sh_hdr.lo.word);
bufsize = c_cdb.sh_hdr.hi.field.idlen;
- printf("cdb = %p\n\n", cdb);
- printf("Descriptor size = %d\n", bufsize);
+ fprintf(stdout, "cdb = %p\n\n", cdb);
+ fprintf(stdout, "Descriptor size = %d\n", bufsize);
int m;
for (m = 0; m < bufsize; m++)
- printf("0x%x\n", rte_be_to_cpu_32(c_cdb.sh_desc[m]));
+ fprintf(stdout, "0x%x\n", rte_be_to_cpu_32(c_cdb.sh_desc[m]));
- printf("\n");
+ fprintf(stdout, "\n");
mbuf_dump:
sym_op = op->sym;
if (sym_op->m_src) {
- printf("Source mbuf:\n");
+ fprintf(stdout, "Source mbuf:\n");
rte_pktmbuf_dump(stdout, sym_op->m_src,
sym_op->m_src->data_len);
}
if (sym_op->m_dst) {
- printf("Destination mbuf:\n");
+ fprintf(stdout, "Destination mbuf:\n");
rte_pktmbuf_dump(stdout, sym_op->m_dst,
sym_op->m_dst->data_len);
}
- printf("Session address = %p\ncipher offset: %d, length: %d\n"
+ fprintf(stdout, "Session address = %p\ncipher offset: %d, length: %d\n"
"auth offset: %d, length: %d\n aead offset: %d, length: %d\n",
sym_op->session, sym_op->cipher.data.offset,
sym_op->cipher.data.length,
sym_op->auth.data.offset, sym_op->auth.data.length,
sym_op->aead.data.offset, sym_op->aead.data.length);
- printf("\n");
+ fprintf(stdout, "\n");
- printf("******************************************************\n");
- printf("ctx info:\n");
- printf("job->sg[0] output info:\n");
+ fprintf(stdout, "******************************************************\n");
+ fprintf(stdout, "ctx info:\n");
+ fprintf(stdout, "job->sg[0] output info:\n");
memcpy(&sg[0], &job->sg[0], sizeof(sg[0]));
- printf("\taddr = %"PRIx64",\n\tlen = %d,\n\tfinal = %d,\n\textension = %d"
+ fprintf(stdout, "\taddr = %"PRIx64",\n\tlen = %d,\n\tfinal = %d,\n\textension = %d"
"\n\tbpid = %d\n\toffset = %d\n",
(uint64_t)sg[0].addr, sg[0].length, sg[0].final,
sg[0].extension, sg[0].bpid, sg[0].offset);
- printf("\njob->sg[1] input info:\n");
+ fprintf(stdout, "\njob->sg[1] input info:\n");
memcpy(&sg[1], &job->sg[1], sizeof(sg[1]));
hw_sg_to_cpu(&sg[1]);
- printf("\taddr = %"PRIx64",\n\tlen = %d,\n\tfinal = %d,\n\textension = %d"
+ fprintf(stdout, "\taddr = %"PRIx64",\n\tlen = %d,\n\tfinal = %d,\n\textension = %d"
"\n\tbpid = %d\n\toffset = %d\n",
(uint64_t)sg[1].addr, sg[1].length, sg[1].final,
sg[1].extension, sg[1].bpid, sg[1].offset);
- printf("\nctx pool addr = %p\n", ctx->ctx_pool);
+ fprintf(stdout, "\nctx pool addr = %p\n", ctx->ctx_pool);
if (ctx->ctx_pool)
- printf("ctx pool available counts = %d\n",
+ fprintf(stdout, "ctx pool available counts = %d\n",
rte_mempool_avail_count(ctx->ctx_pool));
- printf("\nop pool addr = %p\n", op->mempool);
+ fprintf(stdout, "\nop pool addr = %p\n", op->mempool);
if (op->mempool)
- printf("op pool available counts = %d\n",
+ fprintf(stdout, "op pool available counts = %d\n",
rte_mempool_avail_count(op->mempool));
- printf("********************************************************\n");
- printf("Queue data:\n");
- printf("\tFQID = 0x%x\n\tstate = %d\n\tnb_desc = %d\n"
+ fprintf(stdout, "********************************************************\n");
+ fprintf(stdout, "Queue data:\n");
+ fprintf(stdout, "\tFQID = 0x%x\n\tstate = %d\n\tnb_desc = %d\n"
"\tctx_pool = %p\n\trx_pkts = %d\n\ttx_pkts"
"= %d\n\trx_errs = %d\n\ttx_errs = %d\n\n",
qp->outq.fqid, qp->outq.state, qp->outq.nb_desc,
diff --git a/drivers/net/dpaa2/dpaa2_flow.c b/drivers/net/dpaa2/dpaa2_flow.c
index df06c3862e..4d9fad1596 100644
--- a/drivers/net/dpaa2/dpaa2_flow.c
+++ b/drivers/net/dpaa2/dpaa2_flow.c
@@ -244,7 +244,7 @@ static inline void dpaa2_flow_qos_table_extracts_log(
if (!dpaa2_flow_control_log)
return;
- printf("Setup QoS table: number of extracts: %d\r\n",
+ fprintf(stdout, "Setup QoS table: number of extracts: %d\r\n",
priv->extract.qos_key_extract.dpkg.num_extracts);
for (idx = 0; idx < priv->extract.qos_key_extract.dpkg.num_extracts;
idx++) {
@@ -253,11 +253,11 @@ static inline void dpaa2_flow_qos_table_extracts_log(
priv->extract.qos_key_extract.dpkg.extracts[idx]
.extract.from_hdr.field,
string);
- printf("%s", string);
+ fprintf(stdout, "%s", string);
if ((idx + 1) < priv->extract.qos_key_extract.dpkg.num_extracts)
- printf(" / ");
+ fprintf(stdout, " / ");
}
- printf("\r\n");
+ fprintf(stdout, "\r\n");
}
static inline void dpaa2_flow_fs_table_extracts_log(
@@ -269,7 +269,7 @@ static inline void dpaa2_flow_fs_table_extracts_log(
if (!dpaa2_flow_control_log)
return;
- printf("Setup FS table: number of extracts of TC[%d]: %d\r\n",
+ fprintf(stdout, "Setup FS table: number of extracts of TC[%d]: %d\r\n",
tc_id, priv->extract.tc_key_extract[tc_id]
.dpkg.num_extracts);
for (idx = 0; idx < priv->extract.tc_key_extract[tc_id]
@@ -279,12 +279,12 @@ static inline void dpaa2_flow_fs_table_extracts_log(
priv->extract.tc_key_extract[tc_id].dpkg.extracts[idx]
.extract.from_hdr.field,
string);
- printf("%s", string);
+ fprintf(stdout, "%s", string);
if ((idx + 1) < priv->extract.tc_key_extract[tc_id]
.dpkg.num_extracts)
- printf(" / ");
+ fprintf(stdout, " / ");
}
- printf("\r\n");
+ fprintf(stdout, "\r\n");
}
static inline void dpaa2_flow_qos_entry_log(
@@ -296,21 +296,21 @@ static inline void dpaa2_flow_qos_entry_log(
if (!dpaa2_flow_control_log)
return;
- printf("\r\n%s QoS entry[%d] for TC[%d], extracts size is %d\r\n",
+ fprintf(stdout, "\r\n%s QoS entry[%d] for TC[%d], extracts size is %d\r\n",
log_info, qos_index, flow->tc_id, flow->qos_real_key_size);
key = (uint8_t *)(size_t)flow->qos_rule.key_iova;
mask = (uint8_t *)(size_t)flow->qos_rule.mask_iova;
- printf("key:\r\n");
+ fprintf(stdout, "key:\r\n");
for (idx = 0; idx < flow->qos_real_key_size; idx++)
- printf("%02x ", key[idx]);
+ fprintf(stdout, "%02x ", key[idx]);
- printf("\r\nmask:\r\n");
+ fprintf(stdout, "\r\nmask:\r\n");
for (idx = 0; idx < flow->qos_real_key_size; idx++)
- printf("%02x ", mask[idx]);
+ fprintf(stdout, "%02x ", mask[idx]);
- printf("\r\n%s QoS ipsrc: %d, ipdst: %d\r\n", log_info,
+ fprintf(stdout, "\r\n%s QoS ipsrc: %d, ipdst: %d\r\n", log_info,
flow->ipaddr_rule.qos_ipsrc_offset,
flow->ipaddr_rule.qos_ipdst_offset);
}
@@ -324,21 +324,21 @@ static inline void dpaa2_flow_fs_entry_log(
if (!dpaa2_flow_control_log)
return;
- printf("\r\n%s FS/TC entry[%d] of TC[%d], extracts size is %d\r\n",
+ fprintf(stdout, "\r\n%s FS/TC entry[%d] of TC[%d], extracts size is %d\r\n",
log_info, flow->tc_index, flow->tc_id, flow->fs_real_key_size);
key = (uint8_t *)(size_t)flow->fs_rule.key_iova;
mask = (uint8_t *)(size_t)flow->fs_rule.mask_iova;
- printf("key:\r\n");
+ fprintf(stdout, "key:\r\n");
for (idx = 0; idx < flow->fs_real_key_size; idx++)
- printf("%02x ", key[idx]);
+ fprintf(stdout, "%02x ", key[idx]);
- printf("\r\nmask:\r\n");
+ fprintf(stdout, "\r\nmask:\r\n");
for (idx = 0; idx < flow->fs_real_key_size; idx++)
- printf("%02x ", mask[idx]);
+ fprintf(stdout, "%02x ", mask[idx]);
- printf("\r\n%s FS ipsrc: %d, ipdst: %d\r\n", log_info,
+ fprintf(stdout, "\r\n%s FS ipsrc: %d, ipdst: %d\r\n", log_info,
flow->ipaddr_rule.fs_ipsrc_offset,
flow->ipaddr_rule.fs_ipdst_offset);
}
--
2.17.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drivers: replace printf with fprintf for debug functions
2023-02-15 10:29 ` [PATCH 2/2] drivers: replace printf with fprintf for debug functions Hemant Agrawal
@ 2023-02-15 15:16 ` Thomas Monjalon
2023-02-16 9:27 ` Hemant Agrawal
2023-02-15 17:17 ` Stephen Hemminger
1 sibling, 1 reply; 5+ messages in thread
From: Thomas Monjalon @ 2023-02-15 15:16 UTC (permalink / raw)
To: Hemant Agrawal; +Cc: dev
15/02/2023 11:29, Hemant Agrawal:
> This patch replaces simple printf with fprintf for debug dump
> related functions for various NXP dpaaX related drivers.
Why replacing with fprintf(stdout)?
Would it be better to provide a FILE* parameter to the functions?
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drivers: replace printf with fprintf for debug functions
2023-02-15 10:29 ` [PATCH 2/2] drivers: replace printf with fprintf for debug functions Hemant Agrawal
2023-02-15 15:16 ` Thomas Monjalon
@ 2023-02-15 17:17 ` Stephen Hemminger
1 sibling, 0 replies; 5+ messages in thread
From: Stephen Hemminger @ 2023-02-15 17:17 UTC (permalink / raw)
To: Hemant Agrawal; +Cc: dev, thomas
On Wed, 15 Feb 2023 15:59:05 +0530
Hemant Agrawal <hemant.agrawal@nxp.com> wrote:
> diff --git a/drivers/bus/dpaa/base/fman/netcfg_layer.c b/drivers/bus/dpaa/base/fman/netcfg_layer.c
> index 6a405c984d..69cee08fb9 100644
> --- a/drivers/bus/dpaa/base/fman/netcfg_layer.c
> +++ b/drivers/bus/dpaa/base/fman/netcfg_layer.c
> @@ -33,33 +33,33 @@ dump_netcfg(struct netcfg_info *cfg_ptr)
> {
> int i;
>
> - printf(".......... DPAA Configuration ..........\n\n");
> + fprintf(stdout, ".......... DPAA Configuration ..........\n\n");
>
If you only do "printf -> fprintf(stdout," then it doesn't make sense.
Ideally change debug interface to take a user supplied output FILE *
like other dump routines.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drivers: replace printf with fprintf for debug functions
2023-02-15 15:16 ` Thomas Monjalon
@ 2023-02-16 9:27 ` Hemant Agrawal
0 siblings, 0 replies; 5+ messages in thread
From: Hemant Agrawal @ 2023-02-16 9:27 UTC (permalink / raw)
To: Thomas Monjalon, Hemant Agrawal; +Cc: dev
On 15-Feb-23 8:46 PM, Thomas Monjalon wrote:
> 15/02/2023 11:29, Hemant Agrawal:
>> This patch replaces simple printf with fprintf for debug dump
>> related functions for various NXP dpaaX related drivers.
> Why replacing with fprintf(stdout)?
>
> Would it be better to provide a FILE* parameter to the functions?
yes, I will update.
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-02-16 9:28 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-15 10:29 [PATCH 1/2] drivers: replace printf with log macros Hemant Agrawal
2023-02-15 10:29 ` [PATCH 2/2] drivers: replace printf with fprintf for debug functions Hemant Agrawal
2023-02-15 15:16 ` Thomas Monjalon
2023-02-16 9:27 ` Hemant Agrawal
2023-02-15 17:17 ` Stephen Hemminger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).