Merge bdd2ca6d5ba4a8e82f9bbd5e0184759e1ef86f5c on remote branch (82019caa) · Commits · e / devices / android_kernel_fairphone_FP4

fw/htt_ppdu_stats.h

+44 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2017-2020 The Linux Foundation. All rights reserved.
		* Copyright (c) 2017-2021 The Linux Foundation. All rights reserved.
		*
		* Permission to use, copy, modify, and/or distribute this software for
		* any purpose with or without fee is hereby granted, provided that the
		@@ -51,6 +51,7 @@ enum htt_ppdu_stats_tlv_tag {
		HTT_PPDU_STATS_USERS_INFO_TLV, /* htt_ppdu_stats_users_info_tlv */
		HTT_PPDU_STATS_USR_MPDU_ENQ_BITMAP_1024_TLV, /* htt_ppdu_stats_enq_mpdu_bitmap_1024_tlv */
		HTT_PPDU_STATS_USR_COMPLTN_BA_BITMAP_1024_TLV,/* htt_ppdu_stats_user_compltn_ba_bitmap_1024_tlv */
		HTT_PPDU_STATS_RX_MGMTCTRL_PAYLOAD_TLV, /* htt_ppdu_stats_rx_mgmtctrl_payload_tlv */

		/* New TLV's are added above to this line */
		HTT_PPDU_STATS_MAX_TAG,
		@@ -2353,6 +2354,48 @@ typedef struct {
		A_UINT32 payload[1];
		} htt_ppdu_stats_tx_mgmtctrl_payload_tlv;

		#define HTT_PPDU_STATS_RX_MGMTCTRL_TLV_FRAME_LENGTH_M 0x0000ffff
		#define HTT_PPDU_STATS_RX_MGMTCTRL_TLV_FRAME_LENGTH_S 0

		#define HTT_PPDU_STATS_RX_MGMTCTRL_TLV_FRAME_LENGTH_GET(_var) \
		(((_var) & HTT_PPDU_STATS_RX_MGMTCTRL_TLV_FRAME_LENGTH_M) >> \
		HTT_PPDU_STATS_RX_MGMTCTRL_TLV_FRAME_LENGTH_S)

		#define HTT_PPDU_STATS_RX_MGMTCTRL_TLV_FRAME_LENGTH_SET(_var, _val) \
		do { \
		HTT_CHECK_SET_VAL(HTT_PPDU_STATS_RX_MGMTCTRL_TLV_FRAME_LENGTH, _val); \
		((_var) \|= ((_val) << HTT_PPDU_STATS_RX_MGMTCTRL_TLV_FRAME_LENGTH_S)); \
		} while (0)

		typedef struct {
		htt_tlv_hdr_t tlv_hdr;

		/*
		* BIT [ 15 : 0] :- frame_length (in bytes)
		* BIT [ 31 : 16] :- reserved1
		*/
		union {
		A_UINT32 rsvd__frame_length;
		struct {
		A_UINT32 frame_length: 16,
		reserved1: 16; /* set to 0x0 */
		};
		};

		/* Future purpose */
		A_UINT32 reserved2; /* set to 0x0 */
		A_UINT32 reserved3; /* set to 0x0 */

		/* mgmt/ctrl frame payload
		* The size of the actual mgmt payload (in bytes) can be obtained from
		* the frame_length field.
		* The size of entire payload including the padding for alignment
		* (in bytes) can be derived from the length in tlv parametes,
		* minus the 12 bytes of the above fields.
		*/
		A_UINT32 payload[1];
		} htt_ppdu_stats_rx_mgmtctrl_payload_tlv;

		#define HTT_PPDU_STATS_USERS_INFO_TLV_MAX_USERS_M 0x000000ff
		#define HTT_PPDU_STATS_USERS_INFO_TLV_MAX_USERS_S 0

fw/htt_stats.h

+303 −218

File changed.

Preview size limit exceeded, changes collapsed.

fw/wmi_services.h

+16 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2011-2020 The Linux Foundation. All rights reserved.
		* Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
		*
		* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
		*
		@@ -509,6 +509,21 @@ typedef enum {
		* be sent on the WMI communication link.
		*/
		WMI_SERVICE_UNIFIED_LL_GET_STA_OVER_QMI_SUPPORT = 274,
		/*
		* Indicates FW supports EAPOL offload for SAE roaming if PMK of
		* candidate AP is present in FW.
		*/
		WMI_SERVICE_SAE_EAPOL_OFFLOAD_SUPPORT = 275,
		/*
		* Indicates FW supports sending events to host during Thermal Throttling
		* every duty cycle on detecting temperature change when dc_per_event is 0.
		*/
		WMI_SERVICE_THERM_THROT_TEMP_CHANGE_DYNAMIC_EVENT_SUPPORT = 276,
		WMI_SERVICE_WAPI_CONCURRENCY_SUPPORTED = 277, /* Indicates FW support for WAPI concurrency */
		WMI_SERVICE_SAP_CONNECTED_D3WOW = 278, /* Indicates FW support for D3WoW for SAP connected case */
		WMI_SERVICE_GO_CONNECTED_D3WOW = 279, /* Indicates FW support for D3WoW for P2P GO connected case */
		WMI_SERVICE_EXT_TPC_REG_SUPPORT = 280, /* Support for new 6G TPC power limits */
		WMI_SERVICE_REG_CC_EXT_EVENT_SUPPORT = 281, /* Support for Extended REG_CC Event with additional params for 6G */


		WMI_MAX_EXT2_SERVICE

fw/wmi_tlv_defs.h

+41 −11

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2010-2020 The Linux Foundation. All rights reserved.
		* Copyright (c) 2010-2021 The Linux Foundation. All rights reserved.
		*
		* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
		*
		@@ -1133,6 +1133,9 @@ typedef enum {
		WMITLV_TAG_STRUC_wmi_ctrl_path_twt_stats_struct,
		WMITLV_TAG_STRUC_wmi_ctrl_path_calibration_stats_struct,
		WMITLV_TAG_STRUC_wmi_twt_notify_event_fixed_param,
		WMITLV_TAG_STRUC_wmi_mlo_link_set_active_cmd_fixed_param,
		WMITLV_TAG_STRUC_wmi_mlo_link_set_active_resp_event_fixed_param,
		WMITLV_TAG_STRUC_wmi_roam_sae_offload_tlv_param,
		} WMITLV_TAG_ID;

		/*
		@@ -1589,6 +1592,7 @@ typedef enum {
		OP(WMI_VDEV_SET_TPC_POWER_CMDID) \
		OP(WMI_VDEV_TID_LATENCY_CONFIG_CMDID) \
		OP(WMI_PEER_TID_LATENCY_CONFIG_CMDID) \
		OP(WMI_MLO_LINK_SET_ACTIVE_CMDID) \
		/* add new CMD_LIST elements above this line */


		@@ -1850,6 +1854,7 @@ typedef enum {
		OP(WMI_TWT_NUDGE_DIALOG_COMPLETE_EVENTID) \
		OP(WMI_REG_CHAN_LIST_CC_EXT_EVENTID) \
		OP(WMI_TWT_NOTIFY_EVENTID) \
		OP(WMI_MLO_LINK_SET_ACTIVE_RESP_EVENTID) \
		/* add new EVT_LIST elements above this line */


		@@ -1867,7 +1872,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_INIT_CMDID);

		/* Peer create Cmd */
		#define WMITLV_TABLE_WMI_PEER_CREATE_CMDID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_peer_create_cmd_fixed_param, wmi_peer_create_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_peer_create_cmd_fixed_param, wmi_peer_create_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_peer_create_mlo_params, mlo_params, WMITLV_SIZE_VAR)

		WMITLV_CREATE_PARAM_STRUC(WMI_PEER_CREATE_CMDID);

		@@ -2008,7 +2014,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_11K_INVOKE_NEIGHBOR_REPORT_CMDID);
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_roam_ese_offload_tlv_param, offload_ese_param, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_tlv_buf_len_param, assoc_ie_len_param, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, assoc_ie_buf, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_roam_fils_offload_tlv_param, offload_fils_info_param, WMITLV_SIZE_VAR)
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_roam_fils_offload_tlv_param, offload_fils_info_param, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_roam_sae_offload_tlv_param, offload_sae_info_param, WMITLV_SIZE_VAR)
		WMITLV_CREATE_PARAM_STRUC(WMI_ROAM_SCAN_MODE);

		/* Roam scan Rssi Threshold Cmd */
		@@ -2226,7 +2233,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_WMM_PARAMS_CMDID);
		#define WMITLV_TABLE_WMI_VDEV_START_REQUEST_CMDID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_start_request_cmd_fixed_param, wmi_vdev_start_request_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_channel, wmi_channel, chan, WMITLV_SIZE_FIX) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_p2p_noa_descriptor, noa_descriptors, WMITLV_SIZE_VAR)
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_p2p_noa_descriptor, noa_descriptors, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_vdev_start_mlo_params, mlo_params, WMITLV_SIZE_VAR)

		WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_START_REQUEST_CMDID);

		@@ -2319,7 +2327,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_IPSEC_NATKEEPALIVE_FILTER_CMDID);
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, peer_legacy_rates, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, peer_ht_rates, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vht_rate_set, wmi_vht_rate_set, peer_vht_rates, WMITLV_SIZE_FIX) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_he_rate_set, peer_he_rates, WMITLV_SIZE_VAR)
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_he_rate_set, peer_he_rates, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_peer_assoc_mlo_params, mlo_params, WMITLV_SIZE_VAR)

		WMITLV_CREATE_PARAM_STRUC(WMI_PEER_ASSOC_CMDID);

		@@ -2465,7 +2474,9 @@ WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_SPECTRAL_SCAN_ENABLE_CMDID);
		/* Request stats Cmd */
		#define WMITLV_TABLE_WMI_REQUEST_STATS_CMDID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_request_stats_cmd_fixed_param, wmi_request_stats_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_inst_rssi_stats_params, inst_rssi_params, WMITLV_SIZE_VAR)
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_inst_rssi_stats_params, inst_rssi_params, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, vdev_id_bitmap, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_FIXED_STRUC, wmi_mac_addr, mld_macaddr, WMITLV_SIZE_VAR)

		WMITLV_CREATE_PARAM_STRUC(WMI_REQUEST_STATS_CMDID);

		@@ -2497,13 +2508,17 @@ WMITLV_CREATE_PARAM_STRUC(WMI_DIAG_EVENT_LOG_CONFIG_CMDID);

		/* Set config params */
		#define WMITLV_TABLE_WMI_START_LINK_STATS_CMDID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_start_link_stats_cmd_fixed_param, wmi_start_link_stats_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_start_link_stats_cmd_fixed_param, wmi_start_link_stats_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, vdev_id_bitmap, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_FIXED_STRUC, wmi_mac_addr, mld_macaddr, WMITLV_SIZE_VAR)

		WMITLV_CREATE_PARAM_STRUC(WMI_START_LINK_STATS_CMDID);

		/* Request to clear link stats */
		#define WMITLV_TABLE_WMI_CLEAR_LINK_STATS_CMDID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_clear_link_stats_cmd_fixed_param, wmi_clear_link_stats_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_clear_link_stats_cmd_fixed_param, wmi_clear_link_stats_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, vdev_id_bitmap, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_FIXED_STRUC, wmi_mac_addr, mld_macaddr, WMITLV_SIZE_VAR)

		WMITLV_CREATE_PARAM_STRUC(WMI_CLEAR_LINK_STATS_CMDID);

		@@ -3019,7 +3034,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_SET_CUSTOM_AGGR_SIZE_CMDID);
		/* Vdev create Cmd */
		#define WMITLV_TABLE_WMI_VDEV_CREATE_CMDID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_create_cmd_fixed_param, wmi_vdev_create_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_vdev_txrx_streams, cfg_txrx_streams, WMITLV_SIZE_VAR)
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_vdev_txrx_streams, cfg_txrx_streams, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_vdev_create_mlo_params, mlo_params, WMITLV_SIZE_VAR)

		WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_CREATE_CMDID);

		@@ -3507,7 +3523,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PEER_GET_ESTIMATED_LINKSPEED_CMDID);
		/* ext stats Request */
		#define WMITLV_TABLE_WMI_REQUEST_STATS_EXT_CMDID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_req_stats_ext_cmd_fixed_param, wmi_req_stats_ext_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, data, WMITLV_SIZE_VAR)
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, data, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, vdev_id_bitmap, WMITLV_SIZE_VAR)
		WMITLV_CREATE_PARAM_STRUC(WMI_REQUEST_STATS_EXT_CMDID);

		/* 2.4Ghz HT40 OBSS scan enable */
		@@ -4572,6 +4589,13 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_GET_TPC_STATS_CMDID);
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_enable_duration_based_tx_mode_selection_cmd_fixed_param, wmi_pdev_enable_duration_based_tx_mode_selection_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
		WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_ENABLE_DURATION_BASED_TX_MODE_SELECTION_CMDID);

		/* MLO set link for active or inactive Cmd */
		#define WMITLV_TABLE_WMI_MLO_LINK_SET_ACTIVE_CMDID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_mlo_link_set_active_cmd_fixed_param, wmi_mlo_link_set_active_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_mlo_set_active_link_number_param, link_number_param, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, vdev_id_bitmap, WMITLV_SIZE_VAR)
		WMITLV_CREATE_PARAM_STRUC(WMI_MLO_LINK_SET_ACTIVE_CMDID);


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

		@@ -6172,10 +6196,16 @@ WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_BCN_LATENCY_EVENTID);
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_twt_session_stats_info, twt_sessions, WMITLV_SIZE_VAR)
		WMITLV_CREATE_PARAM_STRUC(WMI_TWT_SESSION_STATS_EVENTID);

		/* TWT Stats session event */
		#define WMITLV_TABLE_WMI_MLO_LINK_SET_ACTIVE_RESP_EVENTID(id,op,buf,len) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_mlo_link_set_active_resp_event_fixed_param, wmi_mlo_link_set_active_resp_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, force_active_vdev_bitmap, WMITLV_SIZE_VAR) \
		WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, force_inactive_vdev_bitmap, WMITLV_SIZE_VAR)
		WMITLV_CREATE_PARAM_STRUC(WMI_MLO_LINK_SET_ACTIVE_RESP_EVENTID);


		#ifdef __cplusplus
		}
		#endif

		#endif /_WMI_TLV_DEFS_H_/

fw/wmi_unified.h

+349 −16

File changed.

Preview size limit exceeded, changes collapsed.