d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bus/dpaa: move log types to NXP drivers

Browse Source 
This is to reduce the number of variables getting exposed
from the dpaa bus. They are not required to be in bus.

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
This commit is contained in:
Hemant Agrawal 2020-05-15 15:17:49 +05:30 committed by David Marchand
parent a8ee206a1b
commit df80d4f87f
9 changed files with 83 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/bus/dpaa/dpaa_bus.c
View File

@ -43,9 +43,6 @@
#include <netcfg.h>
int dpaa_logtype_bus;
int dpaa_logtype_mempool;
int dpaa_logtype_pmd;
int dpaa_logtype_eventdev;
static struct rte_dpaa_bus rte_dpaa_bus;
struct netcfg_info *dpaa_netcfg;
@ -567,13 +564,13 @@ rte_dpaa_bus_probe(void)
/* One time load of Qman/Bman drivers */
ret = qman_global_init();
if (ret) {
DPAA_PMD_ERR("QMAN initialization failed: %d",
DPAA_BUS_ERR("QMAN initialization failed: %d",
ret);
return ret;
}
ret = bman_global_init();
if (ret) {
DPAA_PMD_ERR("BMAN initialization failed: %d",
DPAA_BUS_ERR("BMAN initialization failed: %d",
ret);
return ret;
}
@ -752,16 +749,4 @@ RTE_INIT(dpaa_init_log)
dpaa_logtype_bus = rte_log_register("bus.dpaa");
if (dpaa_logtype_bus >= 0)
rte_log_set_level(dpaa_logtype_bus, RTE_LOG_NOTICE);
dpaa_logtype_mempool = rte_log_register("mempool.dpaa");
if (dpaa_logtype_mempool >= 0)
rte_log_set_level(dpaa_logtype_mempool, RTE_LOG_NOTICE);
dpaa_logtype_pmd = rte_log_register("pmd.net.dpaa");
if (dpaa_logtype_pmd >= 0)
rte_log_set_level(dpaa_logtype_pmd, RTE_LOG_NOTICE);
dpaa_logtype_eventdev = rte_log_register("pmd.event.dpaa");
if (dpaa_logtype_eventdev >= 0)
rte_log_set_level(dpaa_logtype_eventdev, RTE_LOG_NOTICE);
}

3
drivers/bus/dpaa/rte_bus_dpaa_version.map
View File

@ -14,9 +14,6 @@ INTERNAL {
bman_thread_irq;
dpaa_get_qm_channel_caam;
dpaa_get_qm_channel_pool;
dpaa_logtype_eventdev;
dpaa_logtype_mempool;
dpaa_logtype_pmd;
dpaa_netcfg;
dpaa_svr_family;
fman_dealloc_bufs_mask_hi;

58
drivers/bus/dpaa/rte_dpaa_logs.h
View File

@ -10,9 +10,6 @@
#include <rte_log.h>
extern int dpaa_logtype_bus;
extern int dpaa_logtype_mempool;
extern int dpaa_logtype_pmd;
extern int dpaa_logtype_eventdev;
#define DPAA_BUS_LOG(level, fmt, args...) \
rte_log(RTE_LOG_ ## level, dpaa_logtype_bus, "dpaa: " fmt "\n", ##args)
@ -40,59 +37,4 @@ extern int dpaa_logtype_eventdev;
#define DPAA_BUS_WARN(fmt, args...) \
DPAA_BUS_LOG(WARNING, fmt, ## args)
/* Mempool related logs */
#define DPAA_MEMPOOL_LOG(level, fmt, args...) \
rte_log(RTE_LOG_ ## level, dpaa_logtype_mempool, "%s(): " fmt "\n", \
__func__, ##args)
#define MEMPOOL_INIT_FUNC_TRACE() DPAA_MEMPOOL_LOG(DEBUG, " >>")
#define DPAA_MEMPOOL_DPDEBUG(fmt, args...) \
RTE_LOG_DP(DEBUG, PMD, fmt, ## args)
#define DPAA_MEMPOOL_DEBUG(fmt, args...) \
DPAA_MEMPOOL_LOG(DEBUG, fmt, ## args)
#define DPAA_MEMPOOL_ERR(fmt, args...) \
DPAA_MEMPOOL_LOG(ERR, fmt, ## args)
#define DPAA_MEMPOOL_INFO(fmt, args...) \
DPAA_MEMPOOL_LOG(INFO, fmt, ## args)
#define DPAA_MEMPOOL_WARN(fmt, args...) \
DPAA_MEMPOOL_LOG(WARNING, fmt, ## args)
/* PMD related logs */
#define DPAA_PMD_LOG(level, fmt, args...) \
rte_log(RTE_LOG_ ## level, dpaa_logtype_pmd, "%s(): " fmt "\n", \
__func__, ##args)
#define PMD_INIT_FUNC_TRACE() DPAA_PMD_LOG(DEBUG, " >>")
#define DPAA_PMD_DEBUG(fmt, args...) \
DPAA_PMD_LOG(DEBUG, fmt, ## args)
#define DPAA_PMD_ERR(fmt, args...) \
DPAA_PMD_LOG(ERR, fmt, ## args)
#define DPAA_PMD_INFO(fmt, args...) \
DPAA_PMD_LOG(INFO, fmt, ## args)
#define DPAA_PMD_WARN(fmt, args...) \
DPAA_PMD_LOG(WARNING, fmt, ## args)
#define DPAA_EVENTDEV_LOG(level, fmt, args...) \
rte_log(RTE_LOG_ ## level, dpaa_logtype_eventdev, "%s(): " fmt "\n", \
__func__, ##args)
#define EVENTDEV_INIT_FUNC_TRACE() DPAA_EVENTDEV_LOG(DEBUG, " >>")
#define DPAA_EVENTDEV_DEBUG(fmt, args...) \
DPAA_EVENTDEV_LOG(DEBUG, fmt, ## args)
#define DPAA_EVENTDEV_ERR(fmt, args...) \
DPAA_EVENTDEV_LOG(ERR, fmt, ## args)
#define DPAA_EVENTDEV_INFO(fmt, args...) \
DPAA_EVENTDEV_LOG(INFO, fmt, ## args)
#define DPAA_EVENTDEV_WARN(fmt, args...) \
DPAA_EVENTDEV_LOG(WARNING, fmt, ## args)
/* DP Logs, toggled out at compile time if level lower than current level */
#define DPAA_DP_LOG(level, fmt, args...) \
RTE_LOG_DP(level, PMD, fmt, ## args)
#endif /* _DPAA_LOGS_H_ */

7
drivers/event/dpaa/dpaa_eventdev.c
View File

@ -46,6 +46,7 @@
* Eventqueue = Channel Instance
* 1 Eventdev can have N Eventqueue
*/
int dpaa_logtype_eventdev;
#define DISABLE_INTR_MODE "disable_intr"
@ -1068,3 +1069,9 @@ static struct rte_vdev_driver vdev_eventdev_dpaa_pmd = {
RTE_PMD_REGISTER_VDEV(EVENTDEV_NAME_DPAA_PMD, vdev_eventdev_dpaa_pmd);
RTE_PMD_REGISTER_PARAM_STRING(EVENTDEV_NAME_DPAA_PMD,
DISABLE_INTR_MODE "=<int>");
RTE_INIT(dpaa_event_init_log)
{
dpaa_logtype_eventdev = rte_log_register("pmd.event.dpaa");
if (dpaa_logtype_eventdev >= 0)
rte_log_set_level(dpaa_logtype_eventdev, RTE_LOG_NOTICE);
}

16
drivers/event/dpaa/dpaa_eventdev.h
View File

@ -76,4 +76,20 @@ struct dpaa_eventdev {
uint32_t nb_event_port_enqueue_depth;
uint32_t event_dev_cfg;
};
#define DPAA_EVENTDEV_LOG(level, fmt, args...) \
rte_log(RTE_LOG_ ## level, dpaa_logtype_eventdev, "%s(): " fmt "\n", \
__func__, ##args)
#define EVENTDEV_INIT_FUNC_TRACE() DPAA_EVENTDEV_LOG(DEBUG, " >>")
#define DPAA_EVENTDEV_DEBUG(fmt, args...) \
DPAA_EVENTDEV_LOG(DEBUG, fmt, ## args)
#define DPAA_EVENTDEV_ERR(fmt, args...) \
DPAA_EVENTDEV_LOG(ERR, fmt, ## args)
#define DPAA_EVENTDEV_INFO(fmt, args...) \
DPAA_EVENTDEV_LOG(INFO, fmt, ## args)
#define DPAA_EVENTDEV_WARN(fmt, args...) \
DPAA_EVENTDEV_LOG(WARNING, fmt, ## args)
#endif /* __DPAA_EVENTDEV_H__ */

8
drivers/mempool/dpaa/dpaa_mempool.c
View File

@ -36,6 +36,7 @@ struct dpaa_memseg_list rte_dpaa_memsegs
= TAILQ_HEAD_INITIALIZER(rte_dpaa_memsegs);
struct dpaa_bp_info *rte_dpaa_bpid_info;
int dpaa_logtype_mempool;
static int
dpaa_mbuf_create_pool(struct rte_mempool *mp)
@ -356,3 +357,10 @@ static const struct rte_mempool_ops dpaa_mpool_ops = {
};
MEMPOOL_REGISTER_OPS(dpaa_mpool_ops);
RTE_INIT(dpaa_mp_init_log)
{
dpaa_logtype_mempool = rte_log_register("mempool.dpaa");
if (dpaa_logtype_mempool >= 0)
rte_log_set_level(dpaa_logtype_mempool, RTE_LOG_NOTICE);
}

19
drivers/mempool/dpaa/dpaa_mempool.h
View File

@ -58,4 +58,23 @@ extern struct dpaa_bp_info *rte_dpaa_bpid_info;
#define DPAA_BPID_TO_POOL_INFO(__bpid) (&rte_dpaa_bpid_info[__bpid])
/* Mempool related logs */
#define DPAA_MEMPOOL_LOG(level, fmt, args...) \
rte_log(RTE_LOG_ ## level, dpaa_logtype_mempool, "%s(): " fmt "\n", \
__func__, ##args)
#define MEMPOOL_INIT_FUNC_TRACE() DPAA_MEMPOOL_LOG(DEBUG, " >>")
#define DPAA_MEMPOOL_DPDEBUG(fmt, args...) \
RTE_LOG_DP(DEBUG, PMD, fmt, ## args)
#define DPAA_MEMPOOL_DEBUG(fmt, args...) \
DPAA_MEMPOOL_LOG(DEBUG, fmt, ## args)
#define DPAA_MEMPOOL_ERR(fmt, args...) \
DPAA_MEMPOOL_LOG(ERR, fmt, ## args)
#define DPAA_MEMPOOL_INFO(fmt, args...) \
DPAA_MEMPOOL_LOG(INFO, fmt, ## args)
#define DPAA_MEMPOOL_WARN(fmt, args...) \
DPAA_MEMPOOL_LOG(WARNING, fmt, ## args)
#endif

10
drivers/net/dpaa/dpaa_ethdev.c
View File

@ -46,6 +46,8 @@
#include <fsl_bman.h>
#include <fsl_fman.h>
int dpaa_logtype_pmd;
/* Supported Rx offloads */
static uint64_t dev_rx_offloads_sup =
DEV_RX_OFFLOAD_JUMBO_FRAME |
@ -1058,7 +1060,7 @@ static int dpaa_dev_queue_intr_disable(struct rte_eth_dev *dev,
temp1 = read(rxq->q_fd, &temp, sizeof(temp));
if (temp1 != sizeof(temp))
DPAA_EVENTDEV_ERR("irq read error");
DPAA_PMD_ERR("irq read error");
qman_fq_portal_thread_irq(rxq->qp);
@ -1664,3 +1666,9 @@ static struct rte_dpaa_driver rte_dpaa_pmd = {
};
RTE_PMD_REGISTER_DPAA(net_dpaa, rte_dpaa_pmd);
RTE_INIT(dpaa_net_init_log)
{
dpaa_logtype_pmd = rte_log_register("pmd.net.dpaa");
if (dpaa_logtype_pmd >= 0)
rte_log_set_level(dpaa_logtype_pmd, RTE_LOG_NOTICE);
}

22
drivers/net/dpaa/dpaa_ethdev.h
View File

@ -185,4 +185,26 @@ dpaa_rx_cb_atomic(void *event,
const struct qm_dqrr_entry *dqrr,
void **bufs);
/* PMD related logs */
extern int dpaa_logtype_pmd;
#define DPAA_PMD_LOG(level, fmt, args...) \
rte_log(RTE_LOG_ ## level, dpaa_logtype_pmd, "%s(): " fmt "\n", \
__func__, ##args)
#define PMD_INIT_FUNC_TRACE() DPAA_PMD_LOG(DEBUG, " >>")
#define DPAA_PMD_DEBUG(fmt, args...) \
DPAA_PMD_LOG(DEBUG, fmt, ## args)
#define DPAA_PMD_ERR(fmt, args...) \
DPAA_PMD_LOG(ERR, fmt, ## args)
#define DPAA_PMD_INFO(fmt, args...) \
DPAA_PMD_LOG(INFO, fmt, ## args)
#define DPAA_PMD_WARN(fmt, args...) \
DPAA_PMD_LOG(WARNING, fmt, ## args)
/* DP Logs, toggled out at compile time if level lower than current level */
#define DPAA_DP_LOG(level, fmt, args...) \
RTE_LOG_DP(level, PMD, fmt, ## args)
#endif