From 586ab172f33e758547f889d459631ea1febdb12f Mon Sep 17 00:00:00 2001 From: Sandeep Puligilla Date: Thu, 18 May 2017 10:01:06 -0700 Subject: [PATCH] fw-api: CL 3094881 - update fw common interface files define WMI messages for PDEV_BSS_CHAN_INFO request and event Change-Id: I35772aa95d0d081489b97d8ae3371a9fd696aed6 CRs-Fixed: 1107600 --- fw/wmi_services.h | 1 + fw/wmi_tlv_defs.h | 14 ++++++++++++++ fw/wmi_unified.h | 36 ++++++++++++++++++++++++++++++++++++ fw/wmi_version.h | 2 +- 4 files changed, 52 insertions(+), 1 deletion(-) diff --git a/fw/wmi_services.h b/fw/wmi_services.h index 187ff4c49957..f8d6500c9b3d 100644 --- a/fw/wmi_services.h +++ b/fw/wmi_services.h @@ -193,6 +193,7 @@ typedef enum { WMI_SERVICE_8SS_TX_BFEE = 124, /* support for 8Ant Bfee */ WMI_SERVICE_EXTENDED_NSS_SUPPORT=125, /* Extend NSS support for 80Mhz and 160Mhz */ WMI_SERVICE_ACK_TIMEOUT=126, /* Support TX ack timeout configurations */ + WMI_SERVICE_PDEV_BSS_CHANNEL_INFO_64 = 127, /* BSS channel info (freq, noise floor, rx clear, cycles 64-bit counters) event support */ /******* ADD NEW SERVICES HERE UNTIL ALL VALUES UP TO 128 ARE USED *******/ diff --git a/fw/wmi_tlv_defs.h b/fw/wmi_tlv_defs.h index e1b9cdd30d0d..073259aacf6d 100644 --- a/fw/wmi_tlv_defs.h +++ b/fw/wmi_tlv_defs.h @@ -834,6 +834,8 @@ typedef enum { WMITLV_TAG_STRUC_wmi_oem_indirect_data, WMITLV_TAG_STRUC_wmi_oem_dma_buf_release_fixed_param, WMITLV_TAG_STRUC_wmi_oem_dma_buf_release_entry, + WMITLV_TAG_STRUC_wmi_pdev_bss_chan_info_request_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_bss_chan_info_event_fixed_param, } WMITLV_TAG_ID; /* @@ -1168,6 +1170,7 @@ typedef enum { OP(WMI_PDEV_DIV_GET_RSSI_ANTID_CMDID) \ OP(WMI_THERM_THROT_SET_CONF_CMDID) \ OP(WMI_OEM_DMA_RING_CFG_REQ_CMDID) \ + OP(WMI_PDEV_BSS_CHAN_INFO_REQUEST_CMDID) \ /* add new CMD_LIST elements above this line */ @@ -1354,6 +1357,7 @@ typedef enum { OP(WMI_PDEV_DIV_RSSI_ANTID_EVENTID) \ OP(WMI_OEM_DMA_RING_CFG_RSP_EVENTID) \ OP(WMI_OEM_DMA_BUF_RELEASE_EVENTID) \ + OP(WMI_PDEV_BSS_CHAN_INFO_EVENTID) \ /* add new EVT_LIST elements above this line */ @@ -2184,6 +2188,11 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_GET_TPC_CONFIG_CMDID); WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_DIV_GET_RSSI_ANTID_CMDID); +#define WMITLV_TABLE_WMI_PDEV_BSS_CHAN_INFO_REQUEST_CMDID(id,op,buf,len) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_bss_chan_info_request_fixed_param, wmi_pdev_bss_chan_info_request_fixed_param, fixed_param, WMITLV_SIZE_FIX) + +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_BSS_CHAN_INFO_REQUEST_CMDID); + /* VDEV Get Tx power Cmd */ #define WMITLV_TABLE_WMI_VDEV_GET_TX_POWER_CMDID(id,op,buf,len) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_get_tx_power_cmd_fixed_param, wmi_vdev_get_tx_power_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) @@ -3468,6 +3477,11 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_TPC_CONFIG_EVENTID); WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_div_rssi_antid_event_fixed_param, wmi_pdev_div_rssi_antid_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_DIV_RSSI_ANTID_EVENTID); +/* PDEV BSS CHAN info Event */ +#define WMITLV_TABLE_WMI_PDEV_BSS_CHAN_INFO_EVENTID(id,op,buf,len) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_bss_chan_info_event_fixed_param, wmi_pdev_bss_chan_info_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_BSS_CHAN_INFO_EVENTID); + /* VDEV Tx Power Event */ #define WMITLV_TABLE_WMI_VDEV_GET_TX_POWER_EVENTID(id,op,buf,len) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_tx_power_event_fixed_param, wmi_vdev_get_tx_power_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index 51b3fe9c4655..94ef995b796d 100644 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -368,6 +368,8 @@ typedef enum { WMI_PDEV_SET_DIVERSITY_GAIN_CMDID, /** Get chain RSSI and antena index command */ WMI_PDEV_DIV_GET_RSSI_ANTID_CMDID, + /* get bss chan info */ + WMI_PDEV_BSS_CHAN_INFO_REQUEST_CMDID, /* VDEV (virtual device) specific commands */ /** vdev create */ @@ -1129,6 +1131,9 @@ typedef enum { /** Report chain RSSI and antenna index to host */ WMI_PDEV_DIV_RSSI_ANTID_EVENTID, + /** provide noise floor and cycle counts for a channel */ + WMI_PDEV_BSS_CHAN_INFO_EVENTID, + /* VDEV specific events */ /** VDEV started event in response to VDEV_START request */ WMI_VDEV_START_RESP_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_VDEV), @@ -4342,6 +4347,11 @@ typedef struct { wmi_mac_addr macaddr; } wmi_pdev_div_get_rssi_antid_fixed_param; +typedef struct { + A_UINT32 tlv_header; /* WMITLV_TAG_STRUC_wmi_pdev_bss_chan_info_request_fixed_param */ + A_UINT32 param; /* 1 = read only, 2= read and clear */ +} wmi_pdev_bss_chan_info_request_fixed_param; + #define WMI_FAST_DIVERSITY_BIT_OFFSET 0 #define WMI_SLOW_DIVERSITY_BIT_OFFSET 1 @@ -4525,6 +4535,31 @@ typedef struct { wmi_mac_addr macaddr; } wmi_pdev_div_rssi_antid_event_fixed_param; +typedef struct { + A_UINT32 tlv_header; /* WMITLV_TAG_STRUC_wmi_pdev_bss_chan_info_event_fixed_param */ + A_UINT32 freq; /* Units in MHz */ + A_INT32 noise_floor; /* units are dBm */ + + /* rx clear - how often the channel was unused */ + A_UINT32 rx_clear_count_low; /* low 31 bits of rx_clear cnt in 64bits format */ + A_UINT32 rx_clear_count_high; /* high 31 bits of rx_clear cnt in 64bits format */ + + /* cycle count - elapsed time during the measured period, in clock ticks */ + A_UINT32 cycle_count_low; /* low 31 bits of cycle cnt in 64bits format */ + A_UINT32 cycle_count_high; /* high 31 bits of cycle cnt in 64bits format */ + + /* tx cycle count - elapsed time spent in tx, in clock ticks */ + A_UINT32 tx_cycle_count_low; /* low 31 bits of tx_cycle cnt in 64bits format */ + A_UINT32 tx_cycle_count_high; /* high 31 bits of tx_cycle cnt in 64bits format */ + + /* rx cycle count - elapsed time spent in rx, in clock ticks */ + A_UINT32 rx_cycle_count_low; /* low 31 bits of rx_cycle cnt in 64bits format */ + A_UINT32 rx_cycle_count_high; /* high 31 bits of rx_cycle cnt in 64bits format */ + + A_UINT32 rx_bss_cycle_count_low; /* low 31 bits of rx cycle cnt for my bss in 64bits format */ + A_UINT32 rx_bss_cycle_count_high; /* high 31 bits of rx_cycle cnt for my bss in 64bits format */ +} wmi_pdev_bss_chan_info_event_fixed_param; + typedef struct { A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_l1ss_track_event_fixed_param */ A_UINT32 periodCnt; @@ -19211,6 +19246,7 @@ static INLINE A_UINT8 *wmi_id_to_name(A_UINT32 wmi_command) WMI_RETURN_STRING(WMI_SET_SCAN_DBS_DUTY_CYCLE_CMDID); WMI_RETURN_STRING(WMI_THERM_THROT_SET_CONF_CMDID); WMI_RETURN_STRING(WMI_OEM_DMA_RING_CFG_REQ_CMDID); + WMI_RETURN_STRING(WMI_PDEV_BSS_CHAN_INFO_REQUEST_CMDID); } return "Invalid WMI cmd"; diff --git a/fw/wmi_version.h b/fw/wmi_version.h index b22531e77d04..e78ff81a334a 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_ 393 +#define __WMI_REVISION_ 394 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work