qcacld-2.0: CL 5273786 - Update fw common interface files

WMI: add UL_RESP enable / disable flag (and clean up dbglog_id.h)

CRs-fixed: 865207
Change-Id: Icf168eb44288f3689c1b8ddd02a67526fb080a34

3 files changed, 20 insertions, 26 deletions

diff --git a/CORE/SERVICES/COMMON/dbglog_id.h b/CORE/SERVICES/COMMON/dbglog_id.h
index 55fa98d4a4ae..bd48e61b94de 100644
--- a/CORE/SERVICES/COMMON/dbglog_id.h
+++ b/CORE/SERVICES/COMMON/dbglog_id.h
@@ -50,11 +50,7 @@ extern "C" {
 */
 #define DBGLOG_DBGID_SM_FRAMEWORK_PROXY_DBGLOG_MSG 1000
 
-#if defined(WLAN_ML_LOG)
-
-
-
-/* RESMGR messageIDs for ML logging*/
+/* RESMGR messageIDs for ML logging */
 typedef enum {
 	RESMGR_MSGID_DEFINITION_START = 0x0000,
 	RESMGR_CHMMGR_CHAINMASK_CHANGE_REQ_MSGID,
@@ -97,8 +93,7 @@ typedef enum {
 	RESMGR_MSGID_DEFINITION_END = 0x7fff,
 } RESMGR_MSGID;
 
-
-/* VDEVMGR messageIDs for ML logging*/
+/* VDEVMGR messageIDs for ML logging */
 typedef enum {
 	VDEV_MGR_MSGID_DEFINITION_START = 0x0000,
 	VDEV_MGR_RESMGR_CHMMGR_NOTIF_VDEV_UP_MSGID,
@@ -125,7 +120,6 @@ typedef enum {
 	VDEV_MGR_MSGID_DEFINITION_END = 0x7fff,
 } VDEV_MGR_MSGID;
 
-
 /* SCAN messageIDs for ML logging */
 typedef enum {
 	SCAN_MSGID_DEFINITION_START = 0x0000,
@@ -182,7 +176,6 @@ typedef enum {
 	SCAN_MSGID_DEFINITION_END = 0x7fff,
 } SCAN_MSGID;
 
-
 /* MGMT_TXRX messageIDs for ML logging */
 typedef enum {
 	MGMT_TXRX_MSGID_DEFINITION_START = 0x0000,
@@ -193,7 +186,6 @@ typedef enum {
 	MGMT_TXRX_MSGID_DEFINITION_END = 0x7fff,
 } MGMT_TXRX_MSGID;
 
-
 /* OFFLOAD messageIDs for ML logging */
 typedef enum {
 	OFFLOAD_MSGID_DEFINITION_START = 0x0000,
@@ -225,16 +217,14 @@ typedef enum {
 	OFFLOAD_MSGID_DEFINITION_END = 0x7fff,
 } OFFLOAD_MSGID;
 
-
-/* STA_PWRSAVE messageIDs for ML logging*/
+/* STA_PWRSAVE messageIDs for ML logging */
 typedef enum {
 	STA_PWRSAVE_MSGID_DEFINITION_START = 0x0000,
 	STA_PWRSAVE_ARBITER_REQUEST_MSGID,
 	STA_PWRSAVE_MSGID_DEFINITION_END = 0x7fff,
-}STA_PWRSAVE_MSGID;
+} STA_PWRSAVE_MSGID;
 
-
-/* COEX messageIDs for ML logging*/
+/* COEX messageIDs for ML logging */
 typedef enum {
 	COEX_MSGID_DEFINITION_START = 0x0000,
 	COEX_ASM_ANTENNA_REQUEST_MSGID,
@@ -243,18 +233,17 @@ typedef enum {
 	COEX_EVENT_HANDLER_SCAN_ANT_MSGID,
 	COEX_EVENT_HANDLER_VDEV_ANT_OP_MSGID,
 	COEX_MSGID_DEFINITION_END = 0x7fff,
-}COEX_MSGID;
-
+} COEX_MSGID;
 
-/* STA_SMPS messageIDs for ML logging*/
+/* STA_SMPS messageIDs for ML logging */
 typedef enum {
 	STA_SMPS_MSGID_DEFINITION_START = 0x0000,
 	STA_SMPS_VC_CFG_NOTIFY_MSGID,
 	STA_SMPS_MSGID_EDFINITION_END = 0x7fff,
-}STA_SMPS_MSGID;
+} STA_SMPS_MSGID;
 
 
-/* WAL messageIDs for ML logging*/
+/* WAL messageIDs for ML logging */
 typedef enum {
 	WAL_MSGID_DEFINITION_START = 0x0000,
 	WAL_PDEV_CHANNEL_CHANGE_MSGID,
@@ -349,7 +338,6 @@ typedef enum {
 	WAL_MSGID_DEFINITION_END = 0x7fff,
 } WAL_MSGID;
 
-
 /* WPM messageIDs for ML logging */
 typedef enum {
 	WPM_MSGID_DEFINITION_START = 0x0000,
@@ -366,7 +354,6 @@ typedef enum {
 	MLME_THREAD_COMM_UPDATE_STATUS_MSGID,
 	MLME_THREAD_COMM_CMD_PROXY_MSGID,
 	MLME_MSGID_DEFINITION_END = 0x7fff,
-
 } MLME_MSGID;
 
 typedef enum {
@@ -382,9 +369,6 @@ typedef enum {
 	AP_PWRSAVE_MSGID_DEFINITION_END = 0x7fff,
 } AP_PWRSAVE_MSGID;
 
-#endif
-
-
 
 /* INF debug identifier definitions */
 #define INF_DBGID_DEFINITION_START                    0
diff --git a/CORE/SERVICES/COMMON/wmi_unified.h b/CORE/SERVICES/COMMON/wmi_unified.h
index c0235cf4e754..6d623d703e8e 100644
--- a/CORE/SERVICES/COMMON/wmi_unified.h
+++ b/CORE/SERVICES/COMMON/wmi_unified.h
@@ -2354,6 +2354,16 @@ typedef struct {
 
     /* 2nd DWORD of HE MAC Capabilities */
     A_UINT32 he_cap_info_ext;
+
+    /** @brief ul_resp_config - Configures the 11ax uplink ofdma feature on STA.
+     *         I.e. sending uplink response to a trigger frame sent by AP.
+     *  @details
+     *        0 - fw default behavior, based on chipset
+     *        1 - UL_RESP is disabled.
+     *        2 - UL_RESP is enabled.
+     *        other - reserved.
+     */
+    A_UINT32 ul_resp_config;
 } wmi_service_ready_ext_event_fixed_param;
 
 typedef enum {
diff --git a/CORE/SERVICES/COMMON/wmi_version.h b/CORE/SERVICES/COMMON/wmi_version.h
index b0c3075fc120..ed4910b21355 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_ 568
+#define __WMI_REVISION_ 569
 
 /** The Version Namespace should not be normally changed. Only
  *  host and firmware of the same WMI namespace will work