Merge 8a0f96d424523d7453cb7aed24936b9a40993c32 on remote branch (9ea570c9) · Commits · e / devices / android_kernel_fairphone_FP4

fw/htt_ppdu_stats.h

+12 −3

Original line number	Diff line number	Diff line
		@@ -714,13 +714,22 @@ typedef struct {
		* of the BSS and is used to assist a receiving STA in
		* identifying the BSS from which a PPDU originates.
		* Value in the range 0 to 63
		* BIT [31 : 6] -reserved
		* BIT [6 : 6] - PPDU transmitted using Non-SRG opportunity
		* BIT [7 : 7] - PPDU transmitted using SRG opportunity
		* BIT [15: 8] - RSSI of the aborted OBSS frame (in dB w.r.t. noise floor)
		* by which SRG/Non-SRG based spatial reuse opportunity
		* was created.
		* BIT [31:16] - reserved
		*/
		union {
		A_UINT32 reserved__aborted_obss_rssi__srg_tx__non_srg_tx___bss_color_id;
		A_UINT32 reserved__bss_color_id;
		struct {
		A_UINT32 bss_color_id: 6,
		reserved2: 26;
		non_srg_tx: 1,
		srg_tx: 1,
		aborted_obss_rssi: 8,
		reserved2: 16;
		};
		};
		} htt_ppdu_stats_common_tlv;

fw/htt_stats.h

+26 −0

Original line number	Diff line number	Diff line
		@@ -3596,6 +3596,8 @@ typedef struct {
		#define HTT_RX_PDEV_STATS_NUM_GI_COUNTERS 4
		#define HTT_RX_PDEV_STATS_NUM_DCM_COUNTERS 5
		#define HTT_RX_PDEV_STATS_NUM_BW_COUNTERS 4
		#define HTT_RX_PDEV_STATS_TOTAL_BW_COUNTERS \
		(HTT_RX_PDEV_STATS_NUM_BW_EXT_COUNTERS + HTT_RX_PDEV_STATS_NUM_BW_COUNTERS)
		#define HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS 8
		#define HTT_RX_PDEV_STATS_ULMUMIMO_NUM_SPATIAL_STREAMS 8
		#define HTT_RX_PDEV_STATS_NUM_PREAMBLE_TYPES HTT_STATS_PREAM_COUNT
		@@ -3901,6 +3903,15 @@ typedef struct {
		/* Stats for MCS 12/13 */
		A_UINT32 ul_mumimo_rx_mcs_ext[HTT_RX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS];
		A_UINT32 ul_mumimo_rx_gi_ext[HTT_RX_PDEV_STATS_NUM_GI_COUNTERS][HTT_RX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS];

		/* RSSI in dBm for Rx TB PPDUs */
		A_INT8 rx_ul_mumimo_chain_rssi_in_dbm[HTT_RX_PDEV_STATS_ULMUMIMO_NUM_SPATIAL_STREAMS][HTT_RX_PDEV_STATS_TOTAL_BW_COUNTERS];
		/* Target RSSI stats for UL MUMIMO triggers. Units dBm */
		A_INT8 rx_ul_mumimo_target_rssi[HTT_TX_PDEV_STATS_NUM_UL_MUMIMO_USER_STATS][HTT_RX_PDEV_STATS_NUM_BW_COUNTERS];
		/* FD RSSI stats for UL TB PPDUs. Units dBm */
		A_INT8 rx_ul_mumimo_fd_rssi[HTT_TX_PDEV_STATS_NUM_UL_MUMIMO_USER_STATS][HTT_RX_PDEV_STATS_ULMUMIMO_NUM_SPATIAL_STREAMS];
		/* Pilot EVM Stats */
		A_INT8 rx_ulmumimo_pilot_evm_dB_mean[HTT_TX_PDEV_STATS_NUM_UL_MUMIMO_USER_STATS][HTT_RX_PDEV_STATS_ULMUMIMO_NUM_SPATIAL_STREAMS];
		} htt_rx_pdev_ul_mumimo_trig_stats_tlv;

		/* STATS_TYPE : HTT_DBG_EXT_STATS_PDEV_UL_MUMIMO_TRIG_STATS
		@@ -4735,6 +4746,7 @@ typedef struct {

		#define HTT_LATENCY_PROFILE_MAX_HIST 3
		#define HTT_STATS_MAX_PROF_STATS_NAME_LEN 32
		#define HTT_INTERRUPTS_LATENCY_PROFILE_MAX_HIST 3
		typedef struct {
		htt_tlv_hdr_t tlv_hdr;
		/* print_header:
		@@ -4760,6 +4772,20 @@ typedef struct {
		*/
		A_UINT32 hist_intvl;
		A_UINT32 hist[HTT_LATENCY_PROFILE_MAX_HIST];
		A_UINT32 page_fault_max; /* max page faults in any 1 sampling window */
		A_UINT32 page_fault_total; /* summed over all sampling windows */
		/* ignored_latency_count:
		* ignore some of profile latency to avoid avg skewing
		*/
		A_UINT32 ignored_latency_count;
		/* interrupts_max: max interrupts within any single sampling window */
		A_UINT32 interrupts_max;
		/* interrupts_hist: histogram of interrupt rate
		* bin0 contains the number of sampling windows that had 0 interrupts,
		* bin1 contains the number of sampling windows that had 1-4 interrupts,
		* bin2 contains the number of sampling windows that had > 4 interrupts
		*/
		A_UINT32 interrupts_hist[HTT_INTERRUPTS_LATENCY_PROFILE_MAX_HIST];
		} htt_latency_prof_stats_tlv;

		typedef struct {

fw/wmi_services.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -442,6 +442,8 @@ typedef enum {
		WMI_SERVICE_5_DOT_9GHZ_SUPPORT = 247, /* Indicates FW supports new 5.9GHZ (scan, connection and so on) */
		WMI_SERVICE_MU_PREAMBLE_PUNCTURE_SUPPORT = 248, /* Indicates FW supports MU preamble puncture */
		WMI_SERVICE_SRG_SRP_SPATIAL_REUSE_SUPPORT = 249, /* Support for SRG, SRP based spatial reuse support */
		WMI_REQUEST_CTRL_PATH_STATS_REQUEST = 250, /* FW supports control path stats */
		WMI_SERVICE_TPC_STATS_EVENT = 251, /* FW support to dump the TPC tables */


		/***** ADD NEW SERVICES UP TO 256 HERE *****/

fw/wmi_tlv_defs.h

+57 −2

Original line number	Diff line number	Diff line
		@@ -199,6 +199,7 @@ typedef enum {
		WMITLV_TAG_ARRAY_BYTE,
		WMITLV_TAG_ARRAY_STRUC,
		WMITLV_TAG_ARRAY_FIXED_STRUC,
		WMITLV_TAG_ARRAY_INT16,
		WMITLV_TAG_LAST_ARRAY_ENUM = 31, /* Last entry of ARRAY type tags */
		WMITLV_TAG_STRUC_wmi_service_ready_event_fixed_param,
		WMITLV_TAG_STRUC_HAL_REG_CAPABILITIES,
		@@ -1076,6 +1077,18 @@ typedef enum {
		WMITLV_TAG_STRUC_wmi_pdev_non_srg_obss_color_enable_bitmap_cmd_fixed_param,
		WMITLV_TAG_STRUC_wmi_pdev_non_srg_obss_bssid_enable_bitmap_cmd_fixed_param,
		WMITLV_TAG_STRUC_wmi_roam_capability_report_event_fixed_param,
		WMITLV_TAG_STRUC_wmi_pmf_bcn_protect_stats,
		WMITLV_TAG_STRUC_wmi_nan_capabilities,
		WMITLV_TAG_STRUC_wmi_request_ctrl_path_stats_cmd_fixed_param,
		WMITLV_TAG_STRUC_wmi_ctrl_path_stats_event_fixed_param,
		WMITLV_TAG_STRUC_wmi_ctrl_path_pdev_stats_struct,
		WMITLV_TAG_STRUC_wmi_pdev_get_tpc_stats_cmd_fixed_param,
		WMITLV_TAG_STRUC_wmi_pdev_get_tpc_stats_event_fixed_param,
		WMITLV_TAG_STRUC_wmi_tpc_configs,
		WMITLV_TAG_STRUC_wmi_max_reg_power_allowed,
		WMITLV_TAG_STRUC_wmi_tpc_rates_array,
		WMITLV_TAG_STRUC_wmi_tpc_ctl_pwr_table,
		WMITLV_TAG_STRUC_wmi_vdev_bcn_latency_fixed_param,
		} WMITLV_TAG_ID;

		/*
		@@ -1520,6 +1533,8 @@ typedef enum {
		OP(WMI_PDEV_SET_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID) \
		OP(WMI_PDEV_SET_NON_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID) \
		OP(WMI_PDEV_SET_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID) \
		OP(WMI_REQUEST_CTRL_PATH_STATS_CMDID) \
		OP(WMI_PDEV_GET_TPC_STATS_CMDID) \
		/* add new CMD_LIST elements above this line */


		@@ -1770,6 +1785,9 @@ typedef enum {
		OP(WMI_AUDIO_AGGR_REPORT_STATISTICS_EVENTID) \
		OP(WMI_PDEV_SSCAN_FW_PARAM_EVENTID) \
		OP(WMI_ROAM_CAPABILITY_REPORT_EVENTID) \
		OP(WMI_CTRL_PATH_STATS_EVENTID) \
		OP(WMI_PDEV_GET_TPC_STATS_EVENTID) \
		OP(WMI_VDEV_BCN_LATENCY_EVENTID) \
		/* add new EVT_LIST elements above this line */


		@@ -3988,6 +4006,14 @@ WMITLV_CREATE_PARAM_STRUC(WMI_REQUEST_WLAN_STATS_CMDID);
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_request_peer_stats_info_cmd_fixed_param, wmi_request_peer_stats_info_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
		WMITLV_CREATE_PARAM_STRUC(WMI_REQUEST_PEER_STATS_INFO_CMDID);

		/* Request Control Path stats info cmd */
		#define WMITLV_TABLE_WMI_REQUEST_CTRL_PATH_STATS_CMDID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_request_ctrl_path_stats_cmd_fixed_param, wmi_request_ctrl_path_stats_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)\
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, pdev_ids, WMITLV_SIZE_VAR)\
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, vdev_ids, WMITLV_SIZE_VAR)\
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_FIXED_STRUC, wmi_mac_addr, mac_addr_list, WMITLV_SIZE_VAR)
		WMITLV_CREATE_PARAM_STRUC(WMI_REQUEST_CTRL_PATH_STATS_CMDID);

		/* Host sets the current country code */
		#define WMITLV_TABLE_WMI_SET_CURRENT_COUNTRY_CMDID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_set_current_country_cmd_fixed_param, wmi_set_current_country_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
		@@ -4413,6 +4439,11 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_NON_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID);
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_non_srg_obss_bssid_enable_bitmap_cmd_fixed_param, wmi_pdev_non_srg_obss_bssid_enable_bitmap_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
		WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID);

		/* PDEV Get TPC STATS Cmd */
		#define WMITLV_TABLE_WMI_PDEV_GET_TPC_STATS_CMDID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_get_tpc_stats_cmd_fixed_param, wmi_pdev_get_tpc_stats_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
		WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_GET_TPC_STATS_CMDID);


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

		@@ -4458,7 +4489,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_SERVICE_READY_EXT_EVENTID);
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, WMI_DMA_RING_CAPABILITIES, dma_ring_caps, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_spectral_bin_scaling_params, wmi_bin_scaling_params, WMITLV_SIZE_VAR) \
		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_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_CREATE_PARAM_STRUC(WMI_SERVICE_READY_EXT2_EVENTID);

		#define WMITLV_TABLE_WMI_CHAN_RF_CHARACTERIZATION_INFO_EVENTID(id,op,buf,len) \
		@@ -4916,7 +4948,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_HOST_SWFDA_EVENTID);
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_per_chain_rssi_stats, wmi_per_chain_rssi_stats, chain_stats, WMITLV_SIZE_FIX) \
		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_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_CREATE_PARAM_STRUC(WMI_UPDATE_STATS_EVENTID);

		/* Update PN response Event */
		@@ -5721,6 +5754,12 @@ WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_ENCRYPT_DECRYPT_DATA_RESP_EVENTID);
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_peer_stats_info, peer_stats_info, WMITLV_SIZE_VAR)
		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_CREATE_PARAM_STRUC(WMI_CTRL_PATH_STATS_EVENTID);

		#define WMITLV_TABLE_WMI_RADIO_CHAN_STATS_EVENTID(id, op, buf, len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_radio_chan_stats_event_fixed_param, wmi_radio_chan_stats_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_radio_chan_stats, radio_chan_stats, WMITLV_SIZE_VAR)
		@@ -5940,6 +5979,22 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SSCAN_FW_PARAM_EVENTID);
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_roam_capability_report_event_fixed_param, wmi_roam_capability_report_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)
		WMITLV_CREATE_PARAM_STRUC(WMI_ROAM_CAPABILITY_REPORT_EVENTID);

		/* PDEV TPC STATS Event */
		#define WMITLV_TABLE_WMI_PDEV_GET_TPC_STATS_EVENTID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_get_tpc_stats_event_fixed_param, wmi_pdev_get_tpc_stats_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_tpc_configs, tpc_configs, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_max_reg_power_allowed, regulatory_power, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_INT16, A_INT16, reg_buf, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_tpc_rates_array, tpc_rates, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_INT16, A_UINT16, rates_buf, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_tpc_ctl_pwr_table, ctl_power, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_INT8, ctl_buf, WMITLV_SIZE_VAR)
		WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_GET_TPC_STATS_EVENTID);

		/* Send Bcn Latency ie related params to host */
		#define WMITLV_TABLE_WMI_VDEV_BCN_LATENCY_EVENTID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_bcn_latency_fixed_param, wmi_vdev_bcn_latency_fixed_param, fixed_param, WMITLV_SIZE_FIX)
		WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_BCN_LATENCY_EVENTID);

		#ifdef __cplusplus
		}

fw/wmi_unified.h

+418 −24

File changed.

Preview size limit exceeded, changes collapsed.