wlan: Enabling MTRACE logs in PE module
MTRACE is a comprehensive logging mechanism which captures all
the events entering and exiting the PE module in both the northbound
and southbound interfaces.This also records all the timers activity
and state machine changes.MTRACE support is present in our driver since
long time but its not being used.So now these changes are to enable the
MTRACE logging mechanism already present in the PE module and make it work.
CRs-fixed: 446210
Change-Id: If70d0f3d690965485cc9598611556f6fcea21d6d
diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index 740915e..2d1605f 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.c
@@ -1081,7 +1081,11 @@
#ifdef WLAN_FEATURE_P2P
pMac->lim.actionFrameSessionId = 0xff;
#endif
-
+ if( !VOS_IS_STATUS_SUCCESS( vos_lock_init( &pMac->lim.lkPeGlobalLock ) ) )
+ {
+ PELOGE(limLog(pMac, LOGE, FL("pe lock init failed!\n"));)
+ return eSIR_FAILURE;
+ }
return eSIR_SUCCESS;
}
@@ -1133,7 +1137,10 @@
palFreeMemory(pMac->hHdd, pMac->pmm.gpPmmPSState);
pMac->pmm.gpPmmPSState = NULL;
#endif
-
+ if( !VOS_IS_STATUS_SUCCESS( vos_lock_destroy( &pMac->lim.lkPeGlobalLock ) ) )
+ {
+ return eSIR_FAILURE;
+ }
return eSIR_SUCCESS;
}
@@ -2645,7 +2652,7 @@
mmhMsg.type = eWNI_SME_MIC_FAILURE_IND;
mmhMsg.bodyptr = pSirSmeMicFailureInd;
mmhMsg.bodyval = 0;
- MTRACE(macTraceMsgTx(pMac, 0, mmhMsg.type));
+ MTRACE(macTraceMsgTx(pMac, sessionId, mmhMsg.type));
limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
return;
}
@@ -2739,4 +2746,28 @@
return eMGMT_DROP_NO_DROP;
}
+eHalStatus pe_AcquireGlobalLock( tAniSirLim *psPe)
+{
+ eHalStatus status = eHAL_STATUS_INVALID_PARAMETER;
+ if(psPe)
+ {
+ if( VOS_IS_STATUS_SUCCESS( vos_lock_acquire( &psPe->lkPeGlobalLock) ) )
+ {
+ status = eHAL_STATUS_SUCCESS;
+ }
+ }
+ return (status);
+}
+eHalStatus pe_ReleaseGlobalLock( tAniSirLim *psPe)
+{
+ eHalStatus status = eHAL_STATUS_INVALID_PARAMETER;
+ if(psPe)
+ {
+ if( VOS_IS_STATUS_SUCCESS( vos_lock_release( &psPe->lkPeGlobalLock) ) )
+ {
+ status = eHAL_STATUS_SUCCESS;
+ }
+ }
+ return (status);
+}
diff --git a/CORE/MAC/src/pe/lim/limProcessActionFrame.c b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
index e8e559c..bea80ed 100644
--- a/CORE/MAC/src/pe/lim/limProcessActionFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
@@ -162,7 +162,7 @@
}
return;
}
- MTRACE(macTrace(pMac, TRACE_CODE_TIMER_ACTIVATE, NO_SESSION, eLIM_CHANNEL_SWITCH_TIMER));
+ MTRACE(macTrace(pMac, TRACE_CODE_TIMER_ACTIVATE, sessionId, eLIM_CHANNEL_SWITCH_TIMER));
if (tx_timer_activate(&pMac->lim.limTimers.gLimChannelSwitchTimer) != TX_SUCCESS)
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
index 262c6c3..f3be0a4 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
@@ -484,7 +484,7 @@
pMac->lim.limTimers.gLimMinChannelTimer.sessionId = sessionId;
#endif
- MTRACE(macTrace(pMac, TRACE_CODE_TIMER_ACTIVATE, NO_SESSION, eLIM_MIN_CHANNEL_TIMER));
+ MTRACE(macTrace(pMac, TRACE_CODE_TIMER_ACTIVATE, pMac->lim.limTimers.gLimMinChannelTimer.sessionId, eLIM_MIN_CHANNEL_TIMER));
if (tx_timer_activate(&pMac->lim.limTimers.gLimMinChannelTimer) != TX_SUCCESS)
{
@@ -532,7 +532,7 @@
PELOG2(limLog(pMac, LOG2, FL("START PASSIVE Scan chan %d\n"), channelNum);)
/// Passive Scanning. Activate maxChannelTimer
- MTRACE(macTrace(pMac, TRACE_CODE_TIMER_DEACTIVATE, NO_SESSION, eLIM_MAX_CHANNEL_TIMER));
+ MTRACE(macTrace(pMac, TRACE_CODE_TIMER_DEACTIVATE, pMac->lim.limTimers.gLimMaxChannelTimer.sessionId, eLIM_MAX_CHANNEL_TIMER));
if (tx_timer_deactivate(&pMac->lim.limTimers.gLimMaxChannelTimer)
!= TX_SUCCESS)
{
@@ -580,7 +580,7 @@
#endif
//Pick the longer stay time
val = (val > val1) ? val : val1;
- MTRACE(macTrace(pMac, TRACE_CODE_TIMER_ACTIVATE, NO_SESSION, eLIM_MAX_CHANNEL_TIMER));
+ MTRACE(macTrace(pMac, TRACE_CODE_TIMER_ACTIVATE, pMac->lim.limTimers.gLimMaxChannelTimer.sessionId, eLIM_MAX_CHANNEL_TIMER));
if (tx_timer_change(&pMac->lim.limTimers.gLimMaxChannelTimer,
val, 0) != TX_SUCCESS)
{
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
index 08f65b6..5a5a6c9 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
@@ -4744,7 +4744,6 @@
/** Skipped the DeleteDPH Hash Entry as we need it for the new BSS*/
/** Set the MlmState to IDLE*/
psessionEntry->limMlmState = eLIM_MLM_IDLE_STATE;
- MTRACE(macTrace(pMac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId, psessionEntry->limMlmState));
/* Update PE session Id*/
mlmReassocCnf.sessionId = psessionEntry->peSessionId;
switch (psessionEntry->limMlmState) {
@@ -4825,13 +4824,11 @@
mlmReassocCnf.protStatusCode = pStaDs->mlmStaContext.cleanupTrigger;
/** Set the SME State back to WT_Reassoc State*/
psessionEntry->limSmeState = eLIM_SME_WT_REASSOC_STATE;
- MTRACE(macTrace(pMac, TRACE_CODE_SME_STATE, psessionEntry->peSessionId, psessionEntry->limSmeState));
limDeleteDphHashEntry(pMac, pStaDs->staAddr, pStaDs->assocId,psessionEntry);
if((psessionEntry->limSystemRole == eLIM_STA_ROLE)||
(psessionEntry->limSystemRole == eLIM_BT_AMP_STA_ROLE))
{
psessionEntry->limMlmState = eLIM_MLM_IDLE_STATE;
- MTRACE(macTrace(pMac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId, psessionEntry->limMlmState));
}
limPostSmeMessage(pMac, LIM_MLM_REASSOC_CNF, (tANI_U32 *) &mlmReassocCnf);
}
diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index 0202d52..1adb1c1 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -1217,7 +1217,7 @@
pMac->lim.gLimPrevSmeState = pMac->lim.gLimSmeState;
pMac->lim.gLimSmeState = eLIM_SME_WT_SCAN_STATE;
- MTRACE(macTrace(pMac, TRACE_CODE_SME_STATE, NO_SESSION, pMac->lim.gLimSmeState));
+ MTRACE(macTrace(pMac, TRACE_CODE_SME_STATE, pScanReq->sessionId, pMac->lim.gLimSmeState));
if (pScanReq->returnFreshResults & SIR_BG_SCAN_PURGE_RESUTLS)
{
diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index 87ea5ed..18110db 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -3077,7 +3077,7 @@
// start reassoc timer.
pMac->lim.limTimers.gLimReassocFailureTimer.sessionId = psessionEntry->peSessionId;
// Start reassociation failure timer
- MTRACE(macTrace(pMac, TRACE_CODE_TIMER_ACTIVATE, 0, eLIM_REASSOC_FAIL_TIMER));
+ MTRACE(macTrace(pMac, TRACE_CODE_TIMER_ACTIVATE, psessionEntry->peSessionId, eLIM_REASSOC_FAIL_TIMER));
if (tx_timer_activate(&pMac->lim.limTimers.gLimReassocFailureTimer)
!= TX_SUCCESS)
{
diff --git a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
index 6bf6194..600edb1 100644
--- a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
@@ -143,7 +143,7 @@
mmhMsg.type = msgType;
mmhMsg.bodyptr = pSirSmeRsp;
mmhMsg.bodyval = 0;
- MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+ MTRACE(macTraceMsgTx(pMac, smesessionId , mmhMsg.type));
#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM //FEATURE_WLAN_DIAG_SUPPORT
{
@@ -1719,7 +1719,7 @@
}
- MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+ MTRACE(macTraceMsgTx(pMac, sessionId, mmhMsg.type));
if (eSIR_SUCCESS != limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT))
{
palFreeMemory(pMac->hHdd, (void *) pSirSmeWmStatusChangeNtf);
@@ -2362,7 +2362,7 @@
mmhMsg.type = msgType;
// mmhMsg.bodyval = (tANI_U32) pNewPeerInd;
mmhMsg.bodyptr = pNewPeerInd;
- MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+ MTRACE(macTraceMsgTx(pMac, sessionId, mmhMsg.type));
limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
}
@@ -2474,7 +2474,7 @@
mmhMsg.type = eWNI_SME_FT_AGGR_QOS_RSP;
mmhMsg.bodyptr = aggrQosRsp;
mmhMsg.bodyval = 0;
- MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+ MTRACE(macTraceMsgTx(pMac, smesessionId , mmhMsg.type));
limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
return;
@@ -2552,7 +2552,7 @@
PELOG1(limLog(pMac, LOG1, FL("msgType %s peerMacAddr %02x-%02x-%02x-%02x-%02x-%02x"
"sme session id %d\n"),"eWNI_SME_MAX_ASSOC_EXCEEDED", peerMacAddr[0], peerMacAddr[1],
peerMacAddr[2], peerMacAddr[3], peerMacAddr[4], peerMacAddr[5], smesessionId);)
- MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+ MTRACE(macTraceMsgTx(pMac, smesessionId, mmhMsg.type));
limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
return;
diff --git a/CORE/MAC/src/pe/lim/limTrace.c b/CORE/MAC/src/pe/lim/limTrace.c
index eb1c19b..8de45db 100644
--- a/CORE/MAC/src/pe/lim/limTrace.c
+++ b/CORE/MAC/src/pe/lim/limTrace.c
@@ -40,7 +40,9 @@
*/
/**=========================================================================
-
+* Copyright (c) 2013 Qualcomm Atheros, Inc.
+* All Rights Reserved.
+* Qualcomm Atheros Confidential and Proprietary.
\file limTrace.c
\brief implementation for trace related APIs
@@ -98,6 +100,23 @@
CASE_RETURN_STRING(eLIM_LEARN_DURATION_TIMER);
CASE_RETURN_STRING(eLIM_QUIET_TIMER);
CASE_RETURN_STRING(eLIM_QUIET_BSS_TIMER);
+#ifdef WLAN_SOFTAP_FEATURE
+ CASE_RETURN_STRING(eLIM_WPS_OVERLAP_TIMER);
+#endif
+#ifdef WLAN_FEATURE_VOWIFI_11R
+ CASE_RETURN_STRING(eLIM_FT_PREAUTH_RSP_TIMER);
+#endif
+#ifdef WLAN_FEATURE_P2P
+ CASE_RETURN_STRING(eLIM_REMAIN_CHN_TIMER);
+#endif
+ CASE_RETURN_STRING(eLIM_PERIODIC_PROBE_REQ_TIMER);
+#ifdef FEATURE_WLAN_CCX
+ CASE_RETURN_STRING(eLIM_TSM_TIMER);
+#endif
+ CASE_RETURN_STRING(eLIM_DISASSOC_ACK_TIMER);
+ CASE_RETURN_STRING(eLIM_DEAUTH_ACK_TIMER);
+ CASE_RETURN_STRING(eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER);
+ CASE_RETURN_STRING(eLIM_INSERT_SINGLESHOT_NOA_TIMER);
default:
return( "UNKNOWN" );
break;
@@ -179,7 +198,7 @@
"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) \n", recIndex, pRecord->time, pRecord->session,
"RX Mgmt TSF:", " ", pRecord->data, pRecord->data );
@@ -200,15 +219,15 @@
macTraceGetSmeMsgString((tANI_U16)pRecord->data), pRecord->data );
break;
- case TRACE_CODE_TX_HAL_MSG:
+ case TRACE_CODE_TX_WDA_MSG:
limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) \n", recIndex, pRecord->time, pRecord->session,
- "TX HAL Msg:", macTraceGetHalMsgString((tANI_U16)pRecord->data), pRecord->data );
+ "TX WDA Msg:", macTraceGetWdaMsgString((tANI_U16)pRecord->data), pRecord->data );
break;
- case TRACE_CODE_RX_HAL_MSG:
+ case TRACE_CODE_RX_WDA_MSG:
limLog(pMac, LOGE, "%04d %012u S%d %-14s %-30s(0x%x) \n", recIndex, pRecord->time, pRecord->session,
- LIM_TRACE_GET_DEFRD_OR_DROPPED(pRecord->data) ? "Def/Drp LIM Msg:": "RX HAL Msg:",
- macTraceGetHalMsgString((tANI_U16)pRecord->data), pRecord->data );
+ 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:
@@ -263,7 +282,7 @@
macTrace(pMac, TRACE_CODE_TX_SME_MSG, session, data);
break;
case SIR_WDA_MODULE_ID:
- macTrace(pMac, TRACE_CODE_TX_HAL_MSG, session, data);
+ macTrace(pMac, TRACE_CODE_TX_WDA_MSG, session, data);
break;
case SIR_CFG_MODULE_ID:
macTrace(pMac, TRACE_CODE_TX_CFG_MSG, session, data);
@@ -286,7 +305,7 @@
macTraceNew(pMac, module, TRACE_CODE_TX_SME_MSG, session, data);
break;
case SIR_WDA_MODULE_ID:
- macTraceNew(pMac, module, TRACE_CODE_TX_HAL_MSG, session, data);
+ macTraceNew(pMac, module, TRACE_CODE_TX_WDA_MSG, session, data);
break;
case SIR_CFG_MODULE_ID:
macTraceNew(pMac, module, TRACE_CODE_TX_CFG_MSG, session, data);
@@ -313,7 +332,7 @@
macTrace(pMac, TRACE_CODE_RX_SME_MSG, session, data);
break;
case SIR_WDA_MODULE_ID:
- macTrace(pMac, TRACE_CODE_RX_HAL_MSG, session, data);
+ macTrace(pMac, TRACE_CODE_RX_WDA_MSG, session, data);
break;
case SIR_CFG_MODULE_ID:
macTrace(pMac, TRACE_CODE_RX_CFG_MSG, session, data);
@@ -342,7 +361,7 @@
macTraceNew(pMac, module, TRACE_CODE_RX_SME_MSG, session, data);
break;
case SIR_WDA_MODULE_ID:
- macTraceNew(pMac, module, TRACE_CODE_RX_HAL_MSG, session, data);
+ macTraceNew(pMac, module, TRACE_CODE_RX_WDA_MSG, session, data);
break;
case SIR_CFG_MODULE_ID:
macTraceNew(pMac, module, TRACE_CODE_RX_CFG_MSG, session, data);
@@ -378,7 +397,7 @@
CASE_RETURN_STRING( eLIM_MLM_WT_ADD_BSS_RSP_STATE);
CASE_RETURN_STRING( eLIM_MLM_WT_DEL_BSS_RSP_STATE);
CASE_RETURN_STRING( eLIM_MLM_WT_ADD_BSS_RSP_ASSOC_STATE);
- CASE_RETURN_STRING( eLIM_MLM_WT_ADD_BSS_RSP_PREASSOC_STATE);
+ CASE_RETURN_STRING( eLIM_MLM_WT_ADD_BSS_RSP_PREASSOC_STATE);
CASE_RETURN_STRING( eLIM_MLM_WT_ADD_BSS_RSP_REASSOC_STATE);
CASE_RETURN_STRING( eLIM_MLM_WT_ADD_STA_RSP_STATE);
CASE_RETURN_STRING( eLIM_MLM_WT_DEL_STA_RSP_STATE);
diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c
index eb19faf..b81179e 100644
--- a/CORE/MAC/src/pe/lim/limUtils.c
+++ b/CORE/MAC/src/pe/lim/limUtils.c
@@ -3043,7 +3043,7 @@
limLog( pMac, LOGE,
FL("Unable to change gLimQuietBssTimer! Will still attempt to activate anyway...\n"));
}
- MTRACE(macTrace(pMac, TRACE_CODE_TIMER_ACTIVATE, NO_SESSION, eLIM_QUIET_BSS_TIMER));
+ MTRACE(macTrace(pMac, TRACE_CODE_TIMER_ACTIVATE, pMac->lim.limTimers.gLimQuietTimer.sessionId, eLIM_QUIET_BSS_TIMER));
#ifdef GEN6_TODO
/* revisit this piece of code to assign the appropriate sessionId below
* priority - HIGH
@@ -7049,7 +7049,7 @@
if (val > 0 && TX_TIMER_VALID(pMac->lim.limTimers.gLimBackgroundScanTimer))
{
- MTRACE(macTrace(pMac, TRACE_CODE_TIMER_ACTIVATE, NO_SESSION, eLIM_BACKGROUND_SCAN_TIMER));
+ MTRACE(macTrace(pMac, TRACE_CODE_TIMER_ACTIVATE, psessionEntry->peSessionId, eLIM_BACKGROUND_SCAN_TIMER));
if(tx_timer_activate(&pMac->lim.limTimers.gLimBackgroundScanTimer) != TX_SUCCESS)
{
limLog(pMac, LOGP, FL("Could not restart background scan timer, doing LOGP"));
@@ -7062,7 +7062,7 @@
/* Enable heartbeat timer */
if (TX_TIMER_VALID(pMac->lim.limTimers.gLimHeartBeatTimer))
{
- MTRACE(macTrace(pMac, TRACE_CODE_TIMER_ACTIVATE, NO_SESSION, eLIM_HEART_BEAT_TIMER));
+ MTRACE(macTrace(pMac, TRACE_CODE_TIMER_ACTIVATE, psessionEntry->peSessionId, eLIM_HEART_BEAT_TIMER));
if(limActivateHearBeatTimer(pMac) != TX_SUCCESS)
{
limLog(pMac, LOGP, FL("Could not restart heartbeat timer, doing LOGP"));