diff options
| -rw-r--r-- | core/hdd/inc/wlan_hdd_cfg.h | 4 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_main.c | 15 | ||||
| -rw-r--r-- | core/utils/fwlog/dbglog_host.c | 5 |
3 files changed, 13 insertions, 11 deletions
diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index 3feac5c4a440..baabdc9d96f3 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -4941,13 +4941,13 @@ typedef enum { #define CFG_ENABLE_FW_DEBUG_LOG_LEVEL "gFwDebugLogLevel" #define CFG_ENABLE_FW_DEBUG_LOG_LEVEL_MIN (0) #define CFG_ENABLE_FW_DEBUG_LOG_LEVEL_MAX (255) -#define CFG_ENABLE_FW_DEBUG_LOG_LEVEL_DEFAULT (4) +#define CFG_ENABLE_FW_DEBUG_LOG_LEVEL_DEFAULT (3) /* For valid values of log levels check enum DBGLOG_LOG_LVL and * for valid values of module ids check enum WLAN_MODULE_ID. */ #define CFG_ENABLE_FW_MODULE_LOG_LEVEL "gFwDebugModuleLoglevel" -#define CFG_ENABLE_FW_MODULE_LOG_DEFAULT "" +#define CFG_ENABLE_FW_MODULE_LOG_DEFAULT "2,1,5,1,8,1,9,1,11,1,18,1,27,1,31,1,36,1,47,1" /* * <ini> diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 0963bab10e72..4281edbbb394 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -3081,11 +3081,16 @@ static void hdd_set_fw_log_params(hdd_context_t *hdd_ctx, * For FW module ID 7 enable log level 6 */ - /* FW expects WMI command value = - * Module ID * 10 + Module Log level - */ - value = ((moduleloglevel[count] * 10) + - moduleloglevel[count + 1]); + if ((moduleloglevel[count] > WLAN_MODULE_ID_MAX) + || (moduleloglevel[count + 1] > DBGLOG_LVL_MAX)) { + hdd_err("Module id %d and dbglog level %d input length is more than max", + moduleloglevel[count], + moduleloglevel[count + 1]); + return; + } + + value = moduleloglevel[count] << 16; + value |= moduleloglevel[count + 1]; ret = wma_cli_set_command(adapter->sessionId, WMI_DBGLOG_MOD_LOG_LEVEL, value, DBG_CMD); diff --git a/core/utils/fwlog/dbglog_host.c b/core/utils/fwlog/dbglog_host.c index 529d51e7dd14..11be14cb7faa 100644 --- a/core/utils/fwlog/dbglog_host.c +++ b/core/utils/fwlog/dbglog_host.c @@ -1326,12 +1326,9 @@ int dbglog_set_log_lvl(wmi_unified_t wmi_handle, enum DBGLOG_LOG_LVL log_lvl) int dbglog_set_mod_log_lvl(wmi_unified_t wmi_handle, A_UINT32 mod_log_lvl) { - A_UINT32 val = 0; /* set the global module level to log_lvl */ - WMI_DBGLOG_SET_MODULE_ID(val, (mod_log_lvl / 10)); - WMI_DBGLOG_SET_LOG_LEVEL(val, (mod_log_lvl % 10)); wma_config_debug_module_cmd(wmi_handle, WMI_DEBUG_LOG_PARAM_LOG_LEVEL, - val, NULL, 0); + mod_log_lvl, NULL, 0); return 0; } |