Merge "fw-api: CL 6590102 - update fw common interface files"

This commit is contained in:
Linux Build Service Account 2019-02-28 19:05:35 -08:00 committed by Gerrit - the friendly Code Review server
commit a3d3fccc93
5 changed files with 142 additions and 6 deletions

View File

@ -115,6 +115,8 @@
#define HE_PET_8_USEC 1
#define HE_PET_16_USEC 2
#define DEFAULT_OFDMA_RU26_COUNT 0
typedef enum {
MODE_11A = 0, /* 11a Mode */
MODE_11G = 1, /* 11b/g Mode */

View File

@ -379,6 +379,8 @@ typedef enum {
WMI_SERVICE_EXT_PEER_TID_CONFIGS_SUPPORT = 194, /* Extended Peer Tid configuration support for QoS related settings */
WMI_SERVICE_WPA3_FT_SAE_SUPPORT = 195, /* FW roaming support for WPA3_FT_SAE */
WMI_SERVICE_WPA3_FT_SUITE_B_SUPPORT = 196, /* FW roaming support for WPA3_FT_SUITE_B */
WMI_SERVICE_VOW_ENABLE=197, /* FW supports a set of features to optimize VoW performance */
WMI_SERVICE_CFR_CAPTURE_IND_EVT_TYPE_1 = 198, /* support WMI_PEER_CFR_CAPTURE_EVENT msg */
/******* ADD NEW SERVICES HERE *******/

View File

@ -965,6 +965,8 @@ typedef enum {
WMITLV_TAG_STRUC_wmi_request_wlm_stats_cmd_fixed_param,
WMITLV_TAG_STRUC_wmi_wlm_stats_event_fixed_param,
WMITLV_TAG_STRUC_wmi_key_material_ext,
WMITLV_TAG_STRUC_wmi_peer_cfr_capture_event_fixed_param,
WMITLV_TAG_STRUC_wmi_cold_boot_cal_data_fixed_param,
} WMITLV_TAG_ID;
/*
@ -1580,6 +1582,8 @@ typedef enum {
OP(WMI_VDEV_GET_MWS_COEX_IDRX_STATE_EVENTID) \
OP(WMI_VDEV_GET_MWS_COEX_ANTENNA_SHARING_STATE_EVENTID) \
OP(WMI_WLM_STATS_EVENTID) \
OP(WMI_PEER_CFR_CAPTURE_EVENTID) \
OP(WMI_PDEV_COLD_BOOT_CAL_DATA_EVENTID) \
/* add new EVT_LIST elements above this line */
@ -5280,6 +5284,15 @@ WMITLV_CREATE_PARAM_STRUC(WMI_MOTION_DET_BASE_LINE_HOST_EVENTID);
WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_esp_estimate_event_fixed_param, wmi_esp_estimate_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)
WMITLV_CREATE_PARAM_STRUC(WMI_ESP_ESTIMATE_EVENTID);
/* Peer CFR capture event */
#define WMITLV_TABLE_WMI_PEER_CFR_CAPTURE_EVENTID(id,op,buf,len) \
WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_peer_cfr_capture_event_fixed_param, wmi_peer_cfr_capture_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)
WMITLV_CREATE_PARAM_STRUC(WMI_PEER_CFR_CAPTURE_EVENTID);
#define WMITLV_TABLE_WMI_PDEV_COLD_BOOT_CAL_DATA_EVENTID(id,op,buf,len) \
WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_cold_boot_cal_data_fixed_param, wmi_cold_boot_cal_data_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, data, WMITLV_SIZE_VAR)
WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_COLD_BOOT_CAL_DATA_EVENTID);
#ifdef __cplusplus
}

View File

@ -549,8 +549,21 @@ typedef enum {
WMI_PEER_TID_CONFIGURATIONS_CMDID,
/** Peer configuration for Channel Frequency Response (CFR) capture
* of type wmi_peer_cfr_capture_cmd. The CFR capture is communicated
* through HTT_T2H_MSG_TYPE_CFR_DUMP_COMPL_IND.
* of type wmi_peer_cfr_capture_cmd.
*
* On targets that do not use the direct DMA framework,
* completion of the CFR capture is communicated through
* HTT_T2H_MSG_TYPE_CFR_DUMP_COMPL_IND.
* Such targets will set WMI_SERVICE_CFR_CAPTURE_IND_MSG_TYPE_1
* in WMI Service Ready.
*
* On targets that use direct DMA, completion of CFR capture is
* communicated through WMI_PDEV_DMA_RING_BUF_RELEASE_EVENTID
* using module ID WMI_DMA_RING_CONFIG_MODULE_RTT.
* Such targets will set WMI_SERVICE_CFR_CAPTURE_IND_EVT_TYPE_1
* in WMI Service Ready and enumerate WMI_DMA_RING_CONFIG_MODULE_RTT
* in the dma_ring_caps entry of WMI_SERVICE_READY_EXT_EVENTID.
* Additional MAC metadata is provided in WMI_PEER_CFR_CAPTURE_EVENTID.
*/
WMI_PEER_CFR_CAPTURE_CMDID,
@ -1291,6 +1304,9 @@ typedef enum {
/* Event to report the switch count in BSS color of one or more VDEVs */
WMI_PDEV_CSC_SWITCH_COUNT_STATUS_EVENTID,
/* Event to send cold boot calibration data */
WMI_PDEV_COLD_BOOT_CAL_DATA_EVENTID,
/* VDEV specific events */
/** VDEV started event in response to VDEV_START request */
@ -1406,6 +1422,8 @@ typedef enum {
/** report the current tx PN for the peer */
WMI_PEER_TX_PN_RESPONSE_EVENTID,
WMI_PEER_CFR_CAPTURE_EVENTID,
/* beacon/mgmt specific events */
/** RX management frame. the entire frame is carried along with the event. */
WMI_MGMT_RX_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_MGMT),
@ -2949,6 +2967,15 @@ typedef struct {
#define WMI_RSRC_CFG_FLAG_PEER_TID_EXT_S 22
#define WMI_RSRC_CFG_FLAG_PEER_TID_EXT_M 0x400000
/*
* If the VIDEO_OVER_WIFI_ENABLE flag is set, the target will use a
* series of algorithmic adjustments to optimize Video performance
* by reducing latency, reducing latency jitter, and minimizing
* dropped packets.
*/
#define WMI_RSRC_CFG_FLAG_VIDEO_OVER_WIFI_ENABLE_S 23
#define WMI_RSRC_CFG_FLAG_VIDEO_OVER_WIFI_ENABLE_M 0x800000
A_UINT32 flag1;
/** @brief smart_ant_cap - Smart Antenna capabilities information
@ -3202,6 +3229,11 @@ typedef struct {
#define WMI_RSRC_CFG_FLAG_PEER_TID_EXT_GET(word32) \
WMI_RSRC_CFG_FLAG_GET((word32), PEER_TID_EXT)
#define WMI_RSRC_CFG_FLAG_VIDEO_OVER_WIFI_ENABLE_SET(word32, value) \
WMI_RSRC_CFG_FLAG_SET((word32), VIDEO_OVER_WIFI_ENABLE, (value))
#define WMI_RSRC_CFG_FLAG_VIDEO_OVER_WIFI_ENABLE_GET(word32) \
WMI_RSRC_CFG_FLAG_GET((word32), VIDEO_OVER_WIFI_ENABLE)
typedef struct {
A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_init_cmd_fixed_param */
@ -4188,6 +4220,9 @@ typedef struct {
((int8_t) (WMI_F_MS((hdr)->rssi_chain##c, \
WMI_UNIFIED_RSSI_CHAN_##ch)))
#define WMI_UNIFIED_CHAIN_RSSI_GET(tlv, chain_idx, band) \
((A_INT8) WMI_F_MS((tlv)->chain_rssi[chain_idx], WMI_UNIFIED_RSSI_CHAN_ ## band))
typedef struct {
/** Phy error event header */
wmi_single_phyerr_rx_hdr hdr;
@ -24294,7 +24329,8 @@ typedef struct {
} wmi_twt_resume_dialog_complete_event_fixed_param;
typedef enum {
WMI_DMA_RING_CONFIG_MODULE_SPECTRAL,
WMI_DMA_RING_CONFIG_MODULE_SPECTRAL,
WMI_DMA_RING_CONFIG_MODULE_RTT,
} WMI_DMA_RING_SUPPORTED_MODULE;
typedef struct {
@ -24399,8 +24435,8 @@ typedef struct {
*/
A_UINT32 paddr_lo;
/**
* Bits 15:0: address of data [47:32]
* Bits 31:16: reserved
* Bits 11:0: address of data [43:32]
* Bits 31:12: host context data [19:0]
*/
A_UINT32 paddr_hi;
} wmi_dma_buf_release_entry;
@ -25874,6 +25910,89 @@ typedef struct {
#define WMI_HECAP_MAC_HTVHTTRIGRX_SET WMI_HECAP_MAC_HTVHTTRIGRX_SET_D2
#endif /* SUPPORT_11AX_D3 */
typedef struct {
/** TLV tag and len; tag equals
* WMITLV_TAG_STRUC_wmi_cfr_capture_event_fixed_param */
A_UINT32 tlv_header;
/* Method used to capture CFR - of type WMI_PEER_CFR_CAPTURE_METHOD */
A_UINT32 capture_method;
/* VDEV identifier */
A_UINT32 vdev_id;
/* Peer MAC address. In AP mode, this is the address of the connected peer
* for which CFR capture is needed. In case of STA mode, this is the address
* of the AP to which the STA is connected
*/
wmi_mac_addr mac_addr;
/* primary 20 MHz channel frequency in mhz */
A_UINT32 chan_mhz;
/* BW of measurement - of type WMI_PEER_CFR_CAPTURE_BW */
A_UINT32 bandwidth;
/* phy mode WLAN_PHY_MODE of the channel defined in wlan_defs.h*/
A_UINT32 phy_mode;
/* Center frequency 1 in MHz*/
A_UINT32 band_center_freq1;
/* Center frequency 2 in MHz - valid only for 11acvht 80plus80 mode*/
A_UINT32 band_center_freq2;
/* Number of spatial streams */
A_UINT32 sts_count;
/* Bits 31:0: address of data from wmi_dma_buf_release_entry [31:0] */
A_UINT32 correlation_info_1;
/* Bits 11:0: address of data from wmi_dma_buf_release_entry [43:32]
* Bits 15:12: reserved (set to 0x0)
* Bits 31:16: hardware PPDU ID [15:0]
*/
A_UINT32 correlation_info_2;
/* Bits 1:0: TX status (if any); values defined in enum
* WMI_FRAME_TX_STATUS
* Bits 30:2: reserved (set to 0x0)
* Bit 31: Status of the CFR capture of the peer
* 1 (True) - Successful; 0 (False) - Not successful
*/
A_UINT32 status;
/* Timestamp in microseconds at which the CFR was captured in the hardware.
* The clock used for this timestamp is private to the target and
* is not visible to the host i.e., Host can interpret only the
* relative timestamp deltas from one message to the next,
* but can't interpret the absolute timestamp from a single message.
*/
A_UINT32 timestamp_us;
/*
* Count of the current CFR capture from FW.
* This is helpful to identify any drops in FW.
*/
A_UINT32 counter;
/* Per chain RSSI of the peer, for up to WMI_MAX_CHAINS.
* Each chain's entry reports the RSSI for different bands in dBm units.
* Use WMI_UNIFIED_CHAIN_RSSI_GET to extract the value for a particular
* band.
* A band value of 0x80 (-128) is invalid.
*/
A_UINT32 chain_rssi[WMI_MAX_CHAINS];
} wmi_peer_cfr_capture_event_fixed_param;
#define WMI_PEER_CFR_CAPTURE_EVT_STATUS_OK 0x80000000
#define WMI_PEER_CFR_CAPTURE_EVT_STATUS_OK_S 31
#define WMI_PEER_CFR_CAPTURE_EVT_STATUS_TX 0x00000003
#define WMI_PEER_CFR_CAPTURE_EVT_STATUS_TX_S 0
/**
* wmi_cold_boot_cal_data config flags
* BIT 0 : 1 means more data will come, 0 means last event
* BIT 1-31 : Reserved
*/
#define WMI_COLD_BOOT_CAL_DATA_SET_IS_MORE_DATA(flags, val) WMI_SET_BITS(flags, 0, 1, val)
#define WMI_COLD_BOOT_CAL_DATA_GET_IS_MORE_DATA(flags) WMI_GET_BITS(flags, 0, 1)
typedef struct {
A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_cold_boot_cal_data_fixed_param */
A_UINT32 data_len; /** length in byte of data[]. */
A_UINT32 flags; /** config flags : Only 0th bit is used, bit 1-31 are reserved */
/* Following this structure is the TLV:
* A_UINT8 data[]; <-- length in byte given by field data_len.
* This data array contains cold boot data calibration raw data.
*/
} wmi_cold_boot_cal_data_fixed_param;
/* ADD NEW DEFS HERE */

View File

@ -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_ 631
#define __WMI_REVISION_ 634
/** The Version Namespace should not be normally changed. Only
* host and firmware of the same WMI namespace will work