From 55e6d04583c2e2c286c3af1c993e4a339123d741 Mon Sep 17 00:00:00 2001 From: spuligil Date: Wed, 15 Jul 2020 12:01:28 -0700 Subject: [PATCH] fw-api: CL 10992505 - update fw common interface files Change-Id: Iedb5a1fc4f7f8bc34fdd829f9f299dfd9bffba05 WMI: add vdev extd stats CRs-Fixed: 2262693 --- fw/wmi_tlv_defs.h | 7 ++++-- fw/wmi_unified.h | 56 +++++++++++++++++++++++++++++++++-------------- fw/wmi_version.h | 2 +- 3 files changed, 46 insertions(+), 19 deletions(-) diff --git a/fw/wmi_tlv_defs.h b/fw/wmi_tlv_defs.h index c4f271960d39..4cfc55642a3d 100644 --- a/fw/wmi_tlv_defs.h +++ b/fw/wmi_tlv_defs.h @@ -1098,6 +1098,7 @@ typedef enum { WMITLV_TAG_STRUC_wmi_pdev_twt_session_stats_event_fixed_param, 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_ID; /* @@ -4979,7 +4980,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_HOST_SWFDA_EVENTID); WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_rssi_stats, rssi_stats, WMITLV_SIZE_VAR) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_congestion_stats, congestion_stats, WMITLV_SIZE_VAR) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_peer_extd2_stats, peer_extd2_stats, WMITLV_SIZE_VAR) \ - WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_pmf_bcn_protect_stats, pmf_bcn_protect_stats, WMITLV_SIZE_VAR) + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_pmf_bcn_protect_stats, pmf_bcn_protect_stats, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_vdev_extd_stats, vdev_extd_stats, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_UPDATE_STATS_EVENTID); /* Update PN response Event */ @@ -5787,7 +5789,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PEER_STATS_INFO_EVENTID); /* Update Control Path stats event */ #define WMITLV_TABLE_WMI_CTRL_PATH_STATS_EVENTID(id, op, buf, len) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_ctrl_path_stats_event_fixed_param, wmi_ctrl_path_stats_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ - WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_ctrl_path_pdev_stats_struct, ctrl_path_pdev_stats, WMITLV_SIZE_VAR) + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_ctrl_path_pdev_stats_struct, ctrl_path_pdev_stats, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_vdev_extd_stats, vdev_extd_stats, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_CTRL_PATH_STATS_EVENTID); #define WMITLV_TABLE_WMI_RADIO_CHAN_STATS_EVENTID(id, op, buf, len) \ diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index 0c6bdcca8a44..5c974b59b502 100644 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -7774,22 +7774,23 @@ typedef struct { } wmi_pdev_set_wmm_params_cmd_fixed_param; typedef enum { - WMI_REQUEST_PEER_STAT = 0x0001, - WMI_REQUEST_AP_STAT = 0x0002, - WMI_REQUEST_PDEV_STAT = 0x0004, - WMI_REQUEST_VDEV_STAT = 0x0008, - WMI_REQUEST_BCNFLT_STAT = 0x0010, - WMI_REQUEST_VDEV_RATE_STAT = 0x0020, - WMI_REQUEST_INST_STAT = 0x0040, - WMI_REQUEST_MIB_STAT = 0x0080, - WMI_REQUEST_RSSI_PER_CHAIN_STAT = 0x0100, - WMI_REQUEST_CONGESTION_STAT = 0x0200, - WMI_REQUEST_PEER_EXTD_STAT = 0x0400, - WMI_REQUEST_BCN_STAT = 0x0800, - WMI_REQUEST_BCN_STAT_RESET = 0x1000, - WMI_REQUEST_PEER_EXTD2_STAT = 0x2000, - WMI_REQUEST_MIB_EXTD_STAT = 0x4000, - WMI_REQUEST_PMF_BCN_PROTECT_STAT = 0x8000, + WMI_REQUEST_PEER_STAT = 0x00001, + WMI_REQUEST_AP_STAT = 0x00002, + WMI_REQUEST_PDEV_STAT = 0x00004, + WMI_REQUEST_VDEV_STAT = 0x00008, + WMI_REQUEST_BCNFLT_STAT = 0x00010, + WMI_REQUEST_VDEV_RATE_STAT = 0x00020, + WMI_REQUEST_INST_STAT = 0x00040, + WMI_REQUEST_MIB_STAT = 0x00080, + WMI_REQUEST_RSSI_PER_CHAIN_STAT = 0x00100, + WMI_REQUEST_CONGESTION_STAT = 0x00200, + WMI_REQUEST_PEER_EXTD_STAT = 0x00400, + WMI_REQUEST_BCN_STAT = 0x00800, + WMI_REQUEST_BCN_STAT_RESET = 0x01000, + WMI_REQUEST_PEER_EXTD2_STAT = 0x02000, + WMI_REQUEST_MIB_EXTD_STAT = 0x04000, + WMI_REQUEST_PMF_BCN_PROTECT_STAT = 0x08000, + WMI_REQUEST_VDEV_EXTD_STAT = 0x10000, } wmi_stats_id; /* @@ -8514,6 +8515,10 @@ typedef struct { * wmi_pmf_bcn_protect_stats pmf_bcn_protect_stats[] * follows the other TLVs */ +/* If WMI_REQUEST_VDEV_EXTD_STAT is set in stats_id, then TLV + * wmi_vdev_extd_stats wmi_vdev_extd_stats[] + * follows the other TLVs + */ } wmi_stats_event_fixed_param; /* WLAN channel CCA stats bitmap */ @@ -9138,6 +9143,8 @@ typedef struct { * different types of stats: * 1. wmi_ctrl_path_pdev_stats_struct ctrl_path_pdev_stats[]; * This TLV array contains zero or more pdev stats instances. + * 2. wmi_vdev_extd_stats vdev_extd_stats[]; + * This TLV array contains zero or more vdev_extd_stats instances. */ } wmi_ctrl_path_stats_event_fixed_param; @@ -9287,6 +9294,23 @@ typedef struct { A_UINT32 tx_bcn_outage_cnt; /* Total number of failed beacons */ } wmi_bcn_stats; +/** + * vdev extension statistics + */ +typedef struct { + A_UINT32 tlv_header; + /* vdev id */ + A_UINT32 vdev_id; + /* Total number of Fils Discovery frames transmitted successfully */ + A_UINT32 fd_succ_cnt; + /* Total number of Fils Discovery frames failed */ + A_UINT32 fd_fail_cnt; + /* Total number of unsolicited probe response frames transmitted successfully */ + A_UINT32 unsolicited_prb_succ_cnt; + /* Total number of unsolicited probe response frames failed */ + A_UINT32 unsolicited_prb_fail_cnt; +} wmi_vdev_extd_stats; + /** * peer statistics. */ diff --git a/fw/wmi_version.h b/fw/wmi_version.h index 0f5c9b56cab3..136752caba37 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_ 862 +#define __WMI_REVISION_ 863 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work