From 5dc113c36857af36231e8f28d19abc40e16fdab2 Mon Sep 17 00:00:00 2001
From: spuligil <spuligil@codeaurora.org>
Date: Wed, 4 Aug 2021 09:48:00 -0700
Subject: [PATCH] fw-api: CL 14996217 - update fw common interface files

Change-Id: I404ff22cba7e9d5c19f8c1667f57502e2c90e990
WMI: add max_num_[mpdu,msdu]_in_ppdu fields to peer_tid_configurations
CRs-Fixed: 2262693
---
 fw/wmi_unified.h | 46 ++++++++++++++++++++++++++++++++++++++++++++--
 fw/wmi_version.h |  2 +-
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h
index 7d363b6cdaf2..f8b54fd4b875 100644
--- a/fw/wmi_unified.h
+++ b/fw/wmi_unified.h
@@ -20438,10 +20438,32 @@ typedef enum {
  * in wmi_peer_tid_configurations_cmd structure.
  */
 typedef enum {
-      /* Used to indicate that disable_rts_cts field is valid */
-      WMI_PEER_TID_DISABLE_RTS_CTS_VALID = 0x00000001,
+    /* Used to indicate that disable_rts_cts field is valid */
+    WMI_PEER_TID_DISABLE_RTS_CTS_VALID      = 0x00000001,
+    WMI_PEER_TID_MAX_NUM_MPDU_IN_PPDU_VALID = 0x00000002,
+    WMI_PEER_TID_MAX_NUM_MSDU_IN_MPDU_VALID = 0x00000004,
 } WMI_PEER_TID_EXT_CONFIG_VALID_BITMAP;
 
+/**
+ * MPDU Aggregate value for the TID
+ */
+typedef enum {
+    /** Set the default Aggregation value configured in FW */
+    WMI_PEER_TID_MAX_NUM_MPDU_IN_PPDU_DEFAULT,
+    WMI_PEER_TID_MAX_NUM_MPDU_IN_PPDU_MIN = 1,
+    WMI_PEER_TID_MAX_NUM_MPDU_IN_PPDU_MAX = 1024,
+} WMI_PEER_TID_CONFIG_MAX_NUM_MPDU_IN_PPDU;
+
+/**
+ * MSDU Aggregate value for the TID
+ */
+typedef enum {
+    /** Set the default Aggregation value configured in FW */
+    WMI_PEER_TID_MAX_NUM_MSDU_IN_MPDU_DEFAULT,
+    WMI_PEER_TID_MAX_NUM_MSDU_IN_MPDU_MIN = 1,
+    WMI_PEER_TID_MAX_NUM_MSDU_IN_MPDU_MAX = 7,
+} WMI_PEER_TID_CONFIG_MAX_NUM_MSDU_IN_MPDU;
+
 /**
  * Command format for the TID configuration
  */
@@ -20494,6 +20516,26 @@ typedef struct {
 
     /* Knob to enable/disable RTS/CTS per TID */
     A_UINT32 disable_rts_cts;
+
+    /** Size for mpdu aggregation
+     * (max MPDUs per PPDU)
+     * Valid range : 1-1024 (refer to WMI_PEER_TID_MAX_NUM_MPDU_IN_PPDU_MIN,MAX)
+     * When this field is set to 0, default aggregation value configured
+     * in the fw will be used.
+     * This is applicable only when aggr_control is
+     * WMI_PEER_TID_CONFIG_AGGR_CONTROL_ENABLE
+     */
+    A_UINT32 max_num_mpdu_in_ppdu;
+
+    /** Size for msdu aggregation
+     * (max MSDUs per MPDU)
+     * Valid range : 1-7 (refer to WMI_PEER_TID_MAX_NUM_MSDU_IN_MPDU_MIN,MAX)
+     * When this field is set to 0, default aggregation value configured
+     * in the fw will be used.
+     * This is applicable only when aggr_control is
+     * WMI_PEER_TID_CONFIG_AGGR_CONTROL_ENABLE
+     */
+    A_UINT32 max_num_msdu_in_mpdu;
 } wmi_peer_tid_configurations_cmd_fixed_param;
 
 /* The below enable/disable macros are used for both per peer CFR capture
diff --git a/fw/wmi_version.h b/fw/wmi_version.h
index 747acc8f0eb4..5302321e976d 100644
--- a/fw/wmi_version.h
+++ b/fw/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_ 1039
+#define __WMI_REVISION_ 1040
 
 /** The Version Namespace should not be normally changed. Only
  *  host and firmware of the same WMI namespace will work