From a121b214c91bee453a1fe251e5dc44ec63a68bba Mon Sep 17 00:00:00 2001
From: spuligil <spuligil@codeaurora.org>
Date: Sat, 3 Nov 2018 00:03:54 -0700
Subject: [PATCH] fw-api: CL 5810459 - update fw common interface files

WMI service flag to clarify if HTT H2T msg len includes HTC hdr len

Change-Id: I72ce3bc72f3d361e9fef53198352e1d4b191473f
CRs-Fixed: 2262693
---
 fw/wmi_services.h |  1 +
 fw/wmi_unified.h  | 18 ++++++++++++++++++
 fw/wmi_version.h  |  2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/fw/wmi_services.h b/fw/wmi_services.h
index d06412f4bdaf..e8284d21a729 100644
--- a/fw/wmi_services.h
+++ b/fw/wmi_services.h
@@ -270,6 +270,7 @@ typedef  enum  {
     WMI_SERVICE_TX_DATA_MGMT_ACK_RSSI=174, /* ACK RSSI indication to host for host TX data and mgmt frame */
     WMI_SERVICE_NAN_DISABLE_SUPPORT=175, /* indicates firmware is dependent on host to disable NAN incase of concurrencies */
     WMI_SERVICE_NAN_DISABLE_SUPPORT__prototype = WMI_SERVICE_NAN_DISABLE_SUPPORT, /* alias, to clarify that NAN_DISABLE_SUPPORT is for prototype testing purposes */
+    WMI_SERVICE_HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN=176, /* indicates FW supports uniformly excluding the HTC header length from the HTT H2T message length */
 
     /******* ADD NEW SERVICES HERE *******/
 
diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h
index bd2cd1d80881..f91ca63aec68 100644
--- a/fw/wmi_unified.h
+++ b/fw/wmi_unified.h
@@ -2856,6 +2856,20 @@ typedef struct {
     #define WMI_RSRC_CFG_FLAG_TX_ACK_RSSI_S 18
     #define WMI_RSRC_CFG_FLAG_TX_ACK_RSSI_M 0x40000
 
+    /*
+     * If HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN is set, the host will not
+     * include the HTC header length in the payload length for all HTT_H2T
+     * messages.
+     * Otherwise, only when sending HTT_H2T_MSG_TYPE_TX_FRM message,
+     * payload length includes HTC header length. Other HTT_H2T messages'
+     * payload length does not include HTC header length.
+     * The host will only set this HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN flag
+     * if the target has set the WMI_SERVICE_HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN
+     * flag to indicate its support for this option.
+     */
+    #define WMI_RSRC_CFG_FLAG_HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN_S 19
+    #define WMI_RSRC_CFG_FLAG_HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN_M 0x80000
+
     A_UINT32 flag1;
 
     /** @brief smart_ant_cap - Smart Antenna capabilities information
@@ -3089,6 +3103,10 @@ typedef struct {
 #define WMI_RSRC_CFG_FLAG_TX_ACK_RSSI_GET(word32) \
     WMI_RSRC_CFG_FLAG_GET((word32), TX_ACK_RSSI)
 
+#define WMI_RSRC_CFG_FLAG_HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN_SET(word32, value) \
+    WMI_RSRC_CFG_FLAG_SET((word32), HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN, (value))
+#define WMI_RSRC_CFG_FLAG_HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN_GET(word32) \
+    WMI_RSRC_CFG_FLAG_GET((word32), HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN)
 
 typedef struct {
     A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_init_cmd_fixed_param */
diff --git a/fw/wmi_version.h b/fw/wmi_version.h
index a76c12d34f2a..b250417efb71 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_ 589
+#define __WMI_REVISION_ 590
 
 /** The Version Namespace should not be normally changed. Only
  *  host and firmware of the same WMI namespace will work