Merge "Merge remote-tracking branch 'origin/caf/caf-wlan/master'"

1 files changed, 89 insertions, 10 deletions

diff --git a/tools/fwdebuglog/parser.c b/tools/fwdebuglog/parser.c
index 3b555aa6613c..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 */
@@ -1057,18 +1069,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 +1098,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
@@ -1859,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;
     }
@@ -2439,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,