From e239d9680d1f652b31899f88d734cbf844354aca Mon Sep 17 00:00:00 2001
From: Nishank Aggarwal <naggar@codeaurora.org>
Date: Fri, 3 Mar 2017 12:26:02 +0530
Subject: [PATCH] qcacld-3.0: Change default firmware log levels

Change default log level for all firmware modules and
also per module with a specific log level.

Change-Id: I33275f2737e0e56daea4e2edd8debca8016f1ed0
CRs-Fixed: 2013439
---
 core/hdd/inc/wlan_hdd_cfg.h  |  4 ++--
 core/hdd/src/wlan_hdd_main.c | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h
index becbe8cdd0a7..f2e499f57932 100644
--- a/core/hdd/inc/wlan_hdd_cfg.h
+++ b/core/hdd/inc/wlan_hdd_cfg.h
@@ -4290,13 +4290,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 595768407ab4..6e7463a9d518 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -3109,11 +3109,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);