From 5d843e45c3159090b7a9a00611327eb877e8bc78 Mon Sep 17 00:00:00 2001 From: spuligil Date: Mon, 4 Feb 2019 04:18:37 -0800 Subject: [PATCH] fw-api: CL 6432735 - update fw common interface files Change-Id: I58e28b6b8ab2a19528878e0f0313501f94437edf WMI: change wmi_wlm_link_stats within WLM_STATS_EVENT to be opaque CRs-Fixed: 2262693 --- fw/wmi_tlv_defs.h | 3 +-- fw/wmi_unified.h | 26 +------------------------- fw/wmi_version.h | 2 +- 3 files changed, 3 insertions(+), 28 deletions(-) diff --git a/fw/wmi_tlv_defs.h b/fw/wmi_tlv_defs.h index 5fec5951f4..41d8354932 100644 --- a/fw/wmi_tlv_defs.h +++ b/fw/wmi_tlv_defs.h @@ -964,7 +964,6 @@ typedef enum { WMITLV_TAG_STRUC_wmi_vdev_get_mws_coex_antenna_sharing_state_fixed_param, WMITLV_TAG_STRUC_wmi_request_wlm_stats_cmd_fixed_param, WMITLV_TAG_STRUC_wmi_wlm_stats_event_fixed_param, - WMITLV_TAG_STRUC_wmi_wlm_link_stats, } WMITLV_TAG_ID; /* @@ -4426,7 +4425,7 @@ WMITLV_CREATE_PARAM_STRUC(WMI_RADIO_LINK_STATS_EVENTID); /* Update WLM stats event */ #define WMITLV_TABLE_WMI_WLM_STATS_EVENTID(id,op,buf,len) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_wlm_stats_event_fixed_param, wmi_wlm_stats_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ - WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_wlm_link_stats, wlm_link_stats, WMITLV_SIZE_VAR) + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, data, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_WLM_STATS_EVENTID); /* PDEV QVIT Event */ diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index 98c6140207..41abd062fa 100644 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -6844,34 +6844,10 @@ typedef struct { */ A_UINT32 req_interval; /* - * This TLV is followed by another TLV of array of struct - * size of(struct wmi_wlm_link_stats); + * This TLV is followed by an A_UINT32 array TLV carrying an opaque payload. */ } wmi_wlm_stats_event_fixed_param; -/** wlan latency manager stats report */ -typedef struct { - A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_wlm_link_stats */ - /** average beacon rssi in dbm */ - A_INT32 bcn_rssi; - /** scan period, in units of percentage of req_interval */ - A_UINT32 scan_period; - /** power on period, in units of percentage of req_interval */ - A_UINT32 pwr_on_period; - /** congestion level, in units of percentage of req_interval */ - A_UINT32 congestion_level; - /** total phy_err count within req_interval */ - A_UINT32 phy_err; - /** total mpdu_err count within req_interval */ - A_UINT32 mpdu_err; - /** last TX rate in Mbps to bss peer */ - A_UINT32 last_tx_rate; - /** num_ac - how many elements of the ac_stats array contain valid data */ - A_UINT32 num_ac; - /** wmm ac stats */ - wmi_wmm_ac_stats ac_stats[WLAN_MAX_AC]; -} wmi_wlm_link_stats; - /** Suspend option */ enum { WMI_PDEV_SUSPEND, /* suspend */ diff --git a/fw/wmi_version.h b/fw/wmi_version.h index 379dcf4106..ebb8fd5fc2 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_ 623 +#define __WMI_REVISION_ 624 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work