From 8b604b27b8c32223f7766bd390ecbc6284d85683 Mon Sep 17 00:00:00 2001 From: spuligil Date: Sat, 15 Apr 2023 12:01:06 -0700 Subject: [PATCH] fw-api: CL 22585869 - update fw common interface files Change-Id: Ifc8829cdf204415bb7d0c2bf14aa0db96e5bde3e WMI: add cs_wrap_ie in CSA_HANDLING_EVENT msg CRs-Fixed: 2262693 --- fw/wmi_tlv_defs.h | 3 ++- fw/wmi_unified.h | 14 ++++++++++++++ fw/wmi_version.h | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/fw/wmi_tlv_defs.h b/fw/wmi_tlv_defs.h index f880d7ca08d3..5ce14728ee03 100644 --- a/fw/wmi_tlv_defs.h +++ b/fw/wmi_tlv_defs.h @@ -5819,7 +5819,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_GPIO_STATE_RES_EVENTID); /* CSA Handling Event */ #define WMITLV_TABLE_WMI_CSA_HANDLING_EVENTID(id,op,buf,len)\ - WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_csa_event_fixed_param, wmi_csa_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_csa_event_fixed_param, wmi_csa_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, cs_wrap_ie, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_CSA_HANDLING_EVENTID); /* Rfkill state change Event */ diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index a3debdc11f8d..f1b7f83d14bf 100644 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -7938,6 +7938,7 @@ typedef enum { WMI_CSWARP_IE_PRESENT = WMI_CSWRAP_IE_PRESENT, /* deprecated: typo */ WMI_QSBW_ISE_PRESENT = 0x00000010, WMI_CSWRAP_IE_EXTENDED_PRESENT = 0x00000020, /* Added bitmask to verify if the additional information is filled in */ + WMI_CSWRAP_IE_EXT_VER_2_PRESENT = 0x00000040 /* Added bitmask to see if additional info is present in CS wrap IE */ } WMI_CSA_EVENT_IES_PRESENT_FLAG; /* wmi CSA receive event from beacon frame */ @@ -7968,6 +7969,19 @@ typedef struct { * the second octet resides in bits 15:8 of cswrap_ie_extended[0] and so on. */ A_UINT32 cswrap_ie_extended[5]; + + /* num_bytes_valid_in_cswrap_ie_ext_ver2: + * This fixed_param TLV can be followed by a VAR length TLV + * variable-length byte-array TLV for CS WRAP IE. + * Since the variable-length byte-array TLVs are always padded, if needed, + * to contain a multiple of 4 bytes, this field shows how many of the bytes + * contain valid data, versus how many are only for alignment padding. + */ + A_UINT32 num_bytes_valid_in_cswrap_ie_ext_ver2; +/* + * This initial fixed_param TLV may be followed by the below TLVs: + * - cs_wrap_ie variable-length byte-array TLV + */ } wmi_csa_event_fixed_param; #define WMI_GET_MLD_MAC_ADDRESS_PRESENT(mld_mac_address_present) \ diff --git a/fw/wmi_version.h b/fw/wmi_version.h index c7993677d768..fd6ef8063711 100644 --- a/fw/wmi_version.h +++ b/fw/wmi_version.h @@ -37,7 +37,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_ 1321 +#define __WMI_REVISION_ 1322 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work