From 678586caffe7021d08e553ef9fdb29744d40bf26 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Fri, 10 Mar 2017 00:13:58 -0800 Subject: [PATCH] qcacld-3.0: SAP: Reduce the log spam in kmsg Move the logs to appropriate log levels to reduce the log spam in kmsg. Change-Id: Ib53e9944677893ee29a59293dbbfa4a1df2f224d CRs-Fixed: 2014745 --- core/sap/dfs/src/dfs_init.c | 4 ++-- core/sap/src/sap_ch_select.c | 2 +- core/sap/src/sap_fsm.c | 7 ++----- core/sap/src/sap_module.c | 19 ++++++++----------- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/core/sap/dfs/src/dfs_init.c b/core/sap/dfs/src/dfs_init.c index 512e8ac9cf17..945635a043e3 100644 --- a/core/sap/dfs/src/dfs_init.c +++ b/core/sap/dfs/src/dfs_init.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2002-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -234,7 +234,7 @@ int dfs_init_radar_filters(struct ieee80211com *ic, * the rest of the radar configuration as suspect. */ if (radar_info == NULL || radar_info->dfsdomain == 0) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, "%s[%d]: Unknown dfs domain %d ", __func__, __LINE__, dfs->dfsdomain); /* Disable radar detection since we don't have a radar domain */ diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c index e02618ff2aeb..d2714103ef3f 100644 --- a/core/sap/src/sap_ch_select.c +++ b/core/sap/src/sap_ch_select.c @@ -452,7 +452,7 @@ void sap_cleanup_channel_list(void *p_cds_gctx) { ptSapContext pSapCtx; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, "Cleaning up the channel list structure"); if (NULL == p_cds_gctx) { diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index b06bb7878161..53c4e66cd361 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -2005,7 +2005,7 @@ static uint8_t sap_get_bonding_channels(ptSapContext sapContext, } else return 0; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, FL("cbmode: %d, channel: %d"), chanBondState, channel); switch (chanBondState) { @@ -2706,9 +2706,6 @@ static QDF_STATUS sap_goto_starting(ptSapContext sapContext, qdf_mem_copy(sapContext->key_material, key_material, sizeof(key_material)); - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s", - __func__); - if (NULL == hHal) { /* we have a serious problem */ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL, @@ -2716,7 +2713,7 @@ static QDF_STATUS sap_goto_starting(ptSapContext sapContext, return QDF_STATUS_E_FAULT; } - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s: session: %d", + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, "%s: session: %d", __func__, sapContext->sessionId); qdf_ret_status = sme_roam_connect(hHal, sapContext->sessionId, diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 1510e6848f77..305222ae49e5 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -117,7 +117,7 @@ QDF_STATUS wlansap_global_init(void) qdf_atomic_init(&sap_ctx_ref_count[i]); } - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, "%s: sap global context initialized", __func__); return QDF_STATUS_SUCCESS; @@ -149,7 +149,7 @@ QDF_STATUS wlansap_global_deinit(void) return QDF_STATUS_E_FAULT; } - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, "%s: sap global context deinitialized", __func__); return QDF_STATUS_SUCCESS; @@ -173,8 +173,8 @@ static QDF_STATUS wlansap_save_context(ptSapContext ctx) gp_sap_ctx[i] = ctx; qdf_atomic_inc(&sap_ctx_ref_count[i]); qdf_mutex_release(&sap_context_lock); - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, - "%s: sap context saved at index:%d", + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, + "%s: sap context saved at index: %d", __func__, i); return QDF_STATUS_SUCCESS; } @@ -237,7 +237,7 @@ void wlansap_context_put(ptSapContext ctx) qdf_mem_free(ctx); gp_sap_ctx[i] = NULL; QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_INFO, + QDF_TRACE_LEVEL_DEBUG, "%s: sap session freed: %d", __func__, i); } @@ -520,7 +520,7 @@ QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / hal = (tHalHandle) CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (eSAP_TRUE == pSapCtx->isSapSessionOpen && hal) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, "close existing SAP session"); sap_close_session(hal, pSapCtx, NULL, false); } @@ -2138,9 +2138,6 @@ QDF_STATUS wlansap_get_wps_state(void *pCtx, bool *bWPSState) ptSapContext pSapCtx = NULL; void *hHal = NULL; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, - "%s, %d", __func__, __LINE__); - pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, @@ -3015,7 +3012,7 @@ wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53) } else { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL - ("Regdomain not japan, set disable JP W53 not valid")); + ("Regdomain not japan, set disable JP W53 not valid")); status = QDF_STATUS_E_FAULT; } @@ -3627,7 +3624,7 @@ void wlansap_populate_del_sta_params(const uint8_t *mac, else pDelStaParams->subtype = (SIR_MAC_MGMT_DEAUTH >> 4); - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, FL( "Delete STA with RC:%hu subtype:%hhu MAC::" MAC_ADDRESS_STR),