Merge a97a917c1a361a11d8b40490aaf0d885e1dd1632 on remote branch (1594266e) · Commits · e / devices / android_kernel_sony_msm8998

fw/htc.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,11 @@ typedef PREPACK struct _HTC_FRAME_HDR{
		#define HTC_FLAGS_SEND_BUNDLE (1 << 1) /* start or part of bundle */
		#define HTC_FLAGS_SEQ_CHECK (1 << 2) /* seq check on rx side */
		#define HTC_FLAGS_CRC_CHECK (1 << 3) /* CRC check on rx side */
		/* HTC_FLAGS_PADDING_CHECK
		* Set by the sender to inform the receiver that the HTC packet begins
		* with continuation (block) alignment padding from the prior HTC packet.
		*/
		#define HTC_FLAGS_PADDING_CHECK (1 << 4)
		/* receive direction */
		#define HTC_FLAGS_RECV_1MORE_BLOCK (1 << 0) /* bit 0 bundle trailer present */
		#define HTC_FLAGS_RECV_TRAILER (1 << 1) /* bit 1 trailer data present */

fw/htt.h

+891 −18

File changed.

Preview size limit exceeded, changes collapsed.

fw/htt_ppdu_stats.h

+182 −16

Original line number	Diff line number	Diff line
		@@ -26,6 +26,9 @@
		#include <htt.h>
		#include <htt_stats.h>

		#define HTT_STATS_MAX_CHAINS 8
		#define HTT_STATS_NUM_SUPPORTED_BW_SMART_ANTENNA 4 /* 20, 40, 80, 160 MHz */

		#define HTT_BA_64_BIT_MAP_SIZE_DWORDS 2
		#define HTT_BA_256_BIT_MAP_SIZE_DWORDS 8
		enum htt_ppdu_stats_tlv_tag {
		@@ -1233,7 +1236,10 @@ typedef struct {
		* BIT [ 27: 24] :- gi - HTT_PPDU_STATS_GI
		* BIT [ 28: 28] :- dcm
		* BIT [ 29: 29] :- ldpc
		* BIT [ 31: 30] :- reserved4
		* BIT [ 30: 30] :- valid_skipped_rate_ctrl
		* This flag indicates whether the skipped_rate_ctrl
		* flag should be ignored, or if it holds valid data.
		* BIT [ 31: 31] :- skipped_rate_ctrl
		*/
		union {
		A_UINT32 rate_info;
		@@ -1249,7 +1255,8 @@ typedef struct {
		gi: 4,
		dcm: 1,
		ldpc: 1,
		reserved4: 2;
		valid_skipped_rate_ctrl: 1,
		skipped_rate_ctrl: 1;
		};
		};

		@@ -1284,8 +1291,32 @@ typedef struct {
		resp_ppdu_type: 2;
		};
		};

		/* Note: This is for tracking a UL OFDMA packet */
		union {
		A_UINT32 trig_cookie_info;
		struct {
		A_UINT32 trig_cookie: 16,
		trig_cookie_rsvd: 15,
		trig_cookie_valid: 1;
		};
		};
		} htt_ppdu_stats_user_rate_tlv;

		#define HTT_PPDU_STATS_USR_RATE_COOKIE_M 0x0000ffff
		#define HTT_PPDU_STATS_USR_RATE_COOKIE_S 0

		#define HTT_PPDU_STATS_USR_RATE_VALID_M 0x80000000
		#define HTT_PPDU_STATS_USR_RATE_VALID_S 31

		#define HTT_PPDU_STATS_USR_RATE_COOKIE_GET(_val) \
		(((_val) & HTT_PPDU_STATS_USR_RATE_COOKIE_M) >> \
		HTT_PPDU_STATS_USR_RATE_COOKIE_S)

		#define HTT_PPDU_STATS_USR_RATE_VALID_GET(_val) \
		(((_val) & HTT_PPDU_STATS_USR_RATE_VALID_M) >> \
		HTT_PPDU_STATS_USR_RATE_VALID_S)

		#define HTT_PPDU_STATS_ENQ_MPDU_BITMAP_TLV_TID_NUM_M 0x000000ff
		#define HTT_PPDU_STATS_ENQ_MPDU_BITMAP_TLV_TID_NUM_S 0

		@@ -1482,6 +1513,84 @@ typedef enum HTT_PPDU_STATS_RESP_TYPE HTT_PPDU_STATS_RESP_TYPE;
		((_var) \|= ((_val) << HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_RESP_TYPE_S)); \
		} while (0)

		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_CHAIN_RSSI_M 0xffffffff
		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_CHAIN_RSSI_S 0

		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_CHAIN_RSSI_GET(_var) \
		(((_var) & HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_CHAIN_RSSI_M) >> \
		HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_CHAIN_RSSI_S)

		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_CHAIN_RSSI_SET(_var, _val) \
		do { \
		HTT_CHECK_SET_VAL(HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_CHAIN_RSSI, _val); \
		((_var) \|= ((_val) << HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_CHAIN_RSSI_S)); \
		} while (0)

		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_TX_ANTENNA_MASK_M 0xffffffff
		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_TX_ANTENNA_MASK_S 0

		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_TX_ANTENNA_MASK_GET(_var) \
		(((_var) & HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_TX_ANTENNA_MASK_M) >> \
		HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_TX_ANTENNA_MASK_S)

		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_TX_ANTENNA_MASK_SET(_var, _val) \
		do { \
		HTT_CHECK_SET_VAL(HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_TX_ANTENNA_MASK, _val); \
		((_var) \|= ((_val) << HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_TX_ANTENNA_MASK_S)); \
		} while (0)

		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_IS_TRAINING_M 0x00010000
		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_IS_TRAINING_S 16

		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_IS_TRAINING_GET(_var) \
		(((_var) & HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_IS_TRAINING_M) >> \
		HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_IS_TRAINING_S)

		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_IS_TRAINING_SET(_var, _val) \
		do { \
		HTT_CHECK_SET_VAL(HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_IS_TRAINING, _val); \
		((_var) \|= ((_val) << HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_IS_TRAINING_S)); \
		} while (0)

		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_PENDING_TRAINING_PKTS_M 0x0000ffff
		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_PENDING_TRAINING_PKTS_S 0

		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_PENDING_TRAINING_PKTS_GET(_var) \
		(((_var) & HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_PENDING_TRAINING_PKTS_M) >> \
		HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_PENDING_TRAINING_PKTS_S)

		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_PENDING_TRAINING_PKTS_SET(_var, _val) \
		do { \
		HTT_CHECK_SET_VAL(HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_PENDING_TRAINING_PKTS, _val); \
		((_var) \|= ((_val) << HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_PENDING_TRAINING_PKTS_S)); \
		} while (0)

		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_MAX_RATES_M 0xffffffff
		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_MAX_RATES_S 0

		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_MAX_RATES_GET(_var) \
		(((_var) & HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_MAX_RATES_M) >> \
		HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_MAX_RATES_S)

		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_MAX_RATES_SET(_var, _val) \
		do { \
		HTT_CHECK_SET_VAL(HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_MAX_RATES, _val); \
		((_var) \|= ((_val) << HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_MAX_RATES_S)); \
		} while (0)

		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_CURRENT_RATE_PER_M 0xffffffff
		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_CURRENT_RATE_PER_S 0

		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_CURRENT_RATE_PER_GET(_var) \
		(((_var) & HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_CURRENT_RATE_PER_M) >> \
		HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_CURRENT_RATE_PER_S)

		#define HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_CURRENT_RATE_PER_SET(_var, _val) \
		do { \
		HTT_CHECK_SET_VAL(HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_CURRENT_RATE_PER, _val); \
		((_var) \|= ((_val) << HTT_PPDU_STATS_USER_CMPLTN_COMMON_TLV_CURRENT_RATE_PER_S)); \
		} while (0)

		enum HTT_PPDU_STATS_USER_COMPLETION_STATUS {
		HTT_PPDU_STATS_USER_STATUS_OK,
		HTT_PPDU_STATS_USER_STATUS_FILTERED,
		@@ -1536,6 +1645,36 @@ typedef struct {
		reserved0: 19;
		};
		};

		/*
		* ack RSSI per chain for last transmission to the peer-TID
		* (value in dB w.r.t noise floor)
		*/
		A_UINT32 chain_rssi[HTT_STATS_MAX_CHAINS];

		/* Tx Antenna mask for last packet transmission */
		A_UINT32 tx_antenna_mask;

		/* For SmartAntenna
		* BIT [15:0] :- pending_training_pkts
		* Holds number of pending training packets during training.
		* BIT [16] :- is_training
		* This flag indicates if peer is under training.
		* BIT [31:17] :- reserved1
		*/
		A_UINT32 pending_training_pkts:16,
		is_training:1,
		reserved1:15;

		/*
		* Max rates configured per BW:
		* for BW supported by Smart Antenna - 20MHZ, 40MHZ and 80MHZ and 160MHZ
		* (Note: 160 MHz is currently not supported by Smart Antenna)
		*/
		A_UINT32 max_rates[HTT_STATS_NUM_SUPPORTED_BW_SMART_ANTENNA];

		/* PER of the last transmission to the peer-TID (in percent) */
		A_UINT32 current_rate_per;
		} htt_ppdu_stats_user_cmpltn_common_tlv;

		#define HTT_PPDU_STATS_USER_CMPLTN_BA_BITMAP_TLV_TID_NUM_M 0x000000ff
		@@ -1851,17 +1990,44 @@ typedef struct {
		};
		} htt_ppdu_stats_flush_tlv;

		#define HTT_PPDU_STATS_TX_MGMTCTRL_TLV_FRAME_LENGTH_M 0x0000ffff
		#define HTT_PPDU_STATS_TX_MGMTCTRL_TLV_FRAME_LENGTH_S 0

		#define HTT_PPDU_STATS_TX_MGMTCTRL_TLV_FRAME_LENGTH_GET(_var) \
		(((_var) & HTT_PPDU_STATS_TX_MGMTCTRL_TLV_FRAME_LENGTH_M) >> \
		HTT_PPDU_STATS_TX_MGMTCTRL_TLV_FRAME_LENGTH_S)

		#define HTT_PPDU_STATS_TX_MGMTCTRL_TLV_FRAME_LENGTH_SET(_var, _val) \
		do { \
		HTT_CHECK_SET_VAL(HTT_PPDU_STATS_TX_MGMTCTRL_TLV_FRAME_LENGTH, _val); \
		((_var) \|= ((_val) << HTT_PPDU_STATS_TX_MGMTCTRL_TLV_FRAME_LENGTH_S)); \
		} while (0)

		typedef struct {
		htt_tlv_hdr_t tlv_hdr;

		/*
		* BIT [ 15 : 0] :- frame_length
		* 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 reserved1; /* set to 0x0 */
		A_UINT32 reserved2; /* set to 0x0 */
		A_UINT32 reserved3; /* set to 0x0 */

		/* mgmt/ctrl frame payload
		* The size of payload (in bytes) can be derived from the length in
		* tlv parametes, minus the 12 bytes of the above fields.
		* 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_tx_mgmtctrl_payload_tlv;

fw/htt_stats.h

+383 −3

File changed.

Preview size limit exceeded, changes collapsed.

fw/wmi_services.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -395,6 +395,17 @@ typedef enum {
		WMI_SERVICE_TX_COMPL_TSF64 = 210, /* FW supports 64-bit tx TSF in HTT_T2H TX_COMPL_IND msg */
		WMI_SERVICE_DSM_ROAM_FILTER = 211, /* FW supports data stall AP mitigation while roaming */
		WMI_SERVICE_PACKET_CAPTURE_SUPPORT = 212, /* target supports packet capture Mode (SMART MU) */
		WMI_SERVICE_PER_PEER_HTT_STATS_RESET = 213, /* FW supports HTT per peer stats reset facility */
		WMI_SERVICE_DELETE_ALL_PEER_SUPPORT = 214, /* target supports cmd to delete all peers within a vdev */
		WMI_SERVICE_DYNAMIC_HW_MODE_SWITCH_SUPPORT = 215, /* target supports Dynamic HW mode switch */
		WMI_SERVICE_MSDU_FLOW_OVERRIDE_BY_HOST = 216, /* target supports flow override feature */
		WMI_SERVICE_WMI_CHAN_RF_CHARACTERIZATION_INFO_EVENT= 217, /* target will send WMI_CHAN_RF_CHARACTERIZATION_INFO_EVENT */
		WMI_SERVICE_RX_FSE_SUPPORT = 218, /* target supports flow search through RxOLE FSE hw block */
		WMI_SERVICE_FREQINFO_IN_METADATA = 219, /* FW provides freq_info during spectral scan */
		WMI_SERVICE_EXT2_MSG = 220, /* WMI_SERVICE_READY_EXT2 msg is sent by target */
		WMI_SERVICE_WPA3_SAE_ROAM_SUPPORT = 221, /* Indicates FW supports WPA3 SAE roaming */
		WMI_SERVICE_WPA3_OWE_ROAM_SUPPORT = 222, /* Indicates FW supports WPA3 OWE roaming */
		WMI_SERVICE_AUDIO_AGGR = 223, /* Indicates FW supports audio frame aggregation */

		/***** ADD NEW SERVICES HERE *****/