From 544e33b0bb58381f9603ae3dd0df73daf44ab914 Mon Sep 17 00:00:00 2001 From: Sreelakshmi Konamki Date: Wed, 17 Aug 2016 15:08:48 +0530 Subject: [PATCH] qcacld-3.0: Remove redundant MTRACE logs qcacld-2.0 to qcacld-3.0 propagation Currently few MTRACE logs are logged repetitively which leads to overwriting of other important MTRACE logs. To avoid this, 1. Remove MTRACE logs which are seen repetitively in scan, connect/disconnect path and few timer functions. 2. Remove MTRACE log in lim_process_mlm_req_messages() and lim_process_sme_req_messages() as few enums already logged in lim_process_messages(). Add MTRACE log in lim_post_mlm_message() and lim_post_sme_message() for the rest of enums which are not logged in lim_process_messages() Change-Id: I1478f3e9ab8fb57d8b8b2f65cf2eb3450eb7b64c CRs-Fixed: 855840 --- core/mac/src/pe/lim/lim_api.c | 7 ------- core/mac/src/pe/lim/lim_process_message_queue.c | 10 ++++++++-- core/mac/src/pe/lim/lim_process_mlm_req_messages.c | 4 ---- core/mac/src/pe/lim/lim_timer_utils.c | 11 ----------- core/mac/src/pe/lim/lim_types.h | 9 +++++++-- core/sme/src/common/sme_api.c | 3 --- 6 files changed, 15 insertions(+), 29 deletions(-) diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index e418fd95554b..788c0e48a6a0 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -987,13 +987,6 @@ QDF_STATUS pe_handle_mgmt_frame(void *p_cds_gctx, void *cds_buff) WMA_GET_RX_MPDU_HEADER_LEN(pRxPacketInfo), WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo)); - MTRACE(mac_trace(pMac, TRACE_CODE_RX_MGMT, - WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo), - LIM_TRACE_MAKE_RXMGMT(mHdr->fc.subType, - (uint16_t) (((uint16_t) - (mHdr->seqControl.seqNumHi << 4)) | - mHdr->seqControl.seqNumLo)));) - if (WMA_GET_ROAMCANDIDATEIND(pRxPacketInfo)) lim_log(pMac, LOG1, FL("roamCandidateInd %d"), WMA_GET_ROAMCANDIDATEIND(pRxPacketInfo)); diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index c07ee89dec9d..db28515b3167 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -1238,8 +1238,14 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) #ifdef WLAN_DEBUG mac_ctx->lim.numTot++; #endif - MTRACE(mac_trace_msg_rx(mac_ctx, NO_SESSION, - LIM_TRACE_MAKE_RXMSG(msg->type, LIM_MSG_PROCESSED));) + /* + * Omitting below message types as these are too frequent and when crash + * happens we loose critical trace logs if these are also logged + */ + if (msg->type != SIR_CFG_PARAM_UPDATE_IND && + msg->type != SIR_BB_XPORT_MGMT_MSG) + MTRACE(mac_trace_msg_rx(mac_ctx, NO_SESSION, + LIM_TRACE_MAKE_RXMSG(msg->type, LIM_MSG_PROCESSED));) switch (msg->type) { diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index 88629e7e4dad..3b16d6109cc9 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -84,7 +84,6 @@ static void lim_process_auth_retry_timer(tpAniSirGlobal); */ void lim_process_mlm_req_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) { - MTRACE(mac_trace_msg_rx(mac_ctx, NO_SESSION, msg->type)); switch (msg->type) { case LIM_MLM_START_REQ: lim_process_mlm_start_req(mac_ctx, msg->bodyptr); @@ -2173,9 +2172,6 @@ static void lim_process_periodic_probe_req_timer(tpAniSirGlobal mac_ctx) i++; } while (i < mlm_scan_req->numSsid); /* Activate timer again */ - MTRACE(mac_trace(mac_ctx, TRACE_CODE_TIMER_ACTIVATE, - probe_req_timer->sessionId, - eLIM_PERIODIC_PROBE_REQ_TIMER)); if (tx_timer_activate(probe_req_timer) != TX_SUCCESS) { lim_log(mac_ctx, LOGP, FL("could not start periodic probe req timer")); diff --git a/core/mac/src/pe/lim/lim_timer_utils.c b/core/mac/src/pe/lim/lim_timer_utils.c index 31be129d8581..f9ba6664b73d 100644 --- a/core/mac/src/pe/lim/lim_timer_utils.c +++ b/core/mac/src/pe/lim/lim_timer_utils.c @@ -661,9 +661,6 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) uint32_t val = 0; tpPESession session_entry; - MTRACE(mac_trace - (pMac, TRACE_CODE_TIMER_DEACTIVATE, NO_SESSION, timerId)); - switch (timerId) { case eLIM_REASSOC_FAIL_TIMER: case eLIM_FT_PREAUTH_RSP_TIMER: @@ -1063,8 +1060,6 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId uint16_t staId) { uint32_t val; - MTRACE(mac_trace - (pMac, TRACE_CODE_TIMER_DEACTIVATE, NO_SESSION, timerId)); switch (timerId) { case eLIM_CNF_WAIT_TIMER: @@ -1181,9 +1176,6 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId void lim_activate_cnf_timer(tpAniSirGlobal pMac, uint16_t staId, tpPESession psessionEntry) { - MTRACE(mac_trace - (pMac, TRACE_CODE_TIMER_ACTIVATE, psessionEntry->peSessionId, - eLIM_CNF_WAIT_TIMER)); pMac->lim.limTimers.gpLimCnfWaitTimer[staId].sessionId = psessionEntry->peSessionId; if (tx_timer_activate(&pMac->lim.limTimers.gpLimCnfWaitTimer[staId]) @@ -1214,9 +1206,6 @@ void lim_activate_cnf_timer(tpAniSirGlobal pMac, uint16_t staId, void lim_activate_auth_rsp_timer(tpAniSirGlobal pMac, tLimPreAuthNode *pAuthNode) { - MTRACE(mac_trace - (pMac, TRACE_CODE_TIMER_ACTIVATE, NO_SESSION, - eLIM_AUTH_RESP_TIMER)); if (tx_timer_activate(&pAuthNode->timer) != TX_SUCCESS) { /* / Could not activate auth rsp timer. */ /* Log error */ diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h index 04c01e51c305..76f175e0ac61 100644 --- a/core/mac/src/pe/lim/lim_types.h +++ b/core/mac/src/pe/lim/lim_types.h @@ -46,6 +46,7 @@ #include "lim_api.h" #include "lim_debug.h" +#include "lim_trace.h" #include "lim_send_sme_rsp_messages.h" #include "sys_global.h" #include "dph_global.h" @@ -655,10 +656,13 @@ lim_post_sme_message(tpAniSirGlobal pMac, uint32_t msgType, uint32_t *pMsgBuf) msg.type = (uint16_t) msgType; msg.bodyptr = pMsgBuf; msg.bodyval = 0; - if (msgType > eWNI_SME_MSG_TYPES_BEGIN) + if (msgType > eWNI_SME_MSG_TYPES_BEGIN) { + MTRACE(mac_trace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION, + msg.type)); lim_process_sme_req_messages(pMac, &msg); - else + } else { lim_process_mlm_rsp_messages(pMac, msgType, pMsgBuf); + } } /*** end lim_post_sme_message() ***/ /** @@ -698,6 +702,7 @@ lim_post_mlm_message(tpAniSirGlobal pMac, uint32_t msgType, uint32_t *pMsgBuf) msg.type = (uint16_t) msgType; msg.bodyptr = pMsgBuf; msg.bodyval = 0; + MTRACE(mac_trace_msg_rx(pMac, NO_SESSION, msg.type)); lim_process_mlm_req_messages(pMac, &msg); } /*** end lim_post_mlm_message() ***/ diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index d4510e585936..3a811f2ef72b 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -3686,9 +3686,6 @@ tCsrScanResultInfo *sme_scan_result_get_next(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrScanResultInfo *pRet = NULL; - MTRACE(qdf_trace(QDF_MODULE_ID_SME, - TRACE_CODE_SME_RX_HDD_MSG_SCAN_RESULT_GETNEXT, - NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { pRet = csr_scan_result_get_next(pMac, hScanResult);