From 698e3afc127de15d094bcf5c9fb6865ba21469b6 Mon Sep 17 00:00:00 2001 From: sheenam monga Date: Fri, 14 Feb 2020 13:34:48 +0530 Subject: [PATCH] qcacld-3.0: Update trace dump to nofl dump Currently, additional unnecessary information is printed via trace dump. Remove unnecessary information by using nofl trace in lim_trace_dump, sme_trace_dump and hdd_trace_dump Change-Id: I3a02d05030e390ce39b4d33e57190a1aa586d132 CRs-Fixed: 2622095 --- core/hdd/src/wlan_hdd_trace.c | 20 ++-- core/mac/src/pe/lim/lim_trace.c | 180 ++++++++++++++++---------------- core/sme/src/common/sme_trace.c | 42 ++++---- core/sme/src/csr/csr_api_roam.c | 8 +- 4 files changed, 124 insertions(+), 126 deletions(-) diff --git a/core/hdd/src/wlan_hdd_trace.c b/core/hdd/src/wlan_hdd_trace.c index 22a2438499f6e..39b8377d9b831 100644 --- a/core/hdd/src/wlan_hdd_trace.c +++ b/core/hdd/src/wlan_hdd_trace.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -42,15 +42,17 @@ static void hdd_trace_dump(void *mac, tp_qdf_trace_record record, uint16_t index) { if (TRACE_CODE_HDD_RX_SME_MSG == record->code) - hdd_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", - index, record->qtime, record->time, record->session, - "RX SME MSG:", - get_e_roam_cmd_status_str(record->data), record->data); + hdd_nofl_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", + index, record->qtime, record->time, + record->session, "RX SME MSG:", + get_e_roam_cmd_status_str(record->data), + record->data); else - hdd_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", - index, record->qtime, record->time, record->session, - "HDD Event:", - hdd_trace_event_string(record->code), record->data); + hdd_nofl_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", + index, record->qtime, record->time, + record->session, "HDD Event:", + hdd_trace_event_string(record->code), + record->data); } /** diff --git a/core/mac/src/pe/lim/lim_trace.c b/core/mac/src/pe/lim/lim_trace.c index 99f7622487573..3077b816a5bcd 100644 --- a/core/mac/src/pe/lim/lim_trace.c +++ b/core/mac/src/pe/lim/lim_trace.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -115,139 +115,139 @@ void lim_trace_dump(void *mac, tp_qdf_trace_record pRecord, switch (pRecord->code) { case TRACE_CODE_MLM_STATE: - pe_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, - pRecord->qtime, pRecord->time, pRecord->session, - "MLM State:", - lim_trace_get_mlm_state_string( - (uint16_t) pRecord->data), - pRecord->data); + pe_nofl_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, + pRecord->qtime, pRecord->time, pRecord->session, + "MLM State:", + lim_trace_get_mlm_state_string( + (uint16_t)pRecord->data), + pRecord->data); break; case TRACE_CODE_SME_STATE: - pe_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, - pRecord->qtime, pRecord->time, pRecord->session, - "SME State:", - lim_trace_get_sme_state_string( - (uint16_t) pRecord->data), - pRecord->data); + pe_nofl_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, + pRecord->qtime, pRecord->time, pRecord->session, + "SME State:", + lim_trace_get_sme_state_string( + (uint16_t)pRecord->data), + pRecord->data); break; case TRACE_CODE_TX_MGMT: - pe_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, - pRecord->qtime, pRecord->time, pRecord->session, - "TX Mgmt:", frameSubtypeStr[pRecord->data], - pRecord->data); + pe_nofl_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, + pRecord->qtime, pRecord->time, pRecord->session, + "TX Mgmt:", frameSubtypeStr[pRecord->data], + pRecord->data); break; case TRACE_CODE_RX_MGMT: if (LIM_TRACE_MAX_SUBTYPES <= LIM_TRACE_GET_SUBTYPE(pRecord->data)) - pe_debug("Wrong Subtype - %d", - LIM_TRACE_GET_SUBTYPE(pRecord->data)); + pe_nofl_debug("Wrong Subtype - %d", + LIM_TRACE_GET_SUBTYPE(pRecord->data)); else - pe_debug("%04d %012llu %s S%d %-14s %-30s(%d) SN: %d", - recIndex, pRecord->qtime, pRecord->time, - pRecord->session, "RX Mgmt:", - frameSubtypeStr[LIM_TRACE_GET_SUBTYPE + pe_nofl_debug("%04d %012llu %s S%d %-14s %-30s(%d) SN: %d", + recIndex, pRecord->qtime, pRecord->time, + pRecord->session, "RX Mgmt:", + frameSubtypeStr[LIM_TRACE_GET_SUBTYPE (pRecord->data)], - LIM_TRACE_GET_SUBTYPE(pRecord->data), - LIM_TRACE_GET_SSN(pRecord->data)); + LIM_TRACE_GET_SUBTYPE(pRecord->data), + LIM_TRACE_GET_SSN(pRecord->data)); break; case TRACE_CODE_RX_MGMT_DROP: - pe_debug("%04d %012llu %s S%d %-14s %-30s(%d)", - recIndex, pRecord->qtime, pRecord->time, - pRecord->session, "Drop RX Mgmt:", - __lim_trace_get_mgmt_drop_reason_string( - (uint16_t) pRecord->data), - pRecord->data); + pe_nofl_debug("%04d %012llu %s S%d %-14s %-30s(%d)", + recIndex, pRecord->qtime, pRecord->time, + pRecord->session, "Drop RX Mgmt:", + __lim_trace_get_mgmt_drop_reason_string( + (uint16_t)pRecord->data), + pRecord->data); break; case TRACE_CODE_RX_MGMT_TSF: - pe_debug("%04d %012llu %s S%d %-14s %-30s0x%x(%d)", - recIndex, pRecord->qtime, pRecord->time, - pRecord->session, "RX Mgmt TSF:", " ", - pRecord->data, pRecord->data); + pe_nofl_debug("%04d %012llu %s S%d %-14s %-30s0x%x(%d)", + recIndex, pRecord->qtime, pRecord->time, + pRecord->session, "RX Mgmt TSF:", " ", + pRecord->data, pRecord->data); break; case TRACE_CODE_TX_COMPLETE: - pe_debug("%04d %012llu %s S%d %-14s %d", recIndex, - pRecord->qtime, pRecord->time, pRecord->session, - "TX Complete", pRecord->data); + pe_nofl_debug("%04d %012llu %s S%d %-14s %d", recIndex, + pRecord->qtime, pRecord->time, pRecord->session, + "TX Complete", pRecord->data); break; case TRACE_CODE_TX_SME_MSG: - pe_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, - pRecord->qtime, pRecord->time, pRecord->session, - "TX SME Msg:", - mac_trace_get_sme_msg_string((uint16_t) pRecord->data), - pRecord->data); + pe_nofl_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, + pRecord->qtime, pRecord->time, pRecord->session, + "TX SME Msg:", + mac_trace_get_sme_msg_string((uint16_t)pRecord->data), + pRecord->data); break; case TRACE_CODE_RX_SME_MSG: - pe_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, - pRecord->qtime, pRecord->time, pRecord->session, - LIM_TRACE_GET_DEFRD_OR_DROPPED( - pRecord->data) ? "Def/Drp LIM Msg:" : "RX Sme Msg:", - mac_trace_get_sme_msg_string((uint16_t) pRecord->data), - pRecord->data); + pe_nofl_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, + pRecord->qtime, pRecord->time, pRecord->session, + LIM_TRACE_GET_DEFRD_OR_DROPPED( + pRecord->data) ? "Def/Drp LIM Msg:" : "RX Sme Msg:", + mac_trace_get_sme_msg_string((uint16_t)pRecord->data), + pRecord->data); break; case TRACE_CODE_TX_WMA_MSG: - pe_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, - pRecord->qtime, pRecord->time, pRecord->session, - "TX WMA Msg:", - mac_trace_get_wma_msg_string((uint16_t) pRecord->data), - pRecord->data); + pe_nofl_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, + pRecord->qtime, pRecord->time, pRecord->session, + "TX WMA Msg:", + mac_trace_get_wma_msg_string((uint16_t)pRecord->data), + pRecord->data); break; case TRACE_CODE_RX_WMA_MSG: - pe_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, - pRecord->qtime, pRecord->time, pRecord->session, - LIM_TRACE_GET_DEFRD_OR_DROPPED( - pRecord->data) ? "Def/Drp LIM Msg:" : "RX WMA Msg:", - mac_trace_get_wma_msg_string((uint16_t) pRecord->data), - pRecord->data); + pe_nofl_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, + pRecord->qtime, pRecord->time, pRecord->session, + LIM_TRACE_GET_DEFRD_OR_DROPPED( + pRecord->data) ? "Def/Drp LIM Msg:" : "RX WMA Msg:", + mac_trace_get_wma_msg_string((uint16_t)pRecord->data), + pRecord->data); break; case TRACE_CODE_TX_LIM_MSG: - pe_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, - pRecord->qtime, pRecord->time, pRecord->session, - "TX LIM Msg:", - mac_trace_get_lim_msg_string((uint16_t) pRecord->data), - pRecord->data); + pe_nofl_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, + pRecord->qtime, pRecord->time, pRecord->session, + "TX LIM Msg:", + mac_trace_get_lim_msg_string((uint16_t)pRecord->data), + pRecord->data); break; case TRACE_CODE_RX_LIM_MSG: - pe_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, - pRecord->qtime, pRecord->time, pRecord->session, - LIM_TRACE_GET_DEFRD_OR_DROPPED( - pRecord->data) ? "Def/Drp LIM Msg:" : "RX LIM Msg", - mac_trace_get_lim_msg_string((uint16_t) pRecord->data), - pRecord->data); + pe_nofl_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, + pRecord->qtime, pRecord->time, pRecord->session, + LIM_TRACE_GET_DEFRD_OR_DROPPED( + pRecord->data) ? "Def/Drp LIM Msg:" : "RX LIM Msg", + mac_trace_get_lim_msg_string((uint16_t)pRecord->data), + pRecord->data); break; case TRACE_CODE_TIMER_ACTIVATE: - pe_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, - pRecord->qtime, pRecord->time, pRecord->session, - "Timer Actvtd", - __lim_trace_get_timer_string((uint16_t) pRecord->data), - pRecord->data); + pe_nofl_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, + pRecord->qtime, pRecord->time, pRecord->session, + "Timer Actvtd", + __lim_trace_get_timer_string((uint16_t)pRecord->data), + pRecord->data); break; case TRACE_CODE_TIMER_DEACTIVATE: - pe_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, - pRecord->qtime, pRecord->time, pRecord->session, - "Timer DeActvtd", - __lim_trace_get_timer_string((uint16_t) pRecord->data), - pRecord->data); + pe_nofl_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", recIndex, + pRecord->qtime, pRecord->time, pRecord->session, + "Timer DeActvtd", + __lim_trace_get_timer_string((uint16_t)pRecord->data), + pRecord->data); break; case TRACE_CODE_INFO_LOG: - pe_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", - recIndex, pRecord->qtime, pRecord->time, - pRecord->session, "INFORMATION_LOG", - mac_trace_get_info_log_string((uint16_t) pRecord->data), - pRecord->data); + pe_nofl_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", + recIndex, pRecord->qtime, pRecord->time, + pRecord->session, "INFORMATION_LOG", + mac_trace_get_info_log_string((uint16_t)pRecord->data), + pRecord->data); break; default: - pe_debug("%04d %012llu %s S%d %-14s(%d) (0x%x)", - recIndex, pRecord->qtime, pRecord->time, - pRecord->session, "Unknown Code", - pRecord->code, pRecord->data); + pe_nofl_debug("%04d %012llu %s S%d %-14s(%d) (0x%x)", + recIndex, pRecord->qtime, pRecord->time, + pRecord->session, "Unknown Code", + pRecord->code, pRecord->data); break; } } diff --git a/core/sme/src/common/sme_trace.c b/core/sme/src/common/sme_trace.c index f2fb0996723a8..f09ad8a6d00ca 100644 --- a/core/sme/src/common/sme_trace.c +++ b/core/sme/src/common/sme_trace.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -176,32 +176,32 @@ static void sme_trace_dump(void *mac_ctx, tp_qdf_trace_record record, { switch (record->code) { case TRACE_CODE_SME_COMMAND: - sme_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", - rec_index, record->qtime, record->time, record->session, - "SME COMMAND:", - sme_trace_get_command_string(record->data), - record->data); + sme_nofl_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", + rec_index, record->qtime, record->time, + record->session, "SME COMMAND:", + sme_trace_get_command_string(record->data), + record->data); break; case TRACE_CODE_SME_TX_WMA_MSG: - sme_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", - rec_index, record->qtime, record->time, record->session, - "TX WMA Msg:", - mac_trace_get_wma_msg_string((uint16_t)record->data), - record->data); + sme_nofl_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", + rec_index, record->qtime, record->time, + record->session, "TX WMA Msg:", + mac_trace_get_wma_msg_string((uint16_t)record->data), + record->data); break; case TRACE_CODE_SME_RX_WMA_MSG: - sme_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", - rec_index, record->qtime, record->time, record->session, - "RX WMA Msg:", - mac_trace_get_sme_msg_string((uint16_t)record->data), - record->data); + sme_nofl_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", + rec_index, record->qtime, record->time, record->session, + "RX WMA Msg:", + mac_trace_get_sme_msg_string((uint16_t)record->data), + record->data); break; default: - sme_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", - rec_index, record->qtime, record->time, record->session, - "RX HDD MSG:", - sme_trace_get_rx_msg_string(record->code), - record->data); + sme_nofl_debug("%04d %012llu %s S%d %-14s %-30s(0x%x)", + rec_index, record->qtime, record->time, record->session, + "RX HDD MSG:", + sme_trace_get_rx_msg_string(record->code), + record->data); break; } } diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index b02bbf1bda45d..984045f706197 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -17029,10 +17029,8 @@ QDF_STATUS csr_roam_vdev_delete(struct mac_context *mac_ctx, QDF_STATUS status = QDF_STATUS_SUCCESS; struct csr_roam_session *session; - if (!CSR_IS_SESSION_VALID(mac_ctx, vdev_id)) { - sme_debug("session %d not found", vdev_id); + if (!CSR_IS_SESSION_VALID(mac_ctx, vdev_id)) return QDF_STATUS_E_INVAL; - } session = CSR_GET_SESSION(mac_ctx, vdev_id); /* Vdev going down stop roaming */ @@ -17068,10 +17066,8 @@ static void csr_init_session(struct mac_context *mac, uint32_t sessionId) { struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId); - if (!pSession) { - sme_err("session %d not found", sessionId); + if (!pSession) return; - } pSession->sessionActive = false; pSession->sessionId = WLAN_UMAC_VDEV_ID_MAX;