From 3c344a5def73137ecc5a6a95020a7fd7830cac7a Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Wed, 21 Mar 2018 11:28:20 +0000 Subject: [PATCH] net/sfc: remove dedicated init log parameter The previous patches in the set convert per-port logging to use NOTICE level and make this level default. This provides the possibility to remove the dedicated toggle for init-related messages and merge init logging with the main log type. In order to keep these logs silent by default, INFO level should be used. Signed-off-by: Ivan Malov Signed-off-by: Andrew Rybchenko Reviewed-by: Andy Moreton --- doc/guides/nics/sfc_efx.rst | 4 ---- drivers/net/sfc/sfc.h | 1 - drivers/net/sfc/sfc_ethdev.c | 9 +-------- drivers/net/sfc/sfc_kvargs.c | 1 - drivers/net/sfc/sfc_kvargs.h | 2 -- drivers/net/sfc/sfc_log.h | 11 +++++------ 6 files changed, 6 insertions(+), 22 deletions(-) diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst index a580d94067..c0b52d3ccb 100644 --- a/doc/guides/nics/sfc_efx.rst +++ b/doc/guides/nics/sfc_efx.rst @@ -321,10 +321,6 @@ boolean parameters value. **auto** allows NIC firmware to make a choice based on installed licences and firmware variant configured using **sfboot**. -- ``debug_init`` [bool] (default **n**) - - Enable extra logging during device initialization and startup. - - ``mcdi_logging`` [bool] (default **n**) Enable extra logging of the communication with the NIC's management CPU. diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h index 768578e4cc..378c675c44 100644 --- a/drivers/net/sfc/sfc.h +++ b/drivers/net/sfc/sfc.h @@ -171,7 +171,6 @@ struct sfc_adapter { struct rte_eth_dev *eth_dev; struct rte_kvargs *kvargs; uint32_t logtype_main; - bool debug_init; int socket_id; efsys_bar_t mem_bar; efx_family_t family; diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c index f27ce63db8..ebd0a2343c 100644 --- a/drivers/net/sfc/sfc_ethdev.c +++ b/drivers/net/sfc/sfc_ethdev.c @@ -1931,11 +1931,6 @@ sfc_eth_dev_init(struct rte_eth_dev *dev) if (rc != 0) goto fail_kvargs_parse; - rc = sfc_kvargs_process(sa, SFC_KVARG_DEBUG_INIT, - sfc_kvarg_bool_handler, &sa->debug_init); - if (rc != 0) - goto fail_kvarg_debug_init; - sfc_log_init(sa, "entry"); dev->data->mac_addrs = rte_zmalloc("sfc", ETHER_ADDR_LEN, 0); @@ -1989,7 +1984,6 @@ fail_probe: dev->data->mac_addrs = NULL; fail_mac_addrs: -fail_kvarg_debug_init: sfc_kvargs_cleanup(sa); fail_kvargs_parse: @@ -2072,8 +2066,7 @@ RTE_PMD_REGISTER_PARAM_STRING(net_sfc_efx, SFC_KVARG_TX_DATAPATH "=" SFC_KVARG_VALUES_TX_DATAPATH " " SFC_KVARG_PERF_PROFILE "=" SFC_KVARG_VALUES_PERF_PROFILE " " SFC_KVARG_STATS_UPDATE_PERIOD_MS "= " - SFC_KVARG_MCDI_LOGGING "=" SFC_KVARG_VALUES_BOOL " " - SFC_KVARG_DEBUG_INIT "=" SFC_KVARG_VALUES_BOOL); + SFC_KVARG_MCDI_LOGGING "=" SFC_KVARG_VALUES_BOOL); RTE_INIT(sfc_driver_register_logtype); static void diff --git a/drivers/net/sfc/sfc_kvargs.c b/drivers/net/sfc/sfc_kvargs.c index 8f55e99ba9..860adeb8ba 100644 --- a/drivers/net/sfc/sfc_kvargs.c +++ b/drivers/net/sfc/sfc_kvargs.c @@ -23,7 +23,6 @@ sfc_kvargs_parse(struct sfc_adapter *sa) struct rte_devargs *devargs = eth_dev->device->devargs; const char **params = (const char *[]){ SFC_KVARG_STATS_UPDATE_PERIOD_MS, - SFC_KVARG_DEBUG_INIT, SFC_KVARG_MCDI_LOGGING, SFC_KVARG_PERF_PROFILE, SFC_KVARG_RX_DATAPATH, diff --git a/drivers/net/sfc/sfc_kvargs.h b/drivers/net/sfc/sfc_kvargs.h index e7044ca6f3..2c7aaaff21 100644 --- a/drivers/net/sfc/sfc_kvargs.h +++ b/drivers/net/sfc/sfc_kvargs.h @@ -18,8 +18,6 @@ extern "C" { #define SFC_KVARG_VALUES_BOOL "[1|y|yes|on|0|n|no|off]" -#define SFC_KVARG_DEBUG_INIT "debug_init" - #define SFC_KVARG_MCDI_LOGGING "mcdi_logging" #define SFC_KVARG_PERF_PROFILE "perf_profile" diff --git a/drivers/net/sfc/sfc_log.h b/drivers/net/sfc/sfc_log.h index ec903db36d..6daab1c037 100644 --- a/drivers/net/sfc/sfc_log.h +++ b/drivers/net/sfc/sfc_log.h @@ -77,12 +77,11 @@ extern uint32_t sfc_logtype_driver; do { \ const struct sfc_adapter *_sa = (sa); \ \ - if (_sa->debug_init) \ - SFC_LOG(_sa, RTE_LOG_INFO, _sa->logtype_main, \ - RTE_FMT("%s(): " \ - RTE_FMT_HEAD(__VA_ARGS__,), \ - __func__, \ - RTE_FMT_TAIL(__VA_ARGS__,))); \ + SFC_LOG(_sa, RTE_LOG_INFO, _sa->logtype_main, \ + RTE_FMT("%s(): " \ + RTE_FMT_HEAD(__VA_ARGS__ ,), \ + __func__, \ + RTE_FMT_TAIL(__VA_ARGS__ ,))); \ } while (0) #endif /* _SFC_LOG_H_ */ -- 2.20.1