qcacld-2.0: CL 1488100 - update fw common interface files

Add support for scenario debug logging
WMI changes to control WISA features of firmware from host

Change-Id: I01d96c423b6241248242aa2feae6887d8f202691
CRs-Fixed: 865207

4 files changed, 23 insertions, 2 deletions

diff --git a/CORE/SERVICES/COMMON/wmi_tlv_defs.h b/CORE/SERVICES/COMMON/wmi_tlv_defs.h
index 560ae10bfca6..f3bf0d003312 100644
--- a/CORE/SERVICES/COMMON/wmi_tlv_defs.h
+++ b/CORE/SERVICES/COMMON/wmi_tlv_defs.h
@@ -698,6 +698,7 @@ typedef enum {
     WMITLV_TAG_STRUC_WMI_SOC_MAC_PHY_HW_MODE_CAPS,
     WMITLV_TAG_STRUC_WMI_HAL_REG_CAPABILITIES_EXT,
     WMITLV_TAG_STRUC_WMI_SOC_HAL_REG_CAPABILITIES,
+    WMITLV_TAG_STRUC_wmi_vdev_wisa_cmd_fixed_param,
 } WMITLV_TAG_ID;
 
 /*
@@ -979,7 +980,8 @@ typedef enum {
     OP(WMI_CHAN_AVOID_RPT_ALLOW_CMDID) \
     OP(WMI_SET_PERIODIC_CHANNEL_STATS_CONFIG_CMDID) \
     OP(WMI_VDEV_SET_CUSTOM_AGGR_SIZE_CMDID) \
-    OP(WMI_PDEV_WAL_POWER_DEBUG_CMDID)
+    OP(WMI_PDEV_WAL_POWER_DEBUG_CMDID) \
+    OP(WMI_VDEV_WISA_CMDID)
 
 /*
  * IMPORTANT: Please add _ALL_ WMI Events Here.
@@ -2639,6 +2641,10 @@ WMITLV_CREATE_PARAM_STRUC(WMI_TRANSFER_DATA_TO_FLASH_CMDID);
     WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_config_enhanced_mcast_filter_fixed_param, wmi_config_enhanced_mcast_filter_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
 WMITLV_CREATE_PARAM_STRUC(WMI_CONFIG_ENHANCED_MCAST_FILTER_CMDID);
 
+#define WMITLV_TABLE_WMI_VDEV_WISA_CMDID(id,op,buf,len) \
+    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_wisa_cmd_fixed_param, wmi_vdev_wisa_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
+WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_WISA_CMDID);
+
 /* MAWC sensor report indication cmd */
 #define WMITLV_TABLE_WMI_MAWC_SENSOR_REPORT_IND_CMDID(id,op,buf,len) \
     WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_mawc_sensor_report_ind_cmd_fixed_param, wmi_mawc_sensor_report_ind_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
diff --git a/CORE/SERVICES/COMMON/wmi_unified.h b/CORE/SERVICES/COMMON/wmi_unified.h
index 9737560fc2be..88ceffc2b236 100644
--- a/CORE/SERVICES/COMMON/wmi_unified.h
+++ b/CORE/SERVICES/COMMON/wmi_unified.h
@@ -753,6 +753,9 @@ typedef enum {
     WMI_TRANSFER_DATA_TO_FLASH_CMDID,
     /** Command to enable/disable filtering of multicast IP with unicast mac */
     WMI_CONFIG_ENHANCED_MCAST_FILTER_CMDID,
+     /** Command to control WISA mode */
+    WMI_VDEV_WISA_CMDID,
+
     /* GPIO Configuration */
     WMI_GPIO_CONFIG_CMDID=WMI_CMD_GRP_START_ID(WMI_GRP_GPIO),
     WMI_GPIO_OUTPUT_CMDID,
@@ -7632,6 +7635,7 @@ typedef enum event_type_e {
     WOW_NAN_DATA_EVENT,
     WOW_NAN_RTT_EVENT,
     WOW_TDLS_CONN_TRACKER_EVENT,
+    WOW_CRITICAL_LOG_EVENT,
 } WOW_WAKE_EVENT_TYPE;
 
 typedef enum wake_reason_e {
@@ -7679,6 +7683,7 @@ typedef enum wake_reason_e {
     WOW_REASON_NAN_DATA,
     WOW_REASON_NAN_RTT,
     WOW_REASON_TDLS_CONN_TRACKER_EVENT,
+    WOW_REASON_CRITICAL_LOG,
     WOW_REASON_DEBUG_TEST = 0xFF,
 } WOW_WAKE_REASON_TYPE;
 
@@ -13876,6 +13881,15 @@ typedef struct {
     A_UINT32 enable;
 } wmi_config_enhanced_mcast_filter_cmd_fixed_param;
 
+typedef struct {
+    /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_vdev_wisa_cmd_fixed_param */
+    A_UINT32 tlv_header;
+    /** unique id identifying the VDEV, generated by the caller */
+    A_UINT32 vdev_id;
+    /** WISA enable / disable mode */
+    A_UINT32 wisa_mode;
+} wmi_vdev_wisa_cmd_fixed_param;
+
 /*
  * This structure is used to report SMPS force mode set complete to host.
  */
diff --git a/CORE/SERVICES/COMMON/wmi_version.h b/CORE/SERVICES/COMMON/wmi_version.h
index ad1f52817c4e..727a89267a73 100644
--- a/CORE/SERVICES/COMMON/wmi_version.h
+++ b/CORE/SERVICES/COMMON/wmi_version.h
@@ -36,7 +36,7 @@
 #define __WMI_VER_MINOR_    0
 /** WMI revision number has to be incremented when there is a
  *  change that may or may not break compatibility. */
-#define __WMI_REVISION_ 231
+#define __WMI_REVISION_ 233
 
 /** The Version Namespace should not be normally changed. Only
  *  host and firmware of the same WMI namespace will work
diff --git a/CORE/SERVICES/WMI/wmi_unified.c b/CORE/SERVICES/WMI/wmi_unified.c
index 5320eb29cf5e..55fb484b3ed8 100644
--- a/CORE/SERVICES/WMI/wmi_unified.c
+++ b/CORE/SERVICES/WMI/wmi_unified.c
@@ -697,6 +697,7 @@ static u_int8_t* get_wmi_cmd_string(WMI_CMD_ID wmi_command)
 		CASE_RETURN_STRING(WMI_SET_PERIODIC_CHANNEL_STATS_CONFIG_CMDID);
 		CASE_RETURN_STRING(WMI_VDEV_SET_CUSTOM_AGGR_SIZE_CMDID);
 		CASE_RETURN_STRING(WMI_PDEV_WAL_POWER_DEBUG_CMDID);
+		CASE_RETURN_STRING(WMI_VDEV_WISA_CMDID);
         }
 	return "Invalid WMI cmd";
 }