From ffa7eb1984a2a341bf6eedcaa3cda5310bc302ff Mon Sep 17 00:00:00 2001 From: spuligil Date: Mon, 10 Aug 2020 18:00:55 -0700 Subject: [PATCH] fw-api: CL 11287986 - update fw common interface files Change-Id: I52bd09702501a30655943dd028624361be25c4b4 WMI: specify target limits on DL/UL OFDMA/MIMO users per PPDU CRs-Fixed: 2262693 --- fw/wmi_unified.h | 38 ++++++++++++++++++++++++++++++++++++++ fw/wmi_version.h | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index 8040c0ca73bc..c3add244437e 100644 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -2800,6 +2800,30 @@ typedef struct { #define WMI_HW_MAX_TX_POWER_SET(dword, value) \ WMI_SET_BITS(dword, WMI_HW_MAX_TX_POWER_BITPOS, 16, value) +#define WMI_MAX_USER_PER_PPDU_UL_OFDMA_GET(dword) \ + WMI_GET_BITS(dword, 0, 16) + +#define WMI_MAX_USER_PER_PPDU_UL_OFDMA_SET(dword, value) \ + WMI_SET_BITS(dword, 0, 16, value) + +#define WMI_MAX_USER_PER_PPDU_DL_OFDMA_GET(dword) \ + WMI_GET_BITS(dword, 16, 16) + +#define WMI_MAX_USER_PER_PPDU_DL_OFDMA_SET(dword, value) \ + WMI_SET_BITS(dword, 16, 16, value) + +#define WMI_MAX_USER_PER_PPDU_UL_MUMIMO_GET(dword) \ + WMI_GET_BITS(dword, 0, 16) + +#define WMI_MAX_USER_PER_PPDU_UL_MUMIMO_SET(dword, value) \ + WMI_SET_BITS(dword, 0, 16, value) + +#define WMI_MAX_USER_PER_PPDU_DL_MUMIMO_GET(dword) \ + WMI_GET_BITS(dword, 16, 16) + +#define WMI_MAX_USER_PER_PPDU_DL_MUMIMO_SET(dword, value) \ + WMI_SET_BITS(dword, 16, 16, value) + typedef struct { A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_service_ready_ext2_event_fixed_param.*/ @@ -2849,6 +2873,20 @@ typedef struct { * 320: puncturing supported within 320 MHz channels */ A_UINT32 preamble_puncture_bw; + + /* + * [15:0] - ULOFDMA Refer WMI_MAX_USER_PER_PPDU_UL_OFDMA_GET & SET + * [31:16] - DLOFDMA Refer WMI_MAX_USER_PER_PPDU_DL_OFDMA_GET & SET + * If max_user_per_ppdu_ofdma == 0 the UL/DL max users are unspecified. + */ + A_UINT32 max_user_per_ppdu_ofdma; + + /* + * [15:0] - ULMUMIMO Refer WMI_MAX_USER_PER_PPDU_UL_MUMIMO_GET & SET + * [31:16] - DLMUMIMO Refer WMI_MAX_USER_PER_PPDU_DL_MUMIMO_GET & SET + * If max_user_per_ppdu_mumimo == 0 the UL/DL max users are unspecified. + */ + A_UINT32 max_user_per_ppdu_mumimo; } wmi_service_ready_ext2_event_fixed_param; typedef struct { diff --git a/fw/wmi_version.h b/fw/wmi_version.h index b5a0a98e4a13..f36722e0bd21 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_ 878 +#define __WMI_REVISION_ 879 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work