Merge 8f5b3fc8582583ae49d2dd9acf2984d1a80c6d8b on remote branch (bf8af235) · Commits · e / devices / android_kernel_fairphone_FP5

fw/htc_services.h

+3 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012, 2014-2017, 2020 The Linux Foundation. All rights reserved.
		* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
		*
		* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
		*
		@@ -58,7 +59,8 @@ typedef enum {
		#define WMI_CONTROL_SVC_WMAC1 MAKE_SERVICE_ID(WMI_SERVICE_GROUP,5)
		#define WMI_CONTROL_SVC_WMAC2 MAKE_SERVICE_ID(WMI_SERVICE_GROUP,6)
		#define WMI_CONTROL_DIAG_SVC MAKE_SERVICE_ID(WMI_SERVICE_GROUP,7)
		#define WMI_MAX_SERVICES 8
		#define WMI_CONTROL_DBR_SVC MAKE_SERVICE_ID(WMI_SERVICE_GROUP,8)
		#define WMI_MAX_SERVICES 9

		#define NMI_CONTROL_SVC MAKE_SERVICE_ID(NMI_SERVICE_GROUP,0)
		#define NMI_DATA_SVC MAKE_SERVICE_ID(NMI_SERVICE_GROUP,1)

fw/htt.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -751,6 +751,9 @@ typedef enum {
		HTT_STATS_ML_PEER_DETAILS_TAG = 159, /* htt_ml_peer_details_tlv */
		HTT_STATS_ML_PEER_EXT_DETAILS_TAG = 160, /* htt_ml_peer_ext_details_tlv */
		HTT_STATS_ML_LINK_INFO_DETAILS_TAG = 161, /* htt_ml_link_info_tlv */
		HTT_STATS_TX_PDEV_PPDU_DUR_TAG = 162, /* htt_tx_pdev_ppdu_dur_stats_tlv */
		HTT_STATS_RX_PDEV_PPDU_DUR_TAG = 163, /* htt_rx_pdev_ppdu_dur_stats_tlv */
		HTT_STATS_ODD_PDEV_MANDATORY_TAG = 164, /* htt_odd_mandatory_pdev_stats_tlv */


		HTT_STATS_MAX_TAG,

fw/htt_stats.h

+188 −0

Original line number	Diff line number	Diff line
		@@ -463,6 +463,14 @@ enum htt_dbg_ext_stats_type {
		*/
		HTT_DBG_EXT_STATS_ML_PEERS_INFO = 47,

		/* HTT_DBG_ODD_MANDATORY_STATS
		* params:
		* None
		* Response MSG:
		* htt_odd_mandatory_pdev_stats_tlv
		*/
		HTT_DBG_ODD_MANDATORY_STATS = 48,


		/* keep this last */
		HTT_DBG_NUM_EXT_STATS = 256,
		@@ -635,6 +643,8 @@ typedef enum {
		#define HTT_TX_HWQ_MAX_CMD_RESULT_STATS 13
		#define HTT_TX_HWQ_MAX_CMD_STALL_STATS 5
		#define HTT_TX_HWQ_MAX_FES_RESULT_STATS 10
		#define HTT_PDEV_STATS_PPDU_DUR_HIST_BINS 16
		#define HTT_PDEV_STATS_PPDU_DUR_HIST_INTERVAL_US 250

		typedef enum {
		HTT_STATS_TX_PDEV_NO_DATA_UNDERRUN = 0,
		@@ -881,6 +891,7 @@ typedef struct {
		A_UINT32 phy_errs[1]; /* HTT_TX_PDEV_MAX_PHY_ERR_STATS */
		} htt_tx_pdev_stats_phy_err_tlv_v;

		#define HTT_TX_PDEV_SIFS_BURST_HIST_STATS 10
		#define HTT_TX_PDEV_STATS_SIFS_HIST_TLV_SZ(_num_elems) (sizeof(A_UINT32) * (_num_elems))
		/* NOTE: Variable length TLV, use length spec to infer array size */
		typedef struct {
		@@ -1574,6 +1585,19 @@ typedef enum {
		*/
		#define HTT_RX_PEER_STATS_NUM_BW_EXT_COUNTERS 4
		#define HTT_RX_PDEV_STATS_NUM_BW_EXT_COUNTERS 4

		/* HTT_RX STATS_NUM_BW_EXT_2_COUNTERS:
		* bw index 8 (bw ext_2 index 0): rssi_ext160_0_chainX
		* bw index 9 (bw ext_2 index 1): rssi_ext160_1_chainX
		* bw index 10 (bw ext_2 index 2): rssi_ext160_2_chainX
		* bw index 11 (bw ext_2 index 3): rssi_ext160_3_chainX
		* bw index 12 (bw ext_2 index 4): rssi_ext160_4_chainX
		* bw index 13 (bw ext_2 index 5): rssi_ext160_5_chainX
		* bw index 14 (bw ext_2 index 6): rssi_ext160_6_chainX
		* bw index 15 (bw ext_2 index 7): rssi_ext160_7_chainX
		*/
		#define HTT_RX_PDEV_STATS_NUM_BW_EXT_2_COUNTERS 8

		#define HTT_TX_PEER_STATS_NUM_SPATIAL_STREAMS 8
		#define HTT_TX_PEER_STATS_NUM_PREAMBLE_TYPES HTT_STATS_PREAM_COUNT
		#define HTT_TX_PEER_STATS_NUM_REDUCED_CHAN_TYPES 2 /* 0 - Half, 1 - Quarter */
		@@ -2237,6 +2261,14 @@ typedef struct {
		A_UINT32 su_sw_rts_flushed;
		/** CTS (RTS response) received in different BW */
		A_UINT32 su_sw_rts_rcvd_cts_diff_bw;
		/** 11AX HE MU Combined Freq. BSRP Trigger frame sent over the air */
		A_UINT32 combined_ax_bsr_trigger_tried[HTT_NUM_AC_WMM];
		/** 11AX HE MU Combined Freq. BSRP Trigger completed with error(s) */
		A_UINT32 combined_ax_bsr_trigger_err[HTT_NUM_AC_WMM];
		/** 11AX HE MU Standalone Freq. BSRP Trigger frame sent over the air */
		A_UINT32 standalone_ax_bsr_trigger_tried[HTT_NUM_AC_WMM];
		/** 11AX HE MU Standalone Freq. BSRP Trigger completed with error(s) */
		A_UINT32 standalone_ax_bsr_trigger_err[HTT_NUM_AC_WMM];
		} htt_tx_selfgen_cmn_stats_tlv;

		typedef struct {
		@@ -2800,6 +2832,13 @@ typedef struct {
		* 11AX HE UL-MUMIMO Trigger frame for users 0 - 7 completed with error(s)
		*/
		A_UINT32 ax_ul_mumimo_trigger_err[HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS];

		/** 11AX HE MU OFDMA Basic Trigger frame completed with partial user response */
		A_UINT32 ax_basic_trigger_partial_resp;
		/** 11AX HE MU BSRP Trigger frame completed with partial user response */
		A_UINT32 ax_bsr_trigger_partial_resp;
		/** 11AX HE MU BAR Trigger frame completed with partial user response */
		A_UINT32 ax_mu_bar_trigger_partial_resp;
		} htt_tx_selfgen_ax_err_stats_tlv;

		typedef struct {
		@@ -2843,6 +2882,13 @@ typedef struct {
		* 11BE EHT UL-MUMIMO Trigger frame for users 0 - 7 completed with error(s)
		*/
		A_UINT32 be_ul_mumimo_trigger_err[HTT_TX_PDEV_STATS_NUM_BE_MUMIMO_USER_STATS];

		/** 11BE EHT MU OFDMA Basic Trigger frame completed with partial user response */
		A_UINT32 be_basic_trigger_partial_resp;
		/** 11BE EHT MU BSRP Trigger frame completed with partial user response */
		A_UINT32 be_bsr_trigger_partial_resp;
		/** 11BE EHT MU BAR Trigger frame completed with partial user response */
		A_UINT32 be_mu_bar_trigger_partial_resp;
		} htt_tx_selfgen_be_err_stats_tlv;

		/*
		@@ -4836,6 +4882,12 @@ typedef struct {
		A_UINT32 be_ofdma_eht_sig_mcs[HTT_TX_PDEV_STATS_NUM_EHT_SIG_MCS_COUNTERS];
		} htt_tx_pdev_rate_stats_be_ofdma_tlv;

		typedef struct {
		htt_tlv_hdr_t tlv_hdr;
		/ Tx PPDU duration histogram /
		A_UINT32 tx_ppdu_dur_hist[HTT_PDEV_STATS_PPDU_DUR_HIST_BINS];
		} htt_tx_pdev_ppdu_dur_stats_tlv;

		/* STATS_TYPE : HTT_DBG_EXT_STATS_PDEV_TX_RATE
		* TLV_TAGS:
		* - HTT_STATS_TX_PDEV_RATE_STATS_TAG
		@@ -4848,6 +4900,7 @@ typedef struct {
		htt_tx_pdev_rate_stats_tlv rate_tlv;
		htt_tx_pdev_rate_stats_be_tlv rate_be_tlv;
		htt_tx_pdev_rate_stats_sawf_tlv rate_sawf_tlv;
		htt_tx_pdev_ppdu_dur_stats_tlv tx_ppdu_dur_tlv;
		} htt_tx_pdev_rate_stats_t;

		/* == PDEV RX RATE CTRL STATS == */
		@@ -5096,6 +5149,12 @@ typedef struct {
		*/
		} htt_rx_pdev_rate_stats_tlv;

		typedef struct {
		htt_tlv_hdr_t tlv_hdr;
		/ Tx PPDU duration histogram /
		A_UINT32 rx_ppdu_dur_hist[HTT_PDEV_STATS_PPDU_DUR_HIST_BINS];
		} htt_rx_pdev_ppdu_dur_stats_tlv;

		/* STATS_TYPE : HTT_DBG_EXT_STATS_PDEV_RX_RATE
		* TLV_TAGS:
		* - HTT_STATS_RX_PDEV_RATE_STATS_TAG
		@@ -5106,6 +5165,7 @@ typedef struct {
		*/
		typedef struct {
		htt_rx_pdev_rate_stats_tlv rate_tlv;
		htt_rx_pdev_ppdu_dur_stats_tlv rx_ppdu_dur_tlv;
		} htt_rx_pdev_rate_stats_t;

		typedef struct {
		@@ -5135,6 +5195,8 @@ typedef struct {
		A_UINT32 rx_gi_ext_2[HTT_RX_PDEV_STATS_NUM_GI_COUNTERS][HTT_RX_PDEV_STATS_NUM_EXTRA2_MCS_COUNTERS];
		A_UINT32 rx_su_punctured_mode[HTT_RX_PDEV_STATS_NUM_PUNCTURED_MODE_COUNTERS];
		A_UINT32 reduced_rx_bw[HTT_RX_PDEV_STATS_NUM_REDUCED_CHAN_TYPES][HTT_RX_PDEV_STATS_NUM_BW_COUNTERS];
		A_UINT8 rssi_chain_ext_2[HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS][HTT_RX_PDEV_STATS_NUM_BW_EXT_2_COUNTERS]; /* units = dB above noise floor */
		A_INT8 rx_per_chain_rssi_ext_2_in_dbm[HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS][HTT_RX_PDEV_STATS_NUM_BW_EXT_2_COUNTERS];
		} htt_rx_pdev_rate_ext_stats_tlv;

		/* STATS_TYPE : HTT_DBG_EXT_STATS_PDEV_RX_RATE_EXT
		@@ -5215,6 +5277,12 @@ typedef struct {
		*/
		A_UINT32 uplink_sta_power_headroom[HTT_RX_UL_MAX_UPLINK_RSSI_TRACK];
		A_UINT32 reduced_ul_ofdma_rx_bw[HTT_RX_PDEV_STATS_NUM_REDUCED_CHAN_TYPES][HTT_RX_PDEV_STATS_NUM_BW_COUNTERS];

		/*
		* Number of HE UL OFDMA per-user responses containing only a QoS null in
		* response to basic trigger. Typically a data response is expected.
		*/
		A_UINT32 ul_ofdma_basic_trigger_rx_qos_null_only;
		} htt_rx_pdev_ul_trigger_stats_tlv;

		/* STATS_TYPE : HTT_DBG_EXT_STATS_PDEV_UL_TRIG_STATS
		@@ -5280,6 +5348,12 @@ typedef struct {
		* Trig power headroom for STA AID in same idx - UNIT(dB)
		*/
		A_UINT32 be_uplink_sta_power_headroom[HTT_RX_UL_MAX_UPLINK_RSSI_TRACK];

		/*
		* Number of EHT UL OFDMA per-user responses containing only a QoS null in
		* response to basic trigger. Typically a data response is expected.
		*/
		A_UINT32 be_ul_ofdma_basic_trigger_rx_qos_null_only;
		} htt_rx_pdev_be_ul_trigger_stats_tlv;

		/* STATS_TYPE : HTT_DBG_EXT_STATS_PDEV_UL_TRIG_STATS
		@@ -5403,6 +5477,12 @@ typedef struct {
		/** Average pilot EVM measued for RX UL TB PPDU */
		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];
		A_UINT32 reduced_ul_mumimo_rx_bw[HTT_RX_PDEV_STATS_NUM_REDUCED_CHAN_TYPES][HTT_RX_PDEV_STATS_NUM_BW_COUNTERS];

		/*
		* Number of HE UL MU-MIMO per-user responses containing only a QoS null in
		* response to basic trigger. Typically a data response is expected.
		*/
		A_UINT32 ul_mumimo_basic_trigger_rx_qos_null_only;
		} htt_rx_pdev_ul_mumimo_trig_stats_tlv;

		typedef struct {
		@@ -5450,6 +5530,12 @@ typedef struct {
		A_INT8 be_rx_ulmumimo_pilot_evm_dB_mean[HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER][HTT_RX_PDEV_STATS_ULMUMIMO_NUM_SPATIAL_STREAMS];
		/** Number of times UL MUMIMO TB PPDUs received in a punctured mode */
		A_UINT32 rx_ul_mumimo_punctured_mode[HTT_RX_PDEV_STATS_NUM_PUNCTURED_MODE_COUNTERS];

		/*
		* Number of EHT UL MU-MIMO per-user responses containing only a QoS null
		* in response to basic trigger. Typically a data response is expected.
		*/
		A_UINT32 be_ul_mumimo_basic_trigger_rx_qos_null_only;
		} htt_rx_pdev_ul_mumimo_trig_be_stats_tlv;

		/* STATS_TYPE : HTT_DBG_EXT_STATS_PDEV_UL_MUMIMO_TRIG_STATS
		@@ -8062,5 +8148,107 @@ typedef struct _htt_ml_peer_stats {
		htt_ml_link_info_tlv ml_link_info[];
		} htt_ml_peer_stats_t;

		/*
		* ODD Mandatory Stats are grouped together from all the exisitng different
		* stats, to form a set of stats that will be used by the ODD application to
		* post the stats to the cloud instead of polling for the individual stats.
		* This is done to avoid non-mandatory stats to be polled as the data will not
		* be required in the recipes derivation.
		* Rather than the host simply printing the ODD stats, the ODD application
		* will take the buffer and map it to the odd_mandatory_stats data structure.
		*/
		typedef struct {
		htt_tlv_hdr_t tlv_hdr;
		A_UINT32 hw_queued;
		A_UINT32 hw_reaped;
		A_UINT32 hw_paused;
		A_UINT32 hw_filt;
		A_UINT32 seq_posted;
		A_UINT32 seq_completed;
		A_UINT32 underrun;
		A_UINT32 hw_flush;
		A_UINT32 next_seq_posted_dsr;
		A_UINT32 seq_posted_isr;
		A_UINT32 mpdu_cnt_fcs_ok;
		A_UINT32 mpdu_cnt_fcs_err;
		A_UINT32 msdu_count_tqm;
		A_UINT32 mpdu_count_tqm;
		A_UINT32 mpdus_ack_failed;
		A_UINT32 num_data_ppdus_tried_ota;
		A_UINT32 ppdu_ok;
		A_UINT32 num_total_ppdus_tried_ota;
		A_UINT32 thermal_suspend_cnt;
		A_UINT32 dfs_suspend_cnt;
		A_UINT32 tx_abort_suspend_cnt;
		A_UINT32 suspended_txq_mask;
		A_UINT32 last_suspend_reason;
		A_UINT32 seq_failed_queueing;
		A_UINT32 seq_restarted;
		A_UINT32 seq_txop_repost_stop;
		A_UINT32 next_seq_cancel;
		A_UINT32 seq_min_msdu_repost_stop;
		A_UINT32 total_phy_err_cnt;
		A_UINT32 ppdu_recvd;
		A_UINT32 tcp_msdu_cnt;
		A_UINT32 tcp_ack_msdu_cnt;
		A_UINT32 udp_msdu_cnt;
		A_UINT32 fw_tx_mgmt_subtype[HTT_STATS_SUBTYPE_MAX];
		A_UINT32 fw_rx_mgmt_subtype[HTT_STATS_SUBTYPE_MAX];
		A_UINT32 fw_ring_mpdu_err[HTT_RX_STATS_RXDMA_MAX_ERR];
		A_UINT32 urrn_stats[HTT_TX_PDEV_MAX_URRN_STATS];
		A_UINT32 sifs_status[HTT_TX_PDEV_MAX_SIFS_BURST_STATS];
		A_UINT32 sifs_hist_status[HTT_TX_PDEV_SIFS_BURST_HIST_STATS];
		A_UINT32 rx_suspend_cnt;
		A_UINT32 rx_suspend_fail_cnt;
		A_UINT32 rx_resume_cnt;
		A_UINT32 rx_resume_fail_cnt;
		A_UINT32 hwq_beacon_cmd_result[HTT_TX_HWQ_MAX_CMD_RESULT_STATS];
		A_UINT32 hwq_voice_cmd_result[HTT_TX_HWQ_MAX_CMD_RESULT_STATS];
		A_UINT32 hwq_video_cmd_result[HTT_TX_HWQ_MAX_CMD_RESULT_STATS];
		A_UINT32 hwq_best_effort_cmd_result[HTT_TX_HWQ_MAX_CMD_RESULT_STATS];
		A_UINT32 hwq_beacon_mpdu_tried_cnt;
		A_UINT32 hwq_voice_mpdu_tried_cnt;
		A_UINT32 hwq_video_mpdu_tried_cnt;
		A_UINT32 hwq_best_effort_mpdu_tried_cnt;
		A_UINT32 hwq_beacon_mpdu_queued_cnt;
		A_UINT32 hwq_voice_mpdu_queued_cnt;
		A_UINT32 hwq_video_mpdu_queued_cnt;
		A_UINT32 hwq_best_effort_mpdu_queued_cnt;
		A_UINT32 hwq_beacon_mpdu_ack_fail_cnt;
		A_UINT32 hwq_voice_mpdu_ack_fail_cnt;
		A_UINT32 hwq_video_mpdu_ack_fail_cnt;
		A_UINT32 hwq_best_effort_mpdu_ack_fail_cnt;
		A_UINT32 pdev_resets;
		A_UINT32 phy_warm_reset;
		A_UINT32 hwsch_reset_count;
		A_UINT32 phy_warm_reset_ucode_trig;
		A_UINT32 mac_cold_reset;
		A_UINT32 mac_warm_reset;
		A_UINT32 mac_warm_reset_restore_cal;
		A_UINT32 phy_warm_reset_m3_ssr;
		A_UINT32 fw_rx_rings_reset;
		A_UINT32 tx_flush;
		A_UINT32 hwsch_dev_reset_war;
		A_UINT32 mac_cold_reset_restore_cal;
		A_UINT32 mac_only_reset;
		A_UINT32 mac_sfm_reset;
		A_UINT32 tx_ldpc; /* Number of tx PPDUs with LDPC coding */
		A_UINT32 rx_ldpc; /* Number of rx PPDUs with LDPC coding */
		A_UINT32 gen_mpdu_end_reason[HTT_TX_TQM_MAX_GEN_MPDU_END_REASON];
		A_UINT32 list_mpdu_end_reason[HTT_TX_TQM_MAX_LIST_MPDU_END_REASON];
		A_UINT32 tx_mcs[HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS + HTT_TX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS + HTT_TX_PDEV_STATS_NUM_EXTRA2_MCS_COUNTERS];
		A_UINT32 tx_nss[HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS];
		A_UINT32 tx_bw[HTT_TX_PDEV_STATS_NUM_BW_COUNTERS];
		A_UINT32 half_tx_bw[HTT_TX_PDEV_STATS_NUM_BW_COUNTERS];
		A_UINT32 quarter_tx_bw[HTT_TX_PDEV_STATS_NUM_BW_COUNTERS];
		A_UINT32 tx_su_punctured_mode[HTT_TX_PDEV_STATS_NUM_PUNCTURED_MODE_COUNTERS];
		A_UINT32 rx_mcs[HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS + HTT_RX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS + HTT_RX_PDEV_STATS_NUM_EXTRA2_MCS_COUNTERS];
		A_UINT32 rx_nss[HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS];
		A_UINT32 rx_bw[HTT_RX_PDEV_STATS_NUM_BW_COUNTERS];
		A_UINT32 rx_stbc[HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS + HTT_RX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS + HTT_RX_PDEV_STATS_NUM_EXTRA2_MCS_COUNTERS];
		A_UINT32 rts_cnt;
		A_UINT32 rts_success;
		} htt_odd_mandatory_pdev_stats_tlv;


		#endif /* __HTT_STATS_H__ */

fw/wlan_module_ids.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -137,6 +137,7 @@ typedef enum {
		WLAN_MODULE_OEM7, /* 0x63 */

		WLAN_MODULE_T2LM, /* 0x64 */
		WLAN_MODULE_HEALTH_MON, /* 0x65 */

		WLAN_MODULE_ID_MAX,
		WLAN_MODULE_ID_INVALID = WLAN_MODULE_ID_MAX,

fw/wmi_services.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -593,6 +593,7 @@ typedef enum {
		WMI_SERVICE_UMAC_HANG_RECOVERY_SUPPORT = 340, /* FW supports recovering system from UMAC hang condition */
		WMI_SERVICE_COAP_OFFLOAD_SUPPORT = 341, /* FW supports CoAP (the Constrained Application Protocol) offload */
		WMI_SERVICE_TDLS_WIDEBAND_SUPPORT = 342, /* FW supports Wideband TDLS */
		WMI_SERVICE_FEATURE_SET_EVENT_SUPPORT = 343, /* FW supports sending of supported feature set event during init time */

		WMI_MAX_EXT2_SERVICE