From 99923a8330d524fd331c8d65ac1e713b4b8086f9 Mon Sep 17 00:00:00 2001 From: Nirav Shah Date: Sat, 23 Jun 2018 14:35:49 +0530 Subject: [PATCH] qcacld-3.0: Map all module logs to per-level log APIs Map all module level log APIs to per-level log APIs to compile out specific log level if required. Change-Id: Icfcc28fb592ee99704d8fb23bc3cb45b6e4c9f53 CRs-Fixed: 2266718 --- components/disa/core/inc/wlan_disa_main.h | 23 +++++------ components/ocb/core/inc/wlan_ocb_main.h | 28 ++++++------- core/dp/txrx/ol_txrx_flow_control.c | 49 ++++++++++------------- core/dp/txrx/ol_txrx_internal.h | 33 ++++++--------- core/mac/src/pe/lim/lim_utils.c | 2 +- uapi/linux/osapi_linux.h | 8 ++-- 6 files changed, 61 insertions(+), 82 deletions(-) diff --git a/components/disa/core/inc/wlan_disa_main.h b/components/disa/core/inc/wlan_disa_main.h index 26caad4b707f..d178adf245ce 100644 --- a/components/disa/core/inc/wlan_disa_main.h +++ b/components/disa/core/inc/wlan_disa_main.h @@ -28,19 +28,16 @@ #include "wlan_disa_priv.h" #include "wlan_disa_objmgr.h" -#define disa_log(level, args...) QDF_TRACE(QDF_MODULE_ID_DISA, level, ## args) -#define disa_logfl(level, format, args...) disa_log(level, FL(format), ## args) - -#define disa_fatal(format, args...) \ - disa_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args) -#define disa_err(format, args...) \ - disa_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args) -#define disa_warn(format, args...) \ - disa_logfl(QDF_TRACE_LEVEL_WARN, format, ## args) -#define disa_info(format, args...) \ - disa_logfl(QDF_TRACE_LEVEL_INFO, format, ## args) -#define disa_debug(format, args...) \ - disa_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args) +#define disa_fatal(params...) \ + QDF_TRACE_FATAL(QDF_MODULE_ID_DISA, params) +#define disa_err(params...) \ + QDF_TRACE_ERROR(QDF_MODULE_ID_DISA, params) +#define disa_warn(params...) \ + QDF_TRACE_ERROR(QDF_MODULE_ID_DISA, params) +#define disa_info(params...) \ + QDF_TRACE_INFO(QDF_MODULE_ID_DISA, params) +#define disa_debug(params...) \ + QDF_TRACE_DEBUG(QDF_MODULE_ID_DISA, params) #define DISA_ENTER() disa_debug("enter") #define DISA_EXIT() disa_debug("exit") diff --git a/components/ocb/core/inc/wlan_ocb_main.h b/components/ocb/core/inc/wlan_ocb_main.h index 0e66c828ed0d..6757b0919c21 100644 --- a/components/ocb/core/inc/wlan_ocb_main.h +++ b/components/ocb/core/inc/wlan_ocb_main.h @@ -35,22 +35,18 @@ #define ocb_info_rl(params...) QDF_TRACE_INFO_RL(QDF_MODULE_ID_OCB, params) #define ocb_debug_rl(params...) QDF_TRACE_DEBUG_RL(QDF_MODULE_ID_OCB, params) -#define ocb_log(level, args...) \ - QDF_TRACE(QDF_MODULE_ID_OCB, level, ## args) -#define ocb_logfl(level, format, args...) \ - ocb_log(level, FL(format), ## args) -#define ocb_alert(format, args...) \ - ocb_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args) -#define ocb_err(format, args...) \ - ocb_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args) -#define ocb_warn(format, args...) \ - ocb_logfl(QDF_TRACE_LEVEL_WARN, format, ## args) -#define ocb_notice(format, args...) \ - ocb_logfl(QDF_TRACE_LEVEL_INFO, format, ## args) -#define ocb_info(format, args...) \ - ocb_logfl(QDF_TRACE_LEVEL_INFO_HIGH, format, ## args) -#define ocb_debug(format, args...) \ - ocb_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args) +#define ocb_alert(params...) \ + QDF_TRACE_FATAL(QDF_MODULE_ID_OCB, params) +#define ocb_err(params...) \ + QDF_TRACE_ERROR(QDF_MODULE_ID_OCB, params) +#define ocb_warn(params...) \ + QDF_TRACE_WARN(QDF_MODULE_ID_OCB, params) +#define ocb_notice(params...) \ + QDF_TRACE_INFO(QDF_MODULE_ID_OCB, params) +#define ocb_info(params...) \ + QDF_TRACE_INFO(QDF_MODULE_ID_OCB, params) +#define ocb_debug(params...) \ + QDF_TRACE_DEBUG(QDF_MODULE_ID_OCB, params) /** * enum ocb_southbound_event - OCB south bound event type diff --git a/core/dp/txrx/ol_txrx_flow_control.c b/core/dp/txrx/ol_txrx_flow_control.c index df687c251af7..c1841f5b376a 100644 --- a/core/dp/txrx/ol_txrx_flow_control.c +++ b/core/dp/txrx/ol_txrx_flow_control.c @@ -389,18 +389,16 @@ void ol_tx_dump_flow_pool_info(void *ctx) return; } - ol_txrx_log(QDF_TRACE_LEVEL_INFO_LOW, - "Global total %d :: avail %d invalid flow_pool %d ", - pdev->tx_desc.pool_size, - pdev->tx_desc.num_free, - pdev->tx_desc.num_invalid_bin); + ol_txrx_info("Global total %d :: avail %d invalid flow_pool %d ", + pdev->tx_desc.pool_size, + pdev->tx_desc.num_free, + pdev->tx_desc.num_invalid_bin); - ol_txrx_log(QDF_TRACE_LEVEL_INFO_LOW, - "maps %d pool unmaps %d pool resize %d pkt drops %d", - pdev->pool_stats.pool_map_count, - pdev->pool_stats.pool_unmap_count, - pdev->pool_stats.pool_resize_count, - pdev->pool_stats.pkt_drop_no_pool); + ol_txrx_info("maps %d pool unmaps %d pool resize %d pkt drops %d", + pdev->pool_stats.pool_map_count, + pdev->pool_stats.pool_unmap_count, + pdev->pool_stats.pool_resize_count, + pdev->pool_stats.pkt_drop_no_pool); /* * Nested spin lock. * Always take in below order. @@ -418,22 +416,19 @@ void ol_tx_dump_flow_pool_info(void *ctx) if (pool_prev) ol_tx_dec_pool_ref(pool_prev, false); - ol_txrx_log(QDF_TRACE_LEVEL_INFO_LOW, - "flow_pool_id %d ::", tmp_pool.flow_pool_id); - ol_txrx_log(QDF_TRACE_LEVEL_INFO_LOW, - "status %s flow_id %d flow_type %d", - ol_tx_flow_pool_status_to_str(tmp_pool.status), - tmp_pool.member_flow_id, tmp_pool.flow_type); - ol_txrx_log(QDF_TRACE_LEVEL_INFO_LOW, - "total %d :: available %d :: deficient %d :: overflow %d :: pkt dropped (no desc) %d", - tmp_pool.flow_pool_size, tmp_pool.avail_desc, - tmp_pool.deficient_desc, - tmp_pool.overflow_desc, - tmp_pool.pkt_drop_no_desc); - ol_txrx_log(QDF_TRACE_LEVEL_INFO_LOW, - "thresh: start %d stop %d prio start %d prio stop %d", - tmp_pool.start_th, tmp_pool.stop_th, - tmp_pool.start_priority_th, tmp_pool.stop_priority_th); + ol_txrx_info("flow_pool_id %d ::", tmp_pool.flow_pool_id); + ol_txrx_info("status %s flow_id %d flow_type %d", + ol_tx_flow_pool_status_to_str(tmp_pool.status), + tmp_pool.member_flow_id, tmp_pool.flow_type); + ol_txrx_info("total %d :: available %d :: deficient %d :: overflow %d :: pkt dropped (no desc) %d", + tmp_pool.flow_pool_size, tmp_pool.avail_desc, + tmp_pool.deficient_desc, + tmp_pool.overflow_desc, + tmp_pool.pkt_drop_no_desc); + ol_txrx_info("thresh: start %d stop %d prio start %d prio stop %d", + tmp_pool.start_th, tmp_pool.stop_th, + tmp_pool.start_priority_th, + tmp_pool.stop_priority_th); pool_prev = pool; qdf_spin_lock_bh(&pdev->tx_desc.flow_pool_list_lock); } diff --git a/core/dp/txrx/ol_txrx_internal.h b/core/dp/txrx/ol_txrx_internal.h index acc9651ffe44..a6fd30c7b40a 100644 --- a/core/dp/txrx/ol_txrx_internal.h +++ b/core/dp/txrx/ol_txrx_internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2018 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 @@ -70,23 +70,18 @@ #include /* va_list */ #include /* qdf_vprint */ -#define ol_txrx_log(level, args...) \ - QDF_TRACE(QDF_MODULE_ID_TXRX, level, ## args) -#define ol_txrx_logfl(level, format, args...) \ - ol_txrx_log(level, FL(format), ## args) - -#define ol_txrx_alert(format, args...) \ - ol_txrx_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args) -#define ol_txrx_err(format, args...) \ - ol_txrx_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args) -#define ol_txrx_warn(format, args...) \ - ol_txrx_logfl(QDF_TRACE_LEVEL_WARN, format, ## args) -#define ol_txrx_info(format, args...) \ - ol_txrx_logfl(QDF_TRACE_LEVEL_INFO, format, ## args) -#define ol_txrx_info_high(format, args...) \ - ol_txrx_logfl(QDF_TRACE_LEVEL_INFO_HIGH, format, ## args) -#define ol_txrx_dbg(format, args...) \ - ol_txrx_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args) +#define ol_txrx_alert(params...) \ + QDF_TRACE_FATAL(QDF_MODULE_ID_TXRX, params) +#define ol_txrx_err(params...) \ + QDF_TRACE_ERROR(QDF_MODULE_ID_TXRX, params) +#define ol_txrx_warn(params...) \ + QDF_TRACE_WARN(QDF_MODULE_ID_TXRX, params) +#define ol_txrx_info(params...) \ + QDF_TRACE_INFO(QDF_MODULE_ID_TXRX, params) +#define ol_txrx_info_high(params...) \ + QDF_TRACE_INFO(QDF_MODULE_ID_TXRX, params) +#define ol_txrx_dbg(params...) \ + QDF_TRACE_DEBUG(QDF_MODULE_ID_TXRX, params) /* * define PN check failure message print rate @@ -95,8 +90,6 @@ #define TXRX_PN_CHECK_FAILURE_PRINT_PERIOD_MS 1000 #else -#define ol_txrx_log(level, args...) -#define ol_txrx_logfl(level, format, args...) #define ol_txrx_alert(format, args...) #define ol_txrx_err(format, args...) #define ol_txrx_warn(format, args...) diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 6f85f3eb125f..29c03d228f25 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -833,7 +833,7 @@ void lim_reset_deferred_msg_q(tpAniSirGlobal pMac) uint8_t lim_write_deferred_msg_q(tpAniSirGlobal mac_ctx, struct scheduler_msg *lim_msg) { - uint8_t type, subtype; + uint8_t type = 0, subtype = 0; pe_debug("Queue a deferred message size: %d write: %d - type: 0x%x", mac_ctx->lim.gLimDeferredMsgQ.size, diff --git a/uapi/linux/osapi_linux.h b/uapi/linux/osapi_linux.h index eb6c19a659d7..4d520999be5b 100644 --- a/uapi/linux/osapi_linux.h +++ b/uapi/linux/osapi_linux.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2018 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 @@ -69,11 +69,9 @@ #define A_MEMCMP(addr1, addr2, len) memcmp((addr1), (addr2), (len)) #define A_LOGGER(mask, mod, args ...) \ - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ## args) + QDF_TRACE_ERROR(QDF_MODULE_ID_QDF, args) #define A_PRINTF(args ...) \ - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ## args) -#define A_PRINTF_LOG(args ...) \ - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ## args) + QDF_TRACE_ERROR(QDF_MODULE_ID_QDF, args) #define A_SNPRINTF(buf, len, args ...) snprintf(buf, len, args) /*