From e13f93f598cf7e5957fe361c5a48b16c9102372d Mon Sep 17 00:00:00 2001 From: spuligil Date: Wed, 2 Jan 2019 11:59:08 -0800 Subject: [PATCH] fw-api: CL 6174613 - update fw common interface files WMI_VHT_MCS_NOTIFY_EXT_SS GET/SET macros (validity of MCS 10/11) Change-Id: Iad45cc66b17524c94d17d49fea23c154f303c05e CRs-Fixed: 2262693 --- fw/wmi_unified.h | 14 +++++++++++++- fw/wmi_version.h | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index 52664d9a093f..9ae1aa919c1a 100644 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -1977,6 +1977,10 @@ typedef enum { #define WMI_VHT_MAX_MCS_EXT_SS_GET(vht_mcs_map, index) WMI_GET_BITS(vht_mcs_map, 16 + index, 1) #define WMI_VHT_MAX_MCS_EXT_SS_SET(vht_mcs_map, index, value) WMI_SET_BITS(vht_mcs_map, 16 + index, 1, value) +/* Notification bit for Ext MCS 10/11 support */ +#define WMI_VHT_MCS_NOTIFY_EXT_SS_GET(vht_mcs_map) WMI_GET_BITS(vht_mcs_map, 24, 1) +#define WMI_VHT_MCS_NOTIFY_EXT_SS_SET(vht_mcs_map, value) WMI_SET_BITS(vht_mcs_map, 24, 1, value) + #define WMI_VHT_MAX_MCS_4_SS_MASK(r,ss) ((3 & (r)) << (((ss) - 1) << 1)) #define WMI_VHT_MAX_SUPP_RATE_MASK 0x1fff0000 #define WMI_VHT_MAX_SUPP_RATE_MASK_SHIFT 16 @@ -10755,11 +10759,15 @@ typedef struct { A_UINT32 rx_max_rate; /* Max Rx data rate */ A_UINT32 rx_mcs_set; /* Negotiated RX VHT rates */ A_UINT32 tx_max_rate; /* Max Tx data rate */ + /* + * bit [15:0] indicates MCS 0 to 9 + * bit [23:16] indicates MCS 10 & 11 + * bit [24] indicates whether MCS 10 & 11 is notified in bit [23:16] + */ A_UINT32 tx_mcs_set; /* Negotiated TX VHT rates */ A_UINT32 tx_max_mcs_nss; /* b0-b3: max mcs idx; b4-b7: max nss */ } wmi_vht_rate_set; - /* NOTE: It would bea good idea to represent the Tx MCS * info in one word and Rx in another word. This is split * into multiple words for convenience @@ -21868,6 +21876,8 @@ typedef struct { * - . * - . * - bit 23 - for NSS 8 + * - bit 24 - indicate whether the VHT-MCS 10-11 specs in bits 23:16 + * are valid * Refer to the WMI_VHT_MAX_MCS_EXT_SS_GET/SET macros. */ A_UINT32 vht_supp_mcs_2G; @@ -21910,6 +21920,8 @@ typedef struct { * - . * - . * - bit 23 - for NSS 8 + * - bit 24 - indicate whether the VHT-MCS 10-11 specs in bits 23:16 + * are valid * Refer to the WMI_VHT_MAX_MCS_EXT_SS_GET/SET macros. */ A_UINT32 vht_supp_mcs_5G; diff --git a/fw/wmi_version.h b/fw/wmi_version.h index 9263f73bfb26..a8d57353eada 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_ 612 +#define __WMI_REVISION_ 613 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work