wlan: Scenario based BUG report
Change to initiate BUG report in case of fatal event.
Added INI support to Enable/Disable it.
The fatal event handled are as below:
1) Command response from FW is failure. ADD/DEL BSS/STA etc.
2) Roaming failed after successfull preauth.
3) MC, TX, RX Thread is Stucked for 5 sec.
4) Data stall for 10 sec.
5) Sme command timeout.
6) PE defer queue is full.
7) Deny Apps suspend for 15 min.
8) Failed to allocate memory.
9) VOS run out of message wrapper.
10) Management tx timeout.
11) HDD level wait for event timeout.
CRs-Fixed: 912560
Change-Id: I46fb96e1d90f4ab6df2b9f343a0bfc75cb89a417
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index b5f6c73..d8438c6 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -2363,6 +2363,11 @@
#define CFG_DISABLE_P2P_MAC_ADDR_SPOOFING_MAX (1)
#define CFG_DISABLE_P2P_MAC_ADDR_SPOOFING_DEFAULT (0)
+#define CFG_ENABLE_FATAL_EVENT_TRIGGER "gEnableFatalEvent"
+#define CFG_ENABLE_FATAL_EVENT_TRIGGER_MIN (0)
+#define CFG_ENABLE_FATAL_EVENT_TRIGGER_MAX (1)
+#define CFG_ENABLE_FATAL_EVENT_TRIGGER_DEFAULT (0)
+
#define CFG_ENABLE_MGMT_LOGGING "gEnableMgmtLogging"
#define CFG_ENABLE_MGMT_LOGGING_MIN (0)
@@ -3028,6 +3033,7 @@
v_BOOL_t sendDeauthBeforeCon;
v_BOOL_t enableMacSpoofing;
v_BOOL_t disableP2PMacSpoofing;
+ v_BOOL_t enableFatalEvent;
v_BOOL_t enableMgmtLogging;
v_BOOL_t enableBMUHWtracing;
v_BOOL_t enableFWLogging;
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index eb5901a..ebb2a9c 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -1493,8 +1493,11 @@
struct hdd_ext_scan_context ext_scan_context;
#endif /* WLAN_FEATURE_EXTSCAN */
-/* Time since boot up to WiFi turn ON (in micro seconds) */
-v_U64_t wifi_turn_on_time_since_boot;
+ /* Time since boot up to WiFi turn ON (in micro seconds) */
+ v_U64_t wifi_turn_on_time_since_boot;
+ unsigned long last_suspend_success;
+ v_U32_t continuous_suspend_fail_cnt;
+
};
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 71fa450..6ac3f6a 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -3171,6 +3171,13 @@
CFG_DISABLE_P2P_MAC_ADDR_SPOOFING_MIN,
CFG_DISABLE_P2P_MAC_ADDR_SPOOFING_MAX),
+ REG_VARIABLE(CFG_ENABLE_FATAL_EVENT_TRIGGER, WLAN_PARAM_Integer,
+ hdd_config_t, enableFatalEvent,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_ENABLE_FATAL_EVENT_TRIGGER_DEFAULT,
+ CFG_ENABLE_FATAL_EVENT_TRIGGER_MIN,
+ CFG_ENABLE_FATAL_EVENT_TRIGGER_MAX),
+
REG_VARIABLE(CFG_ENABLE_MGMT_LOGGING, WLAN_PARAM_Integer,
hdd_config_t, enableMgmtLogging,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@@ -3836,6 +3843,9 @@
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
"Name = [disableP2PMacSpoofing] Value = [%u] ",
pHddCtx->cfg_ini->disableP2PMacSpoofing);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
+ "Name = [enableFatalEvent] Value = [%u] ",
+ pHddCtx->cfg_ini->enableFatalEvent);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gRoamtoDFSChannel] Value = [%u] ",pHddCtx->cfg_ini->allowDFSChannelRoam);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gMaxConcurrentActiveSessions] Value = [%u] ", pHddCtx->cfg_ini->gMaxConcurrentActiveSessions);
#ifdef WLAN_FEATURE_AP_HT40_24G
@@ -5650,6 +5660,7 @@
smeConfig->csrConfig.ignorePeerErpInfo = pConfig->ignorePeerErpInfo;
smeConfig->csrConfig.ignorePeerHTopMode = pConfig->ignorePeerHTopMode;
smeConfig->csrConfig.disableP2PMacSpoofing = pConfig->disableP2PMacSpoofing;
+ smeConfig->csrConfig.enableFatalEvent= pConfig->enableFatalEvent;
smeConfig->csrConfig.initialScanSkipDFSCh = pConfig->initialScanSkipDFSCh;
smeConfig->csrConfig.isCoalesingInIBSSAllowed =
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 85a58cc..6e1e29d 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -5644,7 +5644,7 @@
status = vos_fatal_event_logs_req(WLAN_LOG_TYPE_NON_FATAL,
WLAN_LOG_INDICATOR_FRAMEWORK,
WLAN_LOG_REASON_CODE_FRAMEWORK,
- TRUE
+ TRUE, TRUE
);
if (VOS_STATUS_SUCCESS != status) {
hddLog(LOGE, FL("Failed to trigger bug report"));
@@ -16189,6 +16189,11 @@
"%s: LOGP in Progress. Ignore!!!", __func__);
return -EAGAIN;
}
+ if (rc <= 0)
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_HDD_TIME_OUT,
+ TRUE, TRUE);
ret = -EINVAL;
goto tx_failed;
diff --git a/CORE/HDD/src/wlan_hdd_dev_pwr.c b/CORE/HDD/src/wlan_hdd_dev_pwr.c
index ab7378c..b4c40a8 100644
--- a/CORE/HDD/src/wlan_hdd_dev_pwr.c
+++ b/CORE/HDD/src/wlan_hdd_dev_pwr.c
@@ -118,13 +118,33 @@
VOS_TRACE(VOS_MODULE_ID_HDD,VOS_TRACE_LEVEL_FATAL,"%s: Global VOS_SCHED context is Null",__func__);
return 0;
}
- if(!vos_is_apps_power_collapse_allowed(pHddCtx))
+
+ if (!pHddCtx->last_suspend_success)
+ pHddCtx->last_suspend_success = vos_timer_get_system_time();
+
+ if (!vos_is_apps_power_collapse_allowed(pHddCtx))
{
/* Fail this suspend */
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, "%s: Fail wlan suspend: not in IMPS/BMPS", __func__);
+ pHddCtx->continuous_suspend_fail_cnt++;
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ FL("Fail wlan suspend: not in IMPS/BMPS, continuous Failcnt %d"),
+ pHddCtx->continuous_suspend_fail_cnt);
+
+ /* call fatal event if power collapse fails for
+ * WLAN_POWER_COLLAPSE_FAIL_THRESHOLD time.
+ */
+ if ((vos_timer_get_system_time() - pHddCtx->last_suspend_success) >=
+ WLAN_POWER_COLLAPSE_FAIL_THRESHOLD)
+ {
+ pHddCtx->last_suspend_success = 0;
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_POWER_COLLAPSE_FAIL,
+ FALSE, TRUE);
+ }
return -EPERM;
}
-
+ pHddCtx->continuous_suspend_fail_cnt = 0;
/*
Suspending MC Thread, Rx Thread and Tx Thread as the platform driver is going to Suspend.
*/
@@ -158,7 +178,18 @@
"%s: TX Thread: will still suspend", __func__);
goto tx_suspend;
}
-
+ /* call fatal event if suspend for
+ * WLAN_POWER_COLLAPSE_FAIL_THRESHOLD time.
+ */
+ if ((vos_timer_get_system_time() - pHddCtx->last_suspend_success) >=
+ WLAN_POWER_COLLAPSE_FAIL_THRESHOLD)
+ {
+ pHddCtx->last_suspend_success = 0;
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_POWER_COLLAPSE_FAIL,
+ FALSE, TRUE);
+ }
return -ETIME;
}
@@ -199,6 +230,18 @@
/* Set the Tx Thread as Resumed */
pHddCtx->isTxThreadSuspended = FALSE;
+ /* call fatal event if suspend for
+ * WLAN_POWER_COLLAPSE_FAIL_THRESHOLD time.
+ */
+ if ((vos_timer_get_system_time() - pHddCtx->last_suspend_success) >=
+ WLAN_POWER_COLLAPSE_FAIL_THRESHOLD)
+ {
+ pHddCtx->last_suspend_success = 0;
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_POWER_COLLAPSE_FAIL,
+ FALSE, TRUE);
+ }
return -ETIME;
}
@@ -248,6 +291,19 @@
/* Set the Tx Thread as Resumed */
pHddCtx->isTxThreadSuspended = FALSE;
+ /* call fatal event if suspend for
+ * WLAN_POWER_COLLAPSE_FAIL_THRESHOLD time.
+ */
+ if ((vos_timer_get_system_time() - pHddCtx->last_suspend_success) >=
+ WLAN_POWER_COLLAPSE_FAIL_THRESHOLD)
+ {
+ pHddCtx->last_suspend_success = 0;
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_POWER_COLLAPSE_FAIL,
+ FALSE, TRUE);
+ }
+
return -ETIME;
}
@@ -257,7 +313,7 @@
/* Set the Station state as Suspended */
pHddCtx->isWlanSuspended = TRUE;
-
+ pHddCtx->last_suspend_success = 0;
return 0;
}
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index 2b874e8..9969bee 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -318,6 +318,10 @@
"%s: timeout waiting for remain on channel"
" ready indication %d",
__func__, status);
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_HDD_TIME_OUT,
+ FALSE, TRUE);
return VOS_STATUS_E_FAILURE;
}
@@ -1053,7 +1057,10 @@
if (cfgState->remain_on_chan_ctx)
cfgState->remain_on_chan_ctx->is_pending_roc_cancelled = TRUE;
mutex_unlock(&pHddCtx->roc_lock);
-
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_HDD_TIME_OUT,
+ FALSE, TRUE);
return 0;
}
diff --git a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
index 113c140..6b79559 100644
--- a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
@@ -96,6 +96,8 @@
#define HDD_SAP_TX_TIMEOUT_RATELIMIT_BURST 1
#define HDD_SAP_TX_STALL_SSR_THRESHOLD 5
#define HDD_SAP_TX_STALL_RECOVERY_THRESHOLD HDD_SAP_TX_STALL_SSR_THRESHOLD - 2
+#define HDD_SAP_TX_STALL_FATAL_EVENT_THRESHOLD 2
+
static DEFINE_RATELIMIT_STATE(hdd_softap_tx_timeout_rs, \
HDD_SAP_TX_TIMEOUT_RATELIMIT_INTERVAL, \
@@ -750,7 +752,15 @@
hdd_wmm_tx_snapshot(pAdapter);
WLANTL_TLDebugMessage(WLANTL_DEBUG_TX_SNAPSHOT);
}
-
+ /* Call fatal event if data stall is for
+ * HDD_TX_STALL_FATAL_EVENT_THRESHOLD times
+ */
+ if (HDD_SAP_TX_STALL_FATAL_EVENT_THRESHOLD ==
+ pAdapter->hdd_stats.hddTxRxStats.continuousTxTimeoutCount)
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_DATA_STALL,
+ FALSE, TRUE);
}
void hdd_softap_tx_timeout(struct net_device *dev)
diff --git a/CORE/HDD/src/wlan_hdd_trace.c b/CORE/HDD/src/wlan_hdd_trace.c
index 766431e..a062523 100644
--- a/CORE/HDD/src/wlan_hdd_trace.c
+++ b/CORE/HDD/src/wlan_hdd_trace.c
@@ -119,13 +119,13 @@
{
if (TRACE_CODE_HDD_RX_SME_MSG == pRecord->code)
{
- hddLog(LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ",
+ hddLog(LOGW, "%04d %012u S%d %-14s %-30s(0x%x)",
recIndex, pRecord->time, pRecord->session, "RX SME MSG:",
get_eRoamCmdStatus_str(pRecord->data), pRecord->data);
}
else
{
- hddLog(LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ",
+ hddLog(LOGW, "%04d %012u S%d %-14s %-30s(0x%x)",
recIndex, pRecord->time, pRecord->session, "HDD Event:",
hddTraceGetEventString(pRecord->code), pRecord->data);
}
diff --git a/CORE/HDD/src/wlan_hdd_tx_rx.c b/CORE/HDD/src/wlan_hdd_tx_rx.c
index 77d1f8c..c680c54 100644
--- a/CORE/HDD/src/wlan_hdd_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_tx_rx.c
@@ -90,6 +90,8 @@
#define HDD_TX_STALL_SSR_THRESHOLD 5
#define HDD_TX_STALL_SSR_THRESHOLD_HIGH 13
#define HDD_TX_STALL_RECOVERY_THRESHOLD HDD_TX_STALL_SSR_THRESHOLD - 2
+#define HDD_TX_STALL_FATAL_EVENT_THRESHOLD 2
+
int gRatefromIdx[] = {
10,20,55,100,
@@ -1226,7 +1228,15 @@
hdd_wmm_tx_snapshot(pAdapter);
WLANTL_TLDebugMessage(WLANTL_DEBUG_TX_SNAPSHOT);
}
-
+ /* Call fatal event if data stall is for
+ * HDD_TX_STALL_FATAL_EVENT_THRESHOLD times
+ */
+ if (HDD_TX_STALL_FATAL_EVENT_THRESHOLD ==
+ pAdapter->hdd_stats.hddTxRxStats.continuousTxTimeoutCount)
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_DATA_STALL,
+ FALSE, TRUE);
}
/**============================================================================
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index 2304198..b9e9e8e 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -7090,7 +7090,7 @@
vos_fatal_event_logs_req(WLAN_LOG_TYPE_NON_FATAL,
WLAN_LOG_INDICATOR_IOCTL,
WLAN_LOG_REASON_IOCTL,
- TRUE);
+ TRUE, TRUE);
break;
}
case WE_GET_FW_MEMDUMP:
diff --git a/CORE/MAC/src/pe/lim/limTrace.c b/CORE/MAC/src/pe/lim/limTrace.c
index b7ed07e..5ac5ddf 100644
--- a/CORE/MAC/src/pe/lim/limTrace.c
+++ b/CORE/MAC/src/pe/lim/limTrace.c
@@ -151,104 +151,154 @@
switch (pRecord->code) {
case TRACE_CODE_MLM_STATE:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- "MLM State:", limTraceGetMlmStateString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOGW, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "MLM State:",
+ limTraceGetMlmStateString((tANI_U16)pRecord->data),
+ pRecord->data);
break;
case TRACE_CODE_SME_STATE:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- "SME State:", limTraceGetSmeStateString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOGW, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "SME State:",
+ limTraceGetSmeStateString((tANI_U16)pRecord->data),
+ pRecord->data);
break;
case TRACE_CODE_TX_MGMT:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- "TX Mgmt:", frameSubtypeStr[pRecord->data], pRecord->data );
+ limLog(pMac, LOGW, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "TX Mgmt:", frameSubtypeStr[pRecord->data], pRecord->data);
break;
case TRACE_CODE_RX_MGMT:
if (LIM_TRACE_MAX_SUBTYPES <= LIM_TRACE_GET_SUBTYPE(pRecord->data))
{
- limLog(pMac, LOGE, "Wrong Subtype - %d", LIM_TRACE_GET_SUBTYPE(pRecord->data));
+ limLog(pMac, LOGW, "Wrong Subtype - %d",
+ LIM_TRACE_GET_SUBTYPE(pRecord->data));
}
else
{
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(%d) SN: %d ", recIndex, pRecord->time, pRecord->session,
- "RX Mgmt:", frameSubtypeStr[LIM_TRACE_GET_SUBTYPE(pRecord->data)],
- LIM_TRACE_GET_SUBTYPE(pRecord->data),
- LIM_TRACE_GET_SSN(pRecord->data) );
+ limLog(pMac,
+ LOGW, "%04d %012u S%d %-14s %-30s(%d) SN: %d ",
+ recIndex, pRecord->time, pRecord->session,
+ "RX Mgmt:",
+ frameSubtypeStr[LIM_TRACE_GET_SUBTYPE(pRecord->data)],
+ LIM_TRACE_GET_SUBTYPE(pRecord->data),
+ LIM_TRACE_GET_SSN(pRecord->data));
}
break;
case TRACE_CODE_RX_MGMT_DROP:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(%d) ", recIndex, pRecord->time, pRecord->session,
- "Drop RX Mgmt:", __limTraceGetMgmtDropReasonString((tANI_U16)pRecord->data), pRecord->data);
+ limLog(pMac, LOGW, "%04d %012u S%d %-14s %-30s(%d)",
+ recIndex, pRecord->time, pRecord->session,
+ "Drop RX Mgmt:",
+ __limTraceGetMgmtDropReasonString((tANI_U16)pRecord->data),
+ pRecord->data);
break;
case TRACE_CODE_RX_MGMT_TSF:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s0x%x(%d) ", recIndex, pRecord->time, pRecord->session,
- "RX Mgmt TSF:", " ", pRecord->data, pRecord->data );
+ limLog(pMac, LOGW, "%04d %012u S%d %-14s %-30s0x%x(%d)",
+ recIndex, pRecord->time, pRecord->session,
+ "RX Mgmt TSF:", " ", pRecord->data, pRecord->data);
break;
case TRACE_CODE_TX_COMPLETE:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %d", recIndex, pRecord->time, pRecord->session,
- "TX Complete", pRecord->data );
+ limLog(pMac, LOGW, "%04d %012u S%d %-14s %d",
+ recIndex, pRecord->time, pRecord->session,
+ "TX Complete", pRecord->data);
break;
case TRACE_CODE_TX_SME_MSG:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- "TX SME Msg:", macTraceGetSmeMsgString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOGW, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "TX SME Msg:",
+ macTraceGetSmeMsgString((tANI_U16)pRecord->data),
+ pRecord->data );
break;
case TRACE_CODE_RX_SME_MSG:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- LIM_TRACE_GET_DEFRD_OR_DROPPED(pRecord->data) ? "Def/Drp LIM Msg:": "RX Sme Msg:",
- macTraceGetSmeMsgString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOGW, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ LIM_TRACE_GET_DEFRD_OR_DROPPED(pRecord->data)
+ ? "Def/Drp LIM Msg:": "RX Sme Msg:",
+ macTraceGetSmeMsgString((tANI_U16)pRecord->data),
+ pRecord->data);
break;
case TRACE_CODE_TX_WDA_MSG:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- "TX WDA Msg:", macTraceGetWdaMsgString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOGW, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "TX WDA Msg:",
+ macTraceGetWdaMsgString((tANI_U16)pRecord->data),
+ pRecord->data);
break;
case TRACE_CODE_RX_WDA_MSG:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- LIM_TRACE_GET_DEFRD_OR_DROPPED(pRecord->data) ? "Def/Drp LIM Msg:": "RX WDA Msg:",
- macTraceGetWdaMsgString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOGW, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ LIM_TRACE_GET_DEFRD_OR_DROPPED(pRecord->data)
+ ? "Def/Drp LIM Msg:": "RX WDA Msg:",
+ macTraceGetWdaMsgString((tANI_U16)pRecord->data),
+ pRecord->data );
break;
case TRACE_CODE_TX_LIM_MSG:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- "TX LIM Msg:", macTraceGetLimMsgString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOGW, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "TX LIM Msg:",
+ macTraceGetLimMsgString((tANI_U16)pRecord->data),
+ pRecord->data);
break;
case TRACE_CODE_RX_LIM_MSG:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- LIM_TRACE_GET_DEFRD_OR_DROPPED(pRecord->data) ? "Def/Drp LIM Msg:": "RX LIM Msg",
- macTraceGetLimMsgString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOGW, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ LIM_TRACE_GET_DEFRD_OR_DROPPED(pRecord->data)
+ ? "Def/Drp LIM Msg:": "RX LIM Msg",
+ macTraceGetLimMsgString((tANI_U16)pRecord->data),
+ pRecord->data );
break;
case TRACE_CODE_TX_CFG_MSG:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- "TX CFG Msg:", macTraceGetCfgMsgString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOGW, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "TX CFG Msg:",
+ macTraceGetCfgMsgString((tANI_U16)pRecord->data),
+ pRecord->data);
break;
case TRACE_CODE_RX_CFG_MSG:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- LIM_TRACE_GET_DEFRD_OR_DROPPED(pRecord->data) ? "Def/Drp LIM Msg:": "RX CFG Msg:",
- macTraceGetCfgMsgString((tANI_U16)MAC_TRACE_GET_MSG_ID(pRecord->data)),
- pRecord->data );
+ limLog(pMac, LOGW, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ LIM_TRACE_GET_DEFRD_OR_DROPPED(pRecord->data)
+ ? "Def/Drp LIM Msg:": "RX CFG Msg:",
+ macTraceGetCfgMsgString
+ ((tANI_U16)MAC_TRACE_GET_MSG_ID(pRecord->data)),
+ pRecord->data);
break;
case TRACE_CODE_TIMER_ACTIVATE:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- "Timer Actvtd", __limTraceGetTimerString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOGW, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "Timer Actvtd",
+ __limTraceGetTimerString((tANI_U16)pRecord->data),
+ pRecord->data);
break;
case TRACE_CODE_TIMER_DEACTIVATE:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) ", recIndex, pRecord->time, pRecord->session,
- "Timer DeActvtd", __limTraceGetTimerString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOGW, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "Timer DeActvtd",
+ __limTraceGetTimerString((tANI_U16)pRecord->data),
+ pRecord->data);
break;
case TRACE_CODE_INFO_LOG:
- limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) \n", recIndex, pRecord->time, pRecord->session,
- "INFORMATION_LOG", macTraceGetInfoLogString((tANI_U16)pRecord->data), pRecord->data );
+ limLog(pMac, LOGW, "%04d %012u S%d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "INFORMATION_LOG",
+ macTraceGetInfoLogString((tANI_U16)pRecord->data),
+ pRecord->data);
break;
default :
- limLog(pMac, LOGE, "%04d %012u S%d %-14s(%d) (0x%x) ", recIndex, pRecord->time, pRecord->session,
- "Unknown Code", pRecord->code, pRecord->data );
+ limLog(pMac, LOGW, "%04d %012u S%d %-14s(%d) (0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ "Unknown Code", pRecord->code, pRecord->data);
break;
}
}
diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c
index d9f3b78..6fe7eb8 100644
--- a/CORE/MAC/src/pe/lim/limUtils.c
+++ b/CORE/MAC/src/pe/lim/limUtils.c
@@ -1399,9 +1399,15 @@
**/
if (pMac->lim.gLimDeferredMsgQ.size >= MAX_DEFERRED_QUEUE_LEN)
{
- if(!(pMac->lim.deferredMsgCnt & 0xF))
+ if (!(pMac->lim.deferredMsgCnt & 0xF))
{
- PELOGE(limLog(pMac, LOGE, FL("Deferred Message Queue is full. Msg:%d Messages Failed:%d"), limMsg->type, ++pMac->lim.deferredMsgCnt);)
+ limLog(pMac, LOGE,
+ FL("Deferred Message Queue is full. Msg:%d Messages Failed:%d"),
+ limMsg->type, ++pMac->lim.deferredMsgCnt);
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_NON_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_QUEUE_FULL,
+ FALSE, TRUE);
}
else
{
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index 490e16c..aa016e9 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -1195,6 +1195,7 @@
tANI_U8 roamDelayStatsEnabled;
tANI_BOOLEAN ignorePeerHTopMode;
tANI_BOOLEAN disableP2PMacSpoofing;
+ tANI_BOOLEAN enableFatalEvent;
}tCsrConfigParam;
//Tush
diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h
index 9ba94a5..f27aec0 100644
--- a/CORE/SME/inc/csrInternal.h
+++ b/CORE/SME/inc/csrInternal.h
@@ -685,6 +685,7 @@
tANI_U8 roamDelayStatsEnabled;
tANI_BOOLEAN ignorePeerHTopMode;
tANI_BOOLEAN disableP2PMacSpoofing;
+ tANI_BOOLEAN enableFatalEvent;
}tCsrConfig;
typedef struct tagCsrChannelPowerInfo
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index 0851895..b6a4d8b 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -3751,7 +3751,8 @@
eHalStatus sme_DeleteAllTDLSPeers(tHalHandle hHal, uint8_t sessionId);
eHalStatus sme_fatal_event_logs_req(tHalHandle hHal, tANI_U32 is_fatal,
- tANI_U32 indicator, tANI_U32 reason_code);
+ tANI_U32 indicator, tANI_U32 reason_code,
+ tANI_BOOLEAN dump_vos_trace);
eHalStatus sme_enableDisableChanAvoidIndEvent(tHalHandle hHal,
tANI_U8 set_value);
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index c8bcaea..73e67b6 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -1955,6 +1955,8 @@
pMac->roam.configParam.ignorePeerHTopMode = pParam->ignorePeerHTopMode;
pMac->roam.configParam.disableP2PMacSpoofing =
pParam->disableP2PMacSpoofing;
+ pMac->roam.configParam.enableFatalEvent =
+ pParam->enableFatalEvent;
pMac->roam.configParam.isCoalesingInIBSSAllowed =
pParam->isCoalesingInIBSSAllowed;
pMac->roam.configParam.allowDFSChannelRoam = pParam->allowDFSChannelRoam;
@@ -2105,6 +2107,7 @@
pParam->ignorePeerHTopMode = pMac->roam.configParam.ignorePeerHTopMode;
pParam->disableP2PMacSpoofing =
pMac->roam.configParam.disableP2PMacSpoofing;
+ pParam->enableFatalEvent = pMac->roam.configParam.enableFatalEvent;
pParam->isCoalesingInIBSSAllowed =
pMac->roam.configParam.isCoalesingInIBSSAllowed;
@@ -8161,6 +8164,10 @@
{
smsLog( pMac, LOGW, "CSR SmeReassocReq failed with statusCode= 0x%08X [%d]", pSmeJoinRsp->statusCode, pSmeJoinRsp->statusCode );
result = eCsrReassocFailure;
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_ROAM_FAIL,
+ FALSE, TRUE);
#ifdef WLAN_FEATURE_VOWIFI_11R
if ((eSIR_SME_FT_REASSOC_TIMEOUT_FAILURE == pSmeJoinRsp->statusCode) ||
(eSIR_SME_FT_REASSOC_FAILURE == pSmeJoinRsp->statusCode) ||
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index fa12f38..dc2463b 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -465,8 +465,18 @@
smeCommandQueueFull++;
csrLLUnlock(&pMac->roam.roamCmdPendingList);
- /* panic with out-of-command */
- VOS_BUG(0);
+ if (pMac->roam.configParam.enableFatalEvent)
+ {
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_SME_OUT_OF_CMD_BUF,
+ FALSE, TRUE);
+ }
+ else
+ {
+ /* panic with out-of-command */
+ VOS_BUG(0);
+ }
}
if( pRetCmd )
@@ -11746,20 +11756,39 @@
void activeListCmdTimeoutHandle(void *userData)
{
+ tHalHandle hHal= (tHalHandle) userData;
+ tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
+
+ if (NULL == pMac)
+ {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,
+ "%s: pMac is null", __func__);
+ return;
+ }
/* Return if no cmd pending in active list as
* in this case we should not be here.
*/
if ((NULL == userData) ||
- (0 == csrLLCount(&((tpAniSirGlobal) userData)->sme.smeCmdActiveList)))
+ (0 == csrLLCount(&pMac->sme.smeCmdActiveList)))
return;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s: Active List command timeout Cmd List Count %d", __func__,
- csrLLCount(&((tpAniSirGlobal) userData)->sme.smeCmdActiveList) );
- smeGetCommandQStatus((tHalHandle) userData);
+ csrLLCount(&pMac->sme.smeCmdActiveList) );
+ smeGetCommandQStatus(hHal);
- if (!(vos_isLoadUnloadInProgress() ||
- vos_is_logp_in_progress(VOS_MODULE_ID_SME, NULL)))
- VOS_BUG(0);
+ if (pMac->roam.configParam.enableFatalEvent)
+ {
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_SME_COMMAND_STUCK,
+ FALSE, TRUE);
+ }
+ else
+ {
+ if (!(vos_isLoadUnloadInProgress() ||
+ vos_is_logp_in_progress(VOS_MODULE_ID_SME, NULL)))
+ VOS_BUG(0);
+ }
}
#ifdef FEATURE_WLAN_CH_AVOID
@@ -13047,7 +13076,8 @@
WDA else return eHAL_STATUS_FAILURE
-------------------------------------------------------------------------*/
eHalStatus sme_fatal_event_logs_req(tHalHandle hHal, tANI_U32 is_fatal,
- tANI_U32 indicator, tANI_U32 reason_code)
+ tANI_U32 indicator, tANI_U32 reason_code,
+ tANI_BOOLEAN dump_vos_trace)
{
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
vos_msg_t msg;
@@ -13055,6 +13085,16 @@
VOS_STATUS vosStatus = VOS_STATUS_SUCCESS;
tpSirFatalEventLogsReqParam pFatalEventLogsReqParams;
+ /* Dump all VosTrace */
+ if (dump_vos_trace)
+ vosTraceDumpAll(pMac,0,0,0,0);
+
+ if (WLAN_LOG_INDICATOR_HOST_ONLY == indicator)
+ {
+ vos_flush_host_logs_for_fatal();
+ return VOS_STATUS_SUCCESS;
+ }
+
if ( eHAL_STATUS_SUCCESS == sme_AcquireGlobalLock( &pMac->sme ))
{
pFatalEventLogsReqParams = vos_mem_malloc(sizeof(tSirFatalEventLogsReqParam));
diff --git a/CORE/SME/src/sme_common/sme_Trace.c b/CORE/SME/src/sme_common/sme_Trace.c
index 5b3c4cb..3e18dcc 100644
--- a/CORE/SME/src/sme_common/sme_Trace.c
+++ b/CORE/SME/src/sme_common/sme_Trace.c
@@ -210,24 +210,24 @@
{
switch (pRecord->code) {
case TRACE_CODE_SME_COMMAND:
- smsLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x)",
+ smsLog(pMac, LOGW, "%04d %012u S%d %-14s %-30s(0x%x)",
recIndex, pRecord->time, pRecord->session, "SME COMMAND:",
smeTraceGetCommandString(pRecord->data), pRecord->data);
break;
case TRACE_CODE_SME_TX_WDA_MSG:
- smsLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x)",
+ smsLog(pMac, LOGW, "%04d %012u S%d %-14s %-30s(0x%x)",
recIndex, pRecord->time, pRecord->session, "TX WDA Msg:",
macTraceGetWdaMsgString((tANI_U16)pRecord->data),
pRecord->data);
break;
case TRACE_CODE_SME_RX_WDA_MSG:
- smsLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x)",
+ smsLog(pMac, LOGW, "%04d %012u S%d %-14s %-30s(0x%x)",
recIndex, pRecord->time, pRecord->session, "RX WDA Msg:",
macTraceGetSmeMsgString((tANI_U16)pRecord->data),
pRecord->data);
break;
default:
- smsLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x)",
+ smsLog(pMac, LOGW, "%04d %012u S%d %-14s %-30s(0x%x)",
recIndex, pRecord->time, pRecord->session, "RX HDD MSG:",
smeTraceGetRxMsgString(pRecord->code), pRecord->data);
break;
diff --git a/CORE/SVC/inc/wlan_logging_sock_svc.h b/CORE/SVC/inc/wlan_logging_sock_svc.h
index 9d8d071..d5afa33 100644
--- a/CORE/SVC/inc/wlan_logging_sock_svc.h
+++ b/CORE/SVC/inc/wlan_logging_sock_svc.h
@@ -49,13 +49,16 @@
void wlan_process_done_indication(uint8 type, uint32 reason_code);
int wlan_logging_sock_activate_svc(int log_fe_to_console, int num_buf,
int pkt_stats_enabled, int pkt_stats_buff);
+void wlan_flush_host_logs_for_fatal(void);
+
void wlan_init_log_completion(void);
int wlan_set_log_completion(uint32 is_fatal,
uint32 indicator,
uint32 reason_code);
-void wlan_get_log_completion(uint32 *is_fatal,
+void wlan_get_log_and_reset_completion(uint32 *is_fatal,
uint32 *indicator,
- uint32 *reason_code);
+ uint32 *reason_code,
+ bool reset);
bool wlan_is_log_report_in_progress(void);
void wlan_reset_log_report_in_progress(void);
diff --git a/CORE/SVC/src/logging/wlan_logging_sock_svc.c b/CORE/SVC/src/logging/wlan_logging_sock_svc.c
index ed10cfd..4c31888 100644
--- a/CORE/SVC/src/logging/wlan_logging_sock_svc.c
+++ b/CORE/SVC/src/logging/wlan_logging_sock_svc.c
@@ -66,6 +66,7 @@
#define LOGGER_FATAL_EVENT_POST_MASK 0x004
#define LOGGER_FW_MEM_DUMP_PKT_POST_MASK 0x005
#define LOGGER_FW_MEM_DUMP_PKT_POST_DONE_MASK 0x006
+#define DETECT_THREAD_STUCK_POST_MASK 0x007
#define LOGGER_MAX_DATA_MGMT_PKT_Q_LEN (8)
@@ -1133,18 +1134,16 @@
}
/**
- * wlan_logging_detect_thread_stuck_cb()- Call back of the
- * thread stuck timer to detect thread stuck
+ * wlan_logging_detect_thread_stuck()- Detect thread stuck
* by probing the MC, TX, RX threads and take action if
* Thread doesnt respond.
- * @priv: timer data.
- * This function is called when the thread stuck timer expire
- * to detect thread stuck
+ *
+ * This function is called to detect thread stuck
* and probe threads.
*
* Return: void
*/
-static void wlan_logging_detect_thread_stuck_cb(void *priv)
+static void wlan_logging_detect_thread_stuck(void)
{
unsigned long flags;
@@ -1154,14 +1153,32 @@
(gwlan_logging.txThreadStuckCount == THREAD_STUCK_COUNT) ||
(gwlan_logging.rxThreadStuckCount == THREAD_STUCK_COUNT)) {
spin_unlock_irqrestore(&gwlan_logging.thread_stuck_lock, flags);
- pr_err("%s: %s Thread Stuck !!!\n", __func__,
- ((gwlan_logging.mcThreadStuckCount == THREAD_STUCK_COUNT)?
- "MC" : (gwlan_logging.mcThreadStuckCount ==
- THREAD_STUCK_COUNT)? "TX" : "RX"));
+ pr_err("%s: Thread Stuck !!! MC Count %d RX count %d TX count %d\n",
+ __func__, gwlan_logging.mcThreadStuckCount,
+ gwlan_logging.rxThreadStuckCount,
+ gwlan_logging.txThreadStuckCount);
VOS_BUG(0);
return;
}
+ if (gwlan_logging.mcThreadStuckCount ||
+ gwlan_logging.txThreadStuckCount ||
+ gwlan_logging.rxThreadStuckCount) {
+
+ spin_unlock_irqrestore(&gwlan_logging.thread_stuck_lock, flags);
+
+ pr_err("%s: MC Count %d RX count %d TX count %d\n",
+ __func__, gwlan_logging.mcThreadStuckCount,
+ gwlan_logging.rxThreadStuckCount,
+ gwlan_logging.txThreadStuckCount);
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_ONLY,
+ WLAN_LOG_REASON_THREAD_STUCK,
+ FALSE, TRUE);
+
+ spin_lock_irqsave(&gwlan_logging.thread_stuck_lock, flags);
+ }
+
/* Increment the thread stuck count for all threads */
gwlan_logging.mcThreadStuckCount++;
gwlan_logging.txThreadStuckCount++;
@@ -1178,6 +1195,25 @@
}
/**
+ * wlan_logging_detect_thread_stuck_cb()- Call back of the
+ * thread stuck timer.
+ * @priv: timer data.
+ * This function is called when the thread stuck timer
+ * expire to detect thread stuck and probe threads.
+ *
+ * Return: void
+ */
+static void wlan_logging_detect_thread_stuck_cb(void *priv)
+{
+ if (!gwlan_logging.exit)
+ {
+ set_bit(DETECT_THREAD_STUCK_POST_MASK,
+ &gwlan_logging.event_flag);
+ wake_up_interruptible(&gwlan_logging.wait_queue);
+ }
+}
+
+/**
* wlan_logging_thread() - The WLAN Logger thread
* @Arg - pointer to the HDD context
*
@@ -1224,7 +1260,9 @@
test_bit(LOGGER_FW_MEM_DUMP_PKT_POST_MASK,&gwlan_logging.event_flag) ||
test_bit(LOGGER_FW_MEM_DUMP_PKT_POST_DONE_MASK, &gwlan_logging.event_flag)||
test_bit(HOST_PKT_STATS_POST_MASK,
- &gwlan_logging.event_flag)));
+ &gwlan_logging.event_flag) ||
+ test_bit(DETECT_THREAD_STUCK_POST_MASK,
+ &gwlan_logging.event_flag)));
if (ret_wait_status == -ERESTARTSYS) {
pr_err("%s: wait_event return -ERESTARTSYS", __func__);
@@ -1241,6 +1279,11 @@
if (-ENOMEM == ret) {
msleep(200);
}
+ if (WLAN_LOG_INDICATOR_HOST_ONLY ==
+ gwlan_logging.log_complete.indicator)
+ {
+ vos_send_fatal_event_done();
+ }
}
if (test_and_clear_bit(LOGGER_FW_LOG_PKT_POST_MASK,
@@ -1252,7 +1295,10 @@
&gwlan_logging.event_flag)) {
send_data_mgmt_log_pkt_to_user();
}
-
+ if (test_and_clear_bit(DETECT_THREAD_STUCK_POST_MASK,
+ &gwlan_logging.event_flag)) {
+ wlan_logging_detect_thread_stuck();
+ }
if (test_and_clear_bit(LOGGER_FATAL_EVENT_POST_MASK,
&gwlan_logging.event_flag)) {
if (gwlan_logging.log_complete.is_flush_complete == true) {
@@ -1261,6 +1307,8 @@
}
else {
gwlan_logging.log_complete.is_flush_complete = true;
+ /* Flush all current host logs*/
+ wlan_queue_logmsg_for_app();
set_bit(HOST_LOG_POST_MASK,&gwlan_logging.event_flag);
set_bit(LOGGER_FW_LOG_PKT_POST_MASK,&gwlan_logging.event_flag);
set_bit(LOGGER_FATAL_EVENT_POST_MASK,&gwlan_logging.event_flag);
@@ -1370,9 +1418,10 @@
spin_unlock_irqrestore(&gwlan_logging.bug_report_lock, flags);
return 0;
}
-void wlan_get_log_completion(uint32 *is_fatal,
+void wlan_get_log_and_reset_completion(uint32 *is_fatal,
uint32 *indicator,
- uint32 *reason_code)
+ uint32 *reason_code,
+ bool reset)
{
unsigned long flags;
@@ -1380,7 +1429,13 @@
*indicator = gwlan_logging.log_complete.indicator;
*is_fatal = gwlan_logging.log_complete.is_fatal;
*reason_code = gwlan_logging.log_complete.reason_code;
- gwlan_logging.log_complete.is_report_in_progress = false;
+ if (reset) {
+ gwlan_logging.log_complete.indicator = WLAN_LOG_TYPE_NON_FATAL;
+ gwlan_logging.log_complete.is_fatal = WLAN_LOG_INDICATOR_UNUSED;
+ gwlan_logging.log_complete.is_report_in_progress = false;
+ gwlan_logging.log_complete.reason_code =
+ WLAN_LOG_REASON_CODE_UNUSED;
+ }
spin_unlock_irqrestore(&gwlan_logging.bug_report_lock, flags);
}
@@ -1848,21 +1903,6 @@
void wlan_process_done_indication(uint8 type, uint32 reason_code)
{
-<<<<<<< HEAD
- if ((type == WLAN_FW_LOGS) && (wlan_is_log_report_in_progress() == TRUE))
- {
- pr_info("%s: Setting LOGGER_FATAL_EVENT\n", __func__);
- set_bit(LOGGER_FATAL_EVENT_POST_MASK, &gwlan_logging.event_flag);
- wake_up_interruptible(&gwlan_logging.wait_queue);
- }
- if(type == WLAN_FW_MEMORY_DUMP)
- {
- pr_info("%s: Setting FW MEM DUMP LOGGER event\n", __func__);
- set_bit(LOGGER_FW_MEM_DUMP_PKT_POST_DONE_MASK, &gwlan_logging.event_flag);
- wake_up_interruptible(&gwlan_logging.wait_queue);
- }
-
-=======
if ((type == WLAN_FW_LOGS) && reason_code)
{
if(wlan_is_log_report_in_progress() == TRUE)
@@ -1883,8 +1923,28 @@
wake_up_interruptible(&gwlan_logging.wait_queue);
}
}
->>>>>>> 6ea54f9... wlan: Handle fatal event triggered from framework and FW
+ if(type == WLAN_FW_MEMORY_DUMP)
+ {
+ pr_info("%s: Setting FW MEM DUMP LOGGER event\n", __func__);
+ set_bit(LOGGER_FW_MEM_DUMP_PKT_POST_DONE_MASK, &gwlan_logging.event_flag);
+ wake_up_interruptible(&gwlan_logging.wait_queue);
+ }
}
+/**
+ * wlan_flush_host_logs_for_fatal() -flush host logs and send
+ * fatal event to upper layer.
+ */
+void wlan_flush_host_logs_for_fatal()
+{
+ if (wlan_is_log_report_in_progress()) {
+ pr_info("%s:flush all host logs Setting HOST_LOG_POST_MASK\n",
+ __func__);
+ wlan_queue_logmsg_for_app();
+ set_bit(HOST_LOG_POST_MASK, &gwlan_logging.event_flag);
+ wake_up_interruptible(&gwlan_logging.wait_queue);
+ }
+}
+
/**
* wlan_is_logger_thread()- Check if threadid is
@@ -1929,7 +1989,6 @@
spin_unlock_irqrestore(&gwlan_logging.thread_stuck_lock, flags);
}
-<<<<<<< HEAD
int wlan_fwr_mem_dump_buffer_allocation(void)
{
/*Allocate the dump memory as reported by fw.
@@ -2127,7 +2186,6 @@
kfree_skb(skb);
return;
}
-=======
#ifdef FEATURE_WLAN_DIAG_SUPPORT
/**
* wlan_report_log_completion() - Report bug report completion to userspace
@@ -2154,6 +2212,5 @@
WLAN_VOS_DIAG_EVENT_REPORT(&wlan_diag_event, EVENT_WLAN_LOG_COMPLETE);
}
#endif
->>>>>>> 6ea54f9... wlan: Handle fatal event triggered from framework and FW
#endif /* WLAN_LOGGING_SOCK_SVC_ENABLE */
diff --git a/CORE/TL/src/wlan_qct_tl_trace.c b/CORE/TL/src/wlan_qct_tl_trace.c
index 3a3e2f3..88e50db 100644
--- a/CORE/TL/src/wlan_qct_tl_trace.c
+++ b/CORE/TL/src/wlan_qct_tl_trace.c
@@ -64,10 +64,12 @@
void tlTraceDump(void *pMac, tpvosTraceRecord pRecord, v_U16_t recIndex)
{
- TLLOGE( VOS_TRACE (VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "%04d %012u S%-3d %-14s %-30s(0x%x)",
- recIndex, pRecord->time, pRecord->session, " TL Event: ",
- tlTraceGetEventString (pRecord->code), pRecord->data));
+ TLLOGE( VOS_TRACE (VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_WARN,
+ "%04d %012u S%-3d %-14s %-30s(0x%x)",
+ recIndex, pRecord->time, pRecord->session,
+ " TL Event: ",
+ tlTraceGetEventString (pRecord->code),
+ pRecord->data));
}
void tlTraceInit()
diff --git a/CORE/VOSS/inc/vos_api.h b/CORE/VOSS/inc/vos_api.h
index 1352502..7f4fc05 100644
--- a/CORE/VOSS/inc/vos_api.h
+++ b/CORE/VOSS/inc/vos_api.h
@@ -125,6 +125,8 @@
RING_ID_PER_PACKET_STATS,
};
+/* 15 Min */
+#define WLAN_POWER_COLLAPSE_FAIL_THRESHOLD (1000 * 60 * 15)
/**
* enum log_event_type - Type of event initiating bug report
* @WLAN_LOG_TYPE_NON_FATAL: Non fatal event
@@ -143,6 +145,9 @@
* @WLAN_LOG_INDICATOR_FRAMEWORK: Framework triggers bug report
* @WLAN_LOG_INDICATOR_HOST_DRIVER: Host driver triggers bug report
* @WLAN_LOG_INDICATOR_FIRMWARE: FW initiates bug report
+ * @WLAN_LOG_INDICATOR_IOCTL: Bug report is initiated by IOCTL
+ * @WLAN_LOG_INDICATOR_HOST_ONLY: Host initiated and only Host
+ * logs are needed
*
* Enum indicating the module that triggered the bug report
*/
@@ -151,53 +156,54 @@
WLAN_LOG_INDICATOR_FRAMEWORK,
WLAN_LOG_INDICATOR_HOST_DRIVER,
WLAN_LOG_INDICATOR_FIRMWARE,
- WLAN_LOG_INDICATOR_IOCTL
+ WLAN_LOG_INDICATOR_IOCTL,
+ WLAN_LOG_INDICATOR_HOST_ONLY,
};
/**
* enum log_event_host_reason_code - Reason code for bug report
* @WLAN_LOG_REASON_CODE_UNUSED: Unused
- * @WLAN_LOG_REASON_COMMAND_UNSUCCESSFUL: Command response status from FW
- * is error
* @WLAN_LOG_REASON_ROAM_FAIL: Driver initiated roam has failed
* @WLAN_LOG_REASON_THREAD_STUCK: Monitor Health of host threads and report
* fatal event if some thread is stuck
* @WLAN_LOG_REASON_DATA_STALL: Unable to send/receive data due to low resource
* scenario for a prolonged period
* @WLAN_LOG_REASON_SME_COMMAND_STUCK: SME command is stuck in SME active queue
- * @WLAN_LOG_REASON_ZERO_SCAN_RESULTS: Full scan resulted in zero scan results
* @WLAN_LOG_REASON_QUEUE_FULL: Defer queue becomes full for a prolonged period
* @WLAN_LOG_REASON_POWER_COLLAPSE_FAIL: Unable to allow apps power collapse
* for a prolonged period
- * @WLAN_LOG_REASON_SSR_FAIL: Unable to gracefully complete SSR
- * @WLAN_LOG_REASON_DISCONNECT_FAIL: Disconnect from Supplicant is not
- * successful
- * @WLAN_LOG_REASON_CLEAN_UP_FAIL: Clean up of TDLS or Pre-Auth Sessions
- * not successful
* @WLAN_LOG_REASON_MALLOC_FAIL: Memory allocation Fails
* @WLAN_LOG_REASON_VOS_MSG_UNDER_RUN: VOS Core runs out of message wrapper
- * @WLAN_LOG_REASON_MSG_POST_FAIL: Unable to post msg
- *
+ * @WLAN_LOG_REASON_IOCTL: Initiated by IOCTL
+ * @WLAN_LOG_REASON_CODE_FRAMEWORK: Initiated by framework
+ * @WLAN_LOG_REASON_DEL_BSS_STA_FAIL: DEL BSS/STA rsp is failure
+ * @WLAN_LOG_REASON_ADD_BSS_STA_FAIL: ADD BSS/STA rsp is failure
+ * @WLAN_LOG_REASON_ENTER_IMPS_BMPS_FAIL: Enter IMPS/BMPS rsp failure
+ * @WLAN_LOG_REASON_EXIT_IMPS_BMPS_FAIL: Exit IMPS/BMPS rsp failure
+ * @WLAN_LOG_REASON_HDD_TIME_OUT: Wait for event Timeout in HDD layer
+ * @WLAN_LOG_REASON_MGMT_FRAME_TIMEOUT:Management frame timedout
+ @WLAN_LOG_REASON_SME_OUT_OF_CMD_BUFL sme out of cmd buffer
* This enum contains the different reason codes for bug report
*/
enum log_event_host_reason_code {
WLAN_LOG_REASON_CODE_UNUSED,
- WLAN_LOG_REASON_COMMAND_UNSUCCESSFUL,
WLAN_LOG_REASON_ROAM_FAIL,
WLAN_LOG_REASON_THREAD_STUCK,
WLAN_LOG_REASON_DATA_STALL,
WLAN_LOG_REASON_SME_COMMAND_STUCK,
- WLAN_LOG_REASON_ZERO_SCAN_RESULTS,
WLAN_LOG_REASON_QUEUE_FULL,
WLAN_LOG_REASON_POWER_COLLAPSE_FAIL,
- WLAN_LOG_REASON_SSR_FAIL,
- WLAN_LOG_REASON_DISCONNECT_FAIL,
- WLAN_LOG_REASON_CLEAN_UP_FAIL,
WLAN_LOG_REASON_MALLOC_FAIL,
WLAN_LOG_REASON_VOS_MSG_UNDER_RUN,
- WLAN_LOG_REASON_MSG_POST_FAIL,
WLAN_LOG_REASON_IOCTL,
WLAN_LOG_REASON_CODE_FRAMEWORK,
+ WLAN_LOG_REASON_DEL_BSS_STA_FAIL,
+ WLAN_LOG_REASON_ADD_BSS_STA_FAIL,
+ WLAN_LOG_REASON_ENTER_IMPS_BMPS_FAIL,
+ WLAN_LOG_REASON_EXIT_IMPS_BMPS_FAIL,
+ WLAN_LOG_REASON_HDD_TIME_OUT,
+ WLAN_LOG_REASON_MGMT_FRAME_TIMEOUT,
+ WLAN_LOG_REASON_SME_OUT_OF_CMD_BUF,
};
/*-------------------------------------------------------------------------
@@ -306,10 +312,15 @@
bool vos_is_log_report_in_progress(void);
void vos_reset_log_report_in_progress(void);
int vos_set_log_completion(uint32 is_fatal, uint32 indicator, uint32 reason_code);
-void vos_get_log_completion(uint32 *is_fatal, uint32 *indicator, uint32 *reason_code);
+void vos_get_log_and_reset_completion(uint32 *is_fatal,
+ uint32 *indicator, uint32 *reason_code, bool reset);
+v_BOOL_t vos_isFatalEventEnabled(void);
VOS_STATUS vos_fatal_event_logs_req( uint32_t is_fatal, uint32_t indicator,
- uint32_t reason_code, bool waitRequired);
+ uint32_t reason_code, bool wait_required,
+ bool dump_vos_trace);
VOS_STATUS vos_process_done_indication(v_U8_t type, v_U32_t reason_code);
+void vos_flush_host_logs_for_fatal(void);
+
void vos_send_fatal_event_done(void);
diff --git a/CORE/VOSS/inc/vos_trace.h b/CORE/VOSS/inc/vos_trace.h
index 1207a13..76095de 100644
--- a/CORE/VOSS/inc/vos_trace.h
+++ b/CORE/VOSS/inc/vos_trace.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/src/vos_api.c b/CORE/VOSS/src/vos_api.c
index 4a9a779..3e9b7bf 100644
--- a/CORE/VOSS/src/vos_api.c
+++ b/CORE/VOSS/src/vos_api.c
@@ -1690,11 +1690,12 @@
indicator,reason_code);
}
-void vos_get_log_completion(uint32 *is_fatal,
+void vos_get_log_and_reset_completion(uint32 *is_fatal,
uint32 *indicator,
- uint32 *reason_code)
+ uint32 *reason_code,
+ bool reset)
{
- wlan_get_log_completion(is_fatal, indicator, reason_code);
+ wlan_get_log_and_reset_completion(is_fatal, indicator, reason_code, reset);
}
@@ -1720,7 +1721,8 @@
return;
}
/*The below API will reset is_report_in_progress flag*/
- vos_get_log_completion(&is_fatal, &indicator, &reason_code);
+ vos_get_log_and_reset_completion(&is_fatal, &indicator,
+ &reason_code, true);
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,
"is_fatal : %d, indicator: %d, reason_code=%d",
is_fatal, indicator, reason_code);
@@ -1728,6 +1730,33 @@
}
+/**
+ * vos_isFatalEventEnabled()
+ *
+ * Return TRUE if Fatal event is enabled is in progress.
+ *
+ */
+v_BOOL_t vos_isFatalEventEnabled(void)
+{
+ hdd_context_t *pHddCtx = NULL;
+ v_CONTEXT_t pVosContext = vos_get_global_context(VOS_MODULE_ID_SYS, NULL);
+
+ if(!pVosContext)
+ {
+ hddLog(VOS_TRACE_LEVEL_FATAL,"%s: Global VOS context is Null", __func__);
+ return FALSE;
+ }
+
+ pHddCtx = (hdd_context_t *)vos_get_context(VOS_MODULE_ID_HDD, pVosContext );
+ if(!pHddCtx) {
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
+ "%s: HDD context is Null", __func__);
+ return FALSE;
+ }
+
+ return pHddCtx->cfg_ini->enableFatalEvent;
+}
+
/**---------------------------------------------------------------------------
@@ -1746,11 +1775,13 @@
VOS_STATUS vos_fatal_event_logs_req( uint32_t is_fatal,
uint32_t indicator,
uint32_t reason_code,
- bool waitRequired)
+ bool wait_required,
+ bool dump_vos_trace)
{
VOS_STATUS vosStatus;
eHalStatus status;
VosContextType *vos_context;
+ hdd_context_t *pHddCtx = NULL;
vos_context = vos_get_global_context(VOS_MODULE_ID_SYS, NULL);
if (!vos_context)
@@ -1759,7 +1790,27 @@
"%s: vos context is Invalid", __func__);
return eHAL_STATUS_FAILURE;
}
+ pHddCtx = (hdd_context_t *)vos_get_context(VOS_MODULE_ID_HDD, vos_context );
+ if(!pHddCtx) {
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
+ "%s: HDD context is Null", __func__);
+ return eHAL_STATUS_FAILURE;
+ }
+ if(!pHddCtx->cfg_ini->enableFatalEvent)
+ {
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,
+ "%s: Fatal event not enabled", __func__);
+ return eHAL_STATUS_FAILURE;
+ }
+
+ if (pHddCtx->isLoadUnloadInProgress ||
+ vos_context->isLogpInProgress)
+ {
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+ "%s: un/Load/SSR in progress", __func__);
+ return eHAL_STATUS_FAILURE;
+ }
if (vos_is_log_report_in_progress() == true)
{
@@ -1775,16 +1826,16 @@
"%s: Failed to set log trigger params for fatalEvent", __func__);
return VOS_STATUS_E_FAILURE;
}
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"%s: Triggering fatal Event: type:%d, indicator=%d reason_code=%d",
__func__, is_fatal, indicator, reason_code);
vos_event_reset(&gpVosContext->fwLogsComplete);
status = sme_fatal_event_logs_req(vos_context->pMACContext,
is_fatal, indicator,
- reason_code);
+ reason_code, dump_vos_trace);
- if (HAL_STATUS_SUCCESS(status) && (waitRequired == TRUE))
+ if (HAL_STATUS_SUCCESS(status) && (wait_required == TRUE))
{
/* Need to update time out of complete */
@@ -1834,6 +1885,17 @@
return VOS_STATUS_SUCCESS;
}
+/**
+ * vos_flush_host_logs_for_fatal() -flush host logs and send
+ * fatal event to upper layer.
+ */
+void vos_flush_host_logs_for_fatal(void)
+{
+ wlan_flush_host_logs_for_fatal();
+ return;
+}
+
+
/**---------------------------------------------------------------------------
\brief vos_logger_pkt_serialize() - queue a logging vos pkt
@@ -2000,7 +2062,14 @@
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"%s: VOS Core run out of message wrapper", __func__);
-
+ if (!gpVosContext->vosWrapperFullReported)
+ {
+ gpVosContext->vosWrapperFullReported = 1;
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_ONLY,
+ WLAN_LOG_REASON_VOS_MSG_UNDER_RUN,
+ FALSE, TRUE);
+ }
return VOS_STATUS_E_RESOURCES;
}
@@ -2118,6 +2187,14 @@
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
"%s: VOS Core run out of message wrapper", __func__);
+ if (!gpVosContext->vosWrapperFullReported)
+ {
+ gpVosContext->vosWrapperFullReported = 1;
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_ONLY,
+ WLAN_LOG_REASON_VOS_MSG_UNDER_RUN,
+ FALSE, TRUE);
+ }
return VOS_STATUS_E_RESOURCES;
}
@@ -2233,6 +2310,14 @@
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"%s: VOS Core run out of message wrapper", __func__);
+ if (!gpVosContext->vosWrapperFullReported)
+ {
+ gpVosContext->vosWrapperFullReported = 1;
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_ONLY,
+ WLAN_LOG_REASON_VOS_MSG_UNDER_RUN,
+ FALSE, TRUE);
+ }
return VOS_STATUS_E_RESOURCES;
}
diff --git a/CORE/VOSS/src/vos_memory.c b/CORE/VOSS/src/vos_memory.c
index d0d69e7..584b512 100644
--- a/CORE/VOSS/src/vos_memory.c
+++ b/CORE/VOSS/src/vos_memory.c
@@ -55,6 +55,7 @@
* ------------------------------------------------------------------------*/
#include "vos_memory.h"
#include "vos_trace.h"
+#include "vos_api.h"
#include <vmalloc.h>
#ifdef CONFIG_WCNSS_MEM_PRE_ALLOC
@@ -214,7 +215,16 @@
return pmem;
}
#endif
- return kmalloc(size, flags);
+ memPtr = kmalloc(size, flags);
+ if ((flags != GFP_ATOMIC) && (NULL == memPtr))
+ {
+ WARN_ON(1);
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_ONLY,
+ WLAN_LOG_REASON_MALLOC_FAIL,
+ false, true);
+ }
+ return memPtr;
}
new_size = size + sizeof(struct s_vos_mem_struct) + 8;
@@ -243,6 +253,14 @@
memPtr = (v_VOID_t*)(memStruct + 1);
}
+ if ((flags != GFP_ATOMIC) && (NULL == memStruct))
+ {
+ WARN_ON(1);
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_ONLY,
+ WLAN_LOG_REASON_MALLOC_FAIL,
+ false, true);
+ }
return memPtr;
}
@@ -298,6 +316,7 @@
v_VOID_t * vos_mem_malloc( v_SIZE_t size )
{
int flags = GFP_KERNEL;
+ v_VOID_t* memPtr = NULL;
#ifdef CONFIG_WCNSS_MEM_PRE_ALLOC
v_VOID_t* pmem;
#endif
@@ -319,7 +338,17 @@
return pmem;
}
#endif
- return kmalloc(size, flags);
+ memPtr = kmalloc(size, flags);
+ if ((flags != GFP_ATOMIC) && (NULL == memPtr))
+ {
+ WARN_ON(1);
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_ONLY,
+ WLAN_LOG_REASON_MALLOC_FAIL,
+ false, true);
+ }
+ return memPtr;
+
}
v_VOID_t vos_mem_free( v_VOID_t *ptr )
diff --git a/CORE/VOSS/src/vos_sched.h b/CORE/VOSS/src/vos_sched.h
index 89cbf58..7ed3ed6 100644
--- a/CORE/VOSS/src/vos_sched.h
+++ b/CORE/VOSS/src/vos_sched.h
@@ -342,6 +342,7 @@
v_U32_t wakelock_log_level;
v_U32_t connectivity_log_level;
v_U32_t packet_stats_log_level;
+ v_U8_t vosWrapperFullReported;
} VosContextType, *pVosContextType;
diff --git a/CORE/VOSS/src/vos_trace.c b/CORE/VOSS/src/vos_trace.c
index 6c91448..095e4df 100755
--- a/CORE/VOSS/src/vos_trace.c
+++ b/CORE/VOSS/src/vos_trace.c
@@ -589,7 +589,7 @@
return;
}
- VOS_TRACE( VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_ERROR,
+ VOS_TRACE( VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_WARN,
"Total Records: %d, Head: %d, Tail: %d",
gvosTraceData.num, gvosTraceData.head, gvosTraceData.tail);
diff --git a/CORE/WDA/inc/wlan_qct_wda.h b/CORE/WDA/inc/wlan_qct_wda.h
index 1ade7a3..35c162f 100644
--- a/CORE/WDA/inc/wlan_qct_wda.h
+++ b/CORE/WDA/inc/wlan_qct_wda.h
@@ -431,6 +431,18 @@
wpt_uint8 wdaAddSelfStaFailReason;
} tWDA_AddSelfStaDebugParams;
+#define BMPS_IMPS_FAILURE_REPORT_THRESHOLD 10
+
+/* Continous Response failure counts */
+typedef struct
+{
+ wpt_uint8 enterBmpsFailureCount;
+ wpt_uint8 exitBmpsFailureCount;
+ wpt_uint8 enterImpsFailureCount;
+ wpt_uint8 exitImpsFailureCount;
+} tWDA_RespFailureCounts;
+
+
typedef struct
{
v_PVOID_t pVosContext; /* global VOSS context*/
@@ -499,7 +511,7 @@
vos_event_t ftmStopDoneEvent;
tWDA_AddSelfStaDebugParams wdaAddSelfStaParams;
-
+ tWDA_RespFailureCounts failureCounts;
} tWDA_CbContext ;
typedef struct
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index d6e3804..562229c 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -3789,6 +3789,16 @@
configBssReqParam->txMgmtPower = wdiConfigBssRsp->ucTxMgmtPower;
#endif
}
+ else
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: Failure with status %d", __func__,
+ wdiConfigBssRsp->wdiStatus);
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_ADD_BSS_STA_FAIL,
+ FALSE, TRUE);
+ }
vos_mem_zero(pWdaParams->wdaWdiApiMsgParam,
sizeof(WDI_ConfigBSSReqParamsType));
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
@@ -3839,6 +3849,10 @@
{
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams) ;
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_ADD_BSS_STA_FAIL,
+ FALSE, TRUE);
WDA_SendMsg(pWDA, WDA_ADD_BSS_RSP, (void *)addBssParams , 0);
}
@@ -4071,6 +4085,16 @@
return ;
}
}
+ else
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: Failure with status %d", __func__,
+ wdiConfigStaRsp->wdiStatus);
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_ADD_BSS_STA_FAIL,
+ FALSE, TRUE);
+ }
vos_mem_free(pWdaParams->wdaWdiApiMsgParam) ;
vos_mem_free(pWdaParams) ;
WDA_SendMsg(pWDA, WDA_ADD_STA_RSP, (void *)addStaReqParam, 0) ;
@@ -4104,6 +4128,10 @@
{
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams) ;
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_ADD_BSS_STA_FAIL,
+ FALSE, TRUE);
WDA_SendMsg(pWDA, WDA_ADD_STA_RSP, (void *)addStaParams , 0);
}
@@ -4194,6 +4222,16 @@
vos_mem_copy(delBssReqParam->bssid, wdiDelBssRsp->macBSSID,
sizeof(tSirMacAddr)) ;
}
+ else
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: Failure with status %d", __func__,
+ wdiDelBssRsp->wdiStatus);
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_DEL_BSS_STA_FAIL,
+ FALSE, TRUE);
+ }
if(WDI_DS_GetStaIdxFromBssIdx(pWDA->pWdiContext, delBssReqParam->bssIdx, &staIdx))
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
@@ -4235,6 +4273,7 @@
}
}
}
+
WDA_SendMsg(pWDA, WDA_DELETE_BSS_RSP, (void *)delBssReqParam , 0) ;
return ;
}
@@ -4266,6 +4305,10 @@
{
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams) ;
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_DEL_BSS_STA_FAIL,
+ FALSE, TRUE);
WDA_SendMsg(pWDA, WDA_DELETE_BSS_RSP, (void *)delbssParams , 0) ;
}
@@ -4358,6 +4401,16 @@
delStaReqParam->staIdx = wdiDelStaRsp->ucSTAIdx ;
WLANTL_StartForwarding(delStaReqParam->staIdx,0,0);
}
+ else
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: Failure with status %d", __func__,
+ wdiDelStaRsp->wdiStatus);
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_DEL_BSS_STA_FAIL,
+ FALSE, TRUE);
+ }
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams) ;
/*Reset the BA information corresponding to this STAIdx */
@@ -4396,6 +4449,10 @@
{
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams) ;
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_DEL_BSS_STA_FAIL,
+ FALSE, TRUE);
WDA_SendMsg(pWDA, WDA_DELETE_STA_RSP, (void *)delStaParams , 0) ;
}
@@ -4483,6 +4540,14 @@
{
pWDA->wdaAddSelfStaParams.wdaAddSelfStaFailReason = WDA_ADDSTA_RSP_WDI_FAIL;
pWDA->wdaAddSelfStaParams.wdiAddStaSelfStaFailCounter++;
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: Failure with status %d failcnter %d", __func__,
+ pwdiAddSTASelfRsp->wdiStatus,
+ pWDA->wdaAddSelfStaParams.wdiAddStaSelfStaFailCounter);
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_ADD_BSS_STA_FAIL,
+ FALSE, TRUE);
}
WDA_SendMsg( pWDA, WDA_ADD_STA_SELF_RSP, (void *)pAddStaSelfRsp, 0) ;
return ;
@@ -4518,6 +4583,14 @@
pWDA->wdaAddSelfStaParams.wdaAddSelfStaFailReason
= WDA_ADDSTA_REQ_WDI_FAIL;
pWDA->wdaAddSelfStaParams.wdiAddStaSelfStaFailCounter++;
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: Failure with status %d failcnter %d", __func__,
+ wdiStatus,
+ pWDA->wdaAddSelfStaParams.wdiAddStaSelfStaFailCounter);
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_ADD_BSS_STA_FAIL,
+ FALSE, TRUE);
WDA_SendMsg(pWDA, WDA_ADD_STA_SELF_RSP, (void *)addStaSelfParams , 0);
}
@@ -4613,7 +4686,14 @@
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams) ;
-
+ if (WDI_STATUS_SUCCESS != delStaSelfParams->status)
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: Failure with status %d", __func__,
+ wdiDelStaSelfRspParams->wdiStatus);
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_DEL_BSS_STA_FAIL,
+ FALSE, TRUE);
WDA_SendMsg(pWDA, WDA_DEL_STA_SELF_RSP, (void *)delStaSelfParams , 0) ;
return ;
}
@@ -4650,6 +4730,10 @@
VOS_ASSERT(0);
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams) ;
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_DEL_BSS_STA_FAIL,
+ FALSE, TRUE);
WDA_SendMsg(pWDA, WDA_DEL_STA_SELF_RSP, (void *)delStaSelfParams , 0) ;
}
@@ -8565,6 +8649,26 @@
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams);
+ if (WDI_STATUS_SUCCESS != status)
+ {
+ pWDA->failureCounts.enterImpsFailureCount++;
+ if (BMPS_IMPS_FAILURE_REPORT_THRESHOLD ==
+ pWDA->failureCounts.enterImpsFailureCount)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: Status %d fail count %d", __func__, status,
+ pWDA->failureCounts.enterImpsFailureCount);
+ pWDA->failureCounts.enterImpsFailureCount = 0;
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_ENTER_IMPS_BMPS_FAIL,
+ FALSE, TRUE);
+ }
+ }
+ else
+ {
+ pWDA->failureCounts.enterImpsFailureCount = 0;
+ }
WDA_SendMsg(pWDA, WDA_ENTER_IMPS_RSP, NULL , status) ;
return ;
}
@@ -8609,6 +8713,19 @@
{
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams);
+ pWDA->failureCounts.enterImpsFailureCount++;
+ if (BMPS_IMPS_FAILURE_REPORT_THRESHOLD ==
+ pWDA->failureCounts.enterImpsFailureCount)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: wdiStatus %d fail count %d", __func__, wdiStatus,
+ pWDA->failureCounts.enterImpsFailureCount);
+ pWDA->failureCounts.enterImpsFailureCount = 0;
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_ENTER_IMPS_BMPS_FAIL,
+ FALSE, TRUE);
+ }
WDA_SendMsg(pWDA, WDA_ENTER_IMPS_RSP, NULL,
CONVERT_WDI2SIR_STATUS(wdiStatus));
}
@@ -8698,6 +8815,27 @@
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams);
+ if (WDI_STATUS_SUCCESS != status)
+ {
+ pWDA->failureCounts.exitImpsFailureCount++;
+ if (BMPS_IMPS_FAILURE_REPORT_THRESHOLD ==
+ pWDA->failureCounts.exitImpsFailureCount)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: Status %d fail count %d", __func__,
+ status,
+ pWDA->failureCounts.exitImpsFailureCount);
+ pWDA->failureCounts.exitImpsFailureCount = 0;
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_EXIT_IMPS_BMPS_FAIL,
+ FALSE, TRUE);
+ }
+ }
+ else
+ {
+ pWDA->failureCounts.exitImpsFailureCount = 0;
+ }
WDA_SendMsg(pWDA, WDA_EXIT_IMPS_RSP, NULL , (status));
return;
@@ -8709,6 +8847,7 @@
void WDA_ExitImpsReqCallback(WDI_Status status, void* pUserData)
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
+ tWDA_CbContext *pWDA;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
"<------ %s " ,__func__);
if(NULL == pWdaParams)
@@ -8718,11 +8857,26 @@
VOS_ASSERT(0);
return;
}
-
+ pWDA = (tWDA_CbContext *)pWdaParams->pWdaContext;
if (IS_WDI_STATUS_FAILURE(status))
{
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams);
+
+ pWDA->failureCounts.exitImpsFailureCount++;
+ if (BMPS_IMPS_FAILURE_REPORT_THRESHOLD ==
+ pWDA->failureCounts.exitImpsFailureCount)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: wdiStatus %d fail count %d", __func__,
+ status,
+ pWDA->failureCounts.exitImpsFailureCount);
+ pWDA->failureCounts.exitImpsFailureCount = 0;
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_EXIT_IMPS_BMPS_FAIL,
+ FALSE, TRUE);
+ }
if (WDI_STATUS_DEV_INTERNAL_FAILURE == status)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
@@ -8827,6 +8981,27 @@
vos_mem_free(pWdaParams->wdaWdiApiMsgParam) ;
vos_mem_free(pWdaParams) ;
+ if (eHAL_STATUS_SUCCESS != pEnterBmpsRspParams->status)
+ {
+ pWDA->failureCounts.enterBmpsFailureCount++;
+ if (BMPS_IMPS_FAILURE_REPORT_THRESHOLD ==
+ pWDA->failureCounts.enterBmpsFailureCount)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: wdiStatus %d fail count %d", __func__,
+ pwdiEnterBmpsRsp->wdiStatus,
+ pWDA->failureCounts.enterBmpsFailureCount);
+ pWDA->failureCounts.enterBmpsFailureCount = 0;
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_ENTER_IMPS_BMPS_FAIL,
+ FALSE, TRUE);
+ }
+ }
+ else
+ {
+ pWDA->failureCounts.enterBmpsFailureCount = 0;
+ }
WDA_SendMsg(pWDA, WDA_ENTER_BMPS_RSP, (void *)pEnterBmpsRspParams , 0);
return ;
@@ -8869,6 +9044,20 @@
{
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams);
+ pWDA->failureCounts.enterBmpsFailureCount++;
+ if (BMPS_IMPS_FAILURE_REPORT_THRESHOLD ==
+ pWDA->failureCounts.enterBmpsFailureCount)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: wdiStatus %d fail count %d", __func__,
+ wdiStatus,
+ pWDA->failureCounts.enterBmpsFailureCount);
+ pWDA->failureCounts.enterBmpsFailureCount = 0;
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_ENTER_IMPS_BMPS_FAIL,
+ FALSE, TRUE);
+ }
WDA_SendMsg(pWDA, WDA_ENTER_BMPS_RSP, (void *)pEnterBmpsRspParams, 0);
}
@@ -8997,7 +9186,29 @@
pExitBmpsRspParams->status = (pwdiExitBmpsRsp->wdiStatus);
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
- vos_mem_free(pWdaParams) ;
+ vos_mem_free(pWdaParams);
+
+ if (WDI_STATUS_SUCCESS != pwdiExitBmpsRsp->wdiStatus)
+ {
+ pWDA->failureCounts.exitBmpsFailureCount++;
+ if (BMPS_IMPS_FAILURE_REPORT_THRESHOLD ==
+ pWDA->failureCounts.exitBmpsFailureCount)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: Status %d fail count %d", __func__,
+ pExitBmpsRspParams->status,
+ pWDA->failureCounts.exitBmpsFailureCount);
+ pWDA->failureCounts.exitBmpsFailureCount = 0;
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_EXIT_IMPS_BMPS_FAIL,
+ FALSE, TRUE);
+ }
+ }
+ else
+ {
+ pWDA->failureCounts.exitBmpsFailureCount = 0;
+ }
WDA_SendMsg(pWDA, WDA_EXIT_BMPS_RSP, (void *)pExitBmpsRspParams , 0) ;
return ;
@@ -9040,6 +9251,20 @@
{
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams);
+ pWDA->failureCounts.exitBmpsFailureCount++;
+ if (BMPS_IMPS_FAILURE_REPORT_THRESHOLD ==
+ pWDA->failureCounts.exitBmpsFailureCount)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: wdiStatus %d fail count %d", __func__,
+ wdiStatus,
+ pWDA->failureCounts.exitBmpsFailureCount);
+ pWDA->failureCounts.exitBmpsFailureCount = 0;
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_EXIT_IMPS_BMPS_FAIL,
+ FALSE, TRUE);
+ }
WDA_SendMsg(pWDA, WDA_EXIT_BMPS_RSP, (void *)pExitBmpsRspParams, 0);
}
@@ -13537,7 +13762,6 @@
"%s: Status %d when waiting for TX Frame Event",
__func__, status);
- VOS_BUG(0);
/*Tag Frame as timed out for later deletion*/
vos_pkt_set_user_data_ptr( (vos_pkt_t *)pFrmBuf, VOS_PKT_USER_DATA_ID_WDA,
(v_PVOID_t)WDA_TL_TX_MGMT_TIMED_OUT);
@@ -13555,6 +13779,13 @@
{
pCompFunc(VOS_GET_MAC_CTXT(pWDA->pVosContext), (vos_pkt_t *)pFrmBuf);
} */
+ if (vos_isFatalEventEnabled())
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_MGMT_FRAME_TIMEOUT,
+ FALSE, TRUE);
+ else
+ VOS_BUG(0);
if( pAckTxComp )
{