Merge 4cef4fea0a5c860b986e0ceeaeb403858c8f0eeb on remote branch (e1aa3daf) · Commits · e / devices / android_kernel_fairphone_FP5

fw/htt.h

+706 −1

File changed.

Preview size limit exceeded, changes collapsed.

fw/htt_ppdu_stats.h

+30 −3

Original line number	Diff line number	Diff line
		@@ -972,12 +972,19 @@ typedef struct {
		* is_buffer_addr_info_valid : This will be set whenever a MSDU is sent as
		* a singleton (single-MSDU PPDU) for FW use-cases or as indicated by host
		* via send_as_standalone in TCL_DATA_CMD.
		*
		* The fields is_sw_rts_enabled, is_hw_rts_enabled, is_sfm_war_enabled
		* indicate whether SW RTS, HW RTS, SFM WAR are enabled for the
		* current Tx-sequence respectively.
		*/
		A_UINT32 host_opaque_cookie: 16,
		is_host_opaque_valid: 1,
		is_standalone: 1,
		is_buffer_addr_info_valid: 1,
		reserved1: 13;
		is_sw_rts_enabled: 1,
		is_hw_rts_enabled: 1,
		is_sfm_war_enabled: 1,
		reserved1: 10;

		/* qdepth bytes : Contains Number of bytes of TIDQ depth */
		A_UINT32 qdepth_bytes;
		@@ -988,6 +995,12 @@ typedef struct {
		* Note - this is valid in case delayed BA processing specifically for
		* BAR frames*/
		A_UINT32 data_frm_ppdu_id;

		/* sw_rts_prot_dur_us:
		* SW RTS protection duration in micro sec.
		* Note - this is valid if SW RTS was used instead of HW RTS.
		*/
		A_UINT32 sw_rts_prot_dur_us;
		} htt_ppdu_stats_user_common_tlv;

		#define HTT_PPDU_STATS_USER_RATE_TLV_TID_NUM_M 0x000000ff
		@@ -1926,8 +1939,8 @@ typedef struct {
		* BIT [ 8 : 8] :- is_ampdu
		* BIT [ 12: 9] :- resp_type
		* BIT [ 15: 13] :- medium protection type
		* BIT [ 16: 16] :- rts_success
		* BIT [ 17: 17] :- rts_failure
		* BIT [ 16: 16] :- rts_success (HW RTS)
		* BIT [ 17: 17] :- rts_failure (HW RTS)
		* BIT [ 18: 18] :- pream_punc_tx
		* BIT [ 31: 19] :- reserved
		*/
		@@ -1979,6 +1992,20 @@ typedef struct {

		/* PER of the last transmission to the peer-TID (in percent) */
		A_UINT32 current_rate_per;

		/*
		* For SW RTS
		* BIT [0] :- Whether SW RTS successfully sent OTA.
		* BIT [1] :- Whether SW RTS successful completion.
		* BIT [2] :- Whether SW RTS failed completion.
		* BIT [3] :- Whether SW RTS response with different BW.
		* BIT [31:4] :- reserved2
		*/
		A_UINT32 sw_rts_tried: 1,
		sw_rts_success: 1,
		sw_rts_failure: 1,
		cts_rcvd_diff_bw: 1,
		reserved2: 28;
		} htt_ppdu_stats_user_cmpltn_common_tlv;

		#define HTT_PPDU_STATS_USER_CMPLTN_BA_BITMAP_TLV_TID_NUM_M 0x000000ff

fw/htt_stats.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -1929,6 +1929,11 @@ typedef struct {
		A_UINT32 delayed_bar_7; /* BAR sent for MU user 7 */
		A_UINT32 bar_with_tqm_head_seq_num;
		A_UINT32 bar_with_tid_seq_num;
		A_UINT32 su_sw_rts_queued; /* SW generated RTS frame queued to the HW */
		A_UINT32 su_sw_rts_tried; /* SW generated RTS frame sent over the air */
		A_UINT32 su_sw_rts_err; /* SW generated RTS frame completed with error */
		A_UINT32 su_sw_rts_flushed; /* SW generated RTS frame flushed */
		A_UINT32 su_sw_rts_rcvd_cts_diff_bw; /* CTS (RTS response) received in different BW */
		} htt_tx_selfgen_cmn_stats_tlv;

		typedef struct {

fw/wmi_services.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -538,6 +538,12 @@ typedef enum {
		WMI_SERVICE_HALPHY_CAL_STATUS = 293, /* Indicates FW supports sending online HALPHY Calibration status to host */
		WMI_SERVICE_HALPHY_CAL_ENABLE_DISABLE_SUPPORT = 294, /* Indicates Calibraton enable/disable support by FW */
		WMI_SERVICE_AFC_SUPPORT = 295, /* Indicates FW supports AFC_CMD,AFC_EVENT */
		WMI_SERVICE_RTT_AP_INITIATOR_STAGGERED_MODE_SUPPORTED = 296, /* FW supports RTT in AP Initiator for Staggered beacon mode */
		WMI_SERVICE_RTT_AP_INITIATOR_BURSTED_MODE_SUPPORTED = 297, /* FW supports RTT in AP Initiator for BURSTED beacon mode */
		WMI_SERVICE_P2P_P2P_CONCURRENCY_SUPPORT = 298, /* Indicates FW supports P2P + P2P conncurency both in SCC, MCC, SBS and DBS */
		WMI_SERVICE_MGMT_RX_REO_SUPPORTED = 299, /* Indicates FW supports Management RX Reorder */
		WMI_SERVICE_EMA_MULTIPLE_GROUP_SUPPORT = 300, /* FW support for EMA multi group support */
		WMI_SERVICE_LARGE_BEACON_SUPPORT = 301, /* FW support for Large beacon support greater then 1.5K */


		WMI_MAX_EXT2_SERVICE

fw/wmi_tlv_defs.h

+50 −2

Original line number	Diff line number	Diff line
		@@ -1180,6 +1180,14 @@ typedef enum {
		WMITLV_TAG_STRUC_wmi_afc_serv_resp_struct,
		WMITLV_TAG_STRUC_wmi_bcn_tmpl_ml_params,
		WMITLV_TAG_STRUC_wmi_vdev_bcn_offload_ml_quiet_config_params,
		WMITLV_TAG_STRUC_wmi_pdev_multiple_vdev_set_param_cmd_fixed_param,
		WMITLV_TAG_STRUC_wmi_pdev_mec_aging_timer_config_cmd_fixed_param,
		WMITLV_TAG_STRUC_wmi_peer_config_ppe_ds_cmd_fixed_param,
		WMITLV_TAG_STRUC_wmi_ctrl_path_dfs_channel_stats_struct,
		WMITLV_TAG_STRUC_wmi_twt_ack_event_fixed_param,
		WMITLV_TAG_STRUC_wmi_twt_caps_param,
		WMITLV_TAG_STRUC_wmi_vdev_enable_disable_intra_bss_cmd_fixed_param,
		WMITLV_TAG_STRUC_wmi_peer_enable_disable_intra_bss_cmd_fixed_param,
		} WMITLV_TAG_ID;

		/*
		@@ -1648,6 +1656,11 @@ typedef enum {
		OP(WMI_PDEV_GET_HALPHY_CAL_STATUS_CMDID) \
		OP(WMI_PDEV_SET_HALPHY_CAL_BMAP_CMDID) \
		OP(WMI_AFC_CMDID) \
		OP(WMI_PDEV_MULTIPLE_VDEV_SET_PARAM_CMDID) \
		OP(WMI_PDEV_MEC_AGING_TIMER_CONFIG_CMDID) \
		OP(WMI_PEER_CONFIG_PPE_DS_CMDID) \
		OP(WMI_VDEV_ENABLE_DISABLE_INTRA_BSS_CMDID) \
		OP(WMI_PEER_ENABLE_DISABLE_INTRA_BSS_CMDID) \
		/* add new CMD_LIST elements above this line */


		@@ -1918,6 +1931,7 @@ typedef enum {
		OP(WMI_PDEV_GET_HALPHY_CAL_STATUS_EVENTID) \
		OP(WMI_PDEV_SET_HALPHY_CAL_BMAP_EVENTID) \
		OP(WMI_AFC_EVENTID) \
		OP(WMI_TWT_ACK_EVENTID) \
		/* add new EVT_LIST elements above this line */


		@@ -4730,6 +4744,33 @@ WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_IGMP_OFFLOAD_CMDID);
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_mgmt_rx_reo_filter_configuration_cmd_fixed_param, wmi_mgmt_rx_reo_filter_configuration_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
		WMITLV_CREATE_PARAM_STRUC(WMI_MGMT_RX_REO_FILTER_CONFIGURATION_CMDID);

		/* Multiple vdev set param cmd */
		#define WMITLV_TABLE_WMI_PDEV_MULTIPLE_VDEV_SET_PARAM_CMDID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_multiple_vdev_set_param_cmd_fixed_param, wmi_pdev_multiple_vdev_set_param_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, vdev_ids, WMITLV_SIZE_VAR)
		WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_MULTIPLE_VDEV_SET_PARAM_CMDID);

		/* Configure MEC AGING TIMER */
		#define WMITLV_TABLE_WMI_PDEV_MEC_AGING_TIMER_CONFIG_CMDID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_mec_aging_timer_config_cmd_fixed_param, wmi_pdev_mec_aging_timer_config_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
		WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_MEC_AGING_TIMER_CONFIG_CMDID);

		/* PPE DS config */
		#define WMITLV_TABLE_WMI_PEER_CONFIG_PPE_DS_CMDID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_peer_config_ppe_ds_cmd_fixed_param, wmi_peer_config_ppe_ds_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
		WMITLV_CREATE_PARAM_STRUC(WMI_PEER_CONFIG_PPE_DS_CMDID);

		/* Enable/Disable Intra Bss for the vdev */
		#define WMITLV_TABLE_WMI_VDEV_ENABLE_DISABLE_INTRA_BSS_CMDID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_enable_disable_intra_bss_cmd_fixed_param, wmi_vdev_enable_disable_intra_bss_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
		WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_ENABLE_DISABLE_INTRA_BSS_CMDID);

		/* Enable/Disable Intra Bss for the peer */
		#define WMITLV_TABLE_WMI_PEER_ENABLE_DISABLE_INTRA_BSS_CMDID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_peer_enable_disable_intra_bss_cmd_fixed_param, wmi_peer_enable_disable_intra_bss_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
		WMITLV_CREATE_PARAM_STRUC(WMI_PEER_ENABLE_DISABLE_INTRA_BSS_CMDID);



		/************************ TLV definitions of WMI events *****************************/

		@@ -4777,7 +4818,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_SERVICE_READY_EXT_EVENTID);
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, WMI_MAC_PHY_CAPABILITIES_EXT, mac_phy_caps, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, WMI_HAL_REG_CAPABILITIES_EXT2, hal_reg_caps, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_nan_capabilities, wmi_nan_capabilities, nan_cap, WMITLV_SIZE_FIX) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, WMI_SCAN_RADIO_CAPABILITIES_EXT2, wmi_scan_radio_caps, WMITLV_SIZE_VAR)
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, WMI_SCAN_RADIO_CAPABILITIES_EXT2, wmi_scan_radio_caps, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_twt_caps_params, twt_caps, WMITLV_SIZE_VAR)
		WMITLV_CREATE_PARAM_STRUC(WMI_SERVICE_READY_EXT2_EVENTID);

		#define WMITLV_TABLE_WMI_CHAN_RF_CHARACTERIZATION_INFO_EVENTID(id,op,buf,len) \
		@@ -6083,7 +6125,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PEER_STATS_INFO_EVENTID);
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_vdev_extd_stats, vdev_extd_stats, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_ctrl_path_mem_stats_struct, ctrl_path_mem_stats, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_ctrl_path_twt_stats_struct, ctrl_path_twt_stats, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_ctrl_path_calibration_stats_struct, ctrl_path_calibration_stats, WMITLV_SIZE_VAR)
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_ctrl_path_calibration_stats_struct, ctrl_path_calibration_stats, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_ctrl_path_dfs_channel_stats_struct, ctrl_path_dfs_channel_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) \
		@@ -6206,6 +6249,11 @@ WMITLV_CREATE_PARAM_STRUC(WMI_TWT_BTWT_REMOVE_STA_COMPLETE_EVENTID);
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_twt_notify_event_fixed_param, wmi_twt_notify_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)
		WMITLV_CREATE_PARAM_STRUC(WMI_TWT_NOTIFY_EVENTID);

		/* TWT Ack Event - FW to send Ack Sync event for Host TWT Cmds */
		#define WMITLV_TABLE_WMI_TWT_ACK_EVENTID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_twt_ack_event_fixed_param, wmi_twt_ack_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)
		WMITLV_CREATE_PARAM_STRUC(WMI_TWT_ACK_EVENTID);

		/* Event to send roam scan stats */
		#define WMITLV_TABLE_WMI_ROAM_SCAN_STATS_EVENTID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_roam_scan_stats_event_fixed_param, wmi_roam_scan_stats_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \