Merge 1c311d3b6b24ab5eb67a3c5a8ad4ee1e3aaaaf50 on remote branch (aa3cf57f) · Commits · e / devices / android_kernel_fairphone_FP4

fw/htt.h

+60 −1

Original line number	Diff line number	Diff line
		@@ -207,9 +207,10 @@
		* 3.83 Shrink seq_idx field in HTT PPDU ID from 3 bits to 2.
		* 3.84 Add fisa_control_bits_v2 def.
		* 3.85 Add HTT_RX_PEER_META_DATA defs.
		* 3.86 Add HTT_T2H_MSG_TYPE_FSE_CMEM_BASE_SEND def.
		*/
		#define HTT_CURRENT_VERSION_MAJOR 3
		#define HTT_CURRENT_VERSION_MINOR 85
		#define HTT_CURRENT_VERSION_MINOR 86

		#define HTT_NUM_TX_FRAG_DESC 1024

		@@ -6917,6 +6918,8 @@ enum htt_t2h_msg_type {
		*/
		HTT_T2H_MSG_TYPE_TX_OFFLOAD_DELIVER_IND = 0x25,
		HTT_T2H_MSG_TYPE_CHAN_CALDATA = 0x26,
		HTT_T2H_MSG_TYPE_FSE_CMEM_BASE_SEND = 0x27,


		HTT_T2H_MSG_TYPE_TEST,
		/* keep this last */
		@@ -14028,6 +14031,62 @@ PREPACK struct htt_chan_caldata_msg {
		} while (0)


		/**
		* @brief HTT_T2H_MSG_TYPE_FSE_CMEM_BASE_SEND Message
		*
		* @details
		* HTT_T2H_MSG_TYPE_FSE_CMEM_BASE_SEND message is sent by the target when
		* FSE placement in CMEM is enabled.
		*
		* This message sends the non-secure CMEM base address.
		* It will be sent to host in response to message
		* HTT_H2T_MSG_TYPE_RX_FSE_SETUP_CFG.
		* The message would appear as follows:
		*
		* \|31 24\|23 16\|15 8\|7 0\|
		* \|----------------+----------------+----------------+----------------\|
		* \| reserved \| num_entries \| msg_type \|
		* \|----------------+----------------+----------------+----------------\|
		* \| base_address_lo \|
		* \|----------------+----------------+----------------+----------------\|
		* \| base_address_hi \|
		* \|-------------------------------------------------------------------\|
		*
		* The message is interpreted as follows:
		* dword0 - b'0:7 - msg_type: This will be set to
		* HTT_T2H_MSG_TYPE_FSE_CMEM_BASE_SEND
		* b'8:15 - number_entries: Indicated the number of entries
		* programmed.
		* b'16:31 - reserved.
		* dword1 - b'0:31 - base_address_lo: Indicate lower 32 bits of
		* CMEM base address
		* dword2 - b'0:31 - base_address_hi: Indicate upper 32 bits of
		* CMEM base address
		*/

		PREPACK struct htt_cmem_base_send_t {
		A_UINT32 msg_type: 8,
		num_entries: 8,
		reserved: 16;
		A_UINT32 base_address_lo;
		A_UINT32 base_address_hi;
		} POSTPACK;

		#define HTT_CMEM_BASE_SEND_SIZE (sizeof(struct htt_cmem_base_send_t))

		#define HTT_CMEM_BASE_SEND_NUM_ENTRIES_M 0x0000FF00
		#define HTT_CMEM_BASE_SEND_NUM_ENTRIES_S 8

		#define HTT_CMEM_BASE_SEND_NUM_ENTRIES_GET(_var) \
		(((_var) & HTT_CMEM_BASE_SEND_NUM_ENTRIES_M) >> \
		HTT_CMEM_BASE_SEND_NUM_ENTRIES_S)

		#define HTT_CMEM_BASE_SEND_NUM_ENTRIES_SET(_var, _val) \
		do { \
		HTT_CHECK_SET_VAL(HTT_CMEM_BASE_SEND_NUM_ENTRIES, _val); \
		((_var) \|= ((_val) << HTT_SRING_SETUP_DONE_PDEV_ID_S)); \
		} while (0)

		/**
		* @brief - HTT PPDU ID format
		*

fw/wmi_services.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -479,6 +479,7 @@ typedef enum {
		WMI_SERVICE_THERMAL_MULTI_CLIENT_SUPPORT = 259, /* Indicates FW Thermal Mgr will support multiple clients for mitigation */
		WMI_SERVICE_NAN_SEND_NAN_ENABLE_RESPONSE_TO_HOST = 260, /* Indicates FW will include an additional TLV in nan enable response for Host driver to parse */
		WMI_SERVICE_UNIFIED_LL_GET_STA_CMD_SUPPORT = 261, /* Indicates that FW supports handling Link Layer and Get Station stats Commands together (WMI_REQUEST_UNIFIED_LL_GET_STA_CMDID) */
		WMI_SERVICE_FSE_CMEM_ALLOC_SUPPORT = 262, /* Indicates that FW supports non-secure CMEM allocation for FSE table */


		WMI_MAX_EXT2_SERVICE

fw/wmi_unified.h

+60 −4

Original line number	Diff line number	Diff line
		@@ -3730,7 +3730,18 @@ typedef struct {
		*
		* Refer to WMI_RSRC_CFG_HOST_SERVICE_FLAG_NAN_IFACE_SUPPORT_GET/SET
		* macros defined below.
		* Bits 31:1 - Reserved
		* Bit 1
		* The bit will be set when HOST is capable of processing multiple
		* radio events per radio. More specifically whenever Firmware is
		* sending multiple radio events (WMI_RADIO_LINK_STATS_EVENTID
		* = 0x16004) for a single radio,
		* Through this flag Firmware will know that HOST is able to support
		* delivery of RADIO_LINK_STATS across multiple event messages,
		* and Firmware can send multiple radio events.
		*
		* Refer to WMI_RSRC_CFG_HOST_SERVICE_FLAG_HOST_SUPPORT_MULTI_RADIO_EVTS_PER_RADIO_GET/SET
		* macros defined below.
		* Bits 31:2 - Reserved
		*/
		A_UINT32 host_service_flags;

		@@ -3989,6 +4000,11 @@ typedef struct {
		#define WMI_RSRC_CFG_HOST_SERVICE_FLAG_NAN_IFACE_SUPPORT_SET(host_service_flags, val) \
		WMI_SET_BITS(host_service_flags, 0, 1, val)

		#define WMI_RSRC_CFG_HOST_SERVICE_FLAG_HOST_SUPPORT_MULTI_RADIO_EVTS_PER_RADIO_GET(host_service_flags) \
		WMI_GET_BITS(host_service_flags, 1, 1)
		#define WMI_RSRC_CFG_HOST_SERVICE_FLAG_HOST_SUPPORT_MULTI_RADIO_EVTS_PER_RADIO_SET(host_service_flags, val) \
		WMI_SET_BITS(host_service_flags, 1, 1, val)

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

		@@ -8263,6 +8279,18 @@ typedef struct {
		A_UINT32 num_radio;
		/** more_data will be set depending on the number of radios */
		A_UINT32 more_radio_events;
		/*
		* For the event WMI_RADIO_LINK_STATS_EVENTID = 0x16004,
		* FW may not be able to send all the channels (2Ghz, 5Ghz & 6Ghz)
		* together in one event message, due to buffer size limitations.
		* To avoid this limitation, FW will send multiple events to HOST
		* depending upon the number of channels.
		* If more_channels is set to 0 means FW has indicated all the
		* channels for this radio.
		* If more_channels is set to 1, it indicates FW will send another
		* event having additional channels for the same radio.
		*/
		A_UINT32 more_channels;
		/*
		* This TLV is followed by another TLV of array of bytes
		* size of(struct wmi_radio_link_stats);
		@@ -17286,9 +17314,26 @@ typedef struct {

		/* WMI_GPIO_CONFIG_CMDID */
		enum {
		WMI_GPIO_PULL_NONE,
		WMI_GPIO_PULL_UP,
		WMI_GPIO_PULL_DOWN,
		WMI_GPIO_PULL_NONE, /** Do not specify a pull. */
		WMI_GPIO_PULL_UP, /** Pull the GPIO up. */
		WMI_GPIO_PULL_DOWN, /** Pull the GPIO down. */
		WMI_GPIO_PULL_KEEPER, /** Designate as a keeper. */
		};

		enum wmi_gpio_drive_strength {
		WMI_GPIO_2MA, /** Specify a 2 mA drive. */
		WMI_GPIO_4MA, /** Specify a 4 mA drive. */
		WMI_GPIO_6MA, /** Specify a 6 mA drive. */
		WMI_GPIO_8MA, /** Specify an 8 mA drive. */
		WMI_GPIO_10MA, /** Specify a 10 mA drive. */
		WMI_GPIO_12MA, /** Specify a 12 mA drive. */
		WMI_GPIO_14MA, /** Specify a 14 mA drive. */
		WMI_GPIO_16MA, /** Specify a 16 mA drive. */
		};

		enum wmi_tlmm_gpio_config {
		WMI_TLMM_GPIO_DISABLE, /** Use the internal inactive configuration. */
		WMI_TLMM_GPIO_ENABLE, /** Use the configuration passed as parameter. */
		};

		enum {
		@@ -17313,6 +17358,17 @@ typedef struct {
		* 0x4 - use the pin as GPIO (rather than UART)
		*/
		A_UINT32 mux_config_val;
		/*
		* The drive strength to use in the configuration of a GPIO.
		* Refer to the wmi_gpio_drive_strength enum.
		*/
		A_UINT32 drive;
		/*
		* Use the internal inactive configuration or configuration passed
		* as parameter.
		* Refer to the wmi_tlmm_gpio_config enum.
		*/
		A_UINT32 init_enable;
		} wmi_gpio_config_cmd_fixed_param;

		/* WMI_GPIO_OUTPUT_CMDID */

fw/wmi_version.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@
		#define __WMI_VER_MINOR_ 0
		/** WMI revision number has to be incremented when there is a
		* change that may or may not break compatibility. */
		#define __WMI_REVISION_ 891
		#define __WMI_REVISION_ 894

		/** The Version Namespace should not be normally changed. Only
		* host and firmware of the same WMI namespace will work