samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Replace lim_log() with pe_* log levels in lim_send_messages.c

Browse Source 
Replace lim_log() with pe_* appropriate log levels in lim_send_messages.c

Change-Id: Ic36cf0d0c3f1a91f569f9756b1e8ff048b05c543
CRs-Fixed: 1093093
This commit is contained in:
Srinivas Girigowda
2017-03-26 15:02:27 -07:00
committed by Sandeep Puligilla
parent ab84753408
commit b60b2c5242
1 changed files with 50 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
core/mac/src/pe/lim/lim_send_messages.c
View File

@@ -99,8 +99,7 @@ tSirRetStatus lim_send_cf_params(tpAniSirGlobal pMac, uint8_t bssIdx,
pCFParams = qdf_mem_malloc(sizeof(tUpdateCFParams));
if (NULL == pCFParams) {
lim_log(pMac, LOGP,
FL("Unable to allocate memory during Update CF Params"));
pe_err("Unable to allocate memory during Update CF Params");
retCode = eSIR_MEM_ALLOC_FAILED;
goto returnFailure;
}
@@ -112,13 +111,12 @@ tSirRetStatus lim_send_cf_params(tpAniSirGlobal pMac, uint8_t bssIdx,
msgQ.reserved = 0;
msgQ.bodyptr = pCFParams;
msgQ.bodyval = 0;
lim_log(pMac, LOG3, FL("Sending WMA_UPDATE_CF_IND..."));
pe_debug("Sending WMA_UPDATE_CF_IND");
MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msgQ.type));
retCode = wma_post_ctrl_msg(pMac, &msgQ);
if (eSIR_SUCCESS != retCode) {
qdf_mem_free(pCFParams);
lim_log(pMac, LOGP,
FL("Posting WMA_UPDATE_CF_IND failed, reason=%X"),
pe_err("Posting WMA_UPDATE_CF_IND failed, reason=%X",
retCode);
}
returnFailure:
@@ -147,8 +145,7 @@ tSirRetStatus lim_send_beacon_params(tpAniSirGlobal pMac,
pBcnParams = qdf_mem_malloc(sizeof(*pBcnParams));
if (NULL == pBcnParams) {
lim_log(pMac, LOGP,
FL("Unable to allocate memory during Update Beacon Params"));
pe_err("Unable to allocate memory during Update Beacon Params");
return eSIR_MEM_ALLOC_FAILED;
}
qdf_mem_copy((uint8_t *) pBcnParams, pUpdatedBcnParams,
@@ -157,9 +154,8 @@ tSirRetStatus lim_send_beacon_params(tpAniSirGlobal pMac,
msgQ.reserved = 0;
msgQ.bodyptr = pBcnParams;
msgQ.bodyval = 0;
PELOG3(lim_log(pMac, LOG3,
FL("Sending WMA_UPDATE_BEACON_IND, paramChangeBitmap in hex = %x"),
pUpdatedBcnParams->paramChangeBitmap);)
pe_debug("Sending WMA_UPDATE_BEACON_IND, paramChangeBitmap in hex: %x",
pUpdatedBcnParams->paramChangeBitmap);
if (NULL == psessionEntry) {
qdf_mem_free(pBcnParams);
MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msgQ.type));
@@ -173,8 +169,7 @@ tSirRetStatus lim_send_beacon_params(tpAniSirGlobal pMac,
retCode = wma_post_ctrl_msg(pMac, &msgQ);
if (eSIR_SUCCESS != retCode) {
qdf_mem_free(pBcnParams);
lim_log(pMac, LOGP,
FL("Posting WMA_UPDATE_BEACON_IND, reason=%X"),
pe_err("Posting WMA_UPDATE_BEACON_IND, reason=%X",
retCode);
}
lim_send_beacon_ind(pMac, psessionEntry);
@@ -218,15 +213,13 @@ tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac,
tpPESession pSessionEntry;
pSessionEntry = pe_find_session_by_session_id(pMac, peSessionId);
if (pSessionEntry == NULL) {
lim_log(pMac, LOGP, FL(
"Unable to get Session for session Id %d"),
pe_err("Unable to get Session for session Id %d",
peSessionId);
return eSIR_FAILURE;
}
pChnlParams = qdf_mem_malloc(sizeof(tSwitchChannelParams));
if (NULL == pChnlParams) {
lim_log(pMac, LOGP, FL(
"Unable to allocate memory for Switch Ch Params"));
pe_err("Unable to allocate memory for Switch Ch Params");
return eSIR_MEM_ALLOC_FAILED;
}
pChnlParams->channelNumber = chnlNumber;
@@ -244,7 +237,7 @@ tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac,
lim_update_chan_he_capable(pMac, pChnlParams);
pChnlParams->dot11_mode = pSessionEntry->dot11mode;
pChnlParams->nss = pSessionEntry->nss;
lim_log(pMac, LOG1, FL("dot11mode: %d, vht_capable: %d nss value: %d"),
pe_debug("dot11mode: %d, vht_capable: %d nss value: %d",
pChnlParams->dot11_mode, pChnlParams->vhtCapable,
pChnlParams->nss);
@@ -282,15 +275,13 @@ tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac,
msgQ.reserved = 0;
msgQ.bodyptr = pChnlParams;
msgQ.bodyval = 0;
PELOG3(lim_log(pMac, LOG3, FL(
"Sending CH_SWITCH_REQ, ch_width %d, ch_num %d, maxTxPower %d"),
pe_debug("Sending CH_SWITCH_REQ, ch_width %d, ch_num %d, maxTxPower %d",
pChnlParams->ch_width,
pChnlParams->channelNumber, pChnlParams->maxTxPower);)
pChnlParams->channelNumber, pChnlParams->maxTxPower);
MTRACE(mac_trace_msg_tx(pMac, peSessionId, msgQ.type));
if (eSIR_SUCCESS != wma_post_ctrl_msg(pMac, &msgQ)) {
qdf_mem_free(pChnlParams);
lim_log(pMac, LOGP, FL(
"Posting CH_SWITCH_REQ to WMA failed"));
pe_err("Posting CH_SWITCH_REQ to WMA failed");
return eSIR_FAILURE;
}
return eSIR_SUCCESS;
@@ -328,8 +319,7 @@ tSirRetStatus lim_send_edca_params(tpAniSirGlobal pMac,
pEdcaParams = qdf_mem_malloc(sizeof(tEdcaParams));
if (NULL == pEdcaParams) {
lim_log(pMac, LOGP,
FL("Unable to allocate memory during Update EDCA Params"));
pe_err("Unable to allocate memory during Update EDCA Params");
retCode = eSIR_MEM_ALLOC_FAILED;
return retCode;
}
@@ -342,23 +332,20 @@ tSirRetStatus lim_send_edca_params(tpAniSirGlobal pMac,
msgQ.reserved = 0;
msgQ.bodyptr = pEdcaParams;
msgQ.bodyval = 0;
PELOG1(lim_log(pMac, LOG1,
FL("Sending WMA_UPDATE_EDCA_PROFILE_IND, EDCA Parameters:"));)
pe_debug("Sending WMA_UPDATE_EDCA_PROFILE_IND, EDCA Parameters:");
for (i = 0; i < MAX_NUM_AC; i++) {
PELOG1(lim_log(pMac, LOG1,
FL("AC[%d]: AIFSN %d, ACM %d, CWmin %d, CWmax %d, TxOp %d "),
pe_debug("AC[%d]: AIFSN %d, ACM %d, CWmin %d, CWmax %d, TxOp %d ",
i, pUpdatedEdcaParams[i].aci.aifsn,
pUpdatedEdcaParams[i].aci.acm,
pUpdatedEdcaParams[i].cw.min,
pUpdatedEdcaParams[i].cw.max,
pUpdatedEdcaParams[i].txoplimit);)
pUpdatedEdcaParams[i].txoplimit);
}
MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msgQ.type));
retCode = wma_post_ctrl_msg(pMac, &msgQ);
if (eSIR_SUCCESS != retCode) {
qdf_mem_free(pEdcaParams);
lim_log(pMac, LOGP,
FL("Posting WMA_UPDATE_EDCA_PROFILE_IND failed, reason=%X"),
pe_err("Posting WMA_UPDATE_EDCA_PROFILE_IND failed, reason=%X",
retCode);
}
return retCode;
@@ -409,21 +396,19 @@ void lim_set_active_edca_params(tpAniSirGlobal mac_ctx,
* such that: BE_ACM=1, BK_ACM=1, VI_ACM=1, VO_ACM=0
* then all AC will be downgraded to AC_BE.
*/
lim_log(mac_ctx, LOGD, FL("adAdmitMask[UPLINK] = 0x%x "),
pe_debug("adAdmitMask[UPLINK] = 0x%x ",
pe_session->gAcAdmitMask[SIR_MAC_DIRECTION_UPLINK]);
lim_log(mac_ctx, LOGD, FL("adAdmitMask[DOWNLINK] = 0x%x "),
pe_debug("adAdmitMask[DOWNLINK] = 0x%x ",
pe_session->gAcAdmitMask[SIR_MAC_DIRECTION_DNLINK]);
for (ac = EDCA_AC_BK; ac <= EDCA_AC_VO; ac++) {
ac_admitted =
((pe_session->gAcAdmitMask[SIR_MAC_DIRECTION_UPLINK] &
(1 << ac)) >> ac);
lim_log(mac_ctx, LOGD,
FL("For AC[%d]: acm=%d, ac_admitted=%d "),
pe_debug("For AC[%d]: acm=%d, ac_admitted=%d ",
ac, edca_params[ac].aci.acm, ac_admitted);
if ((edca_params[ac].aci.acm == 1) && (ac_admitted == 0)) {
lim_log(mac_ctx, LOG1,
FL("We need to downgrade AC %d!! "), ac);
pe_debug("We need to downgrade AC %d!!", ac);
/* Loop backwards through AC values until it finds
* acm == 0 or reaches EDCA_AC_BE.
* Note that for block has no executable statements.
@@ -434,9 +419,7 @@ void lim_set_active_edca_params(tpAniSirGlobal mac_ctx,
i--)
;
new_ac = i;
lim_log(mac_ctx, LOG1,
FL("Downgrading AC %d ---> AC %d "),
ac, new_ac);
pe_info("Downgrading AC %d ---> AC %d ", ac, new_ac);
pe_session->gLimEdcaParamsActive[ac] =
edca_params[new_ac];
}
@@ -492,9 +475,7 @@ tSirRetStatus lim_set_link_state(tpAniSirGlobal pMac, tSirLinkState state,
/* Allocate memory. */
pLinkStateParams = qdf_mem_malloc(sizeof(tLinkStateParams));
if (NULL == pLinkStateParams) {
lim_log(pMac, LOGP,
FL
("Unable to allocate memory while sending Set Link State"));
pe_err("Unable to allocate memory while sending Set Link State");
retCode = eSIR_MEM_ALLOC_FAILED;
return retCode;
}
@@ -516,8 +497,7 @@ tSirRetStatus lim_set_link_state(tpAniSirGlobal pMac, tSirLinkState state,
retCode = (uint32_t) wma_post_ctrl_msg(pMac, &msgQ);
if (retCode != eSIR_SUCCESS) {
qdf_mem_free(pLinkStateParams);
lim_log(pMac, LOGP,
FL("Posting link state %d failed, reason = %x "), state,
pe_err("Posting link state %d failed, reason = %x", state,
retCode);
}
return retCode;
@@ -534,9 +514,7 @@ extern tSirRetStatus lim_set_link_state_ft(tpAniSirGlobal pMac, tSirLinkState
/* Allocate memory. */
pLinkStateParams = qdf_mem_malloc(sizeof(tLinkStateParams));
if (NULL == pLinkStateParams) {
lim_log(pMac, LOGP,
FL
("Unable to allocate memory while sending Set Link State"));
pe_err("Unable to allocate memory while sending Set Link State");
retCode = eSIR_MEM_ALLOC_FAILED;
return retCode;
}
@@ -561,8 +539,7 @@ extern tSirRetStatus lim_set_link_state_ft(tpAniSirGlobal pMac, tSirLinkState
retCode = (uint32_t) wma_post_ctrl_msg(pMac, &msgQ);
if (retCode != eSIR_SUCCESS) {
qdf_mem_free(pLinkStateParams);
lim_log(pMac, LOGP,
FL("Posting link state %d failed, reason = %x "), state,
pe_err("Posting link state %d failed, reason = %x", state,
retCode);
}
return retCode;
@@ -586,15 +563,14 @@ tSirRetStatus lim_send_beacon_filter_info(tpAniSirGlobal pMac,
tpBeaconFilterIe pIe;
if (psessionEntry == NULL) {
lim_log(pMac, LOGE, FL("Fail to find the right session "));
pe_err("Fail to find the right session");
retCode = eSIR_FAILURE;
return retCode;
}
msgSize = sizeof(tBeaconFilterMsg) + sizeof(beacon_filter_table);
pBeaconFilterMsg = qdf_mem_malloc(msgSize);
if (NULL == pBeaconFilterMsg) {
lim_log(pMac, LOGP,
FL("Fail to allocate memory for beaconFiilterMsg "));
pe_err("Fail to allocate memory for beaconFiilterMsg");
retCode = eSIR_MEM_ALLOC_FAILED;
return retCode;
}
@@ -626,13 +602,12 @@ tSirRetStatus lim_send_beacon_filter_info(tpAniSirGlobal pMac,
msgQ.reserved = 0;
msgQ.bodyptr = pBeaconFilterMsg;
msgQ.bodyval = 0;
lim_log(pMac, LOG3, FL("Sending WMA_BEACON_FILTER_IND..."));
pe_debug("Sending WMA_BEACON_FILTER_IND");
MTRACE(mac_trace_msg_tx(pMac, psessionEntry->peSessionId, msgQ.type));
retCode = wma_post_ctrl_msg(pMac, &msgQ);
if (eSIR_SUCCESS != retCode) {
qdf_mem_free(pBeaconFilterMsg);
lim_log(pMac, LOGP,
FL("Posting WMA_BEACON_FILTER_IND failed, reason=%X"),
pe_err("Posting WMA_BEACON_FILTER_IND failed, reason=%X",
retCode);
return retCode;
}
@@ -649,8 +624,7 @@ tSirRetStatus lim_send_mode_update(tpAniSirGlobal pMac,
pVhtOpMode = qdf_mem_malloc(sizeof(tUpdateVHTOpMode));
if (NULL == pVhtOpMode) {
lim_log(pMac, LOGP,
FL("Unable to allocate memory during Update Op Mode"));
pe_err("Unable to allocate memory during Update Op Mode");
return eSIR_MEM_ALLOC_FAILED;
}
qdf_mem_copy((uint8_t *) pVhtOpMode, pTempParam,
@@ -659,8 +633,7 @@ tSirRetStatus lim_send_mode_update(tpAniSirGlobal pMac,
msgQ.reserved = 0;
msgQ.bodyptr = pVhtOpMode;
msgQ.bodyval = 0;
lim_log(pMac, LOG3, FL(
"Sending WMA_UPDATE_OP_MODE, op_mode %d, sta_id %d"),
pe_debug("Sending WMA_UPDATE_OP_MODE, op_mode %d, sta_id %d",
pVhtOpMode->opMode, pVhtOpMode->staId);
if (NULL == psessionEntry)
MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msgQ.type));
@@ -671,8 +644,7 @@ tSirRetStatus lim_send_mode_update(tpAniSirGlobal pMac,
retCode = wma_post_ctrl_msg(pMac, &msgQ);
if (eSIR_SUCCESS != retCode) {
qdf_mem_free(pVhtOpMode);
lim_log(pMac, LOGP,
FL("Posting WMA_UPDATE_OP_MODE failed, reason=%X"),
pe_err("Posting WMA_UPDATE_OP_MODE failed, reason=%X",
retCode);
}
@@ -689,8 +661,7 @@ tSirRetStatus lim_send_rx_nss_update(tpAniSirGlobal pMac,
pRxNss = qdf_mem_malloc(sizeof(tUpdateRxNss));
if (NULL == pRxNss) {
lim_log(pMac, LOGP,
FL("Unable to allocate memory during Update Rx Nss"));
pe_err("Unable to allocate memory during Update Rx Nss");
return eSIR_MEM_ALLOC_FAILED;
}
qdf_mem_copy((uint8_t *) pRxNss, pTempParam, sizeof(tUpdateRxNss));
@@ -698,7 +669,7 @@ tSirRetStatus lim_send_rx_nss_update(tpAniSirGlobal pMac,
msgQ.reserved = 0;
msgQ.bodyptr = pRxNss;
msgQ.bodyval = 0;
PELOG3(lim_log(pMac, LOG3, FL("Sending WMA_UPDATE_RX_NSS"));)
pe_debug("Sending WMA_UPDATE_RX_NSS");
if (NULL == psessionEntry)
MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msgQ.type));
else
@@ -708,8 +679,7 @@ tSirRetStatus lim_send_rx_nss_update(tpAniSirGlobal pMac,
retCode = wma_post_ctrl_msg(pMac, &msgQ);
if (eSIR_SUCCESS != retCode) {
qdf_mem_free(pRxNss);
lim_log(pMac, LOGP,
FL("Posting WMA_UPDATE_RX_NSS failed, reason=%X"),
pe_err("Posting WMA_UPDATE_RX_NSS failed, reason=%X",
retCode);
}
@@ -726,8 +696,7 @@ tSirRetStatus lim_set_membership(tpAniSirGlobal pMac,
pMembership = qdf_mem_malloc(sizeof(tUpdateMembership));
if (NULL == pMembership) {
lim_log(pMac, LOGP,
FL("Unable to allocate memory during Update Membership Mode"));
pe_err("Unable to allocate memory during Update Membership Mode");
return eSIR_MEM_ALLOC_FAILED;
}
qdf_mem_copy((uint8_t *) pMembership, pTempParam,
@@ -737,7 +706,7 @@ tSirRetStatus lim_set_membership(tpAniSirGlobal pMac,
msgQ.reserved = 0;
msgQ.bodyptr = pMembership;
msgQ.bodyval = 0;
PELOG3(lim_log(pMac, LOG3, FL("Sending WMA_UPDATE_MEMBERSHIP"));)
pe_debug("Sending WMA_UPDATE_MEMBERSHIP");
if (NULL == psessionEntry)
MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msgQ.type));
else
@@ -747,8 +716,7 @@ tSirRetStatus lim_set_membership(tpAniSirGlobal pMac,
retCode = wma_post_ctrl_msg(pMac, &msgQ);
if (eSIR_SUCCESS != retCode) {
qdf_mem_free(pMembership);
lim_log(pMac, LOGP,
FL("Posting WMA_UPDATE_MEMBERSHIP failed, reason=%X"),
pe_err("Posting WMA_UPDATE_MEMBERSHIP failed, reason=%X",
retCode);
}
@@ -765,8 +733,7 @@ tSirRetStatus lim_set_user_pos(tpAniSirGlobal pMac,
pUserPos = qdf_mem_malloc(sizeof(tUpdateUserPos));
if (NULL == pUserPos) {
lim_log(pMac, LOGP,
FL("Unable to allocate memory during Update User Position"));
pe_err("Unable to allocate memory during Update User Position");
return eSIR_MEM_ALLOC_FAILED;
}
qdf_mem_copy((uint8_t *) pUserPos, pTempParam, sizeof(tUpdateUserPos));
@@ -775,7 +742,7 @@ tSirRetStatus lim_set_user_pos(tpAniSirGlobal pMac,
msgQ.reserved = 0;
msgQ.bodyptr = pUserPos;
msgQ.bodyval = 0;
PELOG3(lim_log(pMac, LOG3, FL("Sending WMA_UPDATE_USERPOS"));)
pe_debug("Sending WMA_UPDATE_USERPOS");
if (NULL == psessionEntry)
MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msgQ.type));
else
@@ -785,8 +752,7 @@ tSirRetStatus lim_set_user_pos(tpAniSirGlobal pMac,
retCode = wma_post_ctrl_msg(pMac, &msgQ);
if (eSIR_SUCCESS != retCode) {
qdf_mem_free(pUserPos);
lim_log(pMac, LOGP,
FL("Posting WMA_UPDATE_USERPOS failed, reason=%X"),
pe_err("Posting WMA_UPDATE_USERPOS failed, reason=%X",
retCode);
}
@@ -816,8 +782,7 @@ tSirRetStatus lim_send_exclude_unencrypt_ind(tpAniSirGlobal pMac,
pExcludeUnencryptParam =
qdf_mem_malloc(sizeof(tSirWlanExcludeUnencryptParam));
if (NULL == pExcludeUnencryptParam) {
lim_log(pMac, LOGP,
FL("Unable to allocate memory during lim_send_exclude_unencrypt_ind"));
pe_err("Unable to allocate memory during lim_send_exclude_unencrypt_ind");
return eSIR_MEM_ALLOC_FAILED;
}
@@ -829,13 +794,12 @@ tSirRetStatus lim_send_exclude_unencrypt_ind(tpAniSirGlobal pMac,
msgQ.reserved = 0;
msgQ.bodyptr = pExcludeUnencryptParam;
msgQ.bodyval = 0;
PELOG3(lim_log(pMac, LOG3, FL("Sending WMA_EXCLUDE_UNENCRYPTED_IND"));)
pe_debug("Sending WMA_EXCLUDE_UNENCRYPTED_IND");
MTRACE(mac_trace_msg_tx(pMac, psessionEntry->peSessionId, msgQ.type));
retCode = wma_post_ctrl_msg(pMac, &msgQ);
if (eSIR_SUCCESS != retCode) {
qdf_mem_free(pExcludeUnencryptParam);
lim_log(pMac, LOGP,
FL("Posting WMA_EXCLUDE_UNENCRYPTED_IND failed, reason=%X"),
pe_err("Posting WMA_EXCLUDE_UNENCRYPTED_IND failed, reason=%X",
retCode);
}
@@ -896,8 +860,7 @@ tSirRetStatus lim_send_ht40_obss_scanind(tpAniSirGlobal mac_ctx,
channelnum = WNI_CFG_VALID_CHANNEL_LIST_LEN;
if (wlan_cfg_get_str(mac_ctx, WNI_CFG_VALID_CHANNEL_LIST,
chan_list, &channelnum) != eSIR_SUCCESS) {
lim_log(mac_ctx, LOGE,
FL("could not retrieve Valid channel list"));
pe_err("could not retrieve Valid channel list");
qdf_mem_free(ht40_obss_scanind);
return eSIR_FAILURE;
}
@@ -922,15 +885,13 @@ tSirRetStatus lim_send_ht40_obss_scanind(tpAniSirGlobal mac_ctx,
msg.reserved = 0;
msg.bodyptr = (void *)ht40_obss_scanind;
msg.bodyval = 0;
lim_log(mac_ctx, LOG1,
FL("Sending WDA_HT40_OBSS_SCAN_IND to WDA"
"Obss Scan trigger width = %d, delay factor = %d"),
pe_debug("Sending WDA_HT40_OBSS_SCAN_IND to WDA"
"Obss Scan trigger width: %d, delay factor: %d",
ht40_obss_scanind->obss_width_trigger_interval,
ht40_obss_scanind->bsswidth_ch_trans_delay);
ret = wma_post_ctrl_msg(mac_ctx, &msg);
if (eSIR_SUCCESS != ret) {
lim_log(mac_ctx, LOGP,
FL("WDA_HT40_OBSS_SCAN_IND msg failed, reason=%X"),
pe_err("WDA_HT40_OBSS_SCAN_IND msg failed, reason=%X",
ret);
qdf_mem_free(ht40_obss_scanind);
}