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

Commit de6eee43 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge a0fcbc74 on remote branch 

Change-Id: Id0d2f0177c57afab70cfe9e8cc43d75fa59e23f7
parents c2e0f179 a0fcbc74

fw/htt.h

+14 −0
Original line number Diff line number Diff line
@@ -658,6 +658,16 @@ typedef enum { 
    HTT_STATS_PER_RATE_STATS_TAG                   = 128, /* htt_tx_rate_stats_per_tlv */

    HTT_STATS_MU_PPDU_DIST_TAG                     = 129, /* htt_pdev_mu_ppdu_dist_tlv */

    HTT_STATS_TX_PDEV_MUMIMO_GRP_STATS_TAG         = 130, /* htt_tx_pdev_mumimo_grp_stats_tlv */

    HTT_STATS_TX_PDEV_BE_RATE_STATS_TAG            = 131, /* htt_tx_pdev_rate_stats_be_tlv */

    HTT_STATS_AST_ENTRY_TAG                        = 132, /* htt_ast_entry_tlv */

    HTT_STATS_TX_PDEV_BE_DL_MU_OFDMA_STATS_TAG     = 133, /* htt_tx_pdev_dl_be_mu_ofdma_sch_stats_tlv */

    HTT_STATS_TX_PDEV_BE_UL_MU_OFDMA_STATS_TAG     = 134, /* htt_tx_pdev_ul_be_mu_ofdma_sch_stats_tlv */

    HTT_STATS_TX_PDEV_RATE_STATS_BE_OFDMA_TAG      = 135, /* htt_tx_pdev_rate_stats_be_ofdma_tlv */

    HTT_STATS_RX_PDEV_UL_MUMIMO_TRIG_BE_STATS_TAG  = 136, /* htt_rx_pdev_ul_mumimo_trig_be_stats_tlv */

    HTT_STATS_TX_SELFGEN_BE_ERR_STATS_TAG          = 137, /* htt_tx_selfgen_be_err_stats_tlv */

    HTT_STATS_TX_SELFGEN_BE_STATS_TAG              = 138, /* htt_tx_selfgen_be_stats_tlv */

    HTT_STATS_TX_SELFGEN_BE_SCHED_STATUS_STATS_TAG = 139, /* htt_tx_selfgen_be_sched_status_stats_tlv */





























    HTT_STATS_MAX_TAG,















} htt_tlv_tag_t;










@@ -2395,6 +2405,7 @@ typedef enum {













   HTT_TX_FW2WBM_TX_STATUS_REINJECT,















   HTT_TX_FW2WBM_TX_STATUS_INSPECT,















   HTT_TX_FW2WBM_TX_STATUS_MEC_NOTIFY,













   HTT_TX_FW2WBM_TX_STATUS_VDEVID_MISMATCH,





























   HTT_TX_FW2WBM_TX_STATUS_MAX















} htt_tx_fw2wbm_tx_status_t;










@@ -16390,6 +16401,9 @@ enum HTT_MSDU_QTYPE {













    HTT_MSDU_QTYPE_UDP, /* Specifies MSDUQ index used for UDP flow */















    HTT_MSDU_QTYPE_NON_UDP, /* Specifies MSDUQ index used for non-udp flow */















    HTT_MSDU_QTYPE_HOL, /* Specified MSDUQ index used for Head of Line */













    HTT_MSDU_QTYPE_USER_SPECIFIED, /* Specifies MSDUQ index used for advertising changeable flow type */













    HTT_MSDU_QTYPE_HI_PRIO,        /* Specifies MSDUQ index used for high priority flow type */













    HTT_MSDU_QTYPE_LO_PRIO,        /* Specifies MSDUQ index used for low priority flow type */











































    /* New MSDU_QTYPE should be added above this line */

























fw/htt_ppdu_stats.h



+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

































fw/htt_stats.h



+278
−4


























File changed.
Preview size limit exceeded, changes collapsed.
























fw/wmi_services.h



+10
−0


























File changed.
Preview size limit exceeded, changes collapsed.
























fw/wmi_tlv_defs.h



+33
−3


























File changed.
Preview size limit exceeded, changes collapsed.