Add debug options to the config file. Define macros used for logs and make use of config file options to enable them.
Signed-off-by: Alfredo Cardigliano <cardigli...@ntop.org> Reviewed-by: Shannon Nelson <snel...@pensando.io> --- config/common_base | 2 ++ drivers/net/ionic/Makefile | 2 +- drivers/net/ionic/ionic_ethdev.c | 21 +++++++++++++++++ drivers/net/ionic/ionic_logs.h | 46 ++++++++++++++++++++++++++++++++++++++ drivers/net/ionic/meson.build | 1 + 5 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 drivers/net/ionic/ionic_ethdev.c create mode 100644 drivers/net/ionic/ionic_logs.h diff --git a/config/common_base b/config/common_base index 1c11fcae6..c1b556fc1 100644 --- a/config/common_base +++ b/config/common_base @@ -274,6 +274,8 @@ CONFIG_RTE_LIBRTE_E1000_PF_DISABLE_STRIP_CRC=n # Compile Pensando IONIC PMD driver # CONFIG_RTE_LIBRTE_IONIC_PMD=y +CONFIG_RTE_LIBRTE_IONIC_DEBUG_RX=n +CONFIG_RTE_LIBRTE_IONIC_DEBUG_TX=n # # Compile burst-oriented HINIC PMD driver diff --git a/drivers/net/ionic/Makefile b/drivers/net/ionic/Makefile index 3add24087..2f3296a15 100644 --- a/drivers/net/ionic/Makefile +++ b/drivers/net/ionic/Makefile @@ -52,6 +52,6 @@ LDLIBS += -lrte_bus_pci # # all source are stored in SRCS-y # -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += +SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_ethdev.c include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c new file mode 100644 index 000000000..863d20d19 --- /dev/null +++ b/drivers/net/ionic/ionic_ethdev.c @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0 + * Copyright(c) 2018-2019 Pensando Systems, Inc. All rights reserved. + */ + +#include "ionic_logs.h" + +int ionic_logtype_init; +int ionic_logtype_driver; + +RTE_INIT(ionic_init_log) +{ + ionic_logtype_init = rte_log_register("pmd.net.ionic.init"); + + if (ionic_logtype_init >= 0) + rte_log_set_level(ionic_logtype_init, RTE_LOG_NOTICE); + + ionic_logtype_driver = rte_log_register("pmd.net.ionic.driver"); + + if (ionic_logtype_driver >= 0) + rte_log_set_level(ionic_logtype_driver, RTE_LOG_NOTICE); +} diff --git a/drivers/net/ionic/ionic_logs.h b/drivers/net/ionic/ionic_logs.h new file mode 100644 index 000000000..a4a9af888 --- /dev/null +++ b/drivers/net/ionic/ionic_logs.h @@ -0,0 +1,46 @@ +/* SPDX-License-Identifier: GPL-2.0 + * Copyright(c) 2018-2019 Pensando Systems, Inc. All rights reserved. + */ + +#ifndef _IONIC_LOGS_H_ +#define _IONIC_LOGS_H_ + +#include <rte_log.h> + +extern int ionic_logtype_init; +extern int ionic_logtype_driver; + +#define ionic_init_print(level, fmt, args...) rte_log(RTE_LOG_ ## level, \ + ionic_logtype_init, "%s(): " fmt "\n", __func__, ##args) + +#define ionic_init_print_call() ionic_init_print(DEBUG, " >>") + +#ifndef IONIC_WARN_ON +#define IONIC_WARN_ON(x) do { \ + int ret = !!(x); \ + if (unlikely(ret)) \ + ionic_init_print(WARNING, "WARN_ON: \"" #x "\" at %s:%d\n", \ + __func__, __LINE__); \ +} while (0) +#endif + +#ifdef RTE_LIBRTE_IONIC_DEBUG_RX +#define ionic_rx_print(level, fmt, args...) RTE_LOG(level, PMD, \ + "%s(): " fmt "\n", __func__, ## args) +#else +#define ionic_rx_print(level, fmt, args...) do { } while (0) +#endif + +#ifdef RTE_LIBRTE_IONIC_DEBUG_TX +#define ionic_tx_print(level, fmt, args...) RTE_LOG(level, PMD, \ + "%s(): " fmt "\n", __func__, ## args) +#else +#define ionic_tx_print(level, fmt, args...) do { } while (0) +#endif + +#define ionic_drv_print(level, fmt, args...) rte_log(RTE_LOG_ ## level, \ + ionic_logtype_driver, "%s(): " fmt "\n", __func__, ## args) + +#define ionic_drv_print_call() ionic_drv_print(DEBUG, " >>") + +#endif /* _IONIC_LOGS_H_ */ diff --git a/drivers/net/ionic/meson.build b/drivers/net/ionic/meson.build index 502076e3c..5534ad6c3 100644 --- a/drivers/net/ionic/meson.build +++ b/drivers/net/ionic/meson.build @@ -4,5 +4,6 @@ version = 1 sources = files( + 'ionic_ethdev.c' )