Merge a855ce200659dfa7f14b5df3a6c768114d455bfd on remote branch (e7d18bb8) · Commits · e / devices / android_kernel_fairphone_FP4

fw/enet.h

+62 −12

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012, 2014 The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2014, 2017, 2021 The Linux Foundation. All rights reserved.
		*
		* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
		*
		@@ -52,13 +52,13 @@ struct ethernet_hdr_t {
		#define ETHERNET_MTU (ETHERNET_MAX_LEN - (ETHERNET_HDR_LEN + ETHERNET_CRC_LEN))


		struct llc_snap_hdr_t {
		typedef struct llc_snap_hdr_t {
		A_UINT8 dsap;
		A_UINT8 ssap;
		A_UINT8 cntl;
		A_UINT8 org_code[3];
		A_UINT8 ethertype[2];
		};
		} LLC_SNAP_HDR;

		#define LLC_SNAP_HDR_LEN (sizeof(struct llc_snap_hdr_t))
		#define LLC_SNAP_HDR_OFFSET_ETHERTYPE \
		@@ -74,6 +74,23 @@ struct ethernet_vlan_hdr_t {
		A_UINT8 ethertype[2];
		};

		typedef PREPACK struct _wai_hdr {
		A_UINT8 version[2];
		A_UINT8 type;
		A_UINT8 stype;
		A_UINT8 reserve[2];
		A_UINT8 length[2];
		A_UINT8 rxseq[2];
		A_UINT8 frag_sc;
		A_UINT8 more_frag;
		/* followed octets of data */
		} POSTPACK wai_hdr;

		typedef PREPACK struct {
		A_UINT16 vlan_tci;
		A_UINT16 vlan_encap_p;
		} POSTPACK vlan_hdr_t;

		#define ETHERTYPE_IS_EAPOL_WAPI(typeorlen) \
		((typeorlen) == ETHERTYPE_PAE \|\| \
		(typeorlen) == ETHERTYPE_WAI)
		@@ -136,16 +153,49 @@ struct ethernet_vlan_hdr_t {
		#define BTEP_SNAP_ORGCODE_2 0xf8


		#define IS_SNAP(_llc) ((_llc)->dsap == LLC_SNAP_LSAP && \
		#define WAI_FRAME_TYPE 0X01
		#define WAPI_M4_TYPE 0x0c
		#define WAPI_M2_TYPE 0x09


		#define ICMP_PROTOCOL 1
		#define TCP_PROTOCOL 6
		#define UDP_PROTOCOL 17
		#define IGMP_PROTOCOL 2
		#define ICMPV6_PROTOCOL 58
		#define BOOTP_SERVER_PORT 67
		#define BOOTP_CLIENT_PORT 68
		#define MLD_QUERY 130
		#define MLD_DONE 132


		#define IS_EAPOL(typeorlen) \
		((typeorlen) == ETHERTYPE_PAE \|\| \
		(typeorlen) == ETHERTYPE_WAI)

		#define IS_SNAP(_llc) \
		((_llc)->dsap == LLC_SNAP_LSAP && \
		(_llc)->ssap == LLC_SNAP_LSAP && \
		(_llc)->cntl == LLC_UI)

		#define IS_RFC1042(_llc) ((_llc)->org_code[0] == RFC1042_SNAP_ORGCODE_0 && \
		#define IS_RFC1042(_llc) \
		((_llc)->org_code[0] == RFC1042_SNAP_ORGCODE_0 && \
		(_llc)->org_code[1] == RFC1042_SNAP_ORGCODE_1 && \
		(_llc)->org_code[2] == RFC1042_SNAP_ORGCODE_2)

		#define IS_BTEP(_llc) ((_llc)->org_code[0] == BTEP_SNAP_ORGCODE_0 && \
		#define IS_BTEP(_llc) \
		((_llc)->org_code[0] == BTEP_SNAP_ORGCODE_0 && \
		(_llc)->org_code[1] == BTEP_SNAP_ORGCODE_1 && \
		(_llc)->org_code[2] == BTEP_SNAP_ORGCODE_2)

		#define IS_MULTICAST(_hdr) ((A_UINT8 )(_hdr) & 0x1)
		#define IS_BROADCAST(_hdr) \
		((((A_UINT8 )(_hdr) + 0) == 0xff) && \
		(((A_UINT8 )(_hdr) + 1) == 0xff) && \
		(((A_UINT8 )(_hdr) + 2) == 0xff) && \
		(((A_UINT8 )(_hdr) + 3) == 0xff) && \
		(((A_UINT8 )(_hdr) + 4) == 0xff) && \
		(((A_UINT8 )(_hdr) + 5) == 0xff))


		#endif /* _ENET__H_ */

fw/htt.h

+516 −2

File changed.

Preview size limit exceeded, changes collapsed.

fw/htt_stats.h

+18 −0

Original line number	Diff line number	Diff line
		@@ -2454,6 +2454,14 @@ typedef struct {
		A_UINT32 ax_ul_mu_mimo_brp_sch_nusers[HTT_TX_PDEV_STATS_NUM_UL_MUMIMO_USER_STATS];
		} htt_tx_pdev_ul_mu_mimo_sch_stats_tlv;

		typedef struct {
		htt_tlv_hdr_t tlv_hdr;
		/* Represents the count for 11BE UL MU MIMO sequences with Basic Triggers */
		A_UINT32 be_ul_mu_mimo_basic_sch_nusers[HTT_TX_PDEV_STATS_NUM_UL_MUMIMO_USER_STATS];
		/* Represents the count for 11BE UL MU MIMO sequences with BRP Triggers */
		A_UINT32 be_ul_mu_mimo_brp_sch_nusers[HTT_TX_PDEV_STATS_NUM_UL_MUMIMO_USER_STATS];
		} htt_tx_pdev_be_ul_mu_mimo_sch_stats_tlv;

		typedef struct {
		htt_tlv_hdr_t tlv_hdr;
		A_UINT32 mu_mimo_mpdus_queued_usr; /* 11AC DL MU MIMO number of mpdus queued to HW, per user */
		@@ -4234,6 +4242,16 @@ typedef struct {
		A_UINT32 rx_ulmumimo_mpdu_fail; /* mpdu level */
		} htt_rx_pdev_ul_mimo_user_stats_tlv;

		typedef struct {
		htt_tlv_hdr_t tlv_hdr;

		A_UINT32 user_index;
		A_UINT32 be_rx_ulmumimo_non_data_ppdu; /* ppdu level */
		A_UINT32 be_rx_ulmumimo_data_ppdu; /* ppdu level */
		A_UINT32 be_rx_ulmumimo_mpdu_ok; /* mpdu level */
		A_UINT32 be_rx_ulmumimo_mpdu_fail; /* mpdu level */
		} htt_rx_pdev_be_ul_mimo_user_stats_tlv;

		/* == RX PDEV/SOC STATS == */

		typedef struct {

fw/wlan_module_ids.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -121,6 +121,7 @@ typedef enum {
		WLAN_MODULE_MLO_MGR, /* 0x57 / / MLO manager */
		WLAN_MODULE_PEER_INIT, /* 0x58 / / peer init connection handling */
		WLAN_MODULE_STA_MLO_PS, /* 0x59 / / MLO PS manager */
		WLAN_MODULE_MLO_SYNC_SEQ_NUM, /* 0x5a / / sync seq num after rm MPDU */


		WLAN_MODULE_ID_MAX,

fw/wmi_services.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -560,6 +560,7 @@ typedef enum {
		WMI_SERVICE_ICMP_OFFLOAD = 308, /* FW supports ping offload during APPS suspend */
		WMI_SERVICE_RTSCTS_FOR_UNICAST_MGMT_SUPPORT = 309, /* Indicates FW support RTSCTS for unicast management */
		WMI_SERVICE_DYNAMIC_VDEV_MAC_ADDR_UPDATE_SUPPORT = 310, /* FW supports dynamic vdev mac address updating */
		WMI_SERVICE_SAWF_LEVEL0 = 311, /* FW supports WMI_SAWF_SVC_CLASS CFG_CMD + DISABLE_CMD msgs */


		WMI_MAX_EXT2_SERVICE