Merge 258c223dd22e28d44a50332cde170aba9c09e95c on remote branch (344bd277) · Commits · e / devices / android_kernel_fairphone_FP4

fw/htt.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -790,7 +790,7 @@ typedef enum {
		HTT_STATS_PDEV_SCHED_ALGO_OFDMA_STATS_TAG = 165, /* htt_pdev_sched_algo_ofdma_stats_tlv, PUBLISH_FUNC=create_json_response_for_htt_pdev_sched_algo_ofdma_stats */
		HTT_DBG_ODD_MANDATORY_MUMIMO_TAG = 166, /* htt_odd_mandatory_mumimo_pdev_stats_tlv */
		HTT_DBG_ODD_MANDATORY_MUOFDMA_TAG = 167, /* htt_odd_mandatory_muofdma_pdev_stats_tlv */
		HTT_STATS_LATENCY_PROF_CAL_STATS_TAG = 168, /* htt_latency_prof_cal_stats_tlv */
		HTT_STATS_LATENCY_PROF_CAL_STATS_TAG = 168, /* htt_latency_prof_cal_stats_tlv - DEPRECATED */
		HTT_STATS_TX_PDEV_MUEDCA_PARAMS_STATS_TAG = 169, /* htt_tx_pdev_muedca_params_stats_tlv_v - DEPRECATED */
		HTT_STATS_PDEV_BW_MGR_STATS_TAG = 170, /* htt_pdev_bw_mgr_stats_tlv */
		HTT_STATS_TX_PDEV_AP_EDCA_PARAMS_STATS_TAG = 171, /* htt_tx_pdev_ap_edca_params_stats_tlv_v, TOPIC=advanced */
		@@ -815,6 +815,7 @@ typedef enum {
		HTT_STATS_MLO_SCHED_STATS_TAG = 190, /* htt_mlo_sched_stats_tlv */
		HTT_STATS_PDEV_MLO_IPC_STATS_TAG = 191, /* htt_pdev_mlo_ipc_stats_tlv */
		HTT_STATS_WHAL_WSI_TAG = 192, /* htt_stats_whal_wsi_tlv */
		HTT_STATS_LATENCY_PROF_CAL_DATA_TAG = 193, /* htt_stats_latency_prof_cal_data_tlv */


		HTT_STATS_MAX_TAG,

fw/htt_ppdu_stats.h

+2 −3

Original line number	Diff line number	Diff line
		@@ -1192,8 +1192,6 @@ typedef struct {
		*/
		A_UINT32 sw_rts_prot_dur_us;

		/* Data fields related to Transmit power */

		/* tx_pwr_multiplier:
		* Hawkeye now supports power accuracy in 0.25 dBm steps,
		* so all powers are x4.
		@@ -1216,7 +1214,8 @@ typedef struct {
		A_UINT32 tx_pwr_multiplier : 8,
		chain_enable_bits : 8,
		is_smart_ulofdma_basic_trig: 1,
		reserved2 : 15;
		is_primary_link_peer : 1,
		reserved2 : 14;

		/*
		* Transmit powers (signed values packed into unsigned bitfields)

fw/htt_stats.h

+84 −4

Original line number	Diff line number	Diff line
		@@ -500,7 +500,7 @@ enum htt_dbg_ext_stats_type {
		* params:
		* None
		* Response MSG:
		* htt_latency_prof_cal_stats_tlv
		* htt_stats_latency_prof_cal_data_tlv
		*/
		HTT_DBG_EXT_PHY_PROF_CAL_STATS = 52,

		@@ -992,6 +992,8 @@ typedef struct {
		/ pdev uptime in microseconds /
		A_UINT32 pdev_up_time_us_low;
		A_UINT32 pdev_up_time_us_high;
		/** count of ofdma sequences flushed */
		A_UINT32 ofdma_seq_flush;
		} htt_stats_tx_pdev_cmn_tlv;
		/* preserve old name alias for new name consistent with the tag name */
		typedef htt_stats_tx_pdev_cmn_tlv htt_tx_pdev_stats_cmn_tlv;
		@@ -3382,6 +3384,10 @@ typedef struct {
		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;
		/** 11BE EHT MU RTS Trigger frame blocked due to partner link TX/RX(eMLSR) */
		A_UINT32 be_mu_rts_trigger_blocked;
		/** 11BE EHT MU BSR Trigger frame blocked due to partner link TX/RX(eMLSR) */
		A_UINT32 be_bsr_trigger_blocked;
		} htt_stats_tx_selfgen_be_err_stats_tlv;
		/* preserve old name alias for new name consistent with the tag name */
		typedef htt_stats_tx_selfgen_be_err_stats_tlv htt_tx_selfgen_be_err_stats_tlv;
		@@ -4482,6 +4488,8 @@ typedef struct {
		* multicast/broadcast packets received on STA side.
		*/
		A_UINT32 mec_notify;
		A_UINT32 arp_response;
		A_UINT32 arp_request;
		} htt_stats_tx_de_classify_stats_tlv;
		/* preserve old name alias for new name consistent with the tag name */
		typedef htt_stats_tx_de_classify_stats_tlv htt_tx_de_classify_stats_tlv;
		@@ -5398,6 +5406,8 @@ typedef struct {
		A_UINT32 trigger_type_11be[HTT_TX_PDEV_STATS_NUM_11BE_TRIGGER_TYPES];
		/** Stats for Extra EHT LTF */
		A_UINT32 extra_eht_ltf;
		/** Counter for Extra EHT LTFs in OFDMA sequences */
		A_UINT32 extra_eht_ltf_ofdma;
		} htt_stats_tx_pdev_rate_stats_tlv;
		/* preserve old name alias for new name consistent with the tag name */
		typedef htt_stats_tx_pdev_rate_stats_tlv htt_tx_pdev_rate_stats_tlv;
		@@ -8716,7 +8726,7 @@ enum {
		};

		#define HTT_STATS_MAX_CAL_IDX_CNT 8
		typedef struct {
		typedef struct { /* DEPRECATED */

		htt_tlv_hdr_t tlv_hdr;

		@@ -8771,9 +8781,77 @@ typedef struct {

		/** No of indices invoked per each cal profile */
		A_UINT32 CalCnt[HTT_STATS_MAX_PROF_CAL];
		} htt_stats_latency_prof_cal_stats_tlv;
		} htt_stats_latency_prof_cal_stats_tlv; /* DEPRECATED */
		/* preserve old name alias for new name consistent with the tag name */
		typedef htt_stats_latency_prof_cal_stats_tlv htt_latency_prof_cal_stats_tlv;
		typedef htt_stats_latency_prof_cal_stats_tlv htt_latency_prof_cal_stats_tlv; /* DEPRECATED */

		typedef struct {
		/** The cnt is incremented when each time the calindex takes place */
		A_UINT32 cnt;

		/** Minimum time taken to complete the calibration - in us */
		A_UINT32 min;

		/** Maximum time taken to complete the calibration -in us */
		A_UINT32 max;

		/** Time taken by the cal for its final time execution - in us */
		A_UINT32 last;

		/** Total time taken - in us */
		A_UINT32 tot;

		/** hist_intvl - in us, by default will be set to 2000 us */
		A_UINT32 hist_intvl;

		/**
		* If last is less than hist_intvl, then hist[0]++,
		* If last is less than hist_intvl << 1, then hist[1]++,
		* otherwise hist[2]++.
		*/
		A_UINT32 hist[HTT_INTERRUPTS_LATENCY_PROFILE_MAX_HIST];

		/** pf_last will log the current no of page faults */
		A_UINT32 pf_last;

		/** Sum of all page faults happened */
		A_UINT32 pf_tot;

		/** If pf_last > pf_max then pf_max = pf_last */
		A_UINT32 pf_max;

		/**
		* For each cal profile, only certain no of cal indices were invoked,
		* this member will store what all the indices got invoked per each
		* cal profile
		*/
		A_UINT32 enabled_cal_idx;

		/*
		* NOTE: due to backwards-compatibility requirements,
		* no fields can be added to this struct.
		*/
		} htt_stats_latency_prof_cal_data;

		typedef struct {

		htt_tlv_hdr_t tlv_hdr;

		/** To verify whether prof cal is enabled or not */
		A_UINT32 enable;

		/** current pdev_id */
		A_UINT32 pdev_id;

		/** No of indices invoked per each cal profile */
		A_UINT32 cal_cnt[HTT_STATS_MAX_PROF_CAL];

		/** Latency Cal Profile name */
		A_UINT8 latency_prof_name[HTT_STATS_MAX_PROF_CAL][HTT_STATS_MAX_PROF_STATS_NAME_LEN];

		/** Latency Cal data */
		htt_stats_latency_prof_cal_data latency_data[HTT_STATS_MAX_PROF_CAL][HTT_STATS_MAX_CAL_IDX_CNT];
		} htt_stats_latency_prof_cal_data_tlv;

		#define HTT_ML_PEER_EXT_DETAILS_PEER_ASSOC_IPC_RECVD_M 0x0000003F
		#define HTT_ML_PEER_EXT_DETAILS_PEER_ASSOC_IPC_RECVD_S 0
		@@ -10498,6 +10576,7 @@ typedef enum {
		HTT_CTRL_PATH_STATS_CAL_TYPE_PEF = 0x16,
		HTT_CTRL_PATH_STATS_CAL_TYPE_PADROOP = 0x17,
		HTT_CTRL_PATH_STATS_CAL_TYPE_SELFCALTPC = 0x18,
		HTT_CTRL_PATH_STATS_CAL_TYPE_RXSPUR = 0x19,

		/* add new cal types above this line */
		HTT_CTRL_PATH_STATS_CAL_TYPE_INVALID = 0xFF
		@@ -10546,6 +10625,7 @@ static INLINE A_UINT8 *htt_ctrl_path_cal_type_id_to_name(A_UINT32 cal_type_id)
		HTT_RETURN_STRING(HTT_CTRL_PATH_STATS_CAL_TYPE_PEF);
		HTT_RETURN_STRING(HTT_CTRL_PATH_STATS_CAL_TYPE_PADROOP);
		HTT_RETURN_STRING(HTT_CTRL_PATH_STATS_CAL_TYPE_SELFCALTPC);
		HTT_RETURN_STRING(HTT_CTRL_PATH_STATS_CAL_TYPE_RXSPUR);
		}

		return (A_UINT8 *) "HTT_CTRL_PATH_STATS_CAL_TYPE_UNKNOWN";

fw/wmi_services.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -648,6 +648,12 @@ typedef enum {
		WMI_SERVICE_SW_PROG_DFS_SUPPORT = 395, /* Indicate FW support SW progressive DFS */
		WMI_SERVICE_MULTIPLE_REORDER_QUEUE_SETUP_SUPPORT = 396, /* Indicate FW supports multiple TID reorder queues setup in one cmd */
		WMI_SERVICE_MULTIPLE_COEX_CONFIG_SUPPORT = 397, /* FW supports mutiple coex configs in one cmd */
		WMI_SERVICE_PCIE_DATA_RATE_LED_BLINK_SUPPORT = 398, /* FW supports Data Rate based LED blinking for PCI chips */
		WMI_SERVICE_VDEV_DCS_STATS_SUPPORT = 399, /* FW supports VDEV level DCS stats reporting */
		WMI_SERVICE_WIFI_RADAR_SUPPORT = 400, /* FW supports wifi radar */
		WMI_SERVICE_P2P_DEVICE_UPDATE_MAC_ADDR_SUPPORT = 401, /* indicate FW support dynamic update mac address for P2P device */
		WMI_SERVICE_DCS_OBSS_INT_SUPPORT = 402, /* Indicates FW supports OBSS Interference detection */


		WMI_MAX_EXT2_SERVICE

fw/wmi_tlv_defs.h

+33 −4

Original line number	Diff line number	Diff line
		@@ -1421,6 +1421,13 @@ typedef enum {
		WMITLV_TAG_STRUC_wmi_disallowed_mlo_mode_bitmap_param,
		WMITLV_TAG_STRUC_wmi_led_blink_rate_table,
		WMITLV_TAG_STRUC_wmi_enable_led_blink_download_rate_table_fixed_param,
		WMITLV_TAG_STRUC_wmi_vdev_get_twt_session_stats_info_cmd_fixed_param,
		WMITLV_TAG_STRUC_wmi_pdev_enable_wifi_radar_cmd_fixed_param,
		WMITLV_TAG_STRUC_wmi_dma_buf_release_wifi_radar_meta_data,
		WMITLV_TAG_STRUC_wmi_mlo_link_info,
		WMITLV_TAG_STRUC_wmi_dcs_obss_int_t,
		WMITLV_TAG_STRUC_wmi_pdev_wifi_radar_cal_completion_status_event_param,
		WMITLV_TAG_STRUC_wmi_sar_flags,
		} WMITLV_TAG_ID;
		/*
		* IMPORTANT: Please add _ALL_ WMI Commands Here.
		@@ -1963,6 +1970,8 @@ typedef enum {
		OP(WMI_PEER_MULTIPLE_REORDER_QUEUE_SETUP_CMDID) \
		OP(WMI_COEX_MULTIPLE_CONFIG_CMDID) \
		OP(WMI_PDEV_ENABLE_LED_BLINK_DOWNLOAD_TABLE_CMDID) \
		OP(WMI_VDEV_GET_TWT_SESSION_STATS_INFO_CMDID) \
		OP(WMI_PDEV_ENABLE_WIFI_RADAR_CMDID) \
		/* add new CMD_LIST elements above this line */


		@@ -2283,6 +2292,7 @@ typedef enum {
		OP(WMI_VDEV_SCHED_MODE_PROBE_RESP_EVENTID) \
		OP(WMI_VDEV_OOB_CONNECTION_RESP_EVENTID) \
		OP(WMI_AUDIO_TRANSPORT_SWITCH_TYPE_EVENTID) \
		OP(WMI_PDEV_WIFI_RADAR_CAL_COMPLETION_STATUS_EVENTID) \
		/* add new EVT_LIST elements above this line */


		@@ -3627,6 +3637,11 @@ WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_SET_WMM_PARAMS_CMDID);

		WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_SET_TWT_EDCA_PARAMS_CMDID);

		#define WMITLV_TABLE_WMI_VDEV_GET_TWT_SESSION_STATS_INFO_CMDID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_get_twt_session_stats_info_cmd_fixed_param, wmi_vdev_get_twt_session_stats_info_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)

		WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_GET_TWT_SESSION_STATS_INFO_CMDID);

		#define WMITLV_TABLE_WMI_VDEV_SET_GTX_PARAMS_CMDID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_set_gtx_params_cmd_fixed_param, wmi_vdev_set_gtx_params_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)

		@@ -4826,7 +4841,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_WLM_CONFIG_CMDID);
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_roam_trigger_kickout, roam_trigger_kickout, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_roam_trigger_per, roam_trigger_per, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_roam_trigger_periodic, roam_trigger_periodic, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_roam_trigger_hi_rssi, roam_trigger_hi_rssi, WMITLV_SIZE_VAR)
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_roam_trigger_hi_rssi, roam_trigger_hi_rssi, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_mlo_link_info, mlo_link_info, WMITLV_SIZE_VAR)
		WMITLV_CREATE_PARAM_STRUC(WMI_ROAM_STATS_EVENTID);

		/* Motion detection cmd */
		@@ -5550,6 +5566,11 @@ WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_OOB_CONNECTION_REQ_CMDID);
		WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, WMI_COEX_CONFIG_CMD_fixed_param, config_list, WMITLV_SIZE_VAR)
		WMITLV_CREATE_PARAM_STRUC(WMI_COEX_MULTIPLE_CONFIG_CMDID);

		/* Wifi radar enable command */
		#define WMITLV_TABLE_WMI_PDEV_ENABLE_WIFI_RADAR_CMDID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_enable_wifi_radar_cmd_fixed_param, wmi_pdev_enable_wifi_radar_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
		WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_ENABLE_WIFI_RADAR_CMDID);



		/************************ TLV definitions of WMI events *****************************/
		@@ -5608,7 +5629,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_SERVICE_READY_EXT_EVENTID);
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, WMI_COEX_FIX_CHANNEL_CAPABILITIES, coex_fix_channel_caps, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_aux_dev_capabilities, aux_dev_caps, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_enhanced_aoa_caps_param, aoa_caps_param, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_enhanced_aoa_per_band_caps_param, aoa_per_band_caps_param, WMITLV_SIZE_VAR)
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_enhanced_aoa_per_band_caps_param, aoa_per_band_caps_param, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_sar_flags, wmi_sar_flag_tlv_param, sar_flags, WMITLV_SIZE_VAR)
		WMITLV_CREATE_PARAM_STRUC(WMI_SERVICE_READY_EXT2_EVENTID);

		#define WMITLV_TABLE_WMI_SPECTRAL_CAPABILITIES_EVENTID(id,op,buf,len) \
		@@ -6042,7 +6064,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_GTK_OFFLOAD_STATUS_EVENTID);
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_dcs_interference_event_fixed_param, wmi_dcs_interference_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wlan_dcs_cw_int, cw_int, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wlan_dcs_im_tgt_stats_t, wlan_stat, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_dcs_awgn_int_t, awgn_int, WMITLV_SIZE_VAR)
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_dcs_awgn_int_t, awgn_int, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_dcs_obss_int_t, obss_int, WMITLV_SIZE_VAR)
		WMITLV_CREATE_PARAM_STRUC(WMI_DCS_INTERFERENCE_EVENTID);

		/* Profile data Event */
		@@ -7097,7 +7120,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_DMA_RING_CFG_RSP_EVENTID);
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_dma_buf_release_entry, entries, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_dma_buf_release_spectral_meta_data, meta_data, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_dma_buf_release_cv_upload_meta_data, cv_meta_data, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_dma_buf_release_cqi_upload_meta_data, cqi_meta_data, WMITLV_SIZE_VAR)
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_dma_buf_release_cqi_upload_meta_data, cqi_meta_data, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_dma_buf_release_wifi_radar_meta_data, wifi_radar_meta_data, WMITLV_SIZE_VAR)
		WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_DMA_RING_BUF_RELEASE_EVENTID);

		/* ctl failsafe check event */
		@@ -7567,6 +7591,11 @@ WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_SCHED_MODE_PROBE_RESP_EVENTID);
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_oob_connection_resp_event_fixed_param, wmi_vdev_oob_connection_resp_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)
		WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_OOB_CONNECTION_RESP_EVENTID);

		/* WiFi Radar calibration status event */
		#define WMITLV_TABLE_WMI_PDEV_WIFI_RADAR_CAL_COMPLETION_STATUS_EVENTID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_wifi_radar_cal_completion_status_event_param, wmi_pdev_wifi_radar_cal_completion_status_event_param, cal_completion_status_event_param, WMITLV_SIZE_FIX)
		WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_WIFI_RADAR_CAL_COMPLETION_STATUS_EVENTID);



		#ifdef __cplusplus