Merge 04d57479ae856e6473a45ffc7a4114a394b4742f on remote branch (1bb28a24) · Commits · e / devices / android_kernel_fairphone_FP4

fw/dbglog.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -91,7 +91,9 @@ typedef enum {
		DBGLOG_INFO_LVL_2,
		DBGLOG_WARN,
		DBGLOG_ERR,
		DBGLOG_LVL_MAX
		DBGLOG_LVL_MAX,

		DBGLOG_INVALID = 0xf
		}DBGLOG_LOG_LVL;

		PREPACK struct dbglog_buf_s {

fw/htt.h

+24 −3

Original line number	Diff line number	Diff line
		@@ -263,9 +263,10 @@
		* 3.133 Add packet_type_enable_data_flags fields in rx_ring_selection_cfg.
		* 3.134 Add qdata_refill flag in rx_peer_metadata_v1a.
		* 3.135 Add HTT_HOST4_TO_FW_RXBUF_RING def.
		* 3.136 Add htt_ext_present flag in htt_tx_tcl_global_seq_metadata.
		*/
		#define HTT_CURRENT_VERSION_MAJOR 3
		#define HTT_CURRENT_VERSION_MINOR 135
		#define HTT_CURRENT_VERSION_MINOR 136

		#define HTT_NUM_TX_FRAG_DESC 1024

		@@ -830,7 +831,8 @@ typedef enum {
		HTT_STATS_PDEV_RTT_TBR_CMD_RESULT_STATS_TAG = 198, /* htt_stats_pdev_rtt_tbr_cmd_result_stats_tlv */
		HTT_STATS_GTX_TAG = 199, /* htt_stats_gtx_tlv */
		HTT_STATS_TX_PDEV_WIFI_RADAR_TAG = 200, /* htt_stats_tx_pdev_wifi_radar_tlv */

		HTT_STATS_TXBF_OFDMA_BE_PARBW_TAG = 201, /* htt_stats_txbf_ofdma_be_parbw_tlv */
		HTT_STATS_RX_PDEV_RSSI_HIST_TAG = 202, /* htt_stats_rx_pdev_rssi_hist_tlv */

		HTT_STATS_MAX_TAG,
		} htt_stats_tlv_tag_t;
		@@ -2698,7 +2700,7 @@ typedef struct {
		type: 2, /* vdev_id based or peer_id or svc_id or global seq based */
		host_inspected: 1,
		global_seq_no: 12,
		rsvd: 1,
		htt_ext_present:1,
		padding: 16; /* These 16 bits cannot be used by FW for the tcl command */
		} htt_tx_tcl_global_seq_metadata;

		@@ -2741,6 +2743,13 @@ PREPACK struct htt_tx_tcl_metadata_v2 {
		#define HTT_TX_TCL_METADATA_GLBL_SEQ_NO_M 0x00007ff8
		#define HTT_TX_TCL_METADATA_GLBL_SEQ_NO_S 3

		/* HTT ext present flag:
		* Specify whether there is a htt ext desc present for this packet,
		* accompanying the global seq no metadata.
		*/
		#define HTT_TX_TCL_METADATA_GLBL_SEQ_HTT_EXT_PRESENT_M 0x00008000
		#define HTT_TX_TCL_METADATA_GLBL_SEQ_HTT_EXT_PRESENT_S 15


		/----- Get and Set V2 type field in Vdev, Peer, Svc_Class_Id, Global_seq_no /
		#define HTT_TX_TCL_METADATA_TYPE_V2_GET(_var) \
		@@ -2828,6 +2837,15 @@ PREPACK struct htt_tx_tcl_metadata_v2 {
		((_var) \|= ((_val) << HTT_TX_TCL_METADATA_GLBL_SEQ_NO_S)); \
		} while (0)

		#define HTT_TX_TCL_METADATA_GLBL_SEQ_HTT_EXT_PRESENT_GET(_var) \
		(((_var) & HTT_TX_TCL_METADATA_GLBL_SEQ_HTT_EXT_PRESENT_M) >> \
		HTT_TX_TCL_METADATA_GLBL_SEQ_HTT_EXT_PRESENT_S)
		#define HTT_TX_TCL_METADATA_GLBL_SEQ_HTT_EXT_PRESENT_SET(_var, _val) \
		do { \
		HTT_CHECK_SET_VAL(HTT_TX_TCL_METADATA_GLBL_SEQ_HTT_EXT_PRESENT, _val); \
		((_var) \|= ((_val) << HTT_TX_TCL_METADATA_GLBL_SEQ_HTT_EXT_PRESENT_S)); \
		} while (0)

		/*------------------------------------------------------------------
		* End V2 Version of TCL Data Command
		-----------------------------------------------------------------/
		@@ -20909,6 +20927,9 @@ extern void (HTT_RX_PEER_META_DATA_CHIP_ID_SET) (A_UINT32 var, A_UINT32 val);
		extern A_UINT32 (*HTT_RX_PEER_META_DATA_HW_LINK_ID_GET) (A_UINT32 var);
		extern void (HTT_RX_PEER_META_DATA_HW_LINK_ID_SET) (A_UINT32 var, A_UINT32 val);

		extern A_UINT32 (*HTT_RX_PEER_META_DATA_QDATA_REFILL_GET) (A_UINT32 var);
		extern void (HTT_RX_PEER_META_DATA_QDATA_REFILL_SET) (A_UINT32 var, A_UINT32 val);


		/*
		* In some systems, the host SW wants to specify priorities between

fw/htt_stats.h

+63 −0

Original line number	Diff line number	Diff line
		@@ -3377,6 +3377,19 @@ typedef struct {
		typedef htt_stats_txbf_ofdma_be_steer_mpdu_stats_tlv
		htt_txbf_ofdma_be_steer_mpdu_stats_tlv;

		/* HTT_STATS_TXBF_OFDMA_BE_PARBW_TAG stats TLV:
		* Sent by target in response to HTT_DBG_EXT_STATS_TXBF_OFDMA stats ID request.
		*/
		typedef struct {
		htt_tlv_hdr_t tlv_hdr;
		/* Num of EHT TxBF Partial Bandwidth soundings */
		A_UINT32 be_ofdma_parbw_user_snd;
		/* Num of EHT Partial Bandwidth Sounded CVs received */
		A_UINT32 be_ofdma_parbw_cv;
		/* Num of 11BE EHT Total CVs received */
		A_UINT32 be_ofdma_total_cv;
		} htt_stats_txbf_ofdma_be_parbw_tlv;

		/* STATS_TYPE : HTT_DBG_EXT_STATS_TXBF_OFDMA
		* TLV_TAGS:
		* - HTT_STATS_TXBF_OFDMA_NDPA_STATS_TAG
		@@ -5996,6 +6009,25 @@ typedef struct {
		/* preserve old name alias for new name consistent with the tag name */
		typedef htt_stats_rx_pdev_ppdu_dur_tlv htt_rx_pdev_ppdu_dur_stats_tlv;

		#define HTT_STATS_RX_RSSI_HIST_BINS 24
		#define HTT_STATS_RX_RSSI_HIST_OFFSET_DBM -30
		#define HTT_STATS_RX_RSSI_DB_PER_BIN -3

		typedef struct {
		htt_tlv_hdr_t tlv_hdr;

		/** rssi_in_dbm_ppdu_cnt :
		* Number of PPDUs received within each RSSI range
		* rssi_in_dbm_ppdu_cnt[0] : number of PPDUs received > -30 dBm
		* rssi_in_dbm_ppdu_cnt[1] : number of PPDUs received from [-30 to -32] dBm
		* rssi_in_dbm_ppdu_cnt[2] : number of PPDUs received from [-33 to -35] dBm
		* ...
		* rssi_in_dbm_ppdu_cnt[22] : number of PPDUs received from [-93 to -95] dBm
		* rssi_in_dbm_ppdu_cnt[23] : number of PPDUs received <= -96 dBm
		**/
		A_UINT32 rssi_in_dbm_ppdu_cnt[HTT_STATS_RX_RSSI_HIST_BINS];
		} htt_stats_rx_pdev_rssi_hist_tlv;

		/* STATS_TYPE : HTT_DBG_EXT_STATS_PDEV_RX_RATE
		* TLV_TAGS:
		* - HTT_STATS_RX_PDEV_RATE_STATS_TAG
		@@ -6008,6 +6040,7 @@ typedef htt_stats_rx_pdev_ppdu_dur_tlv htt_rx_pdev_ppdu_dur_stats_tlv;
		typedef struct {
		htt_stats_rx_pdev_rate_stats_tlv rate_tlv;
		htt_stats_rx_pdev_ppdu_dur_tlv rx_ppdu_dur_tlv;
		htt_stats_rx_pdev_rssi_hist_tlv rx_ppdu_rssi_hist_tlv;
		} htt_rx_pdev_rate_stats_t;
		#endif /* ATH_TARGET */

		@@ -9085,6 +9118,19 @@ typedef struct {
		/* preserve old name alias for new name consistent with the tag name */
		typedef htt_stats_phy_counters_tlv htt_phy_counters_tlv;

		#define HTT_STATS_ANI_MODE_M 0x000000ff
		#define HTT_STATS_ANI_MODE_S 0

		#define HTT_STATS_ANI_MODE_GET(_var) \
		(((_var) & HTT_STATS_ANI_MODE_M) >> \
		HTT_STATS_ANI_MODE_S)

		#define HTT_STATS_ANI_MODE_SET(_var, _val) \
		do { \
		HTT_CHECK_SET_VAL(HTT_STATS_ANI_MODE, _val); \
		((_var) \|= ((_val) << HTT_STATS_ANI_MODE_S)); \
		} while (0)

		typedef struct {
		htt_tlv_hdr_t tlv_hdr;
		/** per chain hw noise floor values in dBm */
		@@ -9138,6 +9184,23 @@ typedef struct {
		A_UINT32 band_center_frequency_DBW;

		/ DFS SW based progressive stats - end /

		/* BIT [ 7 : 0] :- ani_mode
		* BIT [31 : 8] :- reserved
		*
		* ani_mode:
		* 1 for static ANI
		* 0 for dynamic ANI
		* 0xFF for ANI disabled
		*/
		union {
		A_UINT32 dword__ani_mode;
		struct {
		A_UINT32
		ani_mode: 8,
		reserved: 24;
		};
		};
		} htt_stats_phy_stats_tlv;
		/* preserve old name alias for new name consistent with the tag name */
		typedef htt_stats_phy_stats_tlv htt_phy_stats_tlv;

fw/wlan_module_ids.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -195,6 +195,7 @@ typedef enum {

		WLAN_MODULE_ID_MAX,
		WLAN_MODULE_ID_INVALID = WLAN_MODULE_ID_MAX,
		WLAN_MODULE_ID_ALL = 0xffff /* wildcard to indicate all modules */
		} WLAN_MODULE_ID;

fw/wmi_services.h

+10 −1

Original line number	Diff line number	Diff line
		@@ -656,7 +656,7 @@ typedef enum {
		WMI_SERVICE_DYNAMIC_WSI_REMAP_SUPPORT = 403, /* WSI bypass remap is supported by Firmware */
		WMI_SERVICE_QMS_DLKM_SUPPORT = 404, /* DEPRECATED */
		WMI_SERVICE_SMEM_MAILBOX_SUPPORT = 404, /* FW code has smem_mailbox support enabled */
		WMI_SERVICE_REG_CC_EXT2_EVENT_SUPPORT = 405, /* Indicate FW would send EXT2 REG_CC event having data which would be a continuation to EXT REG_CC event */
		WMI_SERVICE_REG_CC_EXT2_EVENT_SUPPORT = 405, /* DEPRECATED */
		WMI_SERVICE_MLO_MODE2_RECOVERY_SUPPORTED = 406, /* Indicate FW support for MLO mode2 recovery */
		WMI_SERVICE_MSDUQ_RECFG = 407, /* FW support the HTT MSDUQ_RECFG_REQ + MSDUQ_CFG_IND messages */
		WMI_SERVICE_TRAFFIC_CONTEXT_SUPPORT = 408, /* FW supports traffic context aware manager */
		@@ -674,6 +674,15 @@ typedef enum {
		WMI_SERVICE_MGMT_SRNG_SUPPORT = 420, /* FW supports MGMT frame forwarding via host provided SRNG instead of WMI */
		WMI_SERVICE_WDS_NULL_FRAME_SUPPORT = 421,
		WMI_SERVICE_MLO_SAP_CONCURRENCY_SUPPORT = 422, /* Indicates FW supports MLO SAP+STA Concurrency */
		WMI_SERVICE_MEC_AGING_TIMER_SUPPORT = 423, /* FW supports multicast echo check aging timer */
		WMI_SERVICE_MULTI_RSNO_SUPPORT = 424, /* FW supports parsing of multiple RSN override IEs */
		/* WMI_SERVICE_IS_TARGET_IPA:
		* FW indicates to host whether the target is IPA or xFEM.
		* If this flag is 0, the target is XFEM or unspecified.
		* If this flag is 1, the target is IPA.
		*/
		WMI_SERVICE_IS_TARGET_IPA = 425,
		WMI_SERVICE_THERM_THROT_TX_CHAIN_MASK = 426, /FW supports thermal throttling dynamic Tx ChainMask update /


		WMI_MAX_EXT2_SERVICE