Merge 8b50c4db78e0a1ca93306c076424da18622626d5 on remote branch (851ef622) · Commits · e / devices / android_kernel_fairphone_FP4

fw/htt.h

+7 −3

Original line number	Diff line number	Diff line
		@@ -22945,6 +22945,10 @@ typedef enum {
		HTT_SDWF_MSDUQ_CFG_IND_ERROR_PEER_DELETE_IN_PROG = 0x01,
		HTT_SDWF_MSDUQ_CFG_IND_ERROR_SW_MSDUQ_NULL = 0x02,
		HTT_SDWF_MSDUQ_CFG_IND_ERROR_MSDUQ_LOCATE_ERROR = 0x03,
		HTT_SDWF_MSDUQ_CFG_IND_ERROR_QPEER_NULL = 0x04,
		HTT_SDWF_MSDUQ_CFG_IND_ERROR_DEACTIVATED_MSDUQ = 0x05,
		HTT_SDWF_MSDUQ_CFG_IND_ERROR_REACTIVATED_MSDUQ = 0x06,
		HTT_SDWF_MSDUQ_CFG_IND_ERROR_INVALID_SVC_CLASS = 0x07,
		} HTT_SDWF_MSDUQ_CFG_IND_ERROR_CODE_E;

		PREPACK struct htt_t2h_sdwf_msduq_cfg_ind {

fw/htt_stats.h

+15 −0

Original line number	Diff line number	Diff line
		@@ -4398,6 +4398,9 @@ typedef struct {
		A_UINT32 sched_udp_notify2;
		A_UINT32 sched_nonudp_notify1;
		A_UINT32 sched_nonudp_notify2;
		A_UINT32 tqm_enqueue_msdu_count;
		A_UINT32 tqm_dropped_msdu_count;
		A_UINT32 tqm_dequeue_msdu_count;
		} htt_stats_tx_tqm_pdev_tlv;
		/* preserve old name alias for new name consistent with the tag name */
		typedef htt_stats_tx_tqm_pdev_tlv htt_tx_tqm_pdev_stats_tlv_v;
		@@ -4588,6 +4591,18 @@ typedef struct {
		A_UINT32 eapol_start_packets;
		A_UINT32 eapol_logoff_packets;
		A_UINT32 eapol_encap_asf_packets;
		A_UINT32 m1_success;
		A_UINT32 m1_compl_fail;
		A_UINT32 m2_success;
		A_UINT32 m2_compl_fail;
		A_UINT32 m3_success;
		A_UINT32 m3_compl_fail;
		A_UINT32 m4_success;
		A_UINT32 m4_compl_fail;
		A_UINT32 g1_success;
		A_UINT32 g1_compl_fail;
		A_UINT32 g2_success;
		A_UINT32 g2_compl_fail;
		} htt_stats_tx_de_eapol_packets_tlv;
		/* preserve old name alias for new name consistent with the tag name */
		typedef htt_stats_tx_de_eapol_packets_tlv htt_tx_de_eapol_packets_stats_tlv;

fw/wlan_module_ids.h

+2 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
		* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
		* Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.
		*
		* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
		*
		@@ -154,7 +154,7 @@ typedef enum {
		WLAN_MODULE_SMART_TX, /* 0x71 */
		WLAN_MODULE_BRIDGE_PEER, /* 0x72 */
		WLAN_MODULE_AUX_MAC_MGR, /* 0x73 */

		WLAN_MODULE_TCAM, /* 0x74 */

		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
		@@ -661,6 +661,7 @@ typedef enum {
		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 */
		WMI_SERVICE_STA_SAP_NDP_CONCURRENCY_SUPPORT = 409, /* FW supports STA + SAP + NDP concurrency */
		WMI_SERVICE_THERM_THROT_POUT_REDUCTION = 410, /* FW supports thermal throttling Pout reduction */


		WMI_MAX_EXT2_SERVICE

fw/wmi_unified.h

+71 −25

Original line number	Diff line number	Diff line
		@@ -3464,6 +3464,11 @@ typedef struct {
		#define WMI_TARGET_CAP_ML_MONITOR_MODE_SUPPORT_SET(target_cap_flags, value) \
		WMI_SET_BITS(target_cap_flags, 14, 1, value)

		#define WMI_TARGET_CAP_QDATA_TX_LCE_FILTER_SUPPORT_GET(target_cap_flags) \
		WMI_GET_BITS(target_cap_flags, 15, 1)
		#define WMI_TARGET_CAP_QDATA_TX_LCE_FILTER_SUPPORT_SET(target_cap_flags, value)\
		WMI_SET_BITS(target_cap_flags, 15, 1, value)


		/*
		* wmi_htt_msdu_idx_to_htt_msdu_qtype GET/SET APIs
		@@ -3609,7 +3614,8 @@ typedef struct {
		* Bit12 - [ML-STA + SL-SAP] 0: not supported; 1:supported
		* Bit 13 - Support for multipass SAP
		* Bit 14 - Support for ML monitor mode
		* Bits 31:15 - Reserved
		* Bit 15 - Support for Qdata Tx LCE filter installation
		* Bits 31:16 - Reserved
		*/
		A_UINT32 target_cap_flags;

		@@ -22967,6 +22973,12 @@ typedef enum {
		WMI_BL_REASON_REASSOC_RSSI_REJECT,
		/* Reassoc resp with status code 17 - DENIED_NO_MORE_STAS */
		WMI_BL_REASON_REASSOC_NO_MORE_STAS,
		WMI_BL_REASON_BASIC_RATES_MIS_MATCH, /* Status code 18 */
		WMI_BL_REASON_EHT_NOT_SUPPORTED, /* Status code 135 */
		WMI_BL_REASON_EXISTING_MLD_ASSOCIATION, /* Status code 130 */
		WMI_BL_REASON_LINK_TRANSMITTED_NOT_ACCEPTED, /* Status code 139 */
		WMI_BL_REASON_DENIED_OTHER_REASON,
		WMI_BL_REASON_BTM_LOAD_BALANCE,
		} WMI_BLACKLIST_REASON_ID;

		typedef enum {
		@@ -22974,6 +22986,8 @@ typedef enum {
		WMI_BL_SOURCE_FW,
		} WMI_BLACKLIST_SOURCE_ID;

		#define WMI_MAX_FAILED_LINK_COMBO_COUNT 10

		typedef struct {
		/** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_roam_blacklist_with_timeout_tlv_param */
		A_UINT32 tlv_header;
		@@ -22996,11 +23010,18 @@ typedef struct {
		/* Original timeout value in milli seconds when AP added to BL */
		A_UINT32 original_timeout;
		/*
		* If disallow_linkid_bitmap is not 0, then means current entity
		* is for MLD AP and bssid field is standing for MLD address.
		* If all links for MLD AP is disallow, then the value shall be 0xffffffff
		* The disallow link ID bitmap indicates links which should not be allowed
		* for any assoc or partner link combination.
		* If all links for MLD AP are disallowed, then the value shall be
		* 0xffffffff.
		*/
		A_UINT32 disallow_linkid_bitmap;
		/* MLD address of AP */
		wmi_mac_addr mld;
		/* List of link combinations for which association is failed */
		A_UINT32 ml_failed_links_combo_bitmap[WMI_MAX_FAILED_LINK_COMBO_COUNT];
		/* Failed link combo count filled in ml_failed_links_combo_bitmap[] */
		A_UINT32 ml_failed_link_combo_count;
		} wmi_roam_blacklist_with_timeout_tlv_param;

		/** WMI_ROAM_BLACKLIST_EVENT: generated whenever STA needs to move AP to blacklist for a particluar time
		@@ -36768,20 +36789,26 @@ typedef struct {
		/** TLV tag and len; tag equals
		* WMITLV_TAG_STRUC_wmi_therm_throt_level_config_info */
		A_UINT32 tlv_header;
		/**
		/** temp_lwm:
		* temperature sensor value in celsius when to exit to lower zone,
		* this value can be lower than HWM of lower zone as zone overlapping
		* is permitted by design to provide hysteresis
		*/
		A_UINT32 temp_lwm;
		/**
		/** temp_hwm:
		* temperature sensor value in celsius when to exit to higher zone,
		* this value can be higher than LWM of higher zone as zone overlapping
		* is permitted by design to provide hysteresis
		*/
		A_UINT32 temp_hwm;
		A_UINT32 dc_off_percent; /* duty cycle off percent 0-100. 0 means no off, 100 means no on (shutdown the phy) */
		/** Disable only the transmit queues in firmware that have lower priority than value defined by prio
		/** dc_off_percent:
		* duty cycle off percent 0-100.
		* 0 means no off, 100 means no on (shutdown the phy).
		*/
		A_UINT32 dc_off_percent;
		/** prio:
		* Disable only the transmit queues in firmware that have lower priority
		* than value defined by prio.
		* Prioritization:
		* 0 = disable all data tx queues, No Prioritization defined
		* 1 = disable BK tx queue
		@@ -36789,6 +36816,11 @@ typedef struct {
		* 3 = disable BK+BE+VI tx queues
		*/
		A_UINT32 prio;
		/**
		* Pout power reduction in 0.25 dB units.
		* For example, a value of 5 causes a power reduction of 1.25 dB.
		*/
		A_UINT32 pout_reduction_25db;
		} wmi_therm_throt_level_config_info;

		typedef enum {
		@@ -40196,11 +40228,18 @@ typedef struct {
		/* Original timeout value in milli seconds when AP added to BL */
		A_UINT32 original_timeout;
		/*
		* If disallow_linkid_bitmap is not 0, then means current entity
		* is for MLD AP and bssid field is standing for MLD address.
		* If all links for MLD AP is disallow, then the value shall be 0xffffffff
		* The disallow link ID bitmap indicates links which should not be allowed
		* for any assoc or partner link combination.
		* If all links for MLD AP are disallowed, then the value shall be
		* 0xffffffff.
		*/
		A_UINT32 disallow_linkid_bitmap;
		/* MLD address of AP */
		wmi_mac_addr mld;
		/* List of link combinations for which association is failed */
		A_UINT32 ml_failed_links_combo_bitmap[WMI_MAX_FAILED_LINK_COMBO_COUNT];
		/* Failed link combo count filled in ml_failed_links_combo_bitmap[] */
		A_UINT32 ml_failed_link_combo_count;
		} wmi_pdev_bssid_disallow_list_config_param;

		typedef enum {
		@@ -41140,6 +41179,13 @@ typedef struct {
		* each bit represents.
		*/
		A_UINT32 disallow_connect_modes;

		/*
		* If max_link_combo_count is non-zero, STA should try to roam to next
		* candidate once max allowed link combinations is reached with current
		* candidate AP.
		*/
		A_UINT32 max_link_combo_count;
		} wmi_roam_mlo_config_cmd_fixed_param;

		typedef struct {