diff --git a/fw/wmi_tlv_defs.h b/fw/wmi_tlv_defs.h index 823773d66f42..d919898987e8 100644 --- a/fw/wmi_tlv_defs.h +++ b/fw/wmi_tlv_defs.h @@ -1053,6 +1053,8 @@ typedef enum { WMITLV_TAG_STRUC_wmi_smartant_event_fixed_param, WMITLV_TAG_STRUC_wmi_pdev_tbtt_offset_sync_cmd_fixed_param, WMITLV_TAG_STRUC_wmi_pdev_rnr_bss_tbtt_info, + WMITLV_TAG_STRUC_WMI_MAC_PHY_CAPABILITIES_EXT, + WMITLV_TAG_STRUC_WMI_HAL_REG_CAPABILITIES_EXT2, } WMITLV_TAG_ID; /* @@ -4354,7 +4356,9 @@ WMITLV_CREATE_PARAM_STRUC(WMI_SERVICE_READY_EXT_EVENTID); #define WMITLV_TABLE_WMI_SERVICE_READY_EXT2_EVENTID(id,op,buf,len) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_service_ready_ext2_event_fixed_param, wmi_service_ready_ext2_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, WMI_DMA_RING_CAPABILITIES, dma_ring_caps, WMITLV_SIZE_VAR) \ - WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_spectral_bin_scaling_params, wmi_bin_scaling_params, WMITLV_SIZE_VAR) + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_spectral_bin_scaling_params, wmi_bin_scaling_params, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, WMI_MAC_PHY_CAPABILITIES_EXT, mac_phy_caps, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, WMI_HAL_REG_CAPABILITIES_EXT2, hal_reg_caps, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_SERVICE_READY_EXT2_EVENTID); #define WMITLV_TABLE_WMI_CHAN_RF_CHARACTERIZATION_INFO_EVENTID(id,op,buf,len) \ diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index 9b77a3a155be..150a7f84dab4 100644 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -24613,6 +24613,21 @@ typedef struct { **************************************************************************/ } WMI_MAC_PHY_CAPABILITIES; +typedef struct { + A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_WMI_MAC_PHY_CAPABILITIES_EXT */ + /* hw_mode_id - identify a particular set of HW characteristics, as specified + * by the subsequent fields. WMI_MAC_PHY_CAPABILITIES element must be mapped + * to its parent WMI_HW_MODE_CAPABILITIES element using hw_mode_id. + * No particular ordering of WMI_MAC_PHY_CAPABILITIES elements should be assumed, + * though in practice the elements may always be ordered by hw_mode_id */ + A_UINT32 hw_mode_id; + /* pdev_id starts with 1. pdev_id 1 => phy_id 0, pdev_id 2 => phy_id 1 */ + A_UINT32 pdev_id; + /* phy id. Starts with 0 */ + A_UINT32 phy_id; + A_UINT32 wireless_modes_ext; /* REGDMN MODE EXT, see REGDMN_MODE_ enum */ +} WMI_MAC_PHY_CAPABILITIES_EXT; + typedef struct { A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_WMI_HW_MODE_CAPABILITIES */ /* hw_mode_id - identify a particular set of HW characteristics, @@ -24788,6 +24803,14 @@ typedef struct { **************************************************************************/ } WMI_HAL_REG_CAPABILITIES_EXT; +typedef struct { + A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_WMI_HAL_REG_CAPABILITIES_EXT2 */ + /* phy id */ + A_UINT32 phy_id; + /* regdomain value specified in EEPROM */ + A_UINT32 wireless_modes_ext; +} WMI_HAL_REG_CAPABILITIES_EXT2; + typedef struct { A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_WMI_SOC_HAL_REG_CAPABILITIES */ A_UINT32 num_phy; diff --git a/fw/wmi_version.h b/fw/wmi_version.h index f5bade0dfe47..5d3ecdab08ff 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_ 799 +#define __WMI_REVISION_ 800 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work