Merge 955f0c8ffd5ade182b2e375b6c88f5dd292ed7e7 on remote branch (35c2576d) · Commits · e / devices / android_kernel_fairphone_FP5

fw/htt_ppdu_stats.h

+19 −6

Original line number	Original line	Diff line number	Diff line
	@@ -845,6 +845,19 @@ typedef struct {
	((_var) \|= ((_val) << HTT_PPDU_STATS_USER_COMMON_TLV_DELAYED_BA_S)); \		((_var) \|= ((_val) << HTT_PPDU_STATS_USER_COMMON_TLV_DELAYED_BA_S)); \
	} while (0)		} while (0)

			#define HTT_PPDU_STATS_USER_COMMON_TLV_IS_SQNUM_VALID_IN_BUFFER_M 0x00008000
			#define HTT_PPDU_STATS_USER_COMMON_TLV_IS_SQNUM_VALID_IN_BUFFER_S 15

			#define HTT_PPDU_STATS_USER_COMMON_TLV_IS_SQNUM_VALID_IN_BUFFER_GET(_var) \
			(((_var) & HTT_PPDU_STATS_USER_COMMON_TLV_IS_SQNUM_VALID_IN_BUFFER_M) >> \
			HTT_PPDU_STATS_USER_COMMON_TLV_IS_SQNUM_VALID_IN_BUFFER_S)

			#define HTT_PPDU_STATS_USER_COMMON_TLV_IS_SQNUM_VALID_IN_BUFFER_SET(_var, _val) \
			do { \
			HTT_CHECK_SET_VAL(HTT_PPDU_STATS_USER_COMMON_TLV_IS_SQNUM_VALID_IN_BUFFER, _val); \
			((_var) \|= ((_val) << HTT_PPDU_STATS_USER_COMMON_TLV_IS_SQNUM_VALID_IN_BUFFER_S)); \
			} while (0)

	#define HTT_PPDU_STATS_USER_COMMON_TLV_NUM_FRAMES_M 0xffff0000		#define HTT_PPDU_STATS_USER_COMMON_TLV_NUM_FRAMES_M 0xffff0000
	#define HTT_PPDU_STATS_USER_COMMON_TLV_NUM_FRAMES_S 16		#define HTT_PPDU_STATS_USER_COMMON_TLV_NUM_FRAMES_S 16

	@@ -914,7 +927,7 @@ typedef struct {
	mpdus_tried: 9,		mpdus_tried: 9,
	bw: 4,		bw: 4,
	delayed_ba: 1,		delayed_ba: 1,
	reserved0: 1,		is_sqno_valid_in_buffer: 1,
	num_frames: 16;		num_frames: 16;
	};		};
	};		};

fw/wlan_module_ids.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -117,6 +117,8 @@ typedef enum {
	WLAN_MODULE_SHMEM_MGR, /* 0x53 */		WLAN_MODULE_SHMEM_MGR, /* 0x53 */
	WLAN_MODULE_CFIR, /* 0x54 / / Channel Capture */		WLAN_MODULE_CFIR, /* 0x54 / / Channel Capture */
	WLAN_MODULE_CODE_COVER, /* 0x55 / / code coverage */		WLAN_MODULE_CODE_COVER, /* 0x55 / / code coverage */
			WLAN_MODULE_SHO, /* 0x56 / / SAP HW offload */


	WLAN_MODULE_ID_MAX,		WLAN_MODULE_ID_MAX,
	WLAN_MODULE_ID_INVALID = WLAN_MODULE_ID_MAX,		WLAN_MODULE_ID_INVALID = WLAN_MODULE_ID_MAX,

fw/wmi_services.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -482,6 +482,7 @@ typedef enum {
	WMI_SERVICE_FSE_CMEM_ALLOC_SUPPORT = 262, /* Indicates that FW supports non-secure CMEM allocation for FSE table */		WMI_SERVICE_FSE_CMEM_ALLOC_SUPPORT = 262, /* Indicates that FW supports non-secure CMEM allocation for FSE table */
	WMI_SERVICE_PASSIVE_SCAN_START_TIME_ENHANCE = 263, /* Indicates FW support to not skip beacon if passive scan dwell time + channel switch delay is lesser than beacon interval */		WMI_SERVICE_PASSIVE_SCAN_START_TIME_ENHANCE = 263, /* Indicates FW support to not skip beacon if passive scan dwell time + channel switch delay is lesser than beacon interval */
	WMI_SERVICE_QOS_NULL_FRAME_TX_OVER_WMI = 264, /* Indicates that FW supports tx of QoS null frame downloaded through WMI interface */		WMI_SERVICE_QOS_NULL_FRAME_TX_OVER_WMI = 264, /* Indicates that FW supports tx of QoS null frame downloaded through WMI interface */
			WMI_SERVICE_SCAN_CONFIG_PER_CHANNEL = 265, /* Indicates that FW supports per channel configuration support in the scan start command */


	WMI_MAX_EXT2_SERVICE		WMI_MAX_EXT2_SERVICE

fw/wmi_tlv_defs.h

+25 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1112,6 +1112,11 @@ typedef enum {
	WMITLV_TAG_STRUC_wmi_qos_null_frame_tx_send_cmd_fixed_param,		WMITLV_TAG_STRUC_wmi_qos_null_frame_tx_send_cmd_fixed_param,
	WMITLV_TAG_STRUC_wmi_qos_null_frame_tx_compl_event_fixed_param,		WMITLV_TAG_STRUC_wmi_qos_null_frame_tx_compl_event_fixed_param,
	WMITLV_TAG_STRUC_wmi_pdev_enable_duration_based_tx_mode_selection_cmd_fixed_param,		WMITLV_TAG_STRUC_wmi_pdev_enable_duration_based_tx_mode_selection_cmd_fixed_param,
			WMITLV_TAG_STRUC_wmi_regulatory_rule_ext_struct,
			WMITLV_TAG_STRUC_wmi_reg_chan_list_cc_event_ext_fixed_param,
			WMITLV_TAG_STRUC_wmi_ctrl_path_mem_stats_struct,
			WMITLV_TAG_STRUC_wmi_twt_nudge_dialog_cmd_fixed_param,
			WMITLV_TAG_STRUC_wmi_twt_nudge_dialog_complete_event_fixed_param,
	} WMITLV_TAG_ID;		} WMITLV_TAG_ID;

	/*		/*
	@@ -1564,6 +1569,7 @@ typedef enum {
	OP(WMI_REQUEST_UNIFIED_LL_GET_STA_CMDID) \		OP(WMI_REQUEST_UNIFIED_LL_GET_STA_CMDID) \
	OP(WMI_QOS_NULL_FRAME_TX_SEND_CMDID) \		OP(WMI_QOS_NULL_FRAME_TX_SEND_CMDID) \
	OP(WMI_PDEV_ENABLE_DURATION_BASED_TX_MODE_SELECTION_CMDID) \		OP(WMI_PDEV_ENABLE_DURATION_BASED_TX_MODE_SELECTION_CMDID) \
			OP(WMI_TWT_NUDGE_DIALOG_CMDID) \
	/* add new CMD_LIST elements above this line */		/* add new CMD_LIST elements above this line */


	@@ -1822,6 +1828,7 @@ typedef enum {
	OP(WMI_TWT_SESSION_STATS_EVENTID) \		OP(WMI_TWT_SESSION_STATS_EVENTID) \
	OP(WMI_SSCAN_EVT_MESSAGE_EVENTID) \		OP(WMI_SSCAN_EVT_MESSAGE_EVENTID) \
	OP(WMI_QOS_NULL_FRAME_TX_COMPLETION_EVENTID) \		OP(WMI_QOS_NULL_FRAME_TX_COMPLETION_EVENTID) \
			OP(WMI_TWT_NUDGE_DIALOG_COMPLETE_EVENTID) \
	/* add new EVT_LIST elements above this line */		/* add new EVT_LIST elements above this line */


	@@ -4252,6 +4259,11 @@ WMITLV_CREATE_PARAM_STRUC(WMI_TWT_PAUSE_DIALOG_CMDID);
	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_twt_resume_dialog_cmd_fixed_param, wmi_twt_resume_dialog_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_twt_resume_dialog_cmd_fixed_param, wmi_twt_resume_dialog_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
	WMITLV_CREATE_PARAM_STRUC(WMI_TWT_RESUME_DIALOG_CMDID);		WMITLV_CREATE_PARAM_STRUC(WMI_TWT_RESUME_DIALOG_CMDID);

			/* TWT nudge dialog cmd */
			#define WMITLV_TABLE_WMI_TWT_NUDGE_DIALOG_CMDID(id,op,buf,len) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_twt_nudge_dialog_cmd_fixed_param, wmi_twt_nudge_dialog_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
			WMITLV_CREATE_PARAM_STRUC(WMI_TWT_NUDGE_DIALOG_CMDID);

	/* B-TWT STA invitation cmd */		/* B-TWT STA invitation cmd */
	#define WMITLV_TABLE_WMI_TWT_BTWT_INVITE_STA_CMDID(id,op,buf,len) \		#define WMITLV_TABLE_WMI_TWT_BTWT_INVITE_STA_CMDID(id,op,buf,len) \
	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_twt_btwt_invite_sta_cmd_fixed_param, wmi_twt_btwt_invite_sta_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_twt_btwt_invite_sta_cmd_fixed_param, wmi_twt_btwt_invite_sta_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
	@@ -5592,6 +5604,12 @@ WMITLV_CREATE_PARAM_STRUC(WMI_11D_NEW_COUNTRY_EVENTID);
	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_regulatory_rule_struct, reg_rule_array, WMITLV_SIZE_VAR)		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_regulatory_rule_struct, reg_rule_array, WMITLV_SIZE_VAR)
	WMITLV_CREATE_PARAM_STRUC(WMI_REG_CHAN_LIST_CC_EVENTID);		WMITLV_CREATE_PARAM_STRUC(WMI_REG_CHAN_LIST_CC_EVENTID);

			/* Ext regulatory channel list of current country code */
			#define WMITLV_TABLE_WMI_REG_CHAN_LIST_CC_EXT_EVENTID(id,op,buf,len) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_reg_chan_list_cc_event_ext_fixed_param, wmi_reg_chan_list_cc_event_ext_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_regulatory_rule_ext_struct, reg_rule_array, WMITLV_SIZE_VAR)
			WMITLV_CREATE_PARAM_STRUC(WMI_REG_CHAN_LIST_CC_EXT_EVENTID);

	/* FIPS event */		/* FIPS event */
	#define WMITLV_TABLE_WMI_PDEV_FIPS_EVENTID(id,op,buf,len) \		#define WMITLV_TABLE_WMI_PDEV_FIPS_EVENTID(id,op,buf,len) \
	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_fips_event_fixed_param, wmi_pdev_fips_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_fips_event_fixed_param, wmi_pdev_fips_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
	@@ -5845,7 +5863,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PEER_STATS_INFO_EVENTID);
	#define WMITLV_TABLE_WMI_CTRL_PATH_STATS_EVENTID(id, op, buf, len) \		#define WMITLV_TABLE_WMI_CTRL_PATH_STATS_EVENTID(id, op, buf, len) \
	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_ctrl_path_stats_event_fixed_param, wmi_ctrl_path_stats_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_ctrl_path_stats_event_fixed_param, wmi_ctrl_path_stats_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_ctrl_path_pdev_stats_struct, ctrl_path_pdev_stats, WMITLV_SIZE_VAR) \		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_ctrl_path_pdev_stats_struct, ctrl_path_pdev_stats, WMITLV_SIZE_VAR) \
	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_vdev_extd_stats, vdev_extd_stats, WMITLV_SIZE_VAR)		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_vdev_extd_stats, vdev_extd_stats, WMITLV_SIZE_VAR) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_ctrl_path_mem_stats_struct, ctrl_path_mem_stats, WMITLV_SIZE_VAR)
	WMITLV_CREATE_PARAM_STRUC(WMI_CTRL_PATH_STATS_EVENTID);		WMITLV_CREATE_PARAM_STRUC(WMI_CTRL_PATH_STATS_EVENTID);

	#define WMITLV_TABLE_WMI_RADIO_CHAN_STATS_EVENTID(id, op, buf, len) \		#define WMITLV_TABLE_WMI_RADIO_CHAN_STATS_EVENTID(id, op, buf, len) \
	@@ -5948,6 +5967,11 @@ WMITLV_CREATE_PARAM_STRUC(WMI_TWT_PAUSE_DIALOG_COMPLETE_EVENTID);
	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_twt_resume_dialog_complete_event_fixed_param, wmi_twt_resume_dialog_complete_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_twt_resume_dialog_complete_event_fixed_param, wmi_twt_resume_dialog_complete_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)
	WMITLV_CREATE_PARAM_STRUC(WMI_TWT_RESUME_DIALOG_COMPLETE_EVENTID);		WMITLV_CREATE_PARAM_STRUC(WMI_TWT_RESUME_DIALOG_COMPLETE_EVENTID);

			/* nudging TWT dialog complete Event */
			#define WMITLV_TABLE_WMI_TWT_NUDGE_DIALOG_COMPLETE_EVENTID(id,op,buf,len) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_twt_nudge_dialog_complete_event_fixed_param, wmi_twt_nudge_dialog_complete_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)
			WMITLV_CREATE_PARAM_STRUC(WMI_TWT_NUDGE_DIALOG_COMPLETE_EVENTID);

	/* inviting STA to B-TWT dialog complete Event */		/* inviting STA to B-TWT dialog complete Event */
	#define WMITLV_TABLE_WMI_TWT_BTWT_INVITE_STA_COMPLETE_EVENTID(id,op,buf,len) \		#define WMITLV_TABLE_WMI_TWT_BTWT_INVITE_STA_COMPLETE_EVENTID(id,op,buf,len) \
	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_twt_btwt_invite_sta_complete_event_fixed_param, wmi_twt_btwt_invite_sta_complete_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_twt_btwt_invite_sta_complete_event_fixed_param, wmi_twt_btwt_invite_sta_complete_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)

fw/wmi_unified.h

+233 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1298,6 +1298,7 @@ typedef enum {
	WMI_TWT_RESUME_DIALOG_CMDID,		WMI_TWT_RESUME_DIALOG_CMDID,
	WMI_TWT_BTWT_INVITE_STA_CMDID,		WMI_TWT_BTWT_INVITE_STA_CMDID,
	WMI_TWT_BTWT_REMOVE_STA_CMDID,		WMI_TWT_BTWT_REMOVE_STA_CMDID,
			WMI_TWT_NUDGE_DIALOG_CMDID,

	/ WMI commands related to motion detection /		/ WMI commands related to motion detection /
	WMI_MOTION_DET_CONFIG_PARAM_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_MOTION_DET),		WMI_MOTION_DET_CONFIG_PARAM_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_MOTION_DET),
	@@ -1998,6 +1999,7 @@ typedef enum {
	/** WMI events related to regulatory offload */		/** WMI events related to regulatory offload */
	WMI_REG_CHAN_LIST_CC_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_REGULATORY),		WMI_REG_CHAN_LIST_CC_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_REGULATORY),
	WMI_11D_NEW_COUNTRY_EVENTID,		WMI_11D_NEW_COUNTRY_EVENTID,
			WMI_REG_CHAN_LIST_CC_EXT_EVENTID,

	/** Events for TWT(Target Wake Time) of STA and AP */		/** Events for TWT(Target Wake Time) of STA and AP */
	WMI_TWT_ENABLE_COMPLETE_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_TWT),		WMI_TWT_ENABLE_COMPLETE_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_TWT),
	@@ -2009,6 +2011,7 @@ typedef enum {
	WMI_TWT_BTWT_INVITE_STA_COMPLETE_EVENTID,		WMI_TWT_BTWT_INVITE_STA_COMPLETE_EVENTID,
	WMI_TWT_BTWT_REMOVE_STA_COMPLETE_EVENTID,		WMI_TWT_BTWT_REMOVE_STA_COMPLETE_EVENTID,
	WMI_TWT_SESSION_STATS_EVENTID,		WMI_TWT_SESSION_STATS_EVENTID,
			WMI_TWT_NUDGE_DIALOG_COMPLETE_EVENTID,

	/** Events in Prototyping phase */		/** Events in Prototyping phase */
	WMI_NDI_CAP_RSP_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_PROTOTYPE),		WMI_NDI_CAP_RSP_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_PROTOTYPE),
	@@ -4315,6 +4318,14 @@ typedef struct {
	/**		/**
	* TLV (tag length value) parameters follow the scan_cmd		* TLV (tag length value) parameters follow the scan_cmd
	* structure. The TLV's are:		* structure. The TLV's are:
			* channel_list:
			* If FW supports WMI_SERVICE_SCAN_CONFIG_PER_CHANNEL,
			* then channel_list may fill the upper 12 bits with channel flags,
			* while using only the lower 20 bits for channel frequency.
			* Check WMI_SCAN_CHANNEL_FLAG macros for the channel flags
			* If FW doesn't support WMI_SERVICE_SCAN_CONFIG_PER_CHANNEL,
			* then channel_list only holds the frequency value
			* Use WMI_SCAN_CHANNEL_FREQ_MASK & WMI_SCAN_CHANNEL_FLAGS_MASK
	* A_UINT32 channel_list[num_chan]; // in MHz		* A_UINT32 channel_list[num_chan]; // in MHz
	* wmi_ssid ssid_list[num_ssids];		* wmi_ssid ssid_list[num_ssids];
	* wmi_mac_addr bssid_list[num_bssid];		* wmi_mac_addr bssid_list[num_bssid];
	@@ -4464,6 +4475,9 @@ typedef enum {
	/* Extend 6ghz channel measure time */		/* Extend 6ghz channel measure time */
	#define WMI_SCAN_FLAG_EXT_6GHZ_EXTEND_MEASURE_TIME 0x00000400		#define WMI_SCAN_FLAG_EXT_6GHZ_EXTEND_MEASURE_TIME 0x00000400

			/* Force unicast address in RA */
			#define WMI_SCAN_FLAG_EXT_FORCE_UNICAST_RA 0x00000800

	/**		/**
	* Currently passive scan has higher priority than beacon and		* Currently passive scan has higher priority than beacon and
	* beacon miss would happen irrespective of dwell time.		* beacon miss would happen irrespective of dwell time.
	@@ -4486,6 +4500,24 @@ typedef enum {
	/* Combine short SSID with legacy bssid list */		/* Combine short SSID with legacy bssid list */
	#define WMI_SCAN_HINT_FLAG_COMBINE_BSSID_LIST 0x00000004		#define WMI_SCAN_HINT_FLAG_COMBINE_BSSID_LIST 0x00000004


			#define WMI_SCAN_CHANNEL_FREQ_MASK 0x000FFFFF
			#define WMI_SCAN_CHANNEL_FLAGS_MASK 0xFFF00000

			/**
			* Per channel configuration flags
			*/

			/**
			* WMI_SCAN_CHANNEL_FLAG_SCAN_ONLY_IF_RNR_FOUND:
			* If this flag is set, then scan only if the corresponding channel
			* is found via RNR IE during 2g/5g scan.
			* If this flag is not set, then FW always scans the channel
			* irrespective of RNR and also FW ignores
			* WMI_SCAN_FLAG_EXT_6GHZ_SKIP_NON_RNR_CH flag
			*/
			#define WMI_SCAN_CHANNEL_FLAG_SCAN_ONLY_IF_RNR_FOUND 0x001

	typedef struct {		typedef struct {
	A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_stop_scan_cmd_fixed_param */		A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_stop_scan_cmd_fixed_param */
	/** requestor requesting cancel */		/** requestor requesting cancel */
	@@ -9363,6 +9395,73 @@ typedef struct {
	A_UINT32 vdev_pause_fail_rt_to_sched_algo_fifo_full_cnt;		A_UINT32 vdev_pause_fail_rt_to_sched_algo_fifo_full_cnt;
	} wmi_ctrl_path_pdev_stats_struct;		} wmi_ctrl_path_pdev_stats_struct;

			typedef enum {
			WMI_CTRL_PATH_STATS_ARENA_HRAM,
			WMI_CTRL_PATH_STATS_ARENA_HCRAM,
			WMI_CTRL_PATH_STATS_ARENA_HREMOTE,
			WMI_CTRL_PATH_STATS_ARENA_HCREMOTE,
			WMI_CTRL_PATH_STATS_ARENA_REMOTE,
			WMI_CTRL_PATH_STATS_ARENA_SRAM,
			WMI_CTRL_PATH_STATS_ARENA_SRAM_AUX,
			WMI_CTRL_PATH_STATS_ARENA_PAGEABLE,
			WMI_CTRL_PATH_STATS_ARENA_CMEM,
			WMI_CTRL_PATH_STATS_ARENA_TRAM,
			WMI_CTRL_PATH_STATS_ARENA_HWIO,
			WMI_CTRL_PATH_STATS_ARENA_CALDB,
			WMI_CTRL_PATH_STATS_ARENA_M3,
			WMI_CTRL_PATH_STATS_ARENA_ETMREMOTE,
			WMI_CTRL_PATH_STATS_ARENA_M3_DUMP,
			WMI_CTRL_PATH_STATS_ARENA_EMUPHY,
			WMI_CTRL_PATH_STATS_ARENA_DBG_SRAM,
			WMI_CTRL_PATH_STATS_ARENA_DBG_SRAM_AUX,
			WMI_CTRL_PATH_STATS_ARENA_SRAM_AUX_OVERFLOW,
			WMI_CTRL_PATH_STATS_ARENA_AMSS,
			WMI_CTRL_PATH_STATS_ARENA_MAX,
			} wmi_ctrl_path_fw_arena_ids;

			/*
			* Used by some hosts to print names of arenas, based on
			* wmi_ctrl_path_fw_arena_ids values specified in
			* wmi_ctrl_path_mem_stats_struct in ctrl_path_stats event msg.
			*/
			static INLINE A_UINT8 *wmi_ctrl_path_fw_arena_id_to_name(A_UINT32 arena_id)
			{
			switch(arena_id)
			{
			WMI_RETURN_STRING(WMI_CTRL_PATH_STATS_ARENA_HRAM);
			WMI_RETURN_STRING(WMI_CTRL_PATH_STATS_ARENA_HCRAM);
			WMI_RETURN_STRING(WMI_CTRL_PATH_STATS_ARENA_HREMOTE);
			WMI_RETURN_STRING(WMI_CTRL_PATH_STATS_ARENA_HCREMOTE);
			WMI_RETURN_STRING(WMI_CTRL_PATH_STATS_ARENA_REMOTE);
			WMI_RETURN_STRING(WMI_CTRL_PATH_STATS_ARENA_SRAM);
			WMI_RETURN_STRING(WMI_CTRL_PATH_STATS_ARENA_SRAM_AUX);
			WMI_RETURN_STRING(WMI_CTRL_PATH_STATS_ARENA_PAGEABLE);
			WMI_RETURN_STRING(WMI_CTRL_PATH_STATS_ARENA_CMEM);
			WMI_RETURN_STRING(WMI_CTRL_PATH_STATS_ARENA_TRAM);
			WMI_RETURN_STRING(WMI_CTRL_PATH_STATS_ARENA_HWIO);
			WMI_RETURN_STRING(WMI_CTRL_PATH_STATS_ARENA_CALDB);
			WMI_RETURN_STRING(WMI_CTRL_PATH_STATS_ARENA_M3);
			WMI_RETURN_STRING(WMI_CTRL_PATH_STATS_ARENA_ETMREMOTE);
			WMI_RETURN_STRING(WMI_CTRL_PATH_STATS_ARENA_M3_DUMP);
			WMI_RETURN_STRING(WMI_CTRL_PATH_STATS_ARENA_EMUPHY);
			WMI_RETURN_STRING(WMI_CTRL_PATH_STATS_ARENA_DBG_SRAM);
			WMI_RETURN_STRING(WMI_CTRL_PATH_STATS_ARENA_DBG_SRAM_AUX);
			WMI_RETURN_STRING(WMI_CTRL_PATH_STATS_ARENA_SRAM_AUX_OVERFLOW);
			WMI_RETURN_STRING(WMI_CTRL_PATH_STATS_ARENA_AMSS);
			}

			return (A_UINT8 *) "WMI_CTRL_PATH_STATS_ARENA_UNKNOWN";
			}

			typedef struct {
			/** TLV tag and len; tag equals
			* WMITLV_TAG_STRUC_wmi_ctrl_path_stats_event_fixed_param */
			A_UINT32 tlv_header;
			A_UINT32 arena_id; /* see wmi_ctrl_path_fw_arena_ids */
			A_UINT32 total_bytes; /* total bytes in each arena */
			A_UINT32 allocated_bytes; /* allocated bytes in each arena */
			} wmi_ctrl_path_mem_stats_struct;

	typedef struct {		typedef struct {
	/** TLV tag and len; tag equals		/** TLV tag and len; tag equals
	* WMITLV_TAG_STRUC_wmi_ctrl_path_stats_event_fixed_param */		* WMITLV_TAG_STRUC_wmi_ctrl_path_stats_event_fixed_param */
	@@ -15809,6 +15908,7 @@ typedef enum wake_reason_e {
	WOW_REASON_RFKILL,		WOW_REASON_RFKILL,
	WOW_REASON_DFS_CAC,		WOW_REASON_DFS_CAC,
	WOW_REASON_VDEV_DISCONNECT,		WOW_REASON_VDEV_DISCONNECT,
			WOW_REASON_LOCAL_DATA_UC_DROP,

	/* add new WOW_REASON_ defs before this line */		/* add new WOW_REASON_ defs before this line */
	WOW_REASON_MAX,		WOW_REASON_MAX,
	@@ -21849,6 +21949,14 @@ typedef struct {
	*/		*/
	#define WMI_DEBUG_LOG_PARAM_MOD_ENABLE_BITMAP 0x5		#define WMI_DEBUG_LOG_PARAM_MOD_ENABLE_BITMAP 0x5

			/**
			* Wow mode specific logging enablement
			* Wow mode module_id_bitmap : identifies the modules for which the log level
			* should be set in WOW and modules for which the log level
			* should be reset to DBGLOG_MAX_LVL.
			*/
			#define WMI_DEBUG_LOG_PARAM_WOW_MOD_ENABLE_BITMAP 0x6

	#define NUM_MODULES_PER_ENTRY ((sizeof(A_UINT32)) << 3)		#define NUM_MODULES_PER_ENTRY ((sizeof(A_UINT32)) << 3)

	#define WMI_MODULE_ENABLE(pmid_bitmap,mod_id) \		#define WMI_MODULE_ENABLE(pmid_bitmap,mod_id) \
	@@ -25600,9 +25708,12 @@ typedef struct {
	typedef enum {		typedef enum {
	/*		/*
	* Multiple stats type can be requested together, so each value		* Multiple stats type can be requested together, so each value
	* within this enum represents a bit within a stats bitmap.		* within this enum represents a bit position within a stats bitmap.
	*/		*/
	WMI_REQUEST_CTRL_PATH_PDEV_TX_STAT = 0x00000001,		/* bit 0 is currently unused / reserved */
			WMI_REQUEST_CTRL_PATH_PDEV_TX_STAT = 1,
			WMI_REQUEST_CTRL_PATH_VDEV_EXTD_STAT = 2,
			WMI_REQUEST_CTRL_PATH_MEM_STAT = 3,
	} wmi_ctrl_path_stats_id;		} wmi_ctrl_path_stats_id;

	typedef enum {		typedef enum {
	@@ -27225,6 +27336,7 @@ static INLINE A_UINT8 *wmi_id_to_name(A_UINT32 wmi_command)
	WMI_RETURN_STRING(WMI_REQUEST_UNIFIED_LL_GET_STA_CMDID);		WMI_RETURN_STRING(WMI_REQUEST_UNIFIED_LL_GET_STA_CMDID);
	WMI_RETURN_STRING(WMI_QOS_NULL_FRAME_TX_SEND_CMDID);		WMI_RETURN_STRING(WMI_QOS_NULL_FRAME_TX_SEND_CMDID);
	WMI_RETURN_STRING(WMI_PDEV_ENABLE_DURATION_BASED_TX_MODE_SELECTION_CMDID);		WMI_RETURN_STRING(WMI_PDEV_ENABLE_DURATION_BASED_TX_MODE_SELECTION_CMDID);
			WMI_RETURN_STRING(WMI_TWT_NUDGE_DIALOG_CMDID);
	}		}

	return "Invalid WMI cmd";		return "Invalid WMI cmd";
	@@ -27300,6 +27412,38 @@ typedef struct {
	bits 31:16 reserved */		bits 31:16 reserved */
	} wmi_regulatory_rule_struct;		} wmi_regulatory_rule_struct;

			#define WMI_REG_RULE_PSD_FLAG_GET(psd_power_info) \
			WMI_GET_BITS(psd_power_info, 0, 1)
			#define WMI_REG_RULE_PSD_FLAG_SET(psd_power_info, value) \
			WMI_SET_BITS(psd_power_info, 0, 1, value)

			#define WMI_REG_RULE_PSD_EIRP_GET(psd_power_info) \
			WMI_GET_BITS(psd_power_info, 16, 16)
			#define WMI_REG_RULE_PSD_EIRP_SET(psd_power_info, value) \
			WMI_SET_BITS(psd_power_info, 16, 16, value)

			typedef struct {
			A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_regulatory_rule_ext_struct */
			A_UINT32 freq_info; /* bits 15:0 = u16 start_freq,
			bits 31:16 = u16 end_freq
			(both in MHz units)
			use same MACRO as wmi_regulatory_rule_struct
			*/
			A_UINT32 bw_pwr_info; /* bits 15:0 = u16 max_bw (MHz units),
			bits 23:16 = u8 reg_power (dBm units),
			bits 31:24 = u8 ant_gain (dB units)
			use same MACRO as wmi_regulatory_rule_struct
			*/
			A_UINT32 flag_info; /* bits 15:0 = u16 flags,
			bits 31:16 reserved
			use same MACRO as wmi_regulatory_rule_struct
			*/
			A_UINT32 psd_power_info; /* bits 0 - whether PSD power,
			bits 15:1 - reserved
			bits 31:16 - maximum PSD EIRP (dB/MHz)
			*/
			} wmi_regulatory_rule_ext_struct;

	typedef enum {		typedef enum {
	WMI_REG_DFS_UNINIT_REGION = 0,		WMI_REG_DFS_UNINIT_REGION = 0,
	WMI_REG_DFS_FCC_REGION = 1,		WMI_REG_DFS_FCC_REGION = 1,
	@@ -27349,6 +27493,64 @@ typedef struct {
	/* followed by wmi_regulatory_rule_struct TLV array. First 2G and then 5G */		/* followed by wmi_regulatory_rule_struct TLV array. First 2G and then 5G */
	} wmi_reg_chan_list_cc_event_fixed_param;		} wmi_reg_chan_list_cc_event_fixed_param;

			typedef enum {
			WMI_REG_CLIENT_REGULAR = 0,
			WMI_REG_CLIENT_SUBORDINATE = 1,
			/* 2 and 3 are reserved for future growth */
			WMI_REG_CLIENT_MAX = 4, /* can't expand, b/c used as array length below */
			} wmi_reg_client_type;

			typedef struct {
			A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_reg_chan_list_cc_event_ext_fixed_param */
			A_UINT32 status_code; /* WMI_REG_SET_CC_STATUS_CODE */
			A_UINT32 phy_id;
			A_UINT32 alpha2;
			A_UINT32 num_phy;
			A_UINT32 country_id; /* uses CountryCode enum values */
			A_UINT32 domain_code; /* used EnumRd enum values */
			A_UINT32 dfs_region; /* WMI_REG_DFS_REGION */
			A_UINT32 phybitmap; /* WMI_REGULATORY_PHYBITMAP */
			A_UINT32 min_bw_2g; /* BW in MHz */
			A_UINT32 max_bw_2g; /* BW in MHz */
			A_UINT32 min_bw_5g; /* BW in MHz */
			A_UINT32 max_bw_5g; /* BW in MHz */
			A_UINT32 num_2g_reg_rules;
			A_UINT32 num_5g_reg_rules;
			A_UINT32 client_type; /* populated if device can function as client */
			A_UINT32 rnr_tpe_usable; /* If RNR TPE Octet usable for that country */
			A_UINT32 unspecified_ap_usable; /* If unspecified AP usable for that country */
			A_UINT32 domain_code_6g_ap_lpi;
			A_UINT32 domain_code_6g_ap_sp;
			A_UINT32 domain_code_6g_ap_vlp;
			A_UINT32 domain_code_6g_client_lpi[WMI_REG_CLIENT_MAX];
			A_UINT32 domain_code_6g_client_sp[WMI_REG_CLIENT_MAX];
			A_UINT32 domain_code_6g_client_vlp[WMI_REG_CLIENT_MAX];
			A_UINT32 min_bw_6g_ap_sp; /* MHz */
			A_UINT32 max_bw_6g_ap_sp;
			A_UINT32 min_bw_6g_ap_lpi;
			A_UINT32 max_bw_6g_ap_lpi;
			A_UINT32 min_bw_6g_ap_vlp;
			A_UINT32 max_bw_6g_ap_vlp;
			A_UINT32 min_bw_6g_client_sp[WMI_REG_CLIENT_MAX];
			A_UINT32 max_bw_6g_client_sp[WMI_REG_CLIENT_MAX];
			A_UINT32 min_bw_6g_client_lpi[WMI_REG_CLIENT_MAX];
			A_UINT32 max_bw_6g_client_lpi[WMI_REG_CLIENT_MAX];
			A_UINT32 min_bw_6g_client_vlp[WMI_REG_CLIENT_MAX];
			A_UINT32 max_bw_6g_client_vlp[WMI_REG_CLIENT_MAX];
			A_UINT32 num_6g_reg_rules_ap_sp;
			A_UINT32 num_6g_reg_rules_ap_lpi;
			A_UINT32 num_6g_reg_rules_ap_vlp;
			A_UINT32 num_6g_reg_rules_client_sp[WMI_REG_CLIENT_MAX];
			A_UINT32 num_6g_reg_rules_client_lpi[WMI_REG_CLIENT_MAX];
			A_UINT32 num_6g_reg_rules_client_vlp[WMI_REG_CLIENT_MAX];
			/*
			* This fixed_param TLV is followed by wmi_regulatory_rule_ext struct TLV array.
			* Within the reg rule ext TLV array, the 2G elements occur first,
			* then the 5G elements, then the 6G elements (AP SG, AP LPI, AP VLP,
			* client SP x4, client LPI x4, client vlp x4).
			*/
			} wmi_reg_chan_list_cc_event_ext_fixed_param;

	typedef struct {		typedef struct {
	A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_11d_scan_start_cmd_fixed_param */		A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_11d_scan_start_cmd_fixed_param */
	A_UINT32 vdev_id;		A_UINT32 vdev_id;
	@@ -28129,7 +28331,7 @@ typedef struct {
	wmi_mac_addr peer_macaddr; /* peer MAC address */		wmi_mac_addr peer_macaddr; /* peer MAC address */
	A_UINT32 dialog_id; /* TWT dialog ID */		A_UINT32 dialog_id; /* TWT dialog ID */
	A_UINT32 sp_offset_us; /* this long time after TWT resumed the 1st SP will start */		A_UINT32 sp_offset_us; /* this long time after TWT resumed the 1st SP will start */
	A_UINT32 next_twt_size; /* Next TWT subfield Size, refer to IEEE 802.11ax sectin "9.4.1.60 TWT Information field" */		A_UINT32 next_twt_size; /* Next TWT subfield Size, refer to IEEE 802.11ax section "9.4.1.60 TWT Information field" */
	} wmi_twt_resume_dialog_cmd_fixed_param;		} wmi_twt_resume_dialog_cmd_fixed_param;

	/* status code of resuming TWT dialog */		/* status code of resuming TWT dialog */
	@@ -28152,6 +28354,34 @@ typedef struct {
	A_UINT32 status; /* refer to WMI_RESUME_TWT_STATUS_T */		A_UINT32 status; /* refer to WMI_RESUME_TWT_STATUS_T */
	} wmi_twt_resume_dialog_complete_event_fixed_param;		} wmi_twt_resume_dialog_complete_event_fixed_param;

			typedef struct {
			A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_twt_nudge_dialog_cmd_fixed_param */
			A_UINT32 vdev_id; /* VDEV identifier */
			wmi_mac_addr peer_macaddr; /* peer MAC address */
			A_UINT32 dialog_id; /* TWT dialog ID */
			A_UINT32 suspend_duration_ms; /* this long time after TWT paused the 1st SP will start (millisecond) */
			A_UINT32 next_twt_size; /* Next TWT subfield Size, refer to IEEE 802.11ax section "9.4.1.60 TWT Information field" */
			} wmi_twt_nudge_dialog_cmd_fixed_param;

			/* status code of nudging TWT dialog */
			typedef enum _WMI_TWT_NUDGE_STATUS_T {
			WMI_NUDGE_TWT_STATUS_OK, /* nudging TWT dialog successfully completed */
			WMI_NUDGE_TWT_STATUS_DIALOG_ID_NOT_EXIST, /* TWT dialog ID doesn't exist */
			WMI_NUDGE_TWT_STATUS_INVALID_PARAM, /* invalid parameters */
			WMI_NUDGE_TWT_STATUS_DIALOG_ID_BUSY, /* FW is in the process of handling this dialog */
			WMI_NUDGE_TWT_STATUS_NO_RESOURCE, /* FW resource exhausted */
			WMI_NUDGE_TWT_STATUS_NO_ACK, /* peer AP/STA did not ACK the request/response frame */
			WMI_NUDGE_TWT_STATUS_UNKNOWN_ERROR, /* nudging TWT dialog failed with an unknown reason */
			} WMI_TWT_NUDGE_STATUS_T;

			typedef struct {
			A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_twt_nudge_dialog_complete_event_fixed_param */
			A_UINT32 vdev_id; /* VDEV identifier */
			wmi_mac_addr peer_macaddr; /* peer MAC address */
			A_UINT32 dialog_id; /* TWT dialog ID */
			A_UINT32 status; /* refer to WMI_NUDGE_TWT_STATUS_T */
			} wmi_twt_nudge_dialog_complete_event_fixed_param;

	typedef struct {		typedef struct {
	A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_twt_btwt_invite_sta_cmd_fixed_param */		A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_twt_btwt_invite_sta_cmd_fixed_param */
	A_UINT32 vdev_id; /* VDEV identifier */		A_UINT32 vdev_id; /* VDEV identifier */