From 9973ecba047e6d99b178dcd009d03458ef8918e2 Mon Sep 17 00:00:00 2001 From: spuligil Date: Wed, 15 Jul 2020 12:01:44 -0700 Subject: [PATCH] fw-api: CL 11006718 - update fw common interface files Change-Id: I36df38c84730aa158feee4897cbf0e28731663e9 WMI: add additional params TLV in TWT_ADD_DIALOG_COMPLETE_EVENT msg CRs-Fixed: 2262693 --- fw/wmi_tlv_defs.h | 4 +++- fw/wmi_unified.h | 19 +++++++++++++++++++ fw/wmi_version.h | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/fw/wmi_tlv_defs.h b/fw/wmi_tlv_defs.h index 4cfc55642a..1a8ea2273f 100644 --- a/fw/wmi_tlv_defs.h +++ b/fw/wmi_tlv_defs.h @@ -1099,6 +1099,7 @@ typedef enum { WMITLV_TAG_STRUC_wmi_twt_session_stats_info, WMITLV_TAG_STRUC_wmi_configure_roam_trigger_parameters, WMITLV_TAG_STRUC_wmi_vdev_extd_stats, + WMITLV_TAG_STRUC_wmi_twt_add_dialog_additional_params, } WMITLV_TAG_ID; /* @@ -5874,7 +5875,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_TWT_DISABLE_COMPLETE_EVENTID); /* adding TWT dialog complete Event */ #define WMITLV_TABLE_WMI_TWT_ADD_DIALOG_COMPLETE_EVENTID(id,op,buf,len) \ - WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_twt_add_dialog_complete_event_fixed_param, wmi_twt_add_dialog_complete_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_twt_add_dialog_complete_event_fixed_param, wmi_twt_add_dialog_complete_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_twt_add_dialog_additional_params, twt_params, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_TWT_ADD_DIALOG_COMPLETE_EVENTID); /* deleting TWT dialog complete Event */ diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index 5c974b59b5..ae578177b2 100644 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -27479,6 +27479,10 @@ typedef enum _WMI_TWT_COMMAND_T { #define TWT_FLAGS_GET_BTWT_ID0(flag) WMI_GET_BITS(flag, 12, 1) #define TWT_FLAGS_SET_BTWT_ID0(flag, val) WMI_SET_BITS(flag, 12, 1, val) +/* 0 means TWT Information frame is enabled, 1 means TWT Information frame is disabled */ +#define TWT_FLAGS_GET_TWT_INFO_FRAME_DISABLED(flag) WMI_GET_BITS(flag, 13, 1) +#define TWT_FLAGS_SET_TWT_INFO_FRAME_DISABLED(flag, val) WMI_SET_BITS(flag, 13, 1, val) + typedef struct { A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_twt_add_dialog_cmd_fixed_param */ A_UINT32 vdev_id; /* VDEV identifier */ @@ -27527,12 +27531,27 @@ typedef enum _WMI_ADD_TWT_STATUS_T { WMI_ADD_TWT_STATUS_UNKNOWN_ERROR, /* adding TWT dialog failed with an unknown reason */ } WMI_ADD_TWT_STATUS_T; +typedef struct { + A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_twt_add_dialog_additional_params */ + A_UINT32 flags; /* TWT flags, refer to MACROs TWT_FLAGS_*(TWT_FLAGS_GET_CMD etc) */ + A_UINT32 wake_dur_us; /* Wake duration in uS */ + A_UINT32 wake_intvl_us; /* Wake Interval in uS */ + A_UINT32 sp_offset_us; /* SP Starting Offset */ + A_UINT32 sp_tsf_us_lo; /* SP start TSF bits 31:0 */ + A_UINT32 sp_tsf_us_hi; /* SP start TSF bits 63:32 */ +} wmi_twt_add_dialog_additional_params; + typedef struct { A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_twt_add_dialog_complete_event_fixed_param */ A_UINT32 vdev_id; /* VDEV identifier */ wmi_mac_addr peer_macaddr; /* peer MAC address */ A_UINT32 dialog_id; /* TWT dialog ID */ A_UINT32 status; /* refer to WMI_ADD_TWT_STATUS_T */ +/* + * This fixed_param TLV is followed by the below TLVs: + * wmi_twt_add_dialog_additional_params twt_params[]; // TWT params received + * // from peer + */ } wmi_twt_add_dialog_complete_event_fixed_param; typedef struct { diff --git a/fw/wmi_version.h b/fw/wmi_version.h index 136752caba..d00d9b4498 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_ 863 +#define __WMI_REVISION_ 864 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work