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

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

Merge 8b50c4db on remote branch 

Change-Id: Ifdb59514ab80a63393fa5ee7e566498086f8f422
parents c07866c9 8b50c4db

fw/htt.h

+844 −41

File changed.

Preview size limit exceeded, changes collapsed.

fw/htt_stats.h

+140 −1
Original line number Diff line number Diff line
@@ -333,7 +333,9 @@ enum htt_dbg_ext_stats_type { 
     *  PARAMS:

     *

     *  RESP MSG:

     *    - htt_soc_latency_prof_t

     *    - htt_latency_prof_stats_tlv showing latency profile stats for

     *      high-level (pdev or vdev level) events such as tx/rx suspend

     *      or resume, or UMAC, DMAC, or PMAC reset.

     */

    HTT_DBG_EXT_STATS_LATENCY_PROF_STATS = 25,
@@ -656,6 +658,24 @@ enum htt_dbg_ext_stats_type { 
     */

    HTT_DBG_EXT_PDEV_RTT_INITIATOR_STATS = 66,



    /** HTT_DBG_EXT_STATS_LATENCY_PROF_STATS_LO

     *  PARAMS:

     *

     *  RESP MSG:

     *    - htt_latency_prof_stats_tlv showing latency profile stats for

     *      finer-grained events than HTT_DBG_EXT_STATS_LATENCY_PROF_STATS,

     *      such as individual steps within a larger pdev or vdev event.

     */

    HTT_DBG_EXT_STATS_LATENCY_PROF_STATS_LO = 67,



    /** HTT_DBG_GTX_STATS

     * PARAMS:

     *    - No Params

     * RESP MSG:

     *    - htt_pdev_gtx_stats_tlv

     */

    HTT_DBG_GTX_STATS = 68,





    /* keep this last */

    HTT_DBG_NUM_EXT_STATS = 256,
@@ -1944,6 +1964,7 @@ typedef enum { 


#define HTT_TX_PEER_STATS_NUM_MCS_COUNTERS 12 /* 0-11 */

#define HTT_TX_PEER_STATS_NUM_EXTRA_MCS_COUNTERS 2 /* 12, 13 */

#define HTT_TX_PEER_STATS_NUM_EXTRA2_MCS_COUNTERS 2 /* 14, 15 */

/* HTT_TX_PEER_STATS_NUM_GI_COUNTERS:

 * GI Index 0:  WHAL_GI_800

 * GI Index 1:  WHAL_GI_400
@@ -2025,12 +2046,15 @@ typedef struct _htt_tx_peer_rate_stats_tlv { 
    A_UINT32 tx_gi_ext[HTT_TX_PEER_STATS_NUM_GI_COUNTERS][HTT_TX_PEER_STATS_NUM_EXTRA_MCS_COUNTERS];

    A_UINT32 reduced_tx_bw[HTT_TX_PEER_STATS_NUM_REDUCED_CHAN_TYPES][HTT_TX_PEER_STATS_NUM_BW_COUNTERS];

    A_UINT32 tx_bw_320mhz;

    /* MCS 14,15 */

    A_UINT32 tx_mcs_ext_2[HTT_TX_PEER_STATS_NUM_EXTRA2_MCS_COUNTERS];

} htt_stats_peer_tx_rate_stats_tlv;

/* preserve old name alias for new name consistent with the tag name */

typedef htt_stats_peer_tx_rate_stats_tlv htt_tx_peer_rate_stats_tlv;



#define HTT_RX_PEER_STATS_NUM_MCS_COUNTERS 12 /* 0-11 */

#define HTT_RX_PEER_STATS_NUM_EXTRA_MCS_COUNTERS 2 /* 12, 13 */

#define HTT_RX_PEER_STATS_NUM_EXTRA2_MCS_COUNTERS 2 /* 14, 15 */

#define HTT_RX_PEER_STATS_NUM_GI_COUNTERS 4

#define HTT_RX_PEER_STATS_NUM_DCM_COUNTERS 5

#define HTT_RX_PEER_STATS_NUM_BW_COUNTERS 4
@@ -2105,6 +2129,9 @@ typedef struct _htt_rx_peer_rate_stats_tlv { 
    A_UINT32 rx_gi_ext[HTT_RX_PEER_STATS_NUM_GI_COUNTERS][HTT_RX_PEER_STATS_NUM_EXTRA_MCS_COUNTERS];

    A_UINT32 reduced_rx_bw[HTT_RX_PEER_STATS_NUM_REDUCED_CHAN_TYPES][HTT_RX_PEER_STATS_NUM_BW_COUNTERS];

    A_INT8   rx_per_chain_rssi_in_dbm_ext[HTT_RX_PEER_STATS_NUM_SPATIAL_STREAMS][HTT_RX_PEER_STATS_NUM_BW_EXT_COUNTERS];

    A_UINT32 rx_bw_320mhz;

    /* MCS 14,15 */

    A_UINT32 rx_mcs_ext_2[HTT_RX_PEER_STATS_NUM_EXTRA2_MCS_COUNTERS];

} htt_stats_peer_rx_rate_stats_tlv;

/* preserve old name alias for new name consistent with the tag name */

typedef htt_stats_peer_rx_rate_stats_tlv htt_rx_peer_rate_stats_tlv;
@@ -4371,6 +4398,9 @@ typedef struct { 
    A_UINT32 sched_udp_notify2;

    A_UINT32 sched_nonudp_notify1;

    A_UINT32 sched_nonudp_notify2;

    A_UINT32 tqm_enqueue_msdu_count;

    A_UINT32 tqm_dropped_msdu_count;

    A_UINT32 tqm_dequeue_msdu_count;

} htt_stats_tx_tqm_pdev_tlv;

/* preserve old name alias for new name consistent with the tag name */

typedef htt_stats_tx_tqm_pdev_tlv htt_tx_tqm_pdev_stats_tlv_v;
@@ -4561,6 +4591,18 @@ typedef struct { 
    A_UINT32 eapol_start_packets;

    A_UINT32 eapol_logoff_packets;

    A_UINT32 eapol_encap_asf_packets;

    A_UINT32 m1_success;

    A_UINT32 m1_compl_fail;

    A_UINT32 m2_success;

    A_UINT32 m2_compl_fail;

    A_UINT32 m3_success;

    A_UINT32 m3_compl_fail;

    A_UINT32 m4_success;

    A_UINT32 m4_compl_fail;

    A_UINT32 g1_success;

    A_UINT32 g1_compl_fail;

    A_UINT32 g2_success;

    A_UINT32 g2_compl_fail;

} htt_stats_tx_de_eapol_packets_tlv;

/* preserve old name alias for new name consistent with the tag name */

typedef htt_stats_tx_de_eapol_packets_tlv htt_tx_de_eapol_packets_stats_tlv;
@@ -4664,6 +4706,9 @@ typedef struct { 
    A_UINT32 discarded_pkts;

    A_UINT32 local_frames;

    A_UINT32 is_ext_msdu;

    A_UINT32 mlo_invalid_routing_discard;

    A_UINT32 mlo_invalid_routing_dup_entry_discard;

    A_UINT32 discard_peer_unauthorized_pkts;

} htt_stats_tx_de_enqueue_discard_tlv;

/* preserve old name alias for new name consistent with the tag name */

typedef htt_stats_tx_de_enqueue_discard_tlv htt_tx_de_enqueue_discard_stats_tlv;
@@ -5558,6 +5603,8 @@ typedef struct { 
    A_UINT32 extra_eht_ltf;

    /** Counter for Extra EHT LTFs in OFDMA sequences */

    A_UINT32 extra_eht_ltf_ofdma;

    /** 11AX HE UL_BA RU Size stats */

    A_UINT32 ofdma_ba_ru_size[HTT_TX_PDEV_STATS_NUM_AX_RU_SIZE_COUNTERS];

} htt_stats_tx_pdev_rate_stats_tlv;

/* preserve old name alias for new name consistent with the tag name */

typedef htt_stats_tx_pdev_rate_stats_tlv htt_tx_pdev_rate_stats_tlv;
@@ -5646,6 +5693,7 @@ typedef struct { 
    A_UINT32 be_ofdma_tx_ru_size[HTT_TX_PDEV_STATS_NUM_BE_RU_SIZE_COUNTERS];

    /** 11BE EHT DL MU OFDMA EHT-SIG MCS stats */

    A_UINT32 be_ofdma_eht_sig_mcs[HTT_TX_PDEV_STATS_NUM_EHT_SIG_MCS_COUNTERS];

    A_UINT32 be_ofdma_ba_ru_size[HTT_TX_PDEV_STATS_NUM_BE_RU_SIZE_COUNTERS];

} htt_stats_tx_pdev_rate_stats_be_ofdma_tlv;

/* preserve old name alias for new name consistent with the tag name */

typedef htt_stats_tx_pdev_rate_stats_be_ofdma_tlv
@@ -8568,6 +8616,82 @@ typedef struct { 
} htt_pdev_rtt_init_stats_t;

#endif /* ATH_TARGET */



enum {

    HTT_STATS_WIFI_RADAR_CAL_TYPE_NONE = 0,

    HTT_STATS_WIFI_RADAR_CAL_TYPE_GAIN_BINARY_SEARCH = 1,

    HTT_STATS_WIFI_RADAR_CAL_TYPE_TX_GAIN_BINARY_SEARCH = 2,

    HTT_STATS_WIFI_RADAR_CAL_TYPE_RECAL_GAIN_VALIDATION = 3,

    HTT_STATS_WIFI_RADAR_CAL_TYPE_RECAL_GAIN_BINARY_SEARCH = 4,

    /* the value 5 is reserved for future use */



    HTT_STATS_NUM_WIFI_RADAR_CAL_TYPES = 6

};



enum {

    HTT_STATS_WIFI_RADAR_CAL_FAILURE_NONE = 0,

    HTT_STATS_WIFI_RADAR_CAL_FAILURE_DPD_ABORT = 1,

    HTT_STATS_WIFI_RADAR_CAL_FAILURE_CONVERGENCE = 2,

    HTT_STATS_WIFI_RADAR_CAL_FAILURE_TX_EXCEEDS_RETRY = 3,

    HTT_STATS_WIFI_RADAR_CAL_FAILURE_CAPTURE = 4,

    HTT_STATS_WIFI_RADAR_CAL_FAILURE_NEW_CHANNEL_CHANGE = 5,

    HTT_STATS_WIFI_RADAR_CAL_FAILURE_NEW_CAL_REQ = 6,

    /* the values 7-9 are reserved for future use */



    HTT_STATS_NUM_WIFI_RADAR_CAL_FAILURE_REASONS = 10

};



typedef struct {

    htt_tlv_hdr_t tlv_hdr;

    A_UINT32 capture_in_progress;

    A_UINT32 calibration_in_progress;

    /* Capture time interval, in ms */

    A_UINT32 periodicity;

    /* Last user request timestamp, in ms */

    A_UINT32 latest_req_timestamp;

    /* Last target res timestamp, in ms */

    A_UINT32 latest_resp_timestamp;

    /* Time taken by last calibration to end, in ms */

    A_UINT32 latest_calibration_timing;

    /* Time taken by last calibration to end, in ms for each chain */

    A_UINT32 calibration_timing_per_chain[HTT_STATS_MAX_CHAINS];

    /* To log user request count */

    A_UINT32 wifi_radar_req_count;

    /* Total packet success count */

    A_UINT32 num_wifi_radar_pkt_success;

    /* Total packet queued count */

    A_UINT32 num_wifi_radar_pkt_queued;

    /* Total packet success count during latest calibration alone */

    A_UINT32 num_wifi_radar_cal_pkt_success;

    /* Tx Gain Calibration Output - Initial Tx Gain index*/

    A_UINT32 wifi_radar_cal_init_tx_gain;

    /* Last Calibration Type, refer to HTT_STATS_WIFI_RADAR_CAL_TYPE_ consts */

    A_UINT32 latest_wifi_radar_cal_type;

    /* Calibration Type counters */

    A_UINT32 wifi_radar_cal_type_counts[HTT_STATS_NUM_WIFI_RADAR_CAL_TYPES];

    /*

     * Last Calibration Fail Reason,

     * refer to HTT_STATS_WIFI_RADAR_CAL_FAILURE_ consts

     */

    A_UINT32 latest_wifi_radar_cal_fail_reason;

    /* Calibration Fail Reason counters */

    A_UINT32 wifi_radar_cal_fail_reason_counts[HTT_STATS_NUM_WIFI_RADAR_CAL_FAILURE_REASONS];

    /* WiFi Radar Licensed for SKU: 0 - No; 1 - Yes */

    A_UINT32 wifi_radar_licensed;

    /*

     * cmd result to show failure count of CTS2SELF across MAX_CMD_RESULT

     * reasons

     */

    A_UINT32 cmd_results_cts2self[HTT_STATS_MAX_SCH_CMD_RESULT];

    /*

     * cmd result to show failure count of wifi radar across MAX_CMD_RESULT

     * reasons

     */

    A_UINT32 cmd_results_wifi_radar[HTT_STATS_MAX_SCH_CMD_RESULT];

    /* Tx gain index from gain table obtained/used for calibration */

    A_UINT32 wifi_radar_tx_gains[HTT_STATS_MAX_CHAINS];

    /* Rx gain index from gain table obtained/used from calibration */

    A_UINT32 wifi_radar_rx_gains[HTT_STATS_MAX_CHAINS][HTT_STATS_MAX_CHAINS];

} htt_stats_tx_pdev_wifi_radar_tlv;



/* STATS_TYPE : HTT_DBG_EXT_PKTLOG_AND_HTT_RING_STATS

 * TLV_TAGS:
@@ -9286,6 +9410,10 @@ typedef struct { 
        };

        A_UINT32 ctl_args;

    };

    /** max_reg_only_allowed_power:

     * units = 0.25dBm

     */

    A_INT32 max_reg_only_allowed_power[HTT_STATS_MAX_CHAINS];

} htt_stats_phy_tpc_stats_tlv;

/* preserve old name alias for new name consistent with the tag name */

typedef htt_stats_phy_tpc_stats_tlv htt_phy_tpc_stats_tlv;
@@ -10438,6 +10566,7 @@ typedef struct _htt_odd_mandatory_muofdma_pdev_stats_tlv { 
    A_UINT32 ax_mu_brp_sch_status[HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];

    A_UINT32 be_mu_brp_sch_status[HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];

    A_UINT32 ofdma_tx_ru_size[HTT_TX_PDEV_STATS_NUM_AX_RU_SIZE_COUNTERS];

    A_UINT32 ofdma_ba_ru_size[HTT_TX_PDEV_STATS_NUM_AX_RU_SIZE_COUNTERS];

} htt_dbg_odd_mandatory_muofdma_tlv;

/* preserve old name alias for new name consistent with the tag name */

typedef htt_dbg_odd_mandatory_muofdma_tlv
@@ -11678,5 +11807,15 @@ static INLINE A_UINT8 *htt_ctrl_path_cal_type_id_to_name(A_UINT32 cal_type_id) 
}

#endif /* HTT_CTRL_PATH_STATS_CAL_TYPE_STRINGS */



/*===================== Start GTX stats ====================*/

#define HTT_NUM_MCS_PER_NSS 16

typedef struct {

    htt_tlv_hdr_t tlv_hdr;

    A_UINT32 gtx_enabled; /* shows whether Green Tx feature is enabled */

    A_INT32 mcs_tpc_min[HTT_NUM_MCS_PER_NSS]; /* shows current MCS's minimum TPC in 0.25dBm units */

    A_INT32 mcs_tpc_max[HTT_NUM_MCS_PER_NSS]; /* shows current MCS's maximum TPC in 0.25dBm units */

    A_UINT32 mcs_tpc_diff[HTT_NUM_MCS_PER_NSS]; /* shows current MCS's difference between maximum and minimum TPC in 0.25dB unit*/

} htt_stats_gtx_tlv;

/*===================== End GTX stats ====================*/



#endif /* __HTT_STATS_H__ */

fw/txmon_tlvs.h

+71 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2022,2024 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -34,6 +34,22 @@ 
#define TXMON_FW2SW_MON_FES_SETUP_SCHEDULE_ID_M         0xffffffff

#define TXMON_FW2SW_MON_FES_SETUP_SCHEDULE_ID_S         0



#define TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_M           0x000fffff

#define TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_S           0



#define TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_SEQ_NUM_M   0x000007ff

#define TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_SEQ_NUM_S   0



#define TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_HW_LINK_ID_M 0x00003800

#define TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_HW_LINK_ID_S 11



#define TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_PACKET_ID_M 0x0007c000

#define TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_PACKET_ID_S 14



#define TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_VALID_M     0x00080000

#define TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_VALID_S     19





#define TXMON_FW2SW_MON_FES_SETUP_BAND_CENTER_FREQ1_GET(_var) \

    (((_var) & TXMON_FW2SW_MON_FES_SETUP_BAND_CENTER_FREQ1_M) >> \

     TXMON_FW2SW_MON_FES_SETUP_BAND_CENTER_FREQ1_S)
@@ -84,6 +100,58 @@ 
        ((_var) |= ((_val) << TXMON_FW2SW_MON_FES_SETUP_SCHEDULE_ID_S)); \

    } while (0)



#define TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_GET(_var) \

    (((_var) & TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_M) >> \

     TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_S)



#define TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_SET(_var, _val) \

    do { \

        HTT_CHECK_SET_VAL(TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE, _val); \

        ((_var) |= ((_val) << TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_S)); \

    } while (0)





#define TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_SEQ_NUM_GET(_var) \

    (((_var) & TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_SEQ_NUM_M) >> \

     TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_SEQ_NUM_S)



#define TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_SEQ_NUM_SET(_var, _val) \

    do { \

        HTT_CHECK_SET_VAL(TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_SEQ_NUM, _val); \

        ((_var) |= ((_val) << TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_SEQ_NUM_S)); \

    } while (0)



#define TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_HW_LINK_ID_GET(_var) \

    (((_var) & TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_HW_LINK_ID_M) >> \

     TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_HW_LINK_ID_S)



#define TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_HW_LINK_ID_SET(_var, _val) \

    do { \

        HTT_CHECK_SET_VAL(TXMON_FW2SW_MON_FES_SETUP_FW_COOKIEHW_LINK_ID, _val); \

        ((_var) |= ((_val) << TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_HW_LINK_ID_S)); \

    } while (0)



#define TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_PACKET_ID_GET(_var) \

    (((_var) & TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_PACKET_ID_M) >> \

     TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_PACKET_ID_S)



#define TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_PACKET_ID_SET(_var, _val) \

    do { \

        HTT_CHECK_SET_VAL(TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_PACKET_ID, _val); \

        ((_var) |= ((_val) << TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_PACKET_ID_S)); \

    } while (0)



#define TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_VALID_GET(_var) \

    (((_var) & TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_VALID_M) >> \

     TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_VALID_S)



#define TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_VALID_SET(_var, _val) \

    do { \

        HTT_CHECK_SET_VAL(TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_VALID, _val); \

        ((_var) |= ((_val) << TXMON_FW2SW_MON_FES_SETUP_FW_COOKIE_VALID_S)); \

    } while (0)





enum txmon_fw2sw_user_id {

    TXMON_FW2SW_TYPE_FES_SETUP      = 0, /* Placed after  FES_SETUP */

    TXMON_FW2SW_TYPE_FES_SETUP_USER = 1, /* Placed before FES_SETUP_COMPLETE */
@@ -98,6 +166,8 @@ typedef struct txmon_fw2sw_fes_setup { 
             mhz      : 16,

             reserved : 8;

    A_UINT32 schedule_id;

    A_UINT32 fw_cookie : 20,

             rsvd      : 12;

} txmon_fw2sw_fes_setup_t;



typedef struct txmon_fw2sw_fes_setup_ext {

fw/wlan_defs.h

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2016, 2018-2021 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Previously licensed under the ISC license by Qualcomm Atheros, Inc.

 *
@@ -1754,6 +1754,7 @@ typedef enum { 
typedef enum {

    MLO_SHMEM_RECOVERY_CRASH_PARTNER_CHIPS = 1,

    MLO_SHMEM_RECOVER_NON_MLO_MODE = 2,

    MLO_SHMEM_RECOVER_NON_CRASH_MLO_MODE = 3,

} MLO_SHMEM_CHIP_RECOVERY_MODE;



/* glb link info structures used for scratchpad memory (crash and recovery) */

fw/wlan_module_ids.h

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Previously licensed under the ISC license by Qualcomm Atheros, Inc.

 *
@@ -154,7 +154,7 @@ typedef enum { 
  WLAN_MODULE_SMART_TX,                 /* 0x71 */

  WLAN_MODULE_BRIDGE_PEER,              /* 0x72 */

  WLAN_MODULE_AUX_MAC_MGR,              /* 0x73 */



  WLAN_MODULE_TCAM,                     /* 0x74 */



  WLAN_MODULE_ID_MAX,

  WLAN_MODULE_ID_INVALID = WLAN_MODULE_ID_MAX,