summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAtul Mittal <atulmt@qti.qualcomm.com>2014-07-10 17:00:35 +0530
committerAkash Patel <c_akashp@qca.qualcomm.com>2014-07-10 21:45:01 -0700
commit536f53f5bdfb329d008b2fd102a1b20c3625d794 (patch)
treeffc3ef3324b14f9f50cd6eeb1ade8171a090cf2b
parent530bf4dccca54f2ff8c3ab23611fa62c7aea7a8d (diff)
qcacld: fix unwanted f/w logs after ssr
After ssr the value 0 is being set for the log level and type, which causes the f/w logs to be printed on kmsg. Only if log report is set to 1 through iwpriv commnd, the log level and type should be set to the firmware. so to enable the f/w logs user need to set the all the three values which will be retained after ssr and set to f/w, controlled by log report command. Change-Id: I3ec3cfc25b1c64a757cd79fbd518e11856f8998d CRs-Fixed: 690158
-rw-r--r--CORE/HDD/src/wlan_hdd_early_suspend.c37
-rwxr-xr-xCORE/HDD/src/wlan_hdd_main.c2
2 files changed, 22 insertions, 17 deletions
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index c60e782d89e2..e8caf7b16df2 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -2248,24 +2248,29 @@ VOS_STATUS hdd_wlan_re_init(void *hif_sc)
WMI_DBGLOG_MODULE_DISABLE,
pHddCtx->fw_log_settings.enable, DBG_CMD);
}
- process_wma_set_command(pAdapter->sessionId,
- WMI_DBGLOG_TYPE,
- pHddCtx->fw_log_settings.dl_type, DBG_CMD);
- process_wma_set_command(pAdapter->sessionId,
- WMI_DBGLOG_REPORT_ENABLE,
- pHddCtx->fw_log_settings.dl_report, DBG_CMD);
- process_wma_set_command(pAdapter->sessionId,
- WMI_DBGLOG_LOG_LEVEL,
- pHddCtx->fw_log_settings.dl_loglevel, DBG_CMD);
- for (i = 0; i < MAX_MOD_LOGLEVEL; i++) {
- if (pHddCtx->fw_log_settings.dl_mod_loglevel[i] != 0) {
- process_wma_set_command(pAdapter->sessionId,
- WMI_DBGLOG_MOD_LOG_LEVEL,
- pHddCtx->fw_log_settings.dl_mod_loglevel[i],
- DBG_CMD);
+ if (pHddCtx->fw_log_settings.dl_report != 0) {
+
+ process_wma_set_command(pAdapter->sessionId,
+ WMI_DBGLOG_REPORT_ENABLE,
+ pHddCtx->fw_log_settings.dl_report, DBG_CMD);
+
+ process_wma_set_command(pAdapter->sessionId,
+ WMI_DBGLOG_TYPE,
+ pHddCtx->fw_log_settings.dl_type, DBG_CMD);
+
+ process_wma_set_command(pAdapter->sessionId,
+ WMI_DBGLOG_LOG_LEVEL,
+ pHddCtx->fw_log_settings.dl_loglevel, DBG_CMD);
+
+ for (i = 0; i < MAX_MOD_LOGLEVEL; i++) {
+ if (pHddCtx->fw_log_settings.dl_mod_loglevel[i] != 0) {
+ process_wma_set_command(pAdapter->sessionId,
+ WMI_DBGLOG_MOD_LOG_LEVEL,
+ pHddCtx->fw_log_settings.dl_mod_loglevel[i],
+ DBG_CMD);
+ }
}
}
-
/* end of f/w log config after ssr */
pHddCtx->isLogpInProgress = FALSE;
vos_set_logp_in_progress(VOS_MODULE_ID_VOSS, FALSE);
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 28893dd34f93..66614a23387e 100755
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -11437,7 +11437,7 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc)
/* Initialize struct for saving f/w log setting will be used
after ssr */
- pHddCtx->fw_log_settings.enable = 0;
+ pHddCtx->fw_log_settings.enable = pHddCtx->cfg_ini->enablefwlog;
pHddCtx->fw_log_settings.dl_type = 0;
pHddCtx->fw_log_settings.dl_report = 0;
pHddCtx->fw_log_settings.dl_loglevel = 0;