From f9dbbafd311daf1c85c8b6d445d1b85b9406894d Mon Sep 17 00:00:00 2001 From: Subhani Shaik Date: Sat, 1 Mar 2014 17:53:01 -0800 Subject: qxdm log missing for sub modules. In the parser the QXDM log wrapper was missing for some functions which was causing the logs to go to console. Modified to check the global flag and route accordingly. Change-Id: I7e5b2009764c753ad1f3b27c7be4ad1cad832b24 CRs-fixed: 624844 --- tools/fwdebuglog/parser.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) (limited to 'tools') diff --git a/tools/fwdebuglog/parser.c b/tools/fwdebuglog/parser.c index 3b555aa6613c..5e90362ee11c 100644 --- a/tools/fwdebuglog/parser.c +++ b/tools/fwdebuglog/parser.c @@ -1057,18 +1057,25 @@ dbglog_printf( { char buf[128]; va_list ap; + int j; if (vap_id < DBGLOG_MAX_VDEVID) { - printf(DBGLOG_PRINT_PREFIX "[%u] vap-%u ", timestamp, vap_id); + j = snprintf(buf, sizeof(buf), DBGLOG_PRINT_PREFIX + "[%u] vap-%u ", timestamp, vap_id); } else { - printf(DBGLOG_PRINT_PREFIX "[%u] ", timestamp); + j = snprintf(buf, sizeof(buf), DBGLOG_PRINT_PREFIX + "[%u] ", timestamp); } va_start(ap, fmt); - vsnprintf(buf, sizeof(buf), fmt, ap); + vsnprintf(buf+j, sizeof(buf)-j, fmt, ap); va_end(ap); - printf("%s\n", buf); + if (optionflag & QXDM_FLAG) { + qxdm_log(buf); + } else { + printf("%s\n", buf); + } } void @@ -1079,18 +1086,25 @@ dbglog_printf_no_line_break( { char buf[128]; va_list ap; + int j; if (vap_id < DBGLOG_MAX_VDEVID) { - printf(DBGLOG_PRINT_PREFIX "[%u] vap-%u ", timestamp, vap_id); + j = snprintf(buf, sizeof(buf), DBGLOG_PRINT_PREFIX + "[%u] vap-%u ", timestamp, vap_id); } else { - printf(DBGLOG_PRINT_PREFIX "[%u] ", timestamp); + j = snprintf(buf, sizeof(buf), DBGLOG_PRINT_PREFIX + "[%u] ", timestamp); } va_start(ap, fmt); - vsnprintf(buf, sizeof(buf), fmt, ap); + vsnprintf(buf+j, sizeof(buf)-j, fmt, ap); va_end(ap); - printf("%s", buf); + if (optionflag & QXDM_FLAG) { + qxdm_log(buf); + } else { + printf("%s", buf); + } } #define USE_NUMERIC 0 -- cgit v1.2.3 From 49aa4962dff248c5517846b206e9ef5dfeaa462e Mon Sep 17 00:00:00 2001 From: Manikandaraja Venkatachalapathy Date: Thu, 27 Feb 2014 21:21:20 -0800 Subject: qcacld: Enable dbglog for DTIM update Enable logs to validate whether the system is using 2 chains or 1 chain to process beacon for the dtim rx feature. Change-Id: I7dc455d4f4881e95dc24efeaa3c31e2f66429763 CRs-Fixed: 619984 --- tools/fwdebuglog/cld-fwlog-parser.c | 69 +++++++++++++++++++++++++++++++++++-- tools/fwdebuglog/parser.c | 69 +++++++++++++++++++++++++++++++++++-- 2 files changed, 134 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/fwdebuglog/cld-fwlog-parser.c b/tools/fwdebuglog/cld-fwlog-parser.c index 6da618eb8df6..050e8727c23d 100644 --- a/tools/fwdebuglog/cld-fwlog-parser.c +++ b/tools/fwdebuglog/cld-fwlog-parser.c @@ -770,6 +770,12 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] = "WAL_DBGID_BRSSI_CONFIG", "WAL_DBGID_CURRENT_BRSSI_AVE", "WAL_DBGID_BCN_TX_COMP", + "WAL_DBGID_SET_HW_CHAINMASK", + "WAL_DBGID_SET_HW_CHAINMASK_TXRX_STOP_FAIL", + "WAL_DBGID_GET_HW_CHAINMASK", + "WAL_DBGID_SMPS_DISABLE", + "WAL_DBGID_SMPS_ENABLE_HW_CNTRL", + "WAL_DBGID_SMPS_SWSEL_CHAINMASK", "WAL_DBGID_DEFINITION_END", }, { @@ -947,6 +953,12 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] = "STA_SMPS_DBGID_VIRTUAL_CHAN_SMPS_START", "STA_SMPS_DBGID_VIRTUAL_CHAN_SMPS_STOP", "STA_SMPS_DBGID_SEND_SMPS_ACTION_FRAME", + "STA_SMPS_DBGID_DTIM_EBT_EVENT_CHMASK_UPDATE", + "STA_SMPS_DBGID_DTIM_CHMASK_UPDATE", + "STA_SMPS_DBGID_DTIM_BEACON_EVENT_CHMASK_UPDATE", + "STA_SMPS_DBGID_DTIM_POWER_STATE_CHANGE", + "STA_SMPS_DBGID_DTIM_CHMASK_UPDATE_SLEEP", + "STA_SMPS_DBGID_DTIM_CHMASK_UPDATE_AWAKE", "SMPS_DBGID_DEFINITION_END", }, { /* SWBMISS */ @@ -1852,6 +1864,31 @@ dbglog_wal_print_handler( case WAL_DBGID_TX_DISCARD: dbglog_printf(timestamp, vap_id, "WAL Tx enqueue discard msdu_id=0x%x", args[0]); break; + case WAL_DBGID_SET_HW_CHAINMASK: + dbglog_printf(timestamp, vap_id, "WAL set hw chainmask " + "pdev=%d, txchain=0x%x, rxchain=0x%x", + args[0], args[1], args[2]); + break; + case WAL_DBGID_SET_HW_CHAINMASK_TXRX_STOP_FAIL: + dbglog_printf(timestamp, vap_id, "WAL hw chainmask tx stop fail rxstop=%d, txstop=%d", + args[0], args[1]); + break; + case WAL_DBGID_GET_HW_CHAINMASK: + dbglog_printf(timestamp, vap_id, "WAL get hw chainmask " + "txchain=0x%x, rxchain=0x%x", + args[0], args[1]); + break; + case WAL_DBGID_SMPS_DISABLE: + dbglog_printf(timestamp, vap_id, "WAL smps disable"); + break; + case WAL_DBGID_SMPS_ENABLE_HW_CNTRL: + dbglog_printf(timestamp, vap_id, "WAL enable hw ctrl low_pwr_mask=0x%x, high_pwr_mask=0x%x", + args[0], args[1]); + break; + case WAL_DBGID_SMPS_SWSEL_CHAINMASK: + dbglog_printf(timestamp, vap_id, "WAL smps swsel chainmask low_pwr=0x%x, chain_mask=0x%x", + args[0], args[1]); + break; default: return FALSE; } @@ -2432,8 +2469,36 @@ A_BOOL dbglog_smps_print_handler(A_UINT32 mod_id, (args[1] == 0x3 ? "DYNAMIC" : "UNKNOWN"))), args[2]); break; - - + case STA_SMPS_DBGID_DTIM_EBT_EVENT_CHMASK_UPDATE: + dbglog_printf(timestamp, vap_id, "STA_SMPS ebt event chmask update"); + break; + case STA_SMPS_DBGID_DTIM_CHMASK_UPDATE: + dbglog_printf(timestamp, vap_id, "STA_SMPS chmask update " + "tx_mask %#x rx_mask %#x arb_dtim_mask %#x", + args[0], args[1], args[2]); + break; + case STA_SMPS_DBGID_DTIM_BEACON_EVENT_CHMASK_UPDATE: + dbglog_printf(timestamp, vap_id, "STA_SMPS beacon event chmask update"); + break; + case STA_SMPS_DBGID_DTIM_POWER_STATE_CHANGE: + dbglog_printf(timestamp, vap_id, "STA_SMPS cur_pwr_state %s new_pwr_state %d", + (args[0] == 0x1 ? "SLEEP": + (args[0] == 0x2 ? "AWAKE": + (args[0] == 0x3 ? "FULL_SLEEP" : "UNKNOWN"))), + (args[1] == 0x1 ? "SLEEP": + (args[1] == 0x2 ? "AWAKE": + (args[1] == 0x3 ? "FULL_SLEEP" : "UNKNOWN")))); + break; + case STA_SMPS_DBGID_DTIM_CHMASK_UPDATE_SLEEP: + dbglog_printf(timestamp, vap_id, "STA_SMPS chmask update sleep " + "tx_mask %#x rx_mask %#x orig_rx %#x dtim_rx %#x", + args[0], args[1], args[2], args[3]); + break; + case STA_SMPS_DBGID_DTIM_CHMASK_UPDATE_AWAKE: + dbglog_printf(timestamp, vap_id, "STA_SMPS chmask update awake " + "tx_mask %#x rx_mask %#x orig_rx %#x", + args[0], args[1], args[2]); + break; default: dbglog_printf( timestamp, diff --git a/tools/fwdebuglog/parser.c b/tools/fwdebuglog/parser.c index 5e90362ee11c..0a3a540c849b 100644 --- a/tools/fwdebuglog/parser.c +++ b/tools/fwdebuglog/parser.c @@ -779,6 +779,12 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] = "WAL_DBGID_BRSSI_CONFIG", "WAL_DBGID_CURRENT_BRSSI_AVE", "WAL_DBGID_BCN_TX_COMP", + "WAL_DBGID_SET_HW_CHAINMASK", + "WAL_DBGID_SET_HW_CHAINMASK_TXRX_STOP_FAIL", + "WAL_DBGID_GET_HW_CHAINMASK", + "WAL_DBGID_SMPS_DISABLE", + "WAL_DBGID_SMPS_ENABLE_HW_CNTRL", + "WAL_DBGID_SMPS_SWSEL_CHAINMASK", "WAL_DBGID_DEFINITION_END", }, { @@ -956,6 +962,12 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] = "STA_SMPS_DBGID_VIRTUAL_CHAN_SMPS_START", "STA_SMPS_DBGID_VIRTUAL_CHAN_SMPS_STOP", "STA_SMPS_DBGID_SEND_SMPS_ACTION_FRAME", + "STA_SMPS_DBGID_DTIM_EBT_EVENT_CHMASK_UPDATE", + "STA_SMPS_DBGID_DTIM_CHMASK_UPDATE", + "STA_SMPS_DBGID_DTIM_BEACON_EVENT_CHMASK_UPDATE", + "STA_SMPS_DBGID_DTIM_POWER_STATE_CHANGE", + "STA_SMPS_DBGID_DTIM_CHMASK_UPDATE_SLEEP", + "STA_SMPS_DBGID_DTIM_CHMASK_UPDATE_AWAKE", "SMPS_DBGID_DEFINITION_END", }, { /* SWBMISS */ @@ -1873,6 +1885,31 @@ dbglog_wal_print_handler( case WAL_DBGID_TX_DISCARD: dbglog_printf(timestamp, vap_id, "WAL Tx enqueue discard msdu_id=0x%x", args[0]); break; + case WAL_DBGID_SET_HW_CHAINMASK: + dbglog_printf(timestamp, vap_id, "WAL set hw chainmask " + "pdev=%d, txchain=0x%x, rxchain=0x%x", + args[0], args[1], args[2]); + break; + case WAL_DBGID_SET_HW_CHAINMASK_TXRX_STOP_FAIL: + dbglog_printf(timestamp, vap_id, "WAL hw chainmask tx stop fail: rxstop=%d, txstop=%d", + args[0], args[1]); + break; + case WAL_DBGID_GET_HW_CHAINMASK: + dbglog_printf(timestamp, vap_id, "WAL get hw chainmask " + "txchain=0x%x, rxchain=0x%x", + args[0], args[1]); + break; + case WAL_DBGID_SMPS_DISABLE: + dbglog_printf(timestamp, vap_id, "WAL smps disable"); + break; + case WAL_DBGID_SMPS_ENABLE_HW_CNTRL: + dbglog_printf(timestamp, vap_id, "WAL enable hw ctrl low_pwr_mask=0x%x, high_pwr_mask=0x%x", + args[0], args[1]); + break; + case WAL_DBGID_SMPS_SWSEL_CHAINMASK: + dbglog_printf(timestamp, vap_id, "WAL smps swsel chainmask low_pwr=0x%x, chain_mask=0x%x", + args[0], args[1]); + break; default: return FALSE; } @@ -2453,8 +2490,36 @@ A_BOOL dbglog_smps_print_handler(A_UINT32 mod_id, (args[1] == 0x3 ? "DYNAMIC" : "UNKNOWN"))), args[2]); break; - - + case STA_SMPS_DBGID_DTIM_EBT_EVENT_CHMASK_UPDATE: + dbglog_printf(timestamp, vap_id, "STA_SMPS ebt event chmask update"); + break; + case STA_SMPS_DBGID_DTIM_CHMASK_UPDATE: + dbglog_printf(timestamp, vap_id, "STA_SMPS chmask update " + "tx_mask %#x rx_mask %#x arb_dtim_mask %#x", + args[0], args[1], args[2]); + break; + case STA_SMPS_DBGID_DTIM_BEACON_EVENT_CHMASK_UPDATE: + dbglog_printf(timestamp, vap_id, "STA_SMPS beacon event chmask update"); + break; + case STA_SMPS_DBGID_DTIM_POWER_STATE_CHANGE: + dbglog_printf(timestamp, vap_id, "STA_SMPS cur_pwr_state %s new_pwr_state %d", + (args[0] == 0x1 ? "SLEEP": + (args[0] == 0x2 ? "AWAKE": + (args[0] == 0x3 ? "FULL_SLEEP" : "UNKNOWN"))), + (args[1] == 0x1 ? "SLEEP": + (args[1] == 0x2 ? "AWAKE": + (args[1] == 0x3 ? "FULL_SLEEP" : "UNKNOWN")))); + break; + case STA_SMPS_DBGID_DTIM_CHMASK_UPDATE_SLEEP: + dbglog_printf(timestamp, vap_id, "STA_SMPS chmask update sleep " + "tx_mask %#x rx_mask %#x orig_rx %#x dtim_rx %#x", + args[0], args[1], args[2], args[3]); + break; + case STA_SMPS_DBGID_DTIM_CHMASK_UPDATE_AWAKE: + dbglog_printf(timestamp, vap_id, "STA_SMPS chmask update awake " + "tx_mask %#x rx_mask %#x orig_rx %#x", + args[0], args[1], args[2]); + break; default: dbglog_printf( timestamp, -- cgit v1.2.3