Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 18995005 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.14.r1-19500-LAHAINA.QSSI12.0' of...

Merge tag 'LA.UM.9.14.r1-19500-LAHAINA.QSSI12.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/fw-api into android12-5.4-lahaina

"LA.UM.9.14.r1-19500-LAHAINA.QSSI12.0"

* tag 'LA.UM.9.14.r1-19500-LAHAINA.QSSI12.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/fw-api:
  fw-api: CL 17453007 - update fw common interface files
  fw-api: CL 17402406 - update fw common interface files
  fw-api: CL 17390237 - update fw common interface files
  fw-api: CL 17377924 - update fw common interface files
  fw-api: CL 17375848 - update fw common interface files
  fw-api:  Add hw headers for wkk monitor
  fw-api: CL 17350518 - update fw common interface files
  fw-api: CL 17346132 - update fw common interface files
  fw-api: CL 17328421 - update fw common interface files
  fw-api: CL 17323774 - update fw common interface files
  fw-api: CL 17313419 - update fw common interface files
  fw-api: CL 17281689 - update fw common interface files
  fw-api: CL 17270680 - update fw common interface files
  fw-api: CL 17267055 - update fw common interface files
  fw-api: CL 17265976 - update fw common interface files
  fw-api: CL 17259959 - update fw common interface files
  fw-api: CL 17257656 - update fw common interface files
  fw-api: Add Big endian support in headers
  fw-api: Add HWIO_WBM_R0_WBM_CFG_2 related macros
  fw-api: Add missing qcn9224 hdrs
  fw-api: CL 17248910 - update fw common interface files
  fw-api: CL 17246272 - update fw common interface files
  fw-api: CL 17233205 - update fw common interface files
  fw-api: CL 17220375 - update fw common interface files
  fw-api: CL 17216446 - update fw common interface files
  fw-api: CL 17207899 - update fw common interface files
  fw-api: CL 17204425 - update fw common interface files
  fw-api: CL 17183819 - update fw common interface files
  fw-api: CL 17180216 - update fw common interface files
  fw-api: Add rx_reo_queue_1k.h header for qcn9224
  fw-api: kiwi: Get V2 HW header files for kiwi
  fw-api: CL 17178398 - update fw common interface files
  fw-api: CL 17148867 - update fw common interface files
  fw-api: CL 17146895 - update fw common interface files
  fw-api: CL 17114670 - update fw common interface files
  fw-api: CL 17053323 - update fw common interface files
  fw-api: CL 17052075 - update fw common interface files
  fw-api: CL 17040921 - update fw common interface files
  fw-api: Add headers for qcn9224
  fw-api: CL 17023988 - update fw common interface files
  fw-api: CL 17004158 - update fw common interface files
  fw-api: CL 16991780 - update fw common interface files
  fw-api: CL 16974263 - update fw common interface files
  fw-api: CL 16957374 - update fw common interface files
  fw-api: CL 16936729 - update fw common interface files
  fw-api: CL 16924619 - update fw common interface files
  fw-api: CL 16908979 - update fw common interface files
  fw-api: CL 16893507 - update fw common interface files
  fw-api: CL 16867067 - update fw common interface files
  fw-api: CL 16854916 - update fw common interface files
  fw-api: CL 16843790 - update fw common interface files
  fw-api: CL 16842041 - update fw common interface files
  fw-api: CL 16839425 - update fw common interface files
  fw-api: CL 16820609 - update fw common interface files
  fw-api: CL 16819411 - update fw common interface files
  fw-api: CL 16793455 - update fw common interface files
  fw-api: CL 16770646 - update fw common interface files
  fw-api: CL 16758488 - update fw common interface files
  fw-api: CL 16748231 - update fw common interface files
  fw-api: CL 16710513 - update fw common interface files
  fw-api: CL 16708104 - update fw common interface files
  fw-api: CL 16706477 - update fw common interface files
  fw-api: CL 16698771 - update fw common interface files
  fw-api: CL 16693726 - update fw common interface files
  fw-api: CL 16672549 - update fw common interface files
  fw-api: CL 16669046 - update fw common interface files
  fw-api: CL 16661022 - update fw common interface files
  fw-api: CL 16650276 - update fw common interface files
  fw-api: CL 16648993 - update fw common interface files
  fw-api: CL 16646664 - update fw common interface files
  fw-api: CL 16645516 - update fw common interface files
  fw-api: CL 16645116 - update fw common interface files
  fw-api: CL 16641527 - update fw common interface files
  fw-api: CL 16628248 - update fw common interface files
  fw-api: CL 16617997 - update fw common interface files
  fw-api: CL 16617907 - update fw common interface files
  fw-api: CL 16604795 - update fw common interface files
  fw-api: CL 16604792 - update fw common interface files
  fw-api: CL 16589476 - update fw common interface files
  fw-api: CL 16574436 - update fw common interface files
  fw-api: CL 16563077 - update fw common interface files
  fw-api: CL 16547592 - update fw common interface files
  fw-api: CL 16530757 - update fw common interface files
  fw-api: CL 16496860 - update fw common interface files
  fw-api: CL 16481341 - update fw common interface files
  fw-api: CL 16464894 - update fw common interface files
  fw-api: CL 16461719 - update fw common interface files
  fw-api: kiwi: Get E3.R38 HW header files for kiwi
  fw-api: CL 16433800 - update fw common interface files
  fw-api: CL 16422098 - update fw common interface files
  fw-api: CL 16377032 - update fw common interface files
  fw-api: CL 16377025 - update fw common interface files
  fw-api: CL 16352893 - update fw common interface files
  fw-api: CL 16334195 - update fw common interface files
  fw-api: CL 16323376 - update fw common interface files
  fw-api: CL 16300054 - update fw common interface files
  fw-api: CL 16295127 - update fw common interface files
  fw-api: CL 16288213 - update fw common interface files
  fw-api: CL 16267319 - update fw common interface files
  fw-api: CL 16257393 - update fw common interface files
  fw-api: CL 16253037 - update fw common interface files
  fw-api: CL 16086231 - update fw common interface files
  fw-api: CL 16033039 - update fw common interface files
  fw-api: CL 16019470 - update fw common interface files
  fw-api: CL 16009133 - update fw common interface files
  fw-api: CL 16000146 - update fw common interface files
  fw-api: CL 15994738 - update fw common interface files
  fw-api: CL 15978076 - update fw common interface files
  fw-api: CL 15967585 - update fw common interface files
  fw-api: CL 15963168 - update fw common interface files
  fw-api: CL 15949447 - update fw common interface files
  fw-api: CL 15947523 - update fw common interface files
  fw-api: CL 15903681 - update fw common interface files
  fw-api: CL 15877381 - update fw common interface files
  fw-api: CL 15805810 - update fw common interface files
  fw-api: CL 15800352 - update fw common interface files
  fw-api: CL 15762579 - update fw common interface files
  fw-api: CL 15762578 - update fw common interface files
  fw-api: CL 15745076 - update fw common interface files
  fw-api: CL 15741103 - update fw common interface files
  fw-api: CL 15739327 - update fw common interface files
  fw-api: CL 15711001 - update fw common interface files
  fw-api: CL 15705178 - update fw common interface files
  fw-api: CL 15691134 - update fw common interface files
  fw-api: CL 15689464 - update fw common interface files
  fw-api: CL 15687682 - update fw common interface files
  fw-api: CL 15633236 - update fw common interface files
  fw-api: CL 15633220 - update fw common interface files
  fw-api: CL 15605795 - update fw common interface files
  fw-api: CL 15591323 - update fw common interface files
  fw-api: CL 15591321 - update fw common interface files
  fw-api: CL 15569824 - update fw common interface files
  fw-api: CL 15484013 - update fw common interface files
  fw-api: CL 15484006 - update fw common interface files
  fw-api: CL 15458003 - update fw common interface files

Change-Id: I0e5fdfd6dd225cc49c81907fc8dcf17de8228dab
parents f1aebac5 2b58351f
Loading
Loading
Loading
Loading
+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_ */
+1850 −177

File changed.

Preview size limit exceeded, changes collapsed.

+50 −14
Original line number Diff line number Diff line
@@ -210,10 +210,13 @@ PREPACK struct htt_tx_ppdu_stats_info {
    A_UINT32 tx_ratecode:       8,
             is_ampdu:          1,
             ba_ack_failed:     2,
             /*  0: 20 MHz
                 1: 40 MHz
                 2: 80 MHz
                 3: 160 MHz or 80+80 MHz */
             /* bw
              *  0: 20 MHz
              *  1: 40 MHz
              *  2: 80 MHz
              *  3: 160 MHz or 80+80 MHz
              *  4: 320 MHz
              */
             bw:                3,
             sgi:               1,
             skipped_rate_ctrl: 1,
@@ -424,6 +427,7 @@ enum HTT_PPDU_STATS_BW {
    HTT_PPDU_STATS_BANDWIDTH_160MHZ = 5, /* includes 80+80 */
    HTT_PPDU_STATS_BANDWIDTH_DYN    = 6,
    HTT_PPDU_STATS_BANDWIDTH_DYN_PATTERNS = 7,
    HTT_PPDU_STATS_BANDWIDTH_320MHZ = 8,
};
typedef enum HTT_PPDU_STATS_BW HTT_PPDU_STATS_BW;

@@ -446,11 +450,18 @@ enum HTT_PPDU_STATS_SEQ_TYPE {
    HTT_SEQTYPE_AC_MU_MIMO          = 2,
    HTT_SEQTYPE_AX_MU_MIMO          = 3,
    HTT_SEQTYPE_MU_OFDMA            = 4,
    HTT_SEQTYPE_UL_TRIG         = 5,
    HTT_SEQTYPE_UL_MU_OFDMA_TRIG    = 5, /* new name - use this */
        HTT_SEQTYPE_UL_TRIG         = 5,  /* deprecated old name */
    HTT_SEQTYPE_BURST_BCN           = 6,
    HTT_SEQTYPE_UL_BSR_RESP         = 7,
    HTT_SEQTYPE_UL_BSR_TRIG         = 8,
    HTT_SEQTYPE_UL_RESP             = 9,
    HTT_SEQTYPE_UL_MU_MIMO_TRIG     = 10,
    HTT_SEQTYPE_BE_MU_MIMO          = 11,
    HTT_SEQTYPE_BE_MU_OFDMA         = 12,
    HTT_SEQTYPE_BE_UL_MU_OFDMA_TRIG = 13,
    HTT_SEQTYPE_BE_UL_MU_MIMO_TRIG  = 14,
    HTT_SEQTYPE_BE_UL_BSR_TRIG      = 15,
};
typedef enum HTT_PPDU_STATS_SEQ_TYPE HTT_PPDU_STATS_SEQ_TYPE;

@@ -605,6 +616,11 @@ typedef enum HTT_PPDU_STATS_SPATIAL_REUSE HTT_PPDU_STATS_SPATIAL_REUSE;
        (((_val) & HTT_PPDU_STATS_COMMON_TRIG_COOKIE_M) >> \
         HTT_PPDU_STATS_COMMON_TRIG_COOKIE_S)

enum HTT_SEQ_TYPE {
    WAL_PPDU_SEQ_TYPE = 0,
    HTT_PPDU_SEQ_TYPE = 1,
};

typedef struct {
    htt_tlv_hdr_t tlv_hdr;

@@ -766,6 +782,26 @@ typedef struct {
                     trig_cookie_valid: 1;
        };
    };

    /*
     * htt_seq_type field is added for backward compatibility with
     * pktlog decoder, host driver or any third party tool interpreting
     * ppdu sequence type. If field 'htt_seq_type'is not present or is
     * present but set to WAL_PPDU_SEQ_TYPE, decoder should interpret
     * the seq type as WAL_TXSEND_PPDU_SEQUENCE.
     * If the new field htt_seq_type is present and is set to
     * HTT_PPDU_SEQ_TYPE then decoder should interpret the seq type as
     * HTT_PPDU_STATS_SEQ_TYPE. htt_seq_type field will be set to
     * HTT_PPDU_SEQ_TYPE in firmware versions where this field is
     * defined.
     */
    union {
        A_UINT32 reserved__htt_seq_type;
        struct {
            A_UINT32 htt_seq_type:  1,
                     reserved3:     31;
        };
    };
} htt_ppdu_stats_common_tlv;

#define HTT_PPDU_STATS_USER_COMMON_TLV_TID_NUM_M     0x000000ff
+2023 −932

File changed.

Preview size limit exceeded, changes collapsed.

+61 −9
Original line number Diff line number Diff line
@@ -1280,14 +1280,17 @@ struct wlan_dbg_tidq_stats {

typedef enum {
    WLAN_DBG_DATA_STALL_NONE                   = 0,
    WLAN_DBG_DATA_STALL_VDEV_PAUSE,         /* 1 */
    WLAN_DBG_DATA_STALL_HWSCHED_CMD_FILTER, /* 2 */
    WLAN_DBG_DATA_STALL_HWSCHED_CMD_FLUSH,  /* 3 */
    WLAN_DBG_DATA_STALL_RX_REFILL_FAILED,   /* 4 */
    WLAN_DBG_DATA_STALL_RX_FCS_LEN_ERROR,   /* 5 */
    WLAN_DBG_DATA_STALL_MAC_WDOG_ERRORS,    /* 6 */ /* Mac watch dog */
    WLAN_DBG_DATA_STALL_PHY_BB_WDOG_ERROR,  /* 7 */ /* PHY watch dog */
    WLAN_DBG_DATA_STALL_POST_TIM_NO_TXRX_ERROR, /* 8 */
    WLAN_DBG_DATA_STALL_VDEV_PAUSE             = 1,
    WLAN_DBG_DATA_STALL_HWSCHED_CMD_FILTER     = 2,
    WLAN_DBG_DATA_STALL_HWSCHED_CMD_FLUSH      = 3,
    WLAN_DBG_DATA_STALL_RX_REFILL_FAILED       = 4,
    WLAN_DBG_DATA_STALL_RX_FCS_LEN_ERROR       = 5,
    WLAN_DBG_DATA_STALL_MAC_WDOG_ERRORS        = 6, /* Mac watch dog */
    WLAN_DBG_DATA_STALL_PHY_BB_WDOG_ERROR      = 7, /* PHY watch dog */
    WLAN_DBG_DATA_STALL_POST_TIM_NO_TXRX_ERROR = 8,
    WLAN_DBG_DATA_STALL_CONSECUTIVE_NON_FLUSH  = 9,
    WLAN_DBG_DATA_STALL_CONSECUTIVE_NOACK      = 10,
    WLAN_DBG_DATA_STALL_CONSECUTIVE_LT_EXPIRY  = 11,
    WLAN_DBG_DATA_STALL_MAX,
} wlan_dbg_data_stall_type_e;

@@ -1363,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 */
@@ -1539,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)
@@ -1560,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;

Loading