cld: fwlog : Merge dbglog common file changes from perfoce

This patch will merge the following CL's 782830,784178
784337,782678,782707,782709

Change-Id: I8bd0df2dca63de64ed90564c7eaeaf6ab6818142
CRs-Fixed: 580850

3 files changed, 191 insertions, 85 deletions

diff --git a/CORE/SERVICES/COMMON/dbglog_id.h b/CORE/SERVICES/COMMON/dbglog_id.h
index cd37fb24edcf..9b644ed77ed0 100644
--- a/CORE/SERVICES/COMMON/dbglog_id.h
+++ b/CORE/SERVICES/COMMON/dbglog_id.h
@@ -828,6 +828,27 @@ extern "C" {
 #define TDLS_DBGID_PEER_EVT_DISCOVER           18
 #define TDLS_DBGID_PEER_EVT_DELETE             19
 
+/* TXBF Module IDs */
+#define TXBFEE_DBGID_START                      0
+#define TXBFEE_DBGID_NDPA_RECEIVED              1
+#define TXBFEE_DBGID_HOST_CONFIG_TXBFEE_TYPE    2
+#define TXBFER_DBGID_SEND_NDPA                  3
+#define TXBFER_DBGID_GET_NDPA_BUF_FAIL          4
+#define TXBFER_DBGID_SEND_NDPA_FAIL             5
+#define TXBFER_DBGID_GET_NDP_BUF_FAIL           6
+#define TXBFER_DBGID_SEND_NDP_FAIL              7
+#define TXBFER_DBGID_GET_BRPOLL_BUF_FAIL        8
+#define TXBFER_DBGID_SEND_BRPOLL_FAIL           9
+#define TXBFER_DBGID_HOST_CONFIG_CMDID         10
+#define TXBFEE_DBGID_HOST_CONFIG_CMDID         11
+#define TXBFEE_DBGID_ENABLED_ENABLED_UPLOAD_H  12
+#define TXBFEE_DBGID_UPLOADH_CV_TAG            13
+#define TXBFEE_DBGID_UPLOADH_H_TAG             14
+#define TXBFEE_DBGID_CAPTUREH_RECEIVED         15
+#define TXBFEE_DBGID_PACKET_IS_STEERED         16
+#define TXBFEE_UPLOADH_EVENT_ALLOC_MEM_FAIL    17
+#define TXBFEE_DBGID_END                       18
+
 /* SMPS module DBGIDs */
 #define STA_SMPS_DBGID_DEFINITION_START                 0
 #define STA_SMPS_DBGID_CREATE_PDEV_INSTANCE             1
diff --git a/CORE/SERVICES/COMMON/wlan_module_ids.h b/CORE/SERVICES/COMMON/wlan_module_ids.h
index 43c563031245..0b8e43de35f8 100644
--- a/CORE/SERVICES/COMMON/wlan_module_ids.h
+++ b/CORE/SERVICES/COMMON/wlan_module_ids.h
@@ -73,6 +73,7 @@ typedef enum {
   WLAN_MODULE_WMMAC,
   WLAN_MODULE_TDLS,
   WLAN_MODULE_HB,
+  WLAN_MODULE_TXBF,
   WLAN_MODULE_ID_MAX,
   WLAN_MODULE_ID_INVALID = WLAN_MODULE_ID_MAX,
 } WLAN_MODULE_ID;
diff --git a/CORE/UTILS/FWLOG/dbglog_host.c b/CORE/UTILS/FWLOG/dbglog_host.c
index eb35a0715874..57a576374a07 100644
--- a/CORE/UTILS/FWLOG/dbglog_host.c
+++ b/CORE/UTILS/FWLOG/dbglog_host.c
@@ -204,11 +204,20 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] =
         "WMI_CMD_PARAMS",
         "WMI_EVENT_ALLOC_FAILURE",
         "WMI_DBGID_DCS_PARAM_CMD",
+        "WMI_SEND_EVENT_WRONG_TLV",
+        "WMI_SEND_EVENT_NO_TLV_DEF",
         "WMI_DBGID_DEFNITION_END",
     },
     {
         "PS_STA_DEFINITION_START",
         "PS_STA_PM_ARB_REQUEST",
+        "PS_STA_DELIVER_EVENT",
+        "PS_STA_PSPOLL_SEQ_DONE",
+        "PS_STA_COEX_MODE",
+        "PS_STA_PSPOLL_ALLOW",
+        "PS_STA_SET_PARAM",
+        "PS_STA_SPECPOLL_TIMER_STARTED",
+        "PS_STA_SPECPOLL_TIMER_STOPPED",
     },
     {
         "WHAL_DBGID_DEFINITION_START",
@@ -249,56 +258,7 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] =
         "WHAL_ERROR_INTERRUPT_BB_PANIC",
         "WHAL_ERROR_PAPRD_MAXGAIN_ABOVE_WINDOW",
         "WHAL_ERROR_QCU_HW_PAUSE_MISMATCH",
-        "WHAL_COEX_RESET",
-        "WHAL_COEX_SELF_GEN_MASK",
-        "WHAL_ERROR_COEX_MCI_ISR",
-        "WHAL_COEX_MCI_ISR_IntRaw",
-        "WHAL_COEX_MCI_ISR_Int1Raw",
-        "WHAL_COEX_MCI_ISR_RxMsgRaw",
-        "WHAL_COEX_SENDMSG_QUEUE",
-        "WHAL_COEX_TX_MCI_REMOTE_RESET",
-        "WHAL_COEX_TX_MCI_TYPE_UNKNOWN",
-        "WHAL_COEX_TX_MCI_SYS_SLEEPING",
-        "WHAL_COEX_TX_MCI_REQ_WAKE",
-        "WHAL_COEX_TX_MCI_SYS_WAKING",
-        "WHAL_COEX_TX_MCI_LNA_TAKE",
-        "WHAL_COEX_TX_MCI_LNA_TRANS",
-        "WHAL_COEX_TX_MCI_GPM_UNKNOWN",
-        "WHAL_COEX_TX_MCI_GPM_WLAN_SET_ACL_INACTIVITY",
-        "WHAL_COEX_TX_MCI_GPM_BT_PAUSE_PROFILE",
-        "WHAL_COEX_TX_MCI_GPM_WLAN_PRIO",
-        "WHAL_COEX_TX_MCI_GPM_BT_STATUS_UPDATE",
-        "WHAL_COEX_TX_MCI_GPM_BT_UPDATE_FLAGS",
-        "WHAL_COEX_TX_MCI_GPM_VERSION_QUERY",
-        "WHAL_COEX_TX_MCI_GPM_VERSION_RESPONSE",
-        "WHAL_COEX_TX_MCI_GPM_STATUS_QUERY",
-        "WHAL_COEX_TX_MCI_GPM_HALT_BT_GPM",
-        "WHAL_COEX_TX_MCI_GPM_WLAN_CHANNELS",
-        "WHAL_COEX_TX_MCI_GPM_BT_PROFILE_INFO",
-        "WHAL_COEX_TX_MCI_GPM_BT_CAL_REQ ",
-        "WHAL_COEX_TX_MCI_GPM_BT_CAL_GRANT",
-        "WHAL_COEX_TX_MCI_GPM_BT_CAL_DONE",
-        "WHAL_COEX_TX_MCI_GPM_WLAN_CAL_REQ",
-        "WHAL_COEX_TX_MCI_GPM_WLAN_CAL_GRANT",
-        "WHAL_COEX_TX_MCI_GPM_WLAN_CAL_DONE",
-        "WHAL_COEX_TX_MCI_GPM_BT_DEBUG",
-        "WHAL_COEX_WHAL_MCI_RESET",
-        "WHAL_COEX_POLL_BT_CAL_DONE_TIMEOUT",
-        "WHAL_COEX_WHAL_PAUSE",
-        "WHAL_COEX_RX_MCI_GPM_BT_CAL_REQ",
-        "WHAL_COEX_RX_MCI_GPM_BT_CAL_DONE",
-        "WHAL_COEX_RX_MCI_GPM_BT_CAL_GRANT",
-        "WHAL_COEX_WLAN_CAL_START",
-        "WHAL_COEX_WLAN_CAL_RESULT ",
-        "WHAL_COEX_BtMciState",
-        "WHAL_COEX_BtCalState",
-        "WHAL_COEX_WlanCalState",
-        "WHAL_COEX_RxReqWakeCount",
-        "WHAL_COEX_RxRemoteResetCount",
-        "WHAL_COEX_RESTART_CAL",
-        "WHAL_COEX_WHAL_COEX_RESET",
-        "WHAL_COEX_SELF_GEN_MASK",
-        "WHAL_DBGID_DEFINITION_END"
+        "WHAL_DBGID_DEFINITION_END",
     },
     {
         "COEX_DEBUGID_START",
@@ -501,20 +461,45 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] =
         "COEX_PSP_STAT_2",      //                       197
         "COEX_PSP_RX_STATUS_STATE_2",   //               198
         "COEX_PSP_ERROR",       //                       199
-        "COEX_T2BT",    // 200
-        "COEX_BT_DURATION", // 201
-        "COEX_TX_MCI_GPM_WLAN_SCHED_INFO_TRIG", // 202
-        "COEX_TX_MCI_GPM_WLAN_SCHED_INFO_TRIG_RSP", // 203
-        "COEX_TX_MCI_GPM_SCAN_OP",  // 204
-        "COEX_TX_MCI_GPM_BT_PAUSE_GPM_TX",	// 205
-        "COEX_CTS2S_SEND",	// 206
-        "COEX_CTS2S_RESULT",	// 207
-        "COEX_ENTER_OCS",	// 208
-        "COEX_EXIT_OCS",	// 209
-        "COEX_UPDATE_OCS",	// 210
-        "COEX_STATUS_OCS",	// 211
-        "COEX_STATS_BT",	// 212
-        "COEX_DEBUG_MESSAGE_END"
+        "COEX_T2BT",    //                               200
+        "COEX_BT_DURATION", //                           201
+        "COEX_TX_MCI_GPM_WLAN_SCHED_INFO_TRIG", //       202
+        "COEX_TX_MCI_GPM_WLAN_SCHED_INFO_TRIG_RSP", //   203
+        "COEX_TX_MCI_GPM_SCAN_OP",  //                   204
+        "COEX_TX_MCI_GPM_BT_PAUSE_GPM_TX",	//       205
+        "COEX_CTS2S_SEND",	//                       206
+        "COEX_CTS2S_RESULT",	//                       207
+        "COEX_ENTER_OCS",	//                       208
+        "COEX_EXIT_OCS",	//                       209
+        "COEX_UPDATE_OCS",	//                       210
+        "COEX_STATUS_OCS",	//                       211
+        "COEX_STATS_BT",	//                       212
+        "COEX_MWS_WLAN_INIT",
+        "COEX_MWS_WBTMR_SYNC",
+        "COEX_MWS_TYPE2_RX",
+        "COEX_MWS_TYPE2_TX",
+        "COEX_MWS_WLAN_CHAVD",
+        "COEX_MWS_WLAN_CHAVD_INSERT",
+        "COEX_MWS_WLAN_CHAVD_MERGE",
+        "COEX_MWS_WLAN_CHAVD_RPT",
+        "COEX_MWS_CP_MSG_SEND",
+        "COEX_MWS_CP_ESCAPE",
+        "COEX_MWS_CP_UNFRAME",
+        "COEX_MWS_CP_SYNC_UPDATE",
+        "COEX_MWS_CP_SYNC",
+        "COEX_MWS_CP_WLAN_STATE_IND",
+        "COEX_MWS_CP_SYNCRESP_TIMEOUT",
+        "COEX_MWS_SCHEME_UPDATE",
+        "COEX_MWS_WLAN_EVENT",
+        "COEX_MWS_UART_UNESCAPE",
+        "COEX_MWS_UART_ENCODE_SEND",
+        "COEX_MWS_UART_RECV_DECODE",
+        "COEX_MWS_UL_HDL",
+        "COEX_MWS_REMOTE_EVENT",
+        "COEX_MWS_OTHER",
+        "COEX_MWS_ERROR",
+        "COEX_MWS_ANT_DIVERSITY",
+        "COEX_DEBUG_ID_END"
     },
     {
         "ROAM_DBGID_DEFINITION_START",
@@ -648,20 +633,29 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] =
         "VDEV_MGR_DEFINITION_END",
     },
     {
-      "SCAN_START_COMMAND_FAILED", /* scan */
-      "SCAN_STOP_COMMAND_FAILED",
-      "SCAN_EVENT_SEND_FAILED",
-      "SCAN_ENGINE_START",
-      "SCAN_ENGINE_CANCEL_COMMAND",
-      "SCAN_ENGINE_STOP_DUE_TO_TIMEOUT",
-      "SCAN_EVENT_SEND_TO_HOST",
-      "SCAN_FWLOG_EVENT_ADD",
-      "SCAN_FWLOG_EVENT_REM",
-      "SCAN_FWLOG_EVENT_PREEMPTED",
-      "SCAN_FWLOG_EVENT_RESTARTED",
-      "SCAN_FWLOG_EVENT_COMPLETED",
+        "SCAN_START_COMMAND_FAILED", /* scan */
+        "SCAN_STOP_COMMAND_FAILED",
+        "SCAN_EVENT_SEND_FAILED",
+        "SCAN_ENGINE_START",
+        "SCAN_ENGINE_CANCEL_COMMAND",
+        "SCAN_ENGINE_STOP_DUE_TO_TIMEOUT",
+        "SCAN_EVENT_SEND_TO_HOST",
+        "SCAN_FWLOG_EVENT_ADD",
+        "SCAN_FWLOG_EVENT_REM",
+        "SCAN_FWLOG_EVENT_PREEMPTED",
+        "SCAN_FWLOG_EVENT_RESTARTED",
+        "SCAN_FWLOG_EVENT_COMPLETED",
     },
-    { "" /* Rate ctrl*/
+    {
+        "RATECTRL_DBGID_DEFINITION_START", /* Rate ctrl*/
+        "RATECTRL_DBGID_ASSOC",
+        "RATECTRL_DBGID_NSS_CHANGE",
+        "RATECTRL_DBGID_CHAINMASK_ERR",
+        "RATECTRL_DBGID_UNEXPECTED_FRAME",
+        "RATECTRL_DBGID_WAL_RCQUERY",
+        "RATECTRL_DBGID_WAL_RCUPDATE",
+        "RATECTRL_DBGID_GTX_UPDATE",
+        "RATECTRL_DBGID_DEFINITION_END"
     },
     {
         "AP_PS_DBGID_DEFINITION_START",
@@ -681,6 +675,8 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] =
         "AP_PS_DBGID_UAPSD_RESPONSE",
         "AP_PS_DBGID_SEND_COMPLETE",
         "AP_PS_DBGID_SEND_N_COMPLETE",
+        "AP_PS_DBGID_DETECT_OUT_OF_SYNC_STA",
+        "AP_PS_DBGID_DELIVER_CAB",
     },
     {
         "" /* Block Ack */
@@ -701,11 +697,11 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] =
     { "" /* HOST */
     },
     { "" /* BEACON */
-      "BEACON_EVENT_SWBA_SEND_FAILED",
-      "BEACON_EVENT_EARLY_RX_BMISS_STATUS",
-      "BEACON_EVENT_EARLY_RX_SLEEP_SLOP",
-      "BEACON_EVENT_EARLY_RX_CONT_BMISS_TIMEOUT",
-      "BEACON_EVENT_EARLY_RX_PAUSE_SKIP_BCN_NUM",
+        "BEACON_EVENT_SWBA_SEND_FAILED",
+        "BEACON_EVENT_EARLY_RX_BMISS_STATUS",
+        "BEACON_EVENT_EARLY_RX_SLEEP_SLOP",
+        "BEACON_EVENT_EARLY_RX_CONT_BMISS_TIMEOUT",
+        "BEACON_EVENT_EARLY_RX_PAUSE_SKIP_BCN_NUM",
     },
     { /* Offload Mgr */
         "OFFLOAD_MGR_DBGID_DEFINITION_START",
@@ -785,7 +781,28 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] =
         "" /* pcie lp */
     },
     {
-        "" /* RTT */
+        /* RTT */
+        "RTT_CALL_FLOW",
+        "RTT_REQ_SUB_TYPE",
+        "RTT_MEAS_REQ_HEAD",
+        "RTT_MEAS_REQ_BODY",
+        "",
+        "",
+        "RTT_INIT_GLOBAL_STATE",
+        "",
+        "RTT_REPORT",
+        "",
+        "RTT_ERROR_REPORT",
+        "RTT_TIMER_STOP",
+        "RTT_SEND_TM_FRAME",
+        "RTT_V3_RESP_CNT",
+        "RTT_V3_RESP_FINISH",
+        "RTT_CHANNEL_SWITCH_REQ",
+        "RTT_CHANNEL_SWITCH_GRANT",
+        "RTT_CHANNEL_SWITCH_COMPLETE",
+        "RTT_CHANNEL_SWITCH_PREEMPT",
+        "RTT_CHANNEL_SWITCH_STOP",
+        "RTT_TIMER_START",
     },
     {      /* RESOURCE */
         "RESOURCE_DBGID_DEFINITION_START",
@@ -806,7 +823,24 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] =
         ""
     },
     {   /* ANI  */
-        ""
+        "ANI_DBGID_POLL",
+        "ANI_DBGID_CONTROL",
+        "ANI_DBGID_OFDM_PARAMS",
+        "ANI_DBGID_CCK_PARAMS",
+        "ANI_DBGID_RESET",
+        "ANI_DBGID_RESTART",
+        "ANI_DBGID_OFDM_LEVEL",
+        "ANI_DBGID_CCK_LEVEL",
+        "ANI_DBGID_FIRSTEP",
+        "ANI_DBGID_CYCPWR",
+        "ANI_DBGID_MRC_CCK",
+        "ANI_DBGID_SELF_CORR_LOW",
+        "ANI_DBGID_ENABLE",
+        "ANI_DBGID_CURRENT_LEVEL",
+        "ANI_DBGID_POLL_PERIOD",
+        "ANI_DBGID_LISTEN_PERIOD",
+        "ANI_DBGID_OFDM_LEVEL_CFG",
+        "ANI_DBGID_CCK_LEVEL_CFG"
     },
     {
         "P2P_DBGID_DEFINITION_START",
@@ -863,6 +897,7 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] =
         "CSA_OFFLOAD_WMI_EVENT_ERROR",
         "CSA_OFFLOAD_WMI_EVENT_SENT",
         "CSA_OFFLOAD_WMI_CHANSWITCH_RECV",
+        "CSA_DBGID_DEFINITION_END",
     },
     {   /* NLO offload */
         ""
@@ -891,6 +926,7 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] =
         "WOW_INIT",
         "WOW_RECV_MAGIC_PKT",
         "WOW_RECV_BITMAP_PATTERN",
+        "WOW_DBGID_DEFINITION_END",
     },
     {   /* WAL VDEV  */
         ""
@@ -903,7 +939,16 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] =
         "TP_LOCAL_SEND",
     },
     {   /* STA SMPS  */
-        ""
+        "STA_SMPS_DBGID_DEFINITION_START",
+        "STA_SMPS_DBGID_CREATE_PDEV_INSTANCE",
+        "STA_SMPS_DBGID_CREATE_VIRTUAL_CHAN_INSTANCE",
+        "STA_SMPS_DBGID_DELETE_VIRTUAL_CHAN_INSTANCE",
+        "STA_SMPS_DBGID_CREATE_STA_INSTANCE",
+        "STA_SMPS_DBGID_DELETE_STA_INSTANCE",
+        "STA_SMPS_DBGID_VIRTUAL_CHAN_SMPS_START",
+        "STA_SMPS_DBGID_VIRTUAL_CHAN_SMPS_STOP",
+        "STA_SMPS_DBGID_SEND_SMPS_ACTION_FRAME",
+        "SMPS_DBGID_DEFINITION_END",
     },
     {   /* SWBMISS */
         "SWBMISS_DBGID_DEFINITION_START",
@@ -936,6 +981,45 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] =
         "TDLS_DBGID_PEER_EVT_DISCOVER",
         "TDLS_DBGID_PEER_EVT_DELETE",
     },
+    {   /* HB */
+        "WLAN_HB_DBGID_DEFINITION_START",
+        "WLAN_HB_DBGID_INIT",
+        "WLAN_HB_DBGID_TCP_GET_TXBUF_FAIL",
+        "WLAN_HB_DBGID_TCP_SEND_FAIL",
+        "WLAN_HB_DBGID_BSS_PEER_NULL",
+        "WLAN_HB_DBGID_UDP_GET_TXBUF_FAIL",
+        "WLAN_HB_DBGID_UDP_SEND_FAIL",
+        "WLAN_HB_DBGID_WMI_CMD_INVALID_PARAM",
+        "WLAN_HB_DBGID_WMI_CMD_INVALID_OP",
+        "WLAN_HB_DBGID_WOW_NOT_ENTERED",
+        "WLAN_HB_DBGID_ALLOC_SESS_FAIL",
+        "WLAN_HB_DBGID_CTX_NULL",
+        "WLAN_HB_DBGID_CHKSUM_ERR",
+        "WLAN_HB_DBGID_UDP_TX",
+        "WLAN_HB_DBGID_TCP_TX",
+        "WLAN_HB_DBGID_DEFINITION_END",
+    },
+    {   /* TXBF */
+        "TXBFEE_DBGID_START",
+        "TXBFEE_DBGID_NDPA_RECEIVED",
+        "TXBFEE_DBGID_HOST_CONFIG_TXBFEE_TYPE",
+        "TXBFER_DBGID_SEND_NDPA",
+        "TXBFER_DBGID_GET_NDPA_BUF_FAIL",
+        "TXBFER_DBGID_SEND_NDPA_FAIL",
+        "TXBFER_DBGID_GET_NDP_BUF_FAIL",
+        "TXBFER_DBGID_SEND_NDP_FAIL",
+        "TXBFER_DBGID_GET_BRPOLL_BUF_FAIL",
+        "TXBFER_DBGID_SEND_BRPOLL_FAIL",
+        "TXBFER_DBGID_HOST_CONFIG_CMDID",
+        "TXBFEE_DBGID_HOST_CONFIG_CMDID",
+        "TXBFEE_DBGID_ENABLED_ENABLED_UPLOAD_H",
+        "TXBFEE_DBGID_UPLOADH_CV_TAG",
+        "TXBFEE_DBGID_UPLOADH_H_TAG",
+        "TXBFEE_DBGID_CAPTUREH_RECEIVED",
+        "TXBFEE_DBGID_PACKET_IS_STEERED",
+        "TXBFEE_UPLOADH_EVENT_ALLOC_MEM_FAIL",
+        "TXBFEE_DBGID_END",
+    },
 };
 
 int dbglog_module_log_enable(wmi_unified_t  wmi_handle, A_UINT32 mod_id,