Merge 13a718c427ce65aca6485d08bb56b12516b53213 on remote branch (5d60dac5) · Commits · e / devices / android_kernel_fairphone_FP4

fw/htt.h

+44 −11

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
		* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
		*
		* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
		*
		@@ -273,7 +274,7 @@
		*/
		#define HTT_T2H_MSG_TYPE_RC_UPDATE_IND DEPRECATED_HTT_T2H_MSG_TYPE_RC_UPDATE_IND

		/*
		/**
		* htt_dbg_stats_type -
		* bit positions for each stats type within a stats type bitmask
		* The bitmask contains 24 bits.
		@@ -579,6 +580,7 @@ typedef struct {
		};
		} htt_tlv_hdr_t;

		/** HTT stats TLV tag values */
		typedef enum {
		HTT_STATS_TX_PDEV_CMN_TAG = 0, /* htt_tx_pdev_stats_cmn_tlv */
		HTT_STATS_TX_PDEV_UNDERRUN_TAG = 1, /* htt_tx_pdev_stats_urrn_tlv_v */
		@@ -724,10 +726,13 @@ typedef enum {
		HTT_STATS_RX_PDEV_BE_UL_MIMO_USER_STATS_TAG = 141, /* htt_rx_pdev_be_ul_mimo_user_stats_tlv */
		HTT_STATS_RX_RING_STATS_TAG = 142, /* htt_rx_fw_ring_stats_tlv_v */
		HTT_STATS_RX_PDEV_BE_UL_TRIG_STATS_TAG = 143, /* htt_rx_pdev_be_ul_trigger_stats_tlv */
		HTT_STATS_TX_PDEV_SAWF_RATE_STATS_TAG = 144, /* htt_tx_pdev_rate_stats_sawf_tlv */


		HTT_STATS_MAX_TAG,
		} htt_tlv_tag_t;
		} htt_stats_tlv_tag_t;
		/* retain deprecated enum name as an alias for the current enum name */
		typedef htt_stats_tlv_tag_t htt_tlv_tag_t;

		#define HTT_STATS_TLV_TAG_M 0x00000fff
		#define HTT_STATS_TLV_TAG_S 0
		@@ -5538,7 +5543,9 @@ enum htt_srng_ring_id {
		* configuration fields are valid
		* b'27 - drop_thresh_valid (DT): flag to indicate if the
		* rx_drop_threshold field is valid
		* b'28:31 - rsvd1: reserved for future use
		* b'28 - rx_mon_global_en: Enable/Disable global register
		8 configuration in Rx monitor module.
		* b'29:31 - rsvd1: reserved for future use
		* dword1 - b'0:15 - ring_buffer_size: size of bufferes referenced by rx ring,
		* in byte units.
		* Valid only for HW_TO_SW_RING and SW_TO_HW_RING
		@@ -5694,7 +5701,8 @@ PREPACK struct htt_rx_ring_selection_cfg_t {
		pkt_swap: 1,
		rx_offsets_valid: 1,
		drop_thresh_valid: 1,
		rsvd1: 4;
		rx_mon_global_en: 1,
		rsvd1: 3;
		A_UINT32 ring_buffer_size: 16,
		config_length_mgmt:3,
		config_length_ctrl:3,
		@@ -5806,6 +5814,17 @@ PREPACK struct htt_rx_ring_selection_cfg_t {
		((_var) \|= ((_val) << HTT_RX_RING_SELECTION_CFG_DROP_THRESHOLD_VALID_S)); \
		} while (0)

		#define HTT_RX_RING_SELECTION_CFG_RX_MON_GLOBAL_EN_M 0x10000000
		#define HTT_RX_RING_SELECTION_CFG_RX_MON_GLOBAL_EN_S 28
		#define HTT_RX_RING_SELECTION_CFG_RX_MON_GLOBAL_EN_GET(_var) \
		(((_var) & HTT_RX_RING_SELECTION_CFG_RX_MON_GLOBAL_EN_M) >> \
		HTT_RX_RING_SELECTION_CFG_RX_MON_GLOBAL_EN_S)
		#define HTT_RX_RING_SELECTION_CFG_RX_MON_GLOBAL_EN_SET(_var, _val) \
		do { \
		HTT_CHECK_SET_VAL(HTT_RX_RING_SELECTION_CFG_RX_MON_GLOBAL_EN, _val); \
		((_var) \|= ((_val) << HTT_RX_RING_SELECTION_CFG_RX_MON_GLOBAL_EN_S)); \
		} while (0)

		#define HTT_RX_RING_SELECTION_CFG_RING_BUFFER_SIZE_M 0x0000ffff
		#define HTT_RX_RING_SELECTION_CFG_RING_BUFFER_SIZE_S 0
		#define HTT_RX_RING_SELECTION_CFG_RING_BUFFER_SIZE_GET(_var) \
		@@ -5825,7 +5844,7 @@ PREPACK struct htt_rx_ring_selection_cfg_t {
		#define HTT_RX_RING_SELECTION_CFG_CONFIG_LENGTH_MGMT_SET(_var, _val) \
		do { \
		HTT_CHECK_SET_VAL(HTT_RX_RING_SELECTION_CFG_CONFIG_LENGTH_MGMT, _val); \
		((_var) \|= ((_val) << HTT_TX_MONITOR_CFG_CONFIG_LENGTH_MGMT_S)); \
		((_var) \|= ((_val) << HTT_RX_RING_SELECTION_CFG_CONFIG_LENGTH_MGMT_S)); \
		} while (0)

		#define HTT_RX_RING_SELECTION_CFG_CONFIG_LENGTH_CTRL_M 0x00380000
		@@ -6696,7 +6715,9 @@ PREPACK struct htt_rx_ring_selection_cfg_t {
		* b'25 - pkt_swap (PS): 1 is to swap packet TLV - refer to
		* BUF_RING_CFG_0 defs within HW .h files,
		* e.g. wmac_top_reg_seq_hwioreg.h
		* b'26:31 - rsvd1: reserved for future use
		* b'26 - tx_mon_global_en: Enable/Disable global register
		* configuration in Tx monitor module.
		* b'27:31 - rsvd1: reserved for future use
		* dword1 - b'0:15 - ring_buffer_size: size of bufferes referenced by rx ring,
		* in byte units.
		* Valid only for HW_TO_SW_RING and SW_TO_HW_RING
		@@ -6841,7 +6862,8 @@ PREPACK struct htt_tx_monitor_cfg_t {
		ring_id: 8,
		status_swap: 1,
		pkt_swap: 1,
		rsvd1: 6;
		tx_mon_global_en: 1,
		rsvd1: 5;
		A_UINT32 ring_buffer_size: 16,
		config_length_mgmt: 3,
		config_length_ctrl: 3,
		@@ -6925,6 +6947,17 @@ PREPACK struct htt_tx_monitor_cfg_t {
		((_var) \|= ((_val) << HTT_TX_MONITOR_CFG_PKT_SWAP_S)); \
		} while (0)

		#define HTT_TX_MONITOR_CFG_TX_MON_GLOBAL_EN_M 0x04000000
		#define HTT_TX_MONITOR_CFG_TX_MON_GLOBAL_EN_S 26
		#define HTT_TX_MONITOR_CFG_TX_MON_GLOBAL_EN_GET(_var) \
		(((_var) & HTT_TX_MONITOR_CFG_TX_MON_GLOBAL_EN_M) >> \
		HTT_TX_MONITOR_CFG_TX_MON_GLOBAL_EN_S)
		#define HTT_TX_MONITOR_CFG_TX_MON_GLOBAL_EN_SET(_var, _val) \
		do { \
		HTT_CHECK_SET_VAL(HTT_TX_MONITOR_CFG_TX_MON_GLOBAL_EN, _val); \
		((_var) \|= ((_val) << HTT_TX_MONITOR_CFG_TX_MON_GLOBAL_EN_S)); \
		} while (0)

		#define HTT_TX_MONITOR_CFG_RING_BUFFER_SIZE_M 0x0000ffff
		#define HTT_TX_MONITOR_CFG_RING_BUFFER_SIZE_S 0
		#define HTT_TX_MONITOR_CFG_RING_BUFFER_SIZE_GET(_var) \
		@@ -7000,7 +7033,7 @@ PREPACK struct htt_tx_monitor_cfg_t {
		do { \
		HTT_CHECK_SET_VAL(HTT_TX_MONITOR_CFG_FILTER_IN_TX_MPDU_START_CTRL, _val); \
		((_var) \|= ((_val) << HTT_TX_MONITOR_CFG_FILTER_IN_TX_MPDU_START_CTRL_S)); \
		} while (0
		} while (0)

		#define HTT_TX_MONITOR_CFG_FILTER_IN_TX_MPDU_START_DATA_M 0x00000020
		#define HTT_TX_MONITOR_CFG_FILTER_IN_TX_MPDU_START_DATA_S 5
		@@ -7033,7 +7066,7 @@ PREPACK struct htt_tx_monitor_cfg_t {
		do { \
		HTT_CHECK_SET_VAL(HTT_TX_MONITOR_CFG_FILTER_IN_TX_MSDU_START_CTRL, _val); \
		((_var) \|= ((_val) << HTT_TX_MONITOR_CFG_FILTER_IN_TX_MSDU_START_CTRL_S)); \
		} while (0
		} while (0)

		#define HTT_TX_MONITOR_CFG_FILTER_IN_TX_MSDU_START_DATA_M 0x00000100
		#define HTT_TX_MONITOR_CFG_FILTER_IN_TX_MSDU_START_DATA_S 8
		@@ -7066,7 +7099,7 @@ PREPACK struct htt_tx_monitor_cfg_t {
		do { \
		HTT_CHECK_SET_VAL(HTT_TX_MONITOR_CFG_FILTER_IN_TX_MPDU_END_CTRL, _val); \
		((_var) \|= ((_val) << HTT_TX_MONITOR_CFG_FILTER_IN_TX_MPDU_END_CTRL_S)); \
		} while (0
		} while (0)

		#define HTT_TX_MONITOR_CFG_FILTER_IN_TX_MPDU_END_DATA_M 0x00000800
		#define HTT_TX_MONITOR_CFG_FILTER_IN_TX_MPDU_END_DATA_S 11
		@@ -7099,7 +7132,7 @@ PREPACK struct htt_tx_monitor_cfg_t {
		do { \
		HTT_CHECK_SET_VAL(HTT_TX_MONITOR_CFG_FILTER_IN_TX_MSDU_END_CTRL, _val); \
		((_var) \|= ((_val) << HTT_TX_MONITOR_CFG_FILTER_IN_TX_MSDU_END_CTRL_S)); \
		} while (0
		} while (0)

		#define HTT_TX_MONITOR_CFG_FILTER_IN_TX_MSDU_END_DATA_M 0x00004000
		#define HTT_TX_MONITOR_CFG_FILTER_IN_TX_MSDU_END_DATA_S 14

fw/htt_stats.h

+1522 −1030

File changed.

Preview size limit exceeded, changes collapsed.

fw/wlan_defs.h

+49 −0

Original line number	Diff line number	Diff line
		@@ -1366,6 +1366,8 @@ typedef enum {
		MLO_SHMEM_TLV_STRUCT_MLO_GLB_LINK,
		MLO_SHMEM_TLV_STRUCT_MLO_GLB_LINK_INFO,
		MLO_SHMEM_TLV_STRUCT_MLO_GLB_H_SHMEM,
		MLO_SHMEM_TLV_STRUCT_MLO_GLB_CHIP_CRASH_INFO,
		MLO_SHMEM_TLV_STRUCT_MLO_GLB_PER_CHIP_CRASH_INFO,
		} MLO_SHMEM_TLV_TAG_ID;

		/** Helper macro for params GET/SET of mgmt_rx_reo_snapshot */
		@@ -1542,6 +1544,52 @@ typedef struct {
		A_COMPILE_TIME_ASSERT(check_mlo_glb_link_info_8byte_size_quantum,
		(((sizeof(mlo_glb_link_info) % sizeof(A_UINT64) == 0x0))));

		typedef enum {
		MLO_SHMEM_CRASH_PARTNER_CHIPS = 1,
		} MLO_SHMEM_CHIP_CRASH_REASON;

		/* glb link info structures used for scratchpad memory (crash and recovery) */
		typedef struct {
		/* TLV tag and len; tag equals MLO_SHMEM_TLV_STRUCT_MLO_GLB_PER_CHIP_CRASH_INFO */
		A_UINT32 tlv_header;
		/**
		* crash reason, takes value in enum MLO_SHMEM_CHIP_CRASH_REASON
		*/
		A_UINT32 crash_reason;
		} mlo_glb_per_chip_crash_info;

		A_COMPILE_TIME_ASSERT(check_mlo_glb_per_chip_crash_info,
		(((sizeof(mlo_glb_per_chip_crash_info) % sizeof(A_UINT64) == 0x0))));

		/** Helper macro for params GET/SET of mlo_glb_chip_crash_info */
		#define MLO_SHMEM_CHIP_CRASH_INFO_PARAM_NO_OF_CHIPS_GET(chip_info) MLO_SHMEM_GET_BITS(chip_info, 0, 2)
		#define MLO_SHMEM_CHIP_CRASH_INFO_PARAM_NO_OF_CHIPS_SET(chip_info, value) MLO_SHMEM_SET_BITS(chip_info, 0, 2, value)

		#define MLO_SHMEM_CHIP_CRASH_INFO_PARAM_VALID_CHIP_BMAP_GET(chip_info) MLO_SHMEM_GET_BITS(chip_info, 2, 3)
		#define MLO_SHMEM_CHIP_CRASH_INFO_PARAM_VALID_CHIP_BMAP_SET(chip_info, value) MLO_SHMEM_SET_BITS(chip_info, 2, 3, value)

		typedef struct {
		/* TLV tag and len; tag equals MLO_SHMEM_TLV_STRUCT_MLO_GLB_CHIP_CRASH_INFO */
		A_UINT32 tlv_header;

		/**
		* chip_info
		*
		* [1:0]: no_of_chips
		* [4:2]: valid_chip_bmap
		* [31:6]: reserved
		*/
		A_UINT32 chip_info;
		/* This TLV is followed by array of mlo_glb_per_chip_crash_info:
		* mlo_glb_per_chip_crash_info will have mutiple instances equal to num of partner chips
		* received by no_of_chips
		* mlo_glb_per_chip_crash_info per_chip_crash_info[];
		*/
		} mlo_glb_chip_crash_info;

		A_COMPILE_TIME_ASSERT(check_mlo_glb_chip_crash_info,
		(((sizeof(mlo_glb_chip_crash_info) % sizeof(A_UINT64) == 0x0))));

		/** Helper macro for params GET/SET of mlo_glb_h_shmem */
		#define MLO_SHMEM_GLB_H_SHMEM_PARAM_MINOR_VERSION_GET(major_minor_version) MLO_SHMEM_GET_BITS(major_minor_version, 0, 16)
		#define MLO_SHMEM_GLB_H_SHMEM_PARAM_MINOR_VERSION_SET(major_minor_version, value) MLO_SHMEM_SET_BITS(major_minor_version, 0, 16, value)
		@@ -1563,6 +1611,7 @@ typedef struct {
		/* This TLV is followed by TLVs
		* mlo_glb_rx_reo_snapshot_info reo_snapshot;
		* mlo_glb_link_info glb_info;
		* mlo_glb_chip_crash_info crash_info;
		*/
		} mlo_glb_h_shmem;

fw/wmi.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -146,7 +146,6 @@ typedef enum {
		TX_USAGE = 0x02, /* default Tx Key - Static WEP only */
		PMK_USAGE = 0x04, /* PMK cache */
		PASN_USAGE = 0x08, /* is PASN based key */
		LTF_USAGE = 0x10, /* is LTF key seed */
		} KEY_USAGE;
		/*
		* List of Events (target to host)

fw/wmi_services.h

+6 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2011-2022 The Linux Foundation. All rights reserved.
		* Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
		* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
		*
		* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
		*
		@@ -567,11 +568,14 @@ typedef enum {
		WMI_SERVICE_RTT_11AZ_MAC_PHY_SEC_SUPPORT = 315, /* FW support for 11AZ secure LTF + FTM */
		WMI_SERVICE_SPECTRAL_SESSION_INFO_SUPPORT = 316, /* Information corresponding to each Spectral scan session will be sent by the FW before the reports corresponding to that session are sent */
		WMI_SERVICE_PDEV_RATE_CONFIG_SUPPORT = 317, /* Support rate configurations per PDEV */
		MI_SERVICE_MLO_STA_NAN_NDI_SUPPORT = 318, /* FW support for NAN and NDP support with MLO STA */
		WMI_SERVICE_MLO_STA_NAN_NDI_SUPPORT = 318, /* FW support for NAN and NDP support with MLO STA */
		WMI_SERVICE_PROBE_ALL_BW_SUPPORT = 319, /* FW support to probe on higher BW even if the probe fails on lower BW - IOT issue */
		WMI_SERVICE_PKTLOG_DECODE_INFO_SUPPORT = 320, /* FW supports embedding Pktlog decode info in the Pktlog trace file level header */
		WMI_SERVICE_PNO_SCAN_CONFIG_PER_CHANNEL = 321, /* Indicates that FW supports per channel configuration support in the PNO scan start command */
		WMI_SERVICE_MULTIPLE_PEER_GROUP_CMD_SUPPORT = 322, /* FW support for multiple peer group command */
		WMI_SERVICE_AFC_RESET_SUPPORT = 323, /* Indicates FW supports AFC reset */
		WMI_SERVICE_FP_PHY_ERR_FILTER_SUPPORT = 324, /* FW supports monitor ring configurations for filtering in PHY error packets */
		WMI_IS_RADAR_FOUND_CHAN_FREQ_IS_CENTER_FREQ = 325, /* FW Supporting radar event on the actual center frequency radar was detected */

		WMI_MAX_EXT2_SERVICE