Merge 01eae892f5bc45c64f9eb890d3ba30983b4a8b29 on remote branch (1d6f2865) · Commits · e / devices / android_kernel_fairphone_FP4

fw/htt.h

+34 −1

Original line number	Diff line number	Diff line
		@@ -205,9 +205,10 @@
		* 3.81 Add ppdu_start_tsf field in HTT_TX_WBM_COMPLETION_V2.
		* 3.82 Add WIN_SIZE field to HTT_T2H_MSG_TYPE_RX_DELBA msg.
		* 3.83 Shrink seq_idx field in HTT PPDU ID from 3 bits to 2.
		* 3.84 Add fisa_control_bits_v2 def.
		*/
		#define HTT_CURRENT_VERSION_MAJOR 3
		#define HTT_CURRENT_VERSION_MINOR 83
		#define HTT_CURRENT_VERSION_MINOR 84

		#define HTT_NUM_TX_FRAG_DESC 1024

		@@ -6054,6 +6055,10 @@ PREPACK struct htt_h2t_msg_type_fisa_config_t {
		* [17:0]
		*/
		union {
		/*
		* fisa_control_bits structure is deprecated.
		* Please use fisa_control_bits_v2 going forward.
		*/
		struct {
		A_UINT32 fisa_enable: 1,
		ipsec_skip_search: 1,
		@@ -6072,6 +6077,11 @@ PREPACK struct htt_h2t_msg_type_fisa_config_t {
		fisa_aggr_limit: 4,
		reserved: 14;
		} fisa_control_bits;
		struct {
		A_UINT32 fisa_enable: 1,
		fisa_aggr_limit: 4,
		reserved: 27;
		} fisa_control_bits_v2;

		A_UINT32 fisa_control_value;
		} u_fisa_control;
		@@ -6277,6 +6287,29 @@ PREPACK struct htt_h2t_msg_type_fisa_config_t {
		((_var) \|= ((_val) << HTT_RX_FISA_CONFIG_FISA_AGGR_LIMIT_S)); \
		} while (0)

		/* Dword 1: fisa_control_value fisa config */
		#define HTT_RX_FISA_CONFIG_FISA_V2_ENABLE_M 0x00000001
		#define HTT_RX_FISA_CONFIG_FISA_V2_ENABLE_S 0
		#define HTT_RX_FISA_CONFIG_FISA_V2_ENABLE_GET(_var) \
		(((_var) & HTT_RX_FISA_CONFIG_FISA_V2_ENABLE_M) >> \
		HTT_RX_FISA_CONFIG_FISA_V2_ENABLE_S)
		#define HTT_RX_FISA_CONFIG_FISA_V2_ENABLE_SET(_var, _val) \
		do { \
		HTT_CHECK_SET_VAL(HTT_RX_FISA_CONFIG_FISA_V2_ENABLE, _val); \
		((_var) \|= ((_val) << HTT_RX_FISA_CONFIG_FISA_V2_ENABLE_S)); \
		} while (0)

		/* Dword 1: fisa_control_value fisa_aggr_limit */
		#define HTT_RX_FISA_CONFIG_FISA_V2_AGGR_LIMIT_M 0x0000001e
		#define HTT_RX_FISA_CONFIG_FISA_V2_AGGR_LIMIT_S 1
		#define HTT_RX_FISA_CONFIG_FISA_V2_AGGR_LIMIT_GET(_var) \
		(((_var) & HTT_RX_FISA_CONFIG_FISA_V2_AGGR_LIMIT_M) >> \
		HTT_RX_FISA_CONFIG_FISA_V2_AGGR_LIMIT_S)
		#define HTT_RX_FISA_CONFIG_FISA_V2_AGGR_LIMIT_SET(_var, _val) \
		do { \
		HTT_CHECK_SET_VAL(HTT_RX_FISA_CONFIG_FISA_V2_AGGR_LIMIT, _val); \
		((_var) \|= ((_val) << HTT_RX_FISA_CONFIG_FISA_V2_AGGR_LIMIT_S)); \
		} while (0)

		PREPACK struct htt_h2t_msg_rx_fse_setup_t {
		A_UINT32 msg_type:8, /* HTT_H2T_MSG_TYPE_RX_FSE_SETUP_CFG */

fw/htt_stats.h

+32 −0

Original line number	Diff line number	Diff line
		@@ -367,6 +367,14 @@ enum htt_dbg_ext_stats_type {
		*/
		HTT_DBG_EXT_VDEV_RTT_RESP_STATS = 34,

		/* HTT_DBG_EXT_PKTLOG_AND_HTT_RING_STATS
		* PARAMS:
		* - No Params
		* RESP MSG:
		* - htt_pktlog_and_htt_ring_stats_t
		*/
		HTT_DBG_EXT_PKTLOG_AND_HTT_RING_STATS = 35,


		/* keep this last */
		HTT_DBG_NUM_EXT_STATS = 256,
		@@ -511,6 +519,7 @@ typedef enum {
		HTT_STATS_TXBF_OFDMA_STEER_STATS_TAG = 116, /* htt_txbf_ofdma_steer_stats_tlv */
		HTT_STATS_STA_UL_OFDMA_STATS_TAG = 117, /* htt_sta_ul_ofdma_stats_tlv */
		HTT_STATS_VDEV_RTT_RESP_STATS_TAG = 118, /* htt_vdev_rtt_resp_stats_tlv */
		HTT_STATS_PKTLOG_AND_HTT_RING_STATS_TAG = 119, /* htt_pktlog_and_htt_ring_stats_tlv */

		HTT_STATS_MAX_TAG,
		} htt_tlv_tag_t;
		@@ -5113,5 +5122,28 @@ typedef struct {
		htt_vdev_rtt_resp_stats_tlv vdev_rtt_resp_stats;
		} htt_vdev_rtt_resp_stats_t;

		/* STATS_TYPE : HTT_DBG_EXT_PKTLOG_AND_HTT_RING_STATS
		* TLV_TAGS:
		* - HTT_STATS_PKTLOG_AND_HTT_RING_STATS_TAG
		*/
		/* NOTE:
		* This structure is for documentation, and cannot be safely used directly.
		* Instead, use the constituent TLV structures to fill/parse.
		*/
		typedef struct {
		htt_tlv_hdr_t tlv_hdr;

		/* No of pktlog payloads that were dropped in htt_ppdu_stats path */
		A_UINT32 pktlog_lite_drop_cnt;
		/* No of pktlog payloads that were dropped in TQM path */
		A_UINT32 pktlog_tqm_drop_cnt;
		/* No of pktlog ppdu stats payloads that were dropped */
		A_UINT32 pktlog_ppdu_stats_drop_cnt;
		/* No of pktlog ppdu ctrl payloads that were dropped */
		A_UINT32 pktlog_ppdu_ctrl_drop_cnt;
		/* No of pktlog sw events payloads that were dropped */
		A_UINT32 pktlog_sw_events_drop_cnt;
		} htt_pktlog_and_htt_ring_stats_tlv;


		#endif /* __HTT_STATS_H__ */

fw/wmi_services.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -447,6 +447,7 @@ typedef enum {
		WMI_SERVICE_NO_INTERBAND_MCC_SUPPORT = 252, /* Indicates FW doesn't support interband MCC */
		WMI_SERVICE_MBSS_PARAM_IN_VDEV_START_SUPPORT = 253, /* FW supports VDEV's MBSS param exchange in VDEV start command */
		WMI_SERVICE_CONFIGURE_ROAM_TRIGGER_PARAM_SUPPORT = 254, /* FW supports ROAM trigger configuration param TLV */
		WMI_SERVICE_CFR_TA_RA_AS_FP_SUPPORT = 255, /* indicates FW support to program CFR TA/RA filtered packets as Filter pass */


		/***** ADD NEW SERVICES UP TO 256 HERE *****/
		@@ -472,6 +473,9 @@ typedef enum {

		/***** ADD NEW SERVICES 256 AND BEYOND HERE *****/

		WMI_SERVICE_CFR_CAPTURE_COUNT_SUPPORT = 256, /* indicates FW support to program CFR capture mode and capture count */
		WMI_SERVICE_OCV_SUPPORT = 257, /* FW supports OCV (Operating Channel Validation) */


		WMI_MAX_EXT2_SERVICE

fw/wmi_tlv_defs.h

+8 −3

Original line number	Diff line number	Diff line
		@@ -1098,6 +1098,8 @@ 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_STRUC_wmi_twt_add_dialog_additional_params,
		} WMITLV_TAG_ID;

		/*
		@@ -4979,7 +4981,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 +5790,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) \
		@@ -5871,7 +5875,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_TWT_DISABLE_COMPLETE_EVENTID);

		/* adding TWT dialog complete Event */
		#define WMITLV_TABLE_WMI_TWT_ADD_DIALOG_COMPLETE_EVENTID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_twt_add_dialog_complete_event_fixed_param, wmi_twt_add_dialog_complete_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_twt_add_dialog_complete_event_fixed_param, wmi_twt_add_dialog_complete_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_twt_add_dialog_additional_params, twt_params, WMITLV_SIZE_VAR)
		WMITLV_CREATE_PARAM_STRUC(WMI_TWT_ADD_DIALOG_COMPLETE_EVENTID);

		/* deleting TWT dialog complete Event */

fw/wmi_unified.h

+245 −20

File changed.

Preview size limit exceeded, changes collapsed.