net/bnx2x: implement dynamic logging

Replace compile time option for init and driver log with
dynamic value.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
v2: remove remaining RTE_LIBRTE_BNX2X_DEBUG usage

diff --git a/config/common_base b/config/common_base
index bee31e7..5d40fed 100644 (file)
--- a/config/common_base
+++ b/config/common_base
@@ -243,8 +243,6 @@ CONFIG_RTE_LIBRTE_MLX5_TX_MP_CACHE=8
 # Compile burst-oriented Broadcom PMD driver
 #
 CONFIG_RTE_LIBRTE_BNX2X_PMD=n
 # Compile burst-oriented Broadcom PMD driver
 #
 CONFIG_RTE_LIBRTE_BNX2X_PMD=n

-CONFIG_RTE_LIBRTE_BNX2X_DEBUG=n
-CONFIG_RTE_LIBRTE_BNX2X_DEBUG_INIT=n

 CONFIG_RTE_LIBRTE_BNX2X_DEBUG_RX=n
 CONFIG_RTE_LIBRTE_BNX2X_DEBUG_TX=n
 CONFIG_RTE_LIBRTE_BNX2X_MF_SUPPORT=n
 CONFIG_RTE_LIBRTE_BNX2X_DEBUG_RX=n
 CONFIG_RTE_LIBRTE_BNX2X_DEBUG_TX=n
 CONFIG_RTE_LIBRTE_BNX2X_MF_SUPPORT=n

diff --git a/doc/guides/nics/bnx2x.rst b/doc/guides/nics/bnx2x.rst
index fbfc048..b1fec8a 100644 (file)
--- a/doc/guides/nics/bnx2x.rst
+++ b/doc/guides/nics/bnx2x.rst
@@ -102,14 +102,6 @@ enabling debugging options may affect system performance.
   to 'y'. Also, in order for firmware binary to load user will need zlib devel
   package installed.
 
   to 'y'. Also, in order for firmware binary to load user will need zlib devel
   package installed.
 

-- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG`` (default **n**)
-
-  Toggle display of generic debugging messages.
-
-- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_INIT`` (default **n**)
-
-  Toggle display of initialization related messages.
-

 - ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_TX`` (default **n**)
 
   Toggle display of transmit fast path run-time messages.
 - ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_TX`` (default **n**)
 
   Toggle display of transmit fast path run-time messages.

diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index 1b36cab..fb02d0f 100644 (file)
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -1130,9 +1130,7 @@ static void
 bnx2x_sp_event(struct bnx2x_softc *sc, struct bnx2x_fastpath *fp,
             union eth_rx_cqe *rr_cqe)
 {
 bnx2x_sp_event(struct bnx2x_softc *sc, struct bnx2x_fastpath *fp,
             union eth_rx_cqe *rr_cqe)
 {

-#ifdef RTE_LIBRTE_BNX2X_DEBUG

        int cid = SW_CID(rr_cqe->ramrod_cqe.conn_and_cmd_data);
        int cid = SW_CID(rr_cqe->ramrod_cqe.conn_and_cmd_data);

-#endif

        int command = CQE_CMD(rr_cqe->ramrod_cqe.conn_and_cmd_data);
        enum ecore_queue_cmd drv_cmd = ECORE_Q_CMD_MAX;
        struct ecore_queue_sp_obj *q_obj = &BNX2X_SP_OBJ(sc, fp).q_obj;
        int command = CQE_CMD(rr_cqe->ramrod_cqe.conn_and_cmd_data);
        enum ecore_queue_cmd drv_cmd = ECORE_Q_CMD_MAX;
        struct ecore_queue_sp_obj *q_obj = &BNX2X_SP_OBJ(sc, fp).q_obj;


@@ -7547,9 +7545,7 @@ static void bnx2x_probe_pci_caps(struct bnx2x_softc *sc)
 
        struct bnx2x_pci_cap *caps;
        uint16_t link_status;
 
        struct bnx2x_pci_cap *caps;
        uint16_t link_status;

-#ifdef RTE_LIBRTE_BNX2X_DEBUG

        int reg = 0;
        int reg = 0;

-#endif

 
        /* check if PCI Power Management is enabled */
        caps = pci_find_cap(sc, PCIY_PMG, BNX2X_PCI_CAP);
 
        /* check if PCI Power Management is enabled */
        caps = pci_find_cap(sc, PCIY_PMG, BNX2X_PCI_CAP);

diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c
index 95861a0..483d5a1 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_ethdev.c
+++ b/drivers/net/bnx2x/bnx2x_ethdev.c
@@ -14,6 +14,9 @@
 #include <rte_dev.h>
 #include <rte_ethdev_pci.h>
 
 #include <rte_dev.h>
 #include <rte_ethdev_pci.h>
 

+int bnx2x_logtype_init;
+int bnx2x_logtype_driver;
+

 /*
  * The set of PCI devices this driver supports
  */
 /*
  * The set of PCI devices this driver supports
  */


@@ -687,3 +690,15 @@ RTE_PMD_REGISTER_KMOD_DEP(net_bnx2x, "* igb_uio | uio_pci_generic | vfio-pci");
 RTE_PMD_REGISTER_PCI(net_bnx2xvf, rte_bnx2xvf_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_bnx2xvf, pci_id_bnx2xvf_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_bnx2xvf, "* igb_uio | vfio-pci");
 RTE_PMD_REGISTER_PCI(net_bnx2xvf, rte_bnx2xvf_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_bnx2xvf, pci_id_bnx2xvf_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_bnx2xvf, "* igb_uio | vfio-pci");

+
+RTE_INIT(bnx2x_init_log);
+static void
+bnx2x_init_log(void)
+{
+       bnx2x_logtype_init = rte_log_register("pmd.bnx2x.init");
+       if (bnx2x_logtype_init >= 0)
+               rte_log_set_level(bnx2x_logtype_init, RTE_LOG_NOTICE);
+       bnx2x_logtype_driver = rte_log_register("pmd.bnx2x.driver");
+       if (bnx2x_logtype_driver >= 0)
+               rte_log_set_level(bnx2x_logtype_driver, RTE_LOG_NOTICE);
+}

diff --git a/drivers/net/bnx2x/bnx2x_logs.h b/drivers/net/bnx2x/bnx2x_logs.h
index dff014d..08c1b76 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_logs.h
+++ b/drivers/net/bnx2x/bnx2x_logs.h
@@ -11,14 +11,12 @@
 #ifndef _PMD_LOGS_H_
 #define _PMD_LOGS_H_
 
 #ifndef _PMD_LOGS_H_
 #define _PMD_LOGS_H_
 

+extern int bnx2x_logtype_init;

 #define PMD_INIT_LOG(level, fmt, args...) \
 #define PMD_INIT_LOG(level, fmt, args...) \

-       RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ##args)
+       rte_log(RTE_LOG_ ## level, bnx2x_logtype_init, \
+               "%s(): " fmt "\n", __func__, ##args)

 
 

-#ifdef RTE_LIBRTE_BNX2X_DEBUG_INIT

 #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>")
 #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>")

-#else
-#define PMD_INIT_FUNC_TRACE() do { } while(0)
-#endif

 
 #ifdef RTE_LIBRTE_BNX2X_DEBUG_RX
 #define PMD_RX_LOG(level, fmt, args...) \
 
 #ifdef RTE_LIBRTE_BNX2X_DEBUG_RX
 #define PMD_RX_LOG(level, fmt, args...) \


@@ -41,12 +39,10 @@
 #define PMD_TX_FREE_LOG(level, fmt, args...) do { } while(0)
 #endif
 
 #define PMD_TX_FREE_LOG(level, fmt, args...) do { } while(0)
 #endif
 

-#ifdef RTE_LIBRTE_BNX2X_DEBUG
+extern int bnx2x_logtype_driver;

 #define PMD_DRV_LOG_RAW(level, fmt, args...) \
 #define PMD_DRV_LOG_RAW(level, fmt, args...) \

-       RTE_LOG(level, PMD, "%s(): " fmt, __func__, ## args)
-#else
-#define PMD_DRV_LOG_RAW(level, fmt, args...) do { } while (0)
-#endif
+       rte_log(RTE_LOG_ ## level, bnx2x_logtype_driver, \
+               "%s(): " fmt, __func__, ## args)

 
 #define PMD_DRV_LOG(level, fmt, args...) \
        PMD_DRV_LOG_RAW(level, fmt "\n", ## args)
 
 #define PMD_DRV_LOG(level, fmt, args...) \
        PMD_DRV_LOG_RAW(level, fmt "\n", ## args)


@@ -58,5 +54,4 @@
 #define PMD_DEBUG_PERIODIC_LOG(level, fmt, args...) do { } while(0)
 #endif
 
 #define PMD_DEBUG_PERIODIC_LOG(level, fmt, args...) do { } while(0)
 #endif
 

-

 #endif /* _PMD_LOGS_H_ */
 #endif /* _PMD_LOGS_H_ */