diff options
| author | Konamki, Sreelakshmi <c_skonam@qti.qualcomm.com> | 2015-08-04 19:15:50 +0530 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2015-09-01 14:22:09 +0530 |
| commit | 094620ff828ee8e3337326e9f87e649503ecd8f1 (patch) | |
| tree | cd571694cfd5b54bf79c61a5a327db0e15ac5130 | |
| parent | 3eb660e6944a5c12c4423c71e18541f866d35d48 (diff) | |
qcacld-2.0: Add MTRACE logs for missing cfg80211_ops callbacks
prima to qcacld-2.0 propagation
Currently, MTRACE logs are not captured for few cfg80211_ops callbacks
and SME functions. Add missing MTRACE logs in cfg80211_ops callbacks
before calling SME function and also in few SME functions.
Change-Id: Iced4b80de60f9640cad0342afac57f9a17c2a3e2
CRs-Fixed: 859961
| -rw-r--r-- | CORE/HDD/inc/wlan_hdd_trace.h | 8 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg80211.c | 21 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_trace.c | 9 | ||||
| -rw-r--r-- | CORE/SME/inc/sme_Trace.h | 17 | ||||
| -rw-r--r-- | CORE/SME/src/sme_common/sme_Api.c | 27 | ||||
| -rw-r--r-- | CORE/SME/src/sme_common/sme_Trace.c | 17 |
6 files changed, 95 insertions, 4 deletions
diff --git a/CORE/HDD/inc/wlan_hdd_trace.h b/CORE/HDD/inc/wlan_hdd_trace.h index 40089555e4d7..b28619b316fa 100644 --- a/CORE/HDD/inc/wlan_hdd_trace.h +++ b/CORE/HDD/inc/wlan_hdd_trace.h @@ -81,6 +81,8 @@ enum { TRACE_CODE_HDD_CHANGE_STATION, TRACE_CODE_HDD_CFG80211_UPDATE_BSS, TRACE_CODE_HDD_CFG80211_SCAN, + TRACE_CODE_HDD_CFG80211_SCHED_SCAN_START, + TRACE_CODE_HDD_CFG80211_SCHED_SCAN_STOP, TRACE_CODE_HDD_REMAIN_ON_CHANNEL, TRACE_CODE_HDD_REMAINCHANREADYHANDLER, TRACE_CODE_HDD_CFG80211_CANCEL_REMAIN_ON_CHANNEL, @@ -91,6 +93,7 @@ enum { TRACE_CODE_HDD_CFG80211_DEL_STA, TRACE_CODE_HDD_CFG80211_ADD_STA, TRACE_CODE_HDD_CFG80211_SET_PMKSA, + TRACE_CODE_HDD_CFG80211_DEL_PMKSA, TRACE_CODE_HDD_CFG80211_UPDATE_FT_IES, TRACE_CODE_HDD_CFG80211_TDLS_MGMT, TRACE_CODE_HDD_CFG80211_TDLS_OPER, @@ -101,6 +104,11 @@ enum { TRACE_CODE_HDD_STORE_JOIN_REQ, TRACE_CODE_HDD_CLEAR_JOIN_REQ, TRACE_CODE_HDD_ISSUE_JOIN_REQ, + TRACE_CODE_HDD_CFG80211_RESUME_WLAN, + TRACE_CODE_HDD_CFG80211_SUSPEND_WLAN, + TRACE_CODE_HDD_CFG80211_SET_MAC_ACL, + TRACE_CODE_HDD_CFG80211_TESTMODE, + TRACE_CODE_HDD_CFG80211_DUMP_SURVEY, }; extern void hddTraceDump(void *pMac, tpvosTraceRecord pRecord, diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index ee762818c20a..5bf06c79d2bf 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -17796,6 +17796,8 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy, return -ENOENT; } + MTRACE(vos_trace(VOS_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_GET_TXPOWER, + pAdapter->sessionId, pAdapter->device_mode)); wlan_hdd_get_classAstats(pAdapter); *dbm = pAdapter->hdd_stats.ClassA_stat.max_pwr; @@ -18875,6 +18877,9 @@ static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device halHandle = WLAN_HDD_GET_HAL_CTX(pAdapter); + MTRACE(vos_trace(VOS_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_DEL_PMKSA, + pAdapter->sessionId, 0)); + /* Delete the PMKID CSR cache */ if (eHAL_STATUS_SUCCESS != sme_RoamDelPMKIDfromCache(halHandle, @@ -19157,6 +19162,9 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, return -EBUSY; } + MTRACE(vos_trace(VOS_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_SCHED_SCAN_START, + pAdapter->sessionId, pAdapter->device_mode)); /* * The current umac is unable to handle the SCAN_PREEMPT and SCAN_DEQUEUED * so its necessary to terminate the existing scan which is already issued @@ -19477,6 +19485,9 @@ static int __wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy, pPnoRequest->ucNetworksCount = 0; + MTRACE(vos_trace(VOS_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_SCHED_SCAN_STOP, + pAdapter->sessionId, pAdapter->device_mode)); status = sme_SetPreferredNetworkList(hHal, pPnoRequest, pAdapter->sessionId, NULL, pAdapter); @@ -20559,6 +20570,8 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy, VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,"acl policy: = %d" "no acl entries = %d", params->acl_policy, params->n_acl_entries); + MTRACE(vos_trace(VOS_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SET_MAC_ACL, + pAdapter->sessionId, pAdapter->device_mode)); if (WLAN_HDD_SOFTAP == pAdapter->device_mode) { pConfig = &pAdapter->sessionCtx.ap.sapConfig; @@ -20756,6 +20769,8 @@ static int __wlan_hdd_cfg80211_testmode(struct wiphy *wiphy, return -EINVAL; } + MTRACE(vos_trace(VOS_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_TESTMODE, + NO_SESSION, nla_get_u32(tb[WLAN_HDD_TM_ATTR_CMD]))); switch (nla_get_u32(tb[WLAN_HDD_TM_ATTR_CMD])) { #ifdef FEATURE_WLAN_LPHB @@ -20960,6 +20975,8 @@ static int __wlan_hdd_cfg80211_dump_survey(struct wiphy *wiphy, wlan_hdd_get_snr(pAdapter, &snr); wlan_hdd_get_rssi(pAdapter, &rssi); + MTRACE(vos_trace(VOS_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_DUMP_SURVEY, + pAdapter->sessionId, pAdapter->device_mode)); sme_GetOperationChannel(halHandle, &channel, pAdapter->sessionId); hdd_wlan_get_freq(channel, &freq); @@ -21128,6 +21145,8 @@ int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy) hdd_resume_wlan(); + MTRACE(vos_trace(VOS_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_RESUME_WLAN, + NO_SESSION, pHddCtx->isWiphySuspended)); spin_lock(&pHddCtx->schedScan_lock); pHddCtx->isWiphySuspended = FALSE; if (TRUE != pHddCtx->isSchedScanUpdatePending) { @@ -21363,6 +21382,8 @@ int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy, pHddCtx->isTlshimRxThreadSuspended = TRUE; #endif + MTRACE(vos_trace(VOS_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SUSPEND_WLAN, + NO_SESSION, pHddCtx->isWiphySuspended)); pHddCtx->isWiphySuspended = TRUE; #ifdef CONFIG_CNSS diff --git a/CORE/HDD/src/wlan_hdd_trace.c b/CORE/HDD/src/wlan_hdd_trace.c index c15b97d740c7..d519f9aff1b7 100644 --- a/CORE/HDD/src/wlan_hdd_trace.c +++ b/CORE/HDD/src/wlan_hdd_trace.c @@ -81,6 +81,9 @@ static tANI_U8 *hddTraceGetEventString(tANI_U32 code) CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_SET_WIPHY_PARAMS); CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_SET_TXPOWER); CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_GET_TXPOWER); + CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_SCAN); + CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_SCHED_SCAN_START); + CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_SCHED_SCAN_STOP); CASE_RETURN_STRING(TRACE_CODE_HDD_REMAIN_ON_CHANNEL); CASE_RETURN_STRING(TRACE_CODE_HDD_REMAINCHANREADYHANDLER); CASE_RETURN_STRING @@ -92,8 +95,14 @@ static tANI_U8 *hddTraceGetEventString(tANI_U32 code) CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_DEL_STA); CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_ADD_STA); CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_SET_PMKSA); + CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_DEL_PMKSA); CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_UPDATE_FT_IES); CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_TDLS_MGMT); + CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_RESUME_WLAN); + CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_SUSPEND_WLAN); + CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_SET_MAC_ACL); + CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_TESTMODE); + CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_DUMP_SURVEY); CASE_RETURN_STRING(TRACE_CODE_HDD_UNSUPPORTED_IOCTL); CASE_RETURN_STRING (TRACE_CODE_HDD_SETROAMSCANCHANNELMINTIME_IOCTL); diff --git a/CORE/SME/inc/sme_Trace.h b/CORE/SME/inc/sme_Trace.h index 8e26334da876..1eac30491b0e 100644 --- a/CORE/SME/inc/sme_Trace.h +++ b/CORE/SME/inc/sme_Trace.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -62,6 +62,7 @@ enum { TRACE_CODE_SME_RX_HDD_ROAM_GET_CONNECTPROFILE, TRACE_CODE_SME_RX_HDD_ROAM_FREE_CONNECTPROFILE, TRACE_CODE_SME_RX_HDD_ROAM_SET_PMKIDCACHE, + TRACE_CODE_SME_RX_HDD_ROAM_DEL_PMKIDCACHE, TRACE_CODE_SME_RX_HDD_ROAM_GET_PMKIDCACHE, TRACE_CODE_SME_RX_HDD_GET_CONFIGPARAM, TRACE_CODE_SME_RX_HDD_GET_MODPROFFIELDS, @@ -139,7 +140,19 @@ enum { TRACE_CODE_SME_RX_HDD_STORE_JOIN_REQ, TRACE_CODE_SME_RX_HDD_CLEAR_JOIN_REQ, TRACE_CODE_SME_RX_HDD_ISSUE_JOIN_REQ, - + TRACE_CODE_SME_RX_HDD_MSG_DEAUTH_STA, +#ifdef FEATURE_WLAN_TDLS + TRACE_CODE_SME_RX_HDD_TDLS_LINK_ESTABLISH_PARAM, + TRACE_CODE_SME_RX_HDD_TDLS_CHAN_SWITCH_REQ, + TRACE_CODE_SME_RX_HDD_TDLS_SEND_MGMT_FRAME, + TRACE_CODE_SME_RX_HDD_TDLS_CHANGE_PEER_STA, + TRACE_CODE_SME_RX_HDD_TDLS_ADD_PEER_STA, + TRACE_CODE_SME_RX_HDD_TDLS_DEL_PEER_STA, +#endif + TRACE_CODE_SME_RX_HDD_PREF_NET_LIST, +#ifdef FEATURE_WLAN_LPHB + TRACE_CODE_SME_RX_HDD_LPHB_CONFIG_REQ, +#endif /* FEATURE_WLAN_LPHB */ }; void smeTraceInit(tpAniSirGlobal pMac); diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c index e5863e2a9e69..5454f473016d 100644 --- a/CORE/SME/src/sme_common/sme_Api.c +++ b/CORE/SME/src/sme_common/sme_Api.c @@ -4213,6 +4213,8 @@ eHalStatus sme_RoamDeauthSta(tHalHandle hHal, tANI_U8 sessionId, return status; } + MTRACE(vos_trace(VOS_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_DEAUTH_STA, + sessionId, pDelStaParams->reason_code)); status = sme_AcquireGlobalLock( &pMac->sme ); if ( HAL_STATUS_SUCCESS( status ) ) { @@ -4493,6 +4495,8 @@ eHalStatus sme_RoamDelPMKIDfromCache( tHalHandle hHal, tANI_U8 sessionId, { eHalStatus status = eHAL_STATUS_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT( hHal ); + MTRACE(vos_trace(VOS_MODULE_ID_SME, + TRACE_CODE_SME_RX_HDD_ROAM_DEL_PMKIDCACHE, sessionId, flush_cache)); status = sme_AcquireGlobalLock( &pMac->sme ); if ( HAL_STATUS_SUCCESS( status ) ) { @@ -7260,6 +7264,8 @@ eHalStatus sme_SetPreferredNetworkList (tHalHandle hHal, tpSirPNOScanReq pReques tpAniSirGlobal pMac = PMAC_STRUCT( hHal ); eHalStatus status; + MTRACE(vos_trace(VOS_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_PREF_NET_LIST, + sessionId, pRequest->ucNetworksCount)); if ( eHAL_STATUS_SUCCESS == ( status = sme_AcquireGlobalLock( &pMac->sme ) ) ) { pmcSetPreferredNetworkList(hHal, pRequest, sessionId, callbackRoutine, callbackContext); @@ -11342,6 +11348,9 @@ VOS_STATUS sme_SendTdlsLinkEstablishParams(tHalHandle hHal, eHalStatus status = eHAL_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); + MTRACE(vos_trace(VOS_MODULE_ID_SME, + TRACE_CODE_SME_RX_HDD_TDLS_LINK_ESTABLISH_PARAM, + sessionId, tdlsLinkEstablishParams->isOffChannelSupported)); status = sme_AcquireGlobalLock( &pMac->sme ); if ( HAL_STATUS_SUCCESS( status ) ) @@ -11376,6 +11385,9 @@ VOS_STATUS sme_SendTdlsMgmtFrame(tHalHandle hHal, tANI_U8 sessionId, tCsrTdlsSendMgmt sendTdlsReq = {{0}} ; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); + MTRACE(vos_trace(VOS_MODULE_ID_SME, + TRACE_CODE_SME_RX_HDD_TDLS_SEND_MGMT_FRAME, + sessionId, statusCode)); status = sme_AcquireGlobalLock( &pMac->sme ); if ( HAL_STATUS_SUCCESS( status ) ) { @@ -11417,6 +11429,9 @@ VOS_STATUS sme_ChangeTdlsPeerSta(tHalHandle hHal, tANI_U8 sessionId, "%s :pstaParams is NULL",__func__); return eHAL_STATUS_FAILURE; } + MTRACE(vos_trace(VOS_MODULE_ID_SME, + TRACE_CODE_SME_RX_HDD_TDLS_CHANGE_PEER_STA, sessionId, + pstaParams->capability)); status = sme_AcquireGlobalLock( &pMac->sme ); if ( HAL_STATUS_SUCCESS( status ) ) { @@ -11442,6 +11457,9 @@ VOS_STATUS sme_AddTdlsPeerSta(tHalHandle hHal, tANI_U8 sessionId, eHalStatus status = eHAL_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); + MTRACE(vos_trace(VOS_MODULE_ID_SME, + TRACE_CODE_SME_RX_HDD_TDLS_ADD_PEER_STA, + sessionId, 0)); status = sme_AcquireGlobalLock( &pMac->sme ); if ( HAL_STATUS_SUCCESS( status ) ) { @@ -11467,6 +11485,9 @@ VOS_STATUS sme_DeleteTdlsPeerSta(tHalHandle hHal, eHalStatus status = eHAL_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); + MTRACE(vos_trace(VOS_MODULE_ID_SME, + TRACE_CODE_SME_RX_HDD_TDLS_DEL_PEER_STA, + sessionId, 0)); status = sme_AcquireGlobalLock( &pMac->sme ); if ( HAL_STATUS_SUCCESS( status ) ) { @@ -11704,6 +11725,10 @@ eHalStatus sme_SendTdlsChanSwitchReq(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tTdlsChanSwitchParams *pTdlsChanSwitchParams = NULL; vos_msg_t vosMessage; + + MTRACE(vos_trace(VOS_MODULE_ID_SME, + TRACE_CODE_SME_RX_HDD_TDLS_CHAN_SWITCH_REQ, NO_SESSION, + chanSwitchParams->tdls_off_channel)); status = sme_AcquireGlobalLock(&pMac->sme); if (eHAL_STATUS_SUCCESS == status) { @@ -12386,6 +12411,8 @@ eHalStatus sme_LPHBConfigReq tpAniSirGlobal pMac = PMAC_STRUCT(hHal); vos_msg_t vosMessage; + MTRACE(vos_trace(VOS_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_LPHB_CONFIG_REQ, + NO_SESSION, lphdReq->cmd)); status = sme_AcquireGlobalLock(&pMac->sme); if (eHAL_STATUS_SUCCESS == status) { diff --git a/CORE/SME/src/sme_common/sme_Trace.c b/CORE/SME/src/sme_common/sme_Trace.c index d560001c91cc..bb7570f3fc62 100644 --- a/CORE/SME/src/sme_common/sme_Trace.c +++ b/CORE/SME/src/sme_common/sme_Trace.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -70,6 +70,7 @@ static tANI_U8* smeTraceGetRxMsgString( tANI_U32 code ) CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_ROAM_GET_CONNECTPROFILE); CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_ROAM_FREE_CONNECTPROFILE); CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_ROAM_SET_PMKIDCACHE); + CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_ROAM_DEL_PMKIDCACHE); CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_ROAM_GET_PMKIDCACHE); CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_GET_CONFIGPARAM); CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_GET_MODPROFFIELDS); @@ -147,7 +148,19 @@ static tANI_U8* smeTraceGetRxMsgString( tANI_U32 code ) CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_STORE_JOIN_REQ); CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_CLEAR_JOIN_REQ); CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_ISSUE_JOIN_REQ); - + CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_MSG_DEAUTH_STA); +#ifdef FEATURE_WLAN_TDLS + CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_TDLS_LINK_ESTABLISH_PARAM); + CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_TDLS_CHAN_SWITCH_REQ); + CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_TDLS_SEND_MGMT_FRAME); + CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_TDLS_CHANGE_PEER_STA); + CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_TDLS_ADD_PEER_STA); + CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_TDLS_DEL_PEER_STA); +#endif + CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_PREF_NET_LIST); +#ifdef FEATURE_WLAN_LPHB + CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_LPHB_CONFIG_REQ); +#endif /* FEATURE_WLAN_LPHB */ default: return( "UNKNOWN" ); break; |
