From bc6eaa1fca3d57d1f5895281cb6b2d345d43d398 Mon Sep 17 00:00:00 2001 From: Wu Gao Date: Fri, 30 Nov 2018 14:17:45 +0800 Subject: [PATCH] qcacld-3.0: Remove QDF TRACE INIs Since QDF TRACE INIs used infrequently, remove them and related codes. Please file new FR to trace the requirement about host log level setting. Change-Id: I9c519cf2509e3dc22282f0c7ea6f52cbd2913ccd CRs-Fixed: 2358850 --- core/hdd/inc/hdd_config.h | 2 + core/hdd/inc/wlan_hdd_cfg.h | 78 ----------------- core/hdd/src/wlan_hdd_cfg.c | 162 ----------------------------------- core/hdd/src/wlan_hdd_main.c | 47 +--------- 4 files changed, 3 insertions(+), 286 deletions(-) diff --git a/core/hdd/inc/hdd_config.h b/core/hdd/inc/hdd_config.h index f2bee7e84d42..f484ca87f964 100644 --- a/core/hdd/inc/hdd_config.h +++ b/core/hdd/inc/hdd_config.h @@ -29,6 +29,8 @@ #include "wlan_tgt_def_config.h" #endif +#define CFG_QDF_TRACE_ENABLE_DEFAULT (0xffff) + /** * enum hdd_wext_control - knob for wireless extensions * @hdd_wext_disabled - interface is completely disabled. An access diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index eef7b8bd6e59..744acb5e840c 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -2420,58 +2420,6 @@ enum hdd_link_speed_rpt_type { #define CFG_ENABLE_FW_MODULE_LOG_LEVEL "gFwDebugModuleLoglevel" #define CFG_ENABLE_FW_MODULE_LOG_DEFAULT "2,1,3,1,5,1,9,1,13,1,14,1,18,1,19,1,26,1,28,1,29,1,31,1,36,1,38,1,46,1,47,1,50,1,52,1,53,1,56,1,60,1,61,1,4,1" -/* - * QDF Trace Enable Control - * Notes: - * the MIN/MAX/DEFAULT values apply for all modules - * the DEFAULT value is outside the valid range. if the DEFAULT - * value is not overridden, then no change will be made to the - * "built in" default values compiled into the code - * values are a bitmap indicating which log levels are to enabled - * (must match order of qdf_trace_level enumerations) - * 00000001 FATAL - * 00000010 ERROR - * 00000100 WARN - * 00001000 INFO - * 00010000 INFO HIGH - * 00100000 INFO MED - * 01000000 INFO LOW - * 10000000 DEBUG - * - * hence a value of 0xFF would set all bits (enable all logs) - */ - -#define CFG_QDF_TRACE_ENABLE_WDI_NAME "qdf_trace_enable_wdi" -#define CFG_QDF_TRACE_ENABLE_HDD_NAME "qdf_trace_enable_hdd" -#define CFG_QDF_TRACE_ENABLE_SME_NAME "qdf_trace_enable_sme" -#define CFG_QDF_TRACE_ENABLE_PE_NAME "qdf_trace_enable_pe" -#define CFG_QDF_TRACE_ENABLE_PMC_NAME "qdf_trace_enable_pmc" -#define CFG_QDF_TRACE_ENABLE_WMA_NAME "qdf_trace_enable_wma" -#define CFG_QDF_TRACE_ENABLE_SYS_NAME "qdf_trace_enable_sys" -#define CFG_QDF_TRACE_ENABLE_QDF_NAME "qdf_trace_enable_qdf" -#define CFG_QDF_TRACE_ENABLE_SAP_NAME "qdf_trace_enable_sap" -#define CFG_QDF_TRACE_ENABLE_HDD_SAP_NAME "qdf_trace_enable_hdd_sap" -#define CFG_QDF_TRACE_ENABLE_BMI_NAME "qdf_trace_enable_bmi" -#define CFG_QDF_TRACE_ENABLE_CFG_NAME "qdf_trace_enable_cfg" -#define CFG_QDF_TRACE_ENABLE_EPPING "qdf_trace_enable_epping" -#define CFG_QDF_TRACE_ENABLE_QDF_DEVICES "qdf_trace_enable_qdf_devices" -#define CFG_QDF_TRACE_ENABLE_TXRX_NAME "qdf_trace_enable_txrx" -#define CFG_QDF_TRACE_ENABLE_DP_NAME "qdf_trace_enable_dp" -#define CFG_QDF_TRACE_ENABLE_HTC_NAME "qdf_trace_enable_htc" -#define CFG_QDF_TRACE_ENABLE_HIF_NAME "qdf_trace_enable_hif" -#define CFG_CDR_TRACE_ENABLE_HDD_SAP_DATA_NAME "qdf_trace_enable_hdd_sap_data" -#define CFG_QDF_TRACE_ENABLE_HDD_DATA_NAME "qdf_trace_enable_hdd_data" -#define CFG_QDF_TRACE_ENABLE_WIFI_POS "qdf_trace_enable_wifi_pos" -#define CFG_QDF_TRACE_ENABLE_NAN "qdf_trace_enable_nan" -#define CFG_QDF_TRACE_ENABLE_REGULATORY "qdf_trace_enable_regulatory" -#define CFG_QDF_TRACE_ENABLE_CP_STATS "qdf_trace_enable_cp_stats" - -#define CFG_QDF_TRACE_ENABLE_MIN (0) -#define CFG_QDF_TRACE_ENABLE_MAX (0xff) -#define CFG_QDF_TRACE_ENABLE_DEFAULT (0xffff) -/* disable debug logs for DP by default */ -#define CFG_QDF_TRACE_ENABLE_DP_DEFAULT (0x7f) - #ifdef ENABLE_MTRACE_LOG /* * Enable MTRACE for all modules @@ -5240,32 +5188,6 @@ struct hdd_config { #ifdef FEATURE_WLAN_SCAN_PNO bool PnoOffload; #endif - -/* QDF Trace Control*/ - uint16_t qdf_trace_enable_wdi; - uint16_t qdf_trace_enable_hdd; - uint16_t qdf_trace_enable_sme; - uint16_t qdf_trace_enable_pe; - uint16_t qdf_trace_enable_pmc; - uint16_t qdf_trace_enable_wma; - uint16_t qdf_trace_enable_sys; - uint16_t qdf_trace_enable_qdf; - uint16_t qdf_trace_enable_sap; - uint16_t qdf_trace_enable_hdd_sap; - uint16_t qdf_trace_enable_bmi; - uint16_t qdf_trace_enable_cfg; - uint16_t qdf_trace_enable_txrx; - uint16_t qdf_trace_enable_dp; - uint16_t qdf_trace_enable_htc; - uint16_t qdf_trace_enable_hif; - uint16_t qdf_trace_enable_hdd_sap_data; - uint16_t qdf_trace_enable_hdd_data; - uint16_t qdf_trace_enable_epping; - uint16_t qdf_trace_enable_qdf_devices; - uint16_t qdf_trace_enable_wifi_pos; - uint16_t qdf_trace_enable_nan; - uint16_t qdf_trace_enable_regulatory; - uint16_t qdf_trace_enable_cp_stats; #ifdef ENABLE_MTRACE_LOG bool enable_mtrace; #endif diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index 949debeef4af..60bcbfc21ba6 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -384,168 +384,6 @@ struct reg_table_entry g_registry_table[] = { CFG_STA_KEEPALIVE_METHOD_MIN, CFG_STA_KEEPALIVE_METHOD_MAX), -/* CFG_QDF_TRACE_ENABLE Parameters */ - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_WDI_NAME, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_wdi, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_HDD_NAME, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_hdd, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_BMI_NAME, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_bmi, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_SME_NAME, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_sme, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_PE_NAME, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_pe, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_WMA_NAME, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_wma, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_SYS_NAME, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_sys, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_QDF_NAME, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_qdf, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_SAP_NAME, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_sap, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_HDD_SAP_NAME, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_hdd_sap, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_CFG_NAME, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_cfg, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_TXRX_NAME, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_txrx, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_DP_NAME, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_dp, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DP_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_HTC_NAME, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_htc, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_HIF_NAME, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_hif, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_CDR_TRACE_ENABLE_HDD_SAP_DATA_NAME, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_hdd_sap_data, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_HDD_DATA_NAME, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_hdd_data, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_EPPING, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_epping, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_QDF_DEVICES, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_qdf_devices, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_WIFI_POS, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_wifi_pos, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_NAN, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_nan, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_REGULATORY, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_regulatory, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - - REG_VARIABLE(CFG_QDF_TRACE_ENABLE_CP_STATS, WLAN_PARAM_Integer, - struct hdd_config, qdf_trace_enable_cp_stats, - VAR_FLAGS_OPTIONAL, - CFG_QDF_TRACE_ENABLE_DEFAULT, - CFG_QDF_TRACE_ENABLE_MIN, - CFG_QDF_TRACE_ENABLE_MAX), - #ifdef ENABLE_MTRACE_LOG REG_VARIABLE(CFG_ENABLE_MTRACE, WLAN_PARAM_Integer, struct hdd_config, enable_mtrace, diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index ecf492ad6eb5..5a47ea55f3ce 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -9061,52 +9061,7 @@ static void hdd_set_mtrace_for_each(struct hdd_context *hdd_ctx) */ static void hdd_set_trace_level_for_each(struct hdd_context *hdd_ctx) { - hdd_qdf_trace_enable(QDF_MODULE_ID_WMI, - hdd_ctx->config->qdf_trace_enable_wdi); - hdd_qdf_trace_enable(QDF_MODULE_ID_HDD, - hdd_ctx->config->qdf_trace_enable_hdd); - hdd_qdf_trace_enable(QDF_MODULE_ID_SME, - hdd_ctx->config->qdf_trace_enable_sme); - hdd_qdf_trace_enable(QDF_MODULE_ID_PE, - hdd_ctx->config->qdf_trace_enable_pe); - hdd_qdf_trace_enable(QDF_MODULE_ID_WMA, - hdd_ctx->config->qdf_trace_enable_wma); - hdd_qdf_trace_enable(QDF_MODULE_ID_SYS, - hdd_ctx->config->qdf_trace_enable_sys); - hdd_qdf_trace_enable(QDF_MODULE_ID_QDF, - hdd_ctx->config->qdf_trace_enable_qdf); - hdd_qdf_trace_enable(QDF_MODULE_ID_SAP, - hdd_ctx->config->qdf_trace_enable_sap); - hdd_qdf_trace_enable(QDF_MODULE_ID_HDD_SOFTAP, - hdd_ctx->config->qdf_trace_enable_hdd_sap); - hdd_qdf_trace_enable(QDF_MODULE_ID_BMI, - hdd_ctx->config->qdf_trace_enable_bmi); - hdd_qdf_trace_enable(QDF_MODULE_ID_CFG, - hdd_ctx->config->qdf_trace_enable_cfg); - hdd_qdf_trace_enable(QDF_MODULE_ID_EPPING, - hdd_ctx->config->qdf_trace_enable_epping); - hdd_qdf_trace_enable(QDF_MODULE_ID_QDF_DEVICE, - hdd_ctx->config->qdf_trace_enable_qdf_devices); - hdd_qdf_trace_enable(QDF_MODULE_ID_TXRX, - hdd_ctx->config->qdf_trace_enable_txrx); - hdd_qdf_trace_enable(QDF_MODULE_ID_DP, - hdd_ctx->config->qdf_trace_enable_dp); - hdd_qdf_trace_enable(QDF_MODULE_ID_HTC, - hdd_ctx->config->qdf_trace_enable_htc); - hdd_qdf_trace_enable(QDF_MODULE_ID_HIF, - hdd_ctx->config->qdf_trace_enable_hif); - hdd_qdf_trace_enable(QDF_MODULE_ID_HDD_SAP_DATA, - hdd_ctx->config->qdf_trace_enable_hdd_sap_data); - hdd_qdf_trace_enable(QDF_MODULE_ID_HDD_DATA, - hdd_ctx->config->qdf_trace_enable_hdd_data); - hdd_qdf_trace_enable(QDF_MODULE_ID_WIFIPOS, - hdd_ctx->config->qdf_trace_enable_wifi_pos); - hdd_qdf_trace_enable(QDF_MODULE_ID_NAN, - hdd_ctx->config->qdf_trace_enable_nan); - hdd_qdf_trace_enable(QDF_MODULE_ID_REGULATORY, - hdd_ctx->config->qdf_trace_enable_regulatory); - hdd_qdf_trace_enable(QDF_MODULE_ID_CP_STATS, - hdd_ctx->config->qdf_trace_enable_cp_stats); + hdd_qdf_trace_enable(QDF_MODULE_ID_DP, 0x7f); hdd_qdf_trace_enable(QDF_MODULE_ID_MLME, 0xffff); hdd_qdf_trace_enable(QDF_MODULE_ID_FWOL, 0xffff); hdd_qdf_trace_enable(QDF_MODULE_ID_CRYPTO, 0xffff);