From 56038260388ecea1d66459e2cb3459006f224b4e Mon Sep 17 00:00:00 2001 From: spuligil Date: Tue, 27 Jul 2021 06:01:33 -0700 Subject: [PATCH] fw-api: CL 14919884 - update fw common interface files Change-Id: Id5edd42c66cbff9b5df571cea3983318d4fcc83f WMI: add opt mac freq mapping info to ROAM,ROAM_SYNCH,HW_MODE_TRANSITION msgs CRs-Fixed: 2262693 --- fw/wmi_services.h | 1 + fw/wmi_tlv_defs.h | 6 ++++-- fw/wmi_unified.h | 29 +++++++++++++++++++---------- fw/wmi_version.h | 2 +- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/fw/wmi_services.h b/fw/wmi_services.h index fc3e6d34cbce..4194e8483654 100644 --- a/fw/wmi_services.h +++ b/fw/wmi_services.h @@ -546,6 +546,7 @@ typedef enum { WMI_SERVICE_LARGE_BEACON_SUPPORT = 301, /* FW support for Large beacon support greater then 1.5K */ WMI_SERVICE_AOA_FOR_RCC_SUPPORTED = 302, WMI_SERVICE_DYN_NSS_MASK_SUPPORT = 303, /* Indicates FW support for DYN NSS feature */ + WMI_SERVICE_HW_MODE_POLICY_OFFLOAD_SUPPORT = 304, /* FW supports HW mode selection offload */ WMI_MAX_EXT2_SERVICE diff --git a/fw/wmi_tlv_defs.h b/fw/wmi_tlv_defs.h index 19aa2ba27c17..a67c3e06e201 100644 --- a/fw/wmi_tlv_defs.h +++ b/fw/wmi_tlv_defs.h @@ -5090,7 +5090,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_ROAM_EVENTID); WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_key_material_ext, key_ext, WMITLV_SIZE_VAR) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_roam_pmk_cache_synch_tlv_param, roam_pmk_cache_synch_info, WMITLV_SIZE_VAR) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_roam_ml_setup_links_param, setup_links_param, WMITLV_SIZE_VAR) \ - WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_roam_ml_key_material_param, ml_key_material, WMITLV_SIZE_VAR) + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_roam_ml_key_material_param, ml_key_material, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_pdev_band_to_mac, mac_freq_mapping, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_ROAM_SYNCH_EVENTID); /* Roam Synch frame Event */ @@ -5803,7 +5804,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_SOC_HW_MODE_TRANSITION_EVENTID); /* PDEV Hardware Mode Transition event */ #define WMITLV_TABLE_WMI_PDEV_HW_MODE_TRANSITION_EVENTID(id,op,buf,len) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_hw_mode_transition_event_fixed_param, wmi_pdev_hw_mode_transition_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ - WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_pdev_set_hw_mode_response_vdev_mac_entry, wmi_pdev_set_hw_mode_response_vdev_mac_mapping, WMITLV_SIZE_VAR) + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_pdev_set_hw_mode_response_vdev_mac_entry, wmi_pdev_set_hw_mode_response_vdev_mac_mapping, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_pdev_band_to_mac, mac_freq_mapping, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_HW_MODE_TRANSITION_EVENTID); /* SOC Set Dual MAC Config Response event - DEPRECATED */ diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index 58aa52ae84a5..9c39d907350b 100644 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -22104,15 +22104,22 @@ typedef struct { /** * TLV (tag length value) parameters follows roam_synch_event * The TLV's are: - * A_UINT8 bcn_probe_rsp_frame[]; length identified by bcn_probe_rsp_len - * A_UINT8 reassoc_rsp_frame[]; length identified by reassoc_rsp_len + * A_UINT8 bcn_probe_rsp_frame[bcn_probe_resp_len]; + * A_UINT8 reassoc_rsp_frame[reassoc_rsp_len]; * wmi_channel chan; - * wmi_key_material key; - * A_UINT32 status; subnet changed status not being used currently. - * will pass the information using roam_status. - * A_UINT8 reassoc_req_frame[]; length identified by reassoc_req_len - * wmi_key_material_ext key_ext - **/ + * wmi_key_material key[]; + * A_UINT32 status[]; subnet changed status not being used currently. + * Will pass the information using roam_status. + * A_UINT8 reassoc_req_frame[reassoc_req_len]; + * wmi_pdev_hw_mode_transition_event_fixed_param + * hw_mode_transition_fixed_param[]; + * wmi_pdev_set_hw_mode_response_vdev_mac_entry + * wmi_pdev_set_hw_mode_response_vdev_mac_mapping[]; + * wmi_roam_fils_synch_tlv_param roam_fils_synch_info[]; + * wmi_key_material_ext key_ext[]; + * wmi_roam_pmk_cache_synch_tlv_param roam_pmk_cache_synch_info[]; + * wmi_pdev_band_to_mac mac_freq_mapping[]; + */ } wmi_roam_synch_event_fixed_param; /** @@ -24853,9 +24860,11 @@ typedef struct { A_UINT32 num_vdev_mac_entries; /** - * TLV (tag length value) parameters follow the soc_set_hw_mode_response_event + * TLV (tag length value) parameters follow the pdev_set_hw_mode_response_event * structure. The TLV's are: - * A_UINT32 wmi_soc_set_hw_mode_response_vdev_mac_entry[]; + * wmi_pdev_set_hw_mode_response_vdev_mac_entry + * wmi_pdev_set_hw_mode_response_vdev_mac_mapping[]; + * wmi_pdev_band_to_mac mac_freq_mapping[]; */ } wmi_pdev_hw_mode_transition_event_fixed_param; diff --git a/fw/wmi_version.h b/fw/wmi_version.h index 7544e033fe48..593f8f504f4a 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_ 1034 +#define __WMI_REVISION_ 1035 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work