Merge 62b94874003ef7aced22bba1a076c1e4b5d5a9a9 on remote branch (e209dbee) · Commits · e / devices / android_kernel_fairphone_FP4

fw/htt_stats.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -3697,6 +3697,7 @@ typedef struct {
		#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_BW_EXT2_COUNTERS 5 /* 20, 40, 80, 160, 320Mhz */
		#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
		@@ -3892,7 +3893,7 @@ typedef struct {
		A_UINT32 rx_11ax_dl_ofdma_mcs_ext[HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS_EXT];
		/* MCS 14,15 */
		A_UINT32 rx_mcs_ext_2[HTT_RX_PDEV_STATS_NUM_EXTRA2_MCS_COUNTERS];
		A_UINT32 rx_bw_320mhz;
		A_UINT32 rx_bw_ext[HTT_RX_PDEV_STATS_NUM_BW_EXT2_COUNTERS];
		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];
		} htt_rx_pdev_rate_ext_stats_tlv;

fw/wmi_unified.h

+14 −3

Original line number	Diff line number	Diff line
		@@ -3831,20 +3831,26 @@ typedef struct {
		* 1-> MLO support
		* 2-3-> Reserved
		* Refer to the WMI_RSRC_CFG_FLAGS2_RX_PEER_METADATA_VERSION macros.
		* Bits 6 - is_sap_connected_d3wow_enabled
		* Bit 6 - is_sap_connected_d3wow_enabled
		* Enable D3WoW for SAP w/ clients connected
		* 0-> disable the feature
		* 1-> enable the feature
		* Refer to the WMI_RSRC_CFG_FLAGS2_IS_SAP_CONNECTED_D3WOW_ENABLED
		* GET/SET macros.
		* Bits 7 - is_go_connected_d3wow_enabled
		* Bit 7 - is_go_connected_d3wow_enabled
		* Enable D3WoW for GO w/ clients connected
		* 0-> disable the feature
		* 1-> enable the feature
		* Refer to the WMI_RSRC_CFG_FLAGS2_IS_GO_CONNECTED_D3WOW_ENABLED
		* GET/SET macros.
		* Bit 8 - enable_dynamic_pcie_gen_speed_switch
		* enable dynamic pcie gen speed switch
		* 0-> disable the feature
		* 1-> enable the feature
		* Refer to the WMI_RSRC_CFG_FLAGS2_IS_DYNAMIC_PCIE_GEN_SPEED_SWITCH_ENABLED
		* GET/SET macros.
		*
		* Bits 31:8 - Reserved
		* Bits 31:9 - Reserved
		*/
		A_UINT32 flags2;
		/** @brief host_service_flags - can be used by Host to indicate
		@@ -4155,6 +4161,11 @@ typedef struct {
		#define WMI_RSRC_CFG_FLAGS2_IS_GO_CONNECTED_D3WOW_ENABLED_SET(flags2, value) \
		WMI_SET_BITS(flags2, 7, 1, value)

		#define WMI_RSRC_CFG_FLAGS2_IS_DYNAMIC_PCIE_GEN_SPEED_SWITCH_ENABLED_GET(flags2) \
		WMI_GET_BITS(flags2, 8, 1)
		#define WMI_RSRC_CFG_FLAGS2_IS_DYNAMIC_PCIE_GEN_SPEED_SWITCH_ENABLED_SET(flags2, value) \
		WMI_SET_BITS(flags2, 8, 1, value)

		#define WMI_RSRC_CFG_HOST_SERVICE_FLAG_NAN_IFACE_SUPPORT_GET(host_service_flags) \
		WMI_GET_BITS(host_service_flags, 0, 1)
		#define WMI_RSRC_CFG_HOST_SERVICE_FLAG_NAN_IFACE_SUPPORT_SET(host_service_flags, val) \

fw/wmi_version.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@
		#define __WMI_VER_MINOR_ 0
		/** WMI revision number has to be incremented when there is a
		* change that may or may not break compatibility. */
		#define __WMI_REVISION_ 997
		#define __WMI_REVISION_ 998

		/** The Version Namespace should not be normally changed. Only
		* host and firmware of the same WMI namespace will work