diff --git a/fw/wmi_tlv_defs.h b/fw/wmi_tlv_defs.h index e70d4993d3..ee42f9a52c 100644 --- a/fw/wmi_tlv_defs.h +++ b/fw/wmi_tlv_defs.h @@ -1243,6 +1243,7 @@ typedef enum { WMITLV_TAG_STRUC_wmi_tx_send_params_ext, WMITLV_TAG_STRUC_wmi_mgmt_rx_params_ext, WMITLV_TAG_STRUC_wmi_partner_link_stats, + WMITLV_TAG_STRUC_wmi_regulatory_chan_priority_struct, } WMITLV_TAG_ID; /* @@ -6052,7 +6053,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_REG_CHAN_LIST_CC_EVENTID); /* Ext regulatory channel list of current country code */ #define WMITLV_TABLE_WMI_REG_CHAN_LIST_CC_EXT_EVENTID(id,op,buf,len) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_reg_chan_list_cc_event_ext_fixed_param, wmi_reg_chan_list_cc_event_ext_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ - WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_regulatory_rule_ext_struct, reg_rule_array, WMITLV_SIZE_VAR) + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_regulatory_rule_ext_struct, reg_rule_array, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_regulatory_chan_priority_struct, reg_chan_priority, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_REG_CHAN_LIST_CC_EXT_EVENTID); /* WMI AFC info event */ diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index 23e0397305..418dc7dc9b 100644 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -30983,6 +30983,20 @@ typedef struct { */ } wmi_regulatory_rule_ext_struct; +#define WMI_REG_CHAN_PRIORITY_FREQ_GET(freq_info) WMI_GET_BITS(freq_info, 0, 16) +#define WMI_REG_CHAN_PRIORITY_FREQ_SET(freq_info, value) WMI_SET_BITS(freq_info, 0, 16, value) + +typedef struct { + A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_regulatory_chan_priority_struct */ + A_UINT32 freq_info; + /* freq_info: + * bits 15:0 = u16 Cutoff Frequency value for Prioritization (in MHz units) + * The frequencies above this value will be prioritized and + * the frequencies below this value will be de-prioritized. + * bits 31:16 = reserved for future + */ +} wmi_regulatory_chan_priority_struct; + typedef enum { WMI_REG_DFS_UNINIT_REGION = 0, WMI_REG_DFS_FCC_REGION = 1, @@ -31085,10 +31099,12 @@ typedef struct { A_UINT32 num_6g_reg_rules_client_lpi[WMI_REG_CLIENT_MAX]; A_UINT32 num_6g_reg_rules_client_vlp[WMI_REG_CLIENT_MAX]; /* - * This fixed_param TLV is followed by wmi_regulatory_rule_ext struct TLV array. - * Within the reg rule ext TLV array, the 2G elements occur first, - * then the 5G elements, then the 6G elements (AP SG, AP LPI, AP VLP, - * client SP x4, client LPI x4, client vlp x4). + * This fixed_param TLV is followed by the following TLVs: + * - wmi_regulatory_rule_ext reg_rule_array[] struct TLV array. + * Within the reg rule ext TLV array, the 2G elements occur first, + * then the 5G elements, then the 6G elements (AP SG, AP LPI, AP VLP, + * client SP x4, client LPI x4, client vlp x4). + * - wmi_regulatory_chan_priority_struct reg_chan_priority[] */ } wmi_reg_chan_list_cc_event_ext_fixed_param; diff --git a/fw/wmi_version.h b/fw/wmi_version.h index b66e11477c..442deb8231 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_ 1119 +#define __WMI_REVISION_ 1120 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work