Merge cbb840df2f7f0a067a70e0134e8242eb4d0f5d28 on remote branch (d0cc5509) · Commits · e / devices / android_kernel_xiaomi_sm6125

fw/htt.h

+27 −12

Original line number	Original line	Diff line number	Diff line
	@@ -202,9 +202,12 @@
	* 3.78 Add htt_ppdu_id def.		* 3.78 Add htt_ppdu_id def.
	* 3.79 Add HTT_NUM_AC_WMM def.		* 3.79 Add HTT_NUM_AC_WMM def.
	* 3.80 Add add WDS_FREE_COUNT bitfield in T2H PEER_UNMAP_V2 msg.		* 3.80 Add add WDS_FREE_COUNT bitfield in T2H PEER_UNMAP_V2 msg.
			* 3.81 Add ppdu_start_tsf field in HTT_TX_WBM_COMPLETION_V2.
			* 3.82 Add WIN_SIZE field to HTT_T2H_MSG_TYPE_RX_DELBA msg.
			* 3.83 Shrink seq_idx field in HTT PPDU ID from 3 bits to 2.
	*/		*/
	#define HTT_CURRENT_VERSION_MAJOR 3		#define HTT_CURRENT_VERSION_MAJOR 3
	#define HTT_CURRENT_VERSION_MINOR 80		#define HTT_CURRENT_VERSION_MINOR 83

	#define HTT_NUM_TX_FRAG_DESC 1024		#define HTT_NUM_TX_FRAG_DESC 1024

	@@ -2446,7 +2449,9 @@ PREPACK struct htt_tx_wbm_transmit_status {
	*/		*/
	reserved0: 8;		reserved0: 8;
	A_UINT32		A_UINT32
	reserved1: 32;		ppdu_start_tsf: 32; /* PPDU Start timestamp added for multicast
			* packets in the wbm completion path
			*/
	} POSTPACK;		} POSTPACK;

	/* DWORD 4 */		/* DWORD 4 */
	@@ -9674,7 +9679,7 @@ PREPACK struct htt_tx_offload_deliver_ind_hdr_t
	*		*
	* \|31 20\|19 16\|15 10\|9 8\|7 0\|		* \|31 20\|19 16\|15 10\|9 8\|7 0\|
	* \|---------------------------------------------------------------------\|		* \|---------------------------------------------------------------------\|
	* \| peer ID \| TID \| reserved \| IR\| msg type \|		* \| peer ID \| TID \| window size \| IR\| msg type \|
	* \|---------------------------------------------------------------------\|		* \|---------------------------------------------------------------------\|
	*		*
	* The following field definitions describe the format of the rx ADDBA		* The following field definitions describe the format of the rx ADDBA
	@@ -9693,10 +9698,10 @@ PREPACK struct htt_tx_offload_deliver_ind_hdr_t
	* 2 - recipient (a.k.a. responder)		* 2 - recipient (a.k.a. responder)
	* 3 - unused / reserved		* 3 - unused / reserved
	* - WIN_SIZE		* - WIN_SIZE
	* Bits 15:8 (ADDBA only)		* Bits 15:8 for ADDBA, bits 15:10 for DELBA
	* Purpose: Specifies the length of the block ack window (max = 64).		* Purpose: Specifies the length of the block ack window (max = 64).
	* Value:		* Value:
	* block ack window length specified by the received ADDBA		* block ack window length specified by the received ADDBA/DELBA
	* management message.		* management message.
	* - TID		* - TID
	* Bits 19:16		* Bits 19:16
	@@ -9746,6 +9751,8 @@ PREPACK struct htt_tx_offload_deliver_ind_hdr_t

	#define HTT_RX_DELBA_INITIATOR_M 0x00000300		#define HTT_RX_DELBA_INITIATOR_M 0x00000300
	#define HTT_RX_DELBA_INITIATOR_S 8		#define HTT_RX_DELBA_INITIATOR_S 8
			#define HTT_RX_DELBA_WIN_SIZE_M 0x0000FC00
			#define HTT_RX_DELBA_WIN_SIZE_S 10
	#define HTT_RX_DELBA_TID_M HTT_RX_ADDBA_TID_M		#define HTT_RX_DELBA_TID_M HTT_RX_ADDBA_TID_M
	#define HTT_RX_DELBA_TID_S HTT_RX_ADDBA_TID_S		#define HTT_RX_DELBA_TID_S HTT_RX_ADDBA_TID_S
	#define HTT_RX_DELBA_PEER_ID_M HTT_RX_ADDBA_PEER_ID_M		#define HTT_RX_DELBA_PEER_ID_M HTT_RX_ADDBA_PEER_ID_M
	@@ -9764,6 +9771,14 @@ PREPACK struct htt_tx_offload_deliver_ind_hdr_t
	#define HTT_RX_DELBA_INITIATOR_GET(word) \		#define HTT_RX_DELBA_INITIATOR_GET(word) \
	(((word) & HTT_RX_DELBA_INITIATOR_M) >> HTT_RX_DELBA_INITIATOR_S)		(((word) & HTT_RX_DELBA_INITIATOR_M) >> HTT_RX_DELBA_INITIATOR_S)

			#define HTT_RX_DELBA_WIN_SIZE_SET(word, value) \
			do { \
			HTT_CHECK_SET_VAL(HTT_RX_DELBA_WIN_SIZE, value); \
			(word) \|= (value) << HTT_RX_DELBA_WIN_SIZE_S; \
			} while (0)
			#define HTT_RX_DELBA_WIN_SIZE_GET(word) \
			(((word) & HTT_RX_DELBA_WIN_SIZE_M) >> HTT_RX_DELBA_WIN_SIZE_S)

	#define HTT_RX_DELBA_BYTES 4		#define HTT_RX_DELBA_BYTES 4

	/**		/**
	@@ -14030,10 +14045,10 @@ PREPACK struct htt_chan_caldata_msg {
	* The following field definitions describe the format of the PPDU ID.		* The following field definitions describe the format of the PPDU ID.
	* The PPDU ID is truncated to 24 bits for TLVs from TQM.		* The PPDU ID is truncated to 24 bits for TLVs from TQM.
	*		*
	* \|31 30\|29 24\| 23\| 22\|21 19\|18 17\|16 12\|11 0\|		* \|31 30\|29 24\| 23\|22 21\|20 19\|18 17\|16 12\|11 0\|
	* +---------------------------------------------------------------------------		* +--------------------------------------------------------------------------
	* \|rsvd \|seq_cmd_type\|tqm_cmd\|rsvd \|seq_idx\|mac_id\| hwq_ id \| sch id \|		* \|rsvd \|seq_cmd_type\|tqm_cmd\|rsvd \|seq_idx\|mac_id\| hwq_ id \| sch id \|
	* +---------------------------------------------------------------------------		* +--------------------------------------------------------------------------
	*		*
	* sch id :Schedule command id		* sch id :Schedule command id
	* Bits [11 : 0] : monotonically increasing counter to track the		* Bits [11 : 0] : monotonically increasing counter to track the
	@@ -14061,8 +14076,8 @@ PREPACK struct htt_ppdu_id {
	sch_id: 12,		sch_id: 12,
	hwq_id: 5,		hwq_id: 5,
	mac_id: 2,		mac_id: 2,
	seq_idx: 3,		seq_idx: 2,
	reserved1: 1,		reserved1: 2,
	tqm_cmd: 1,		tqm_cmd: 1,
	seq_cmd_type: 6,		seq_cmd_type: 6,
	reserved2: 2;		reserved2: 2;
	@@ -14102,7 +14117,7 @@ PREPACK struct htt_ppdu_id {
	} while (0)		} while (0)

	#define HTT_PPDU_ID_SEQ_IDX_S 19		#define HTT_PPDU_ID_SEQ_IDX_S 19
	#define HTT_PPDU_ID_SEQ_IDX_M 0x00380000		#define HTT_PPDU_ID_SEQ_IDX_M 0x00180000
	#define HTT_PPDU_ID_SEQ_IDX_GET(_var) \		#define HTT_PPDU_ID_SEQ_IDX_GET(_var) \
	(((_var) & HTT_PPDU_ID_SEQ_IDX_M) >> HTT_PPDU_ID_SEQ_IDX_S)		(((_var) & HTT_PPDU_ID_SEQ_IDX_M) >> HTT_PPDU_ID_SEQ_IDX_S)

fw/htt_stats.h

+5 −3

fw/wmi_services.h

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -437,6 +437,11 @@ typedef enum {
	WMI_SERVICE_BW_TRUE_160_SUPPORT = 242, /* Indicates FW supports true 160 BW */		WMI_SERVICE_BW_TRUE_160_SUPPORT = 242, /* Indicates FW supports true 160 BW */
	WMI_SERVICE_HOST_SCAN_STOP_VDEV_ALL_SUPPORT = 243, /* Indicates FW supports scan stop mode WMI_SCN_STOP_HOST_VAP_ALL */		WMI_SERVICE_HOST_SCAN_STOP_VDEV_ALL_SUPPORT = 243, /* Indicates FW supports scan stop mode WMI_SCN_STOP_HOST_VAP_ALL */
	WMI_SERVICE_BEACON_PROTECTION_SUPPORT = 244, /* Indicates FW supports WPA3 Beacon protection */		WMI_SERVICE_BEACON_PROTECTION_SUPPORT = 244, /* Indicates FW supports WPA3 Beacon protection */
			WMI_SERVICE_EMA_AP_SUPPORT = 245, /* FW supports EMA AP feature */
			WMI_SERVICE_PEER_POWER_SAVE_DURATION_SUPPORT = 246, /* Support for adding Power save duration per client */
			WMI_SERVICE_5_DOT_9GHZ_SUPPORT = 247, /* Indicates FW supports new 5.9GHZ (scan, connection and so on) */
			WMI_SERVICE_MU_PREAMBLE_PUNCTURE_SUPPORT = 248, /* Indicates FW supports MU preamble puncture */
			WMI_SERVICE_SRG_SRP_SPATIAL_REUSE_SUPPORT = 249, /* Support for SRG, SRP based spatial reuse support */


	/***** ADD NEW SERVICES UP TO 256 HERE *****/		/***** ADD NEW SERVICES UP TO 256 HERE *****/

fw/wmi_tlv_defs.h

+112 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1057,6 +1057,24 @@ typedef enum {
	WMITLV_TAG_STRUC_WMI_HAL_REG_CAPABILITIES_EXT2,		WMITLV_TAG_STRUC_WMI_HAL_REG_CAPABILITIES_EXT2,
	WMITLV_TAG_STRUC_wmi_roam_pmk_cache_synch_tlv_param,		WMITLV_TAG_STRUC_wmi_roam_pmk_cache_synch_tlv_param,
	WMITLV_TAG_STRUC_wmi_mdns_set_staIP_cmd_fixed_param,		WMITLV_TAG_STRUC_wmi_mdns_set_staIP_cmd_fixed_param,
			WMITLV_TAG_STRUC_wmi_vdev_get_big_data_p2_cmd_fixed_param,
			WMITLV_TAG_STRUC_wmi_vdev_send_big_data_p2_event_fixed_param,
			WMITLV_TAG_STRUC_wmi_audio_aggr_get_statistics,
			WMITLV_TAG_STRUC_wmi_audio_aggr_reset_statistics,
			WMITLV_TAG_STRUC_wmi_audio_aggr_statistics_event_fixed_param,
			WMITLV_TAG_STRUC_wmi_audio_aggr_group_stats,
			WMITLV_TAG_STRUC_wmi_audio_aggr_peer_stats,
			WMITLV_TAG_STRUC_wmi_ant_controller_cmd_fixed_param,
			WMITLV_TAG_STRUC_wmi_pdev_srg_bss_color_bitmap_cmd_fixed_param,
			WMITLV_TAG_STRUC_wmi_pdev_srg_partial_bssid_bitmap_cmd_fixed_param,
			WMITLV_TAG_STRUC_wmi_simulation_test_cmd_fixed_param,
			WMITLV_TAG_STRUC_wmi_audio_aggr_set_rtscts_config,
			WMITLV_TAG_STRUC_wmi_pdev_sscan_fw_cmd_fixed_param,
			WMITLV_TAG_STRUC_wmi_pdev_sscan_fft_bin_index,
			WMITLV_TAG_STRUC_wmi_pdev_srg_obss_color_enable_bitmap_cmd_fixed_param,
			WMITLV_TAG_STRUC_wmi_pdev_srg_obss_bssid_enable_bitmap_cmd_fixed_param,
			WMITLV_TAG_STRUC_wmi_pdev_non_srg_obss_color_enable_bitmap_cmd_fixed_param,
			WMITLV_TAG_STRUC_wmi_pdev_non_srg_obss_bssid_enable_bitmap_cmd_fixed_param,
	} WMITLV_TAG_ID;		} WMITLV_TAG_ID;

	/*		/*
	@@ -1489,6 +1507,18 @@ typedef enum {
	OP(WMI_VDEV_GET_BIG_DATA_CMDID) \		OP(WMI_VDEV_GET_BIG_DATA_CMDID) \
	OP(WMI_PDEV_FRAME_INJECT_CMDID) \		OP(WMI_PDEV_FRAME_INJECT_CMDID) \
	OP(WMI_PDEV_TBTT_OFFSET_SYNC_CMDID) \		OP(WMI_PDEV_TBTT_OFFSET_SYNC_CMDID) \
			OP(WMI_VDEV_GET_BIG_DATA_P2_CMDID) \
			OP(WMI_AUDIO_AGGR_GET_STATISTICS_CMDID) \
			OP(WMI_AUDIO_AGGR_RESET_STATISTICS_CMDID) \
			OP(WMI_ANT_CONTROLLER_CMDID) \
			OP(WMI_PDEV_SET_SRG_BSS_COLOR_BITMAP_CMDID) \
			OP(WMI_PDEV_SET_SRG_PARTIAL_BSSID_BITMAP_CMDID) \
			OP(WMI_SIMULATION_TEST_CMDID) \
			OP(WMI_AUDIO_AGGR_SET_RTSCTS_CONFIG_CMDID) \
			OP(WMI_PDEV_SET_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID) \
			OP(WMI_PDEV_SET_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID) \
			OP(WMI_PDEV_SET_NON_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID) \
			OP(WMI_PDEV_SET_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID) \
	/* add new CMD_LIST elements above this line */		/* add new CMD_LIST elements above this line */


	@@ -1735,6 +1765,9 @@ typedef enum {
	OP(WMI_ROAM_SCAN_CHANNEL_LIST_EVENTID) \		OP(WMI_ROAM_SCAN_CHANNEL_LIST_EVENTID) \
	OP(WMI_VDEV_SEND_BIG_DATA_EVENTID) \		OP(WMI_VDEV_SEND_BIG_DATA_EVENTID) \
	OP(WMI_NAN_DMESG_EVENTID) \		OP(WMI_NAN_DMESG_EVENTID) \
			OP(WMI_VDEV_SEND_BIG_DATA_P2_EVENTID) \
			OP(WMI_AUDIO_AGGR_REPORT_STATISTICS_EVENTID) \
			OP(WMI_PDEV_SSCAN_FW_PARAM_EVENTID) \
	/* add new EVT_LIST elements above this line */		/* add new EVT_LIST elements above this line */


	@@ -2522,6 +2555,11 @@ WMITLV_CREATE_PARAM_STRUC(WMI_GPIO_CONFIG_CMDID);
	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_gpio_output_cmd_fixed_param, wmi_gpio_output_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_gpio_output_cmd_fixed_param, wmi_gpio_output_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
	WMITLV_CREATE_PARAM_STRUC(WMI_GPIO_OUTPUT_CMDID);		WMITLV_CREATE_PARAM_STRUC(WMI_GPIO_OUTPUT_CMDID);

			/* Antenna Controller config Cmd */
			#define WMITLV_TABLE_WMI_ANT_CONTROLLER_CMDID(id,op,buf,len) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_ant_controller_cmd_fixed_param, wmi_ant_controller_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
			WMITLV_CREATE_PARAM_STRUC(WMI_ANT_CONTROLLER_CMDID);

	/* Peer add WDA entry Cmd */		/* Peer add WDA entry Cmd */
	#define WMITLV_TABLE_WMI_PEER_ADD_WDS_ENTRY_CMDID(id,op,buf,len) \		#define WMITLV_TABLE_WMI_PEER_ADD_WDS_ENTRY_CMDID(id,op,buf,len) \
	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_peer_add_wds_entry_cmd_fixed_param, wmi_peer_add_wds_entry_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_peer_add_wds_entry_cmd_fixed_param, wmi_peer_add_wds_entry_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
	@@ -4273,6 +4311,18 @@ WMITLV_CREATE_PARAM_STRUC(WMI_AUDIO_AGGR_SET_GROUP_PROBE_CMDID);
	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_FIXED_STRUC, wmi_mac_addr, au_groups, WMITLV_SIZE_VAR)		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_FIXED_STRUC, wmi_mac_addr, au_groups, WMITLV_SIZE_VAR)
	WMITLV_CREATE_PARAM_STRUC(WMI_AUDIO_AGGR_UPDATE_STA_GROUP_INFO_CMDID);		WMITLV_CREATE_PARAM_STRUC(WMI_AUDIO_AGGR_UPDATE_STA_GROUP_INFO_CMDID);

			#define WMITLV_TABLE_WMI_AUDIO_AGGR_GET_STATISTICS_CMDID(id,op,buf,len) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_audio_aggr_get_statistics, wmi_audio_aggr_get_statistics_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
			WMITLV_CREATE_PARAM_STRUC(WMI_AUDIO_AGGR_GET_STATISTICS_CMDID);

			#define WMITLV_TABLE_WMI_AUDIO_AGGR_RESET_STATISTICS_CMDID(id,op,buf,len) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_audio_aggr_reset_statistics, wmi_audio_aggr_reset_statistics_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
			WMITLV_CREATE_PARAM_STRUC(WMI_AUDIO_AGGR_RESET_STATISTICS_CMDID);

			#define WMITLV_TABLE_WMI_AUDIO_AGGR_SET_RTSCTS_CONFIG_CMDID(id,op,buf,len) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_audio_aggr_set_rtscts_config, wmi_audio_aggr_set_rtscts_config_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
			WMITLV_CREATE_PARAM_STRUC(WMI_AUDIO_AGGR_SET_RTSCTS_CONFIG_CMDID);

	/* CFR Capture Filter cmd */		/* CFR Capture Filter cmd */
	#define WMITLV_TABLE_WMI_CFR_CAPTURE_FILTER_CMDID(id,op,buf,len) \		#define WMITLV_TABLE_WMI_CFR_CAPTURE_FILTER_CMDID(id,op,buf,len) \
	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_cfr_capture_filter_cmd_fixed_param, wmi_cfr_capture_filter_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_cfr_capture_filter_cmd_fixed_param, wmi_cfr_capture_filter_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
	@@ -4303,11 +4353,16 @@ WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_SET_PCL_CMDID);
	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_roam_get_scan_channel_list_cmd_fixed_param, wmi_roam_get_scan_channel_list_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_roam_get_scan_channel_list_cmd_fixed_param, wmi_roam_get_scan_channel_list_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
	WMITLV_CREATE_PARAM_STRUC(WMI_ROAM_GET_SCAN_CHANNEL_LIST_CMDID);		WMITLV_CREATE_PARAM_STRUC(WMI_ROAM_GET_SCAN_CHANNEL_LIST_CMDID);

	/* Get per vdev BIG DATA stats */		/* VDEV_GET_BIG_DATA_CMD IS DEPRECATED - DO NOT USE */
	#define WMITLV_TABLE_WMI_VDEV_GET_BIG_DATA_CMDID(id,op,buf,len) \		#define WMITLV_TABLE_WMI_VDEV_GET_BIG_DATA_CMDID(id,op,buf,len) \
	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_get_big_data_cmd_fixed_param, wmi_vdev_get_big_data_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_get_big_data_cmd_fixed_param, wmi_vdev_get_big_data_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
	WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_GET_BIG_DATA_CMDID);		WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_GET_BIG_DATA_CMDID);

			/* Get per vdev BIG DATA stats P2 */
			#define WMITLV_TABLE_WMI_VDEV_GET_BIG_DATA_P2_CMDID(id,op,buf,len) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_get_big_data_p2_cmd_fixed_param, wmi_vdev_get_big_data_p2_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
			WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_GET_BIG_DATA_P2_CMDID);

	/* Frame inject command */		/* Frame inject command */
	#define WMITLV_TABLE_WMI_PDEV_FRAME_INJECT_CMDID(id,op,buf,len) \		#define WMITLV_TABLE_WMI_PDEV_FRAME_INJECT_CMDID(id,op,buf,len) \
	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_frame_inject_cmd_fixed_param, wmi_frame_inject_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_frame_inject_cmd_fixed_param, wmi_frame_inject_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
	@@ -4320,6 +4375,42 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_FRAME_INJECT_CMDID);
	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_pdev_rnr_bss_tbtt_info, rnr_tbtt_info, WMITLV_SIZE_VAR)		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_pdev_rnr_bss_tbtt_info, rnr_tbtt_info, WMITLV_SIZE_VAR)
	WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_TBTT_OFFSET_SYNC_CMDID);		WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_TBTT_OFFSET_SYNC_CMDID);

			/* SRG BSS color Bitmap */
			#define WMITLV_TABLE_WMI_PDEV_SET_SRG_BSS_COLOR_BITMAP_CMDID(id,op,buf,len) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_srg_bss_color_bitmap_cmd_fixed_param, wmi_pdev_srg_bss_color_bitmap_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
			WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_SRG_BSS_COLOR_BITMAP_CMDID);

			/* SRG Partial BSSid Bitmap */
			#define WMITLV_TABLE_WMI_PDEV_SET_SRG_PARTIAL_BSSID_BITMAP_CMDID(id,op,buf,len) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_srg_partial_bssid_bitmap_cmd_fixed_param, wmi_pdev_srg_partial_bssid_bitmap_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
			WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_SRG_PARTIAL_BSSID_BITMAP_CMDID);

			/* Simulation test command */
			#define WMITLV_TABLE_WMI_SIMULATION_TEST_CMDID(id,op,buf,len) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_simulation_test_cmd_fixed_param, wmi_simulation_test_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, bufp, WMITLV_SIZE_VAR)
			WMITLV_CREATE_PARAM_STRUC(WMI_SIMULATION_TEST_CMDID);

			/* SRG OBSS color Enable Bitmap */
			#define WMITLV_TABLE_WMI_PDEV_SET_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID(id,op,buf,len) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_srg_obss_color_enable_bitmap_cmd_fixed_param, wmi_pdev_srg_obss_color_enable_bitmap_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
			WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID);

			/* SRG OBSS BSSID Enable Bitmap */
			#define WMITLV_TABLE_WMI_PDEV_SET_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID(id,op,buf,len) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_srg_obss_bssid_enable_bitmap_cmd_fixed_param, wmi_pdev_srg_obss_bssid_enable_bitmap_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
			WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID);

			/* Non_SRG OBSS color Enable Bitmap */
			#define WMITLV_TABLE_WMI_PDEV_SET_NON_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID(id,op,buf,len) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_non_srg_obss_color_enable_bitmap_cmd_fixed_param, wmi_pdev_non_srg_obss_color_enable_bitmap_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
			WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_NON_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID);

			/* Non_SRG OBSS BSSID Enable Bitmap */
			#define WMITLV_TABLE_WMI_PDEV_SET_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID(id,op,buf,len) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_non_srg_obss_bssid_enable_bitmap_cmd_fixed_param, wmi_pdev_non_srg_obss_bssid_enable_bitmap_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
			WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID);


	/************************ TLV definitions of WMI events *****************************/		/************************ TLV definitions of WMI events *****************************/

	@@ -5813,16 +5904,35 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_MULTIPLE_VDEV_RESTART_RESP_EVENTID);
	WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, channel_list, WMITLV_SIZE_VAR)		WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, channel_list, WMITLV_SIZE_VAR)
	WMITLV_CREATE_PARAM_STRUC(WMI_ROAM_SCAN_CHANNEL_LIST_EVENTID);		WMITLV_CREATE_PARAM_STRUC(WMI_ROAM_SCAN_CHANNEL_LIST_EVENTID);

	/* send BIG DATA event to host */		/* VDEV_SEND_BIG_DATA_EVENT IS DEPRECATED - DO NOT USE */
	#define WMITLV_TABLE_WMI_VDEV_SEND_BIG_DATA_EVENTID(id,op,buf,len) \		#define WMITLV_TABLE_WMI_VDEV_SEND_BIG_DATA_EVENTID(id,op,buf,len) \
	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_send_big_data_event_fixed_param, wmi_vdev_send_big_data_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_send_big_data_event_fixed_param, wmi_vdev_send_big_data_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)
	WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_SEND_BIG_DATA_EVENTID);		WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_SEND_BIG_DATA_EVENTID);

			/* send BIG DATA event to host P2 */
			#define WMITLV_TABLE_WMI_VDEV_SEND_BIG_DATA_P2_EVENTID(id,op,buf,len) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_send_big_data_p2_event_fixed_param, wmi_vdev_send_big_data_p2_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
			WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, bd_datapath_stats, WMITLV_SIZE_VAR)
			WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_SEND_BIG_DATA_P2_EVENTID);

	#define WMITLV_TABLE_WMI_NAN_DMESG_EVENTID(id,op,buf,len) \		#define WMITLV_TABLE_WMI_NAN_DMESG_EVENTID(id,op,buf,len) \
	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_nan_dmesg_event_fixed_param, wmi_nan_dmesg_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_nan_dmesg_event_fixed_param, wmi_nan_dmesg_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, msg, WMITLV_SIZE_VAR)		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, msg, WMITLV_SIZE_VAR)
	WMITLV_CREATE_PARAM_STRUC(WMI_NAN_DMESG_EVENTID);		WMITLV_CREATE_PARAM_STRUC(WMI_NAN_DMESG_EVENTID);

			/* report soundbar statistics event to host */
			#define WMITLV_TABLE_WMI_AUDIO_AGGR_REPORT_STATISTICS_EVENTID(id,op,buf,len) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_audio_aggr_statistics_event_fixed_param, wmi_audio_aggr_statistics_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_audio_aggr_group_stats, group_stats, WMITLV_SIZE_VAR) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_audio_aggr_peer_stats, peer_stats, WMITLV_SIZE_VAR)
			WMITLV_CREATE_PARAM_STRUC(WMI_AUDIO_AGGR_REPORT_STATISTICS_EVENTID);

			/* Send sscan fw params to host */
			#define WMITLV_TABLE_WMI_PDEV_SSCAN_FW_PARAM_EVENTID(id,op,buf,len) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_sscan_fw_cmd_fixed_param, wmi_pdev_sscan_fw_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
			WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_pdev_sscan_fft_bin_index, fft_bin_index, WMITLV_SIZE_VAR)
			WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SSCAN_FW_PARAM_EVENTID);


	#ifdef __cplusplus		#ifdef __cplusplus
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -1850,10 +1850,10 @@ typedef enum {
	HTT_TX_SELFGEN_SCH_TSFLAG_RESP_CBF_BW_MISMATCH_ERR,		HTT_TX_SELFGEN_SCH_TSFLAG_RESP_CBF_BW_MISMATCH_ERR,
	HTT_TX_SELFGEN_SCH_TSFLAG_RETRY_COUNT_FAIL_ERR,		HTT_TX_SELFGEN_SCH_TSFLAG_RETRY_COUNT_FAIL_ERR,
	HTT_TX_SELFGEN_SCH_TSFLAG_RESP_TOO_LATE_RECEIVED_ERR,		HTT_TX_SELFGEN_SCH_TSFLAG_RESP_TOO_LATE_RECEIVED_ERR,
	HTT_TX_SELFGEN_SCH_TSFLAG_ERR_RESERVED,		HTT_TX_SELFGEN_SCH_TSFLAG_SIFS_STALL_NO_NEXT_CMD_ERR,

	HTT_TX_SELFGEN_NUM_SCH_TSFLAG_ERROR_STATS = 8, /* includes RESERVED */		HTT_TX_SELFGEN_NUM_SCH_TSFLAG_ERROR_STATS = 8,
	HTT_TX_SELFGEN_SCH_TSFLAG_ERROR_STATS_VALID = 7 /* not incl. RESERVED */		HTT_TX_SELFGEN_SCH_TSFLAG_ERROR_STATS_VALID = 8
	} htt_tx_selfgen_sch_tsflag_error_stats;		} htt_tx_selfgen_sch_tsflag_error_stats;

	#define HTT_TX_PDEV_STATS_NUM_AC_MUMIMO_USER_STATS 4		#define HTT_TX_PDEV_STATS_NUM_AC_MUMIMO_USER_STATS 4
	@@ -1941,6 +1941,7 @@ typedef struct {
	A_UINT32 ax_mu_mimo_ndpa_queued;		A_UINT32 ax_mu_mimo_ndpa_queued;
	A_UINT32 ax_mu_mimo_ndp_queued;		A_UINT32 ax_mu_mimo_ndp_queued;
	A_UINT32 ax_mu_mimo_brpoll_queued[HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS - 1];		A_UINT32 ax_mu_mimo_brpoll_queued[HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS - 1];
			A_UINT32 ax_ul_mumimo_trigger[HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS];
	} htt_tx_selfgen_ax_stats_tlv;		} htt_tx_selfgen_ax_stats_tlv;

	typedef struct {		typedef struct {
	@@ -2059,6 +2060,7 @@ typedef struct {
	A_UINT32 ax_mu_mimo_ndpa_flushed;		A_UINT32 ax_mu_mimo_ndpa_flushed;
	A_UINT32 ax_mu_mimo_ndp_flushed;		A_UINT32 ax_mu_mimo_ndp_flushed;
	A_UINT32 ax_mu_mimo_brpoll_flushed[HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS - 1];		A_UINT32 ax_mu_mimo_brpoll_flushed[HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS - 1];
			A_UINT32 ax_ul_mumimo_trigger_err[HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS];
	} htt_tx_selfgen_ax_err_stats_tlv;		} htt_tx_selfgen_ax_err_stats_tlv;

	typedef struct {		typedef struct {