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

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

Merge 7f4d23ab on remote branch 

Change-Id: I0f97ed3fb63ed57cf4afb7e97e51580e25798e8a
parents 8b15a776 7f4d23ab

fw/htt.h

+794 −13

File changed.

Preview size limit exceeded, changes collapsed.

fw/htt_stats.h

+27 −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,16 @@ 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,





    /* keep this last */

    HTT_DBG_NUM_EXT_STATS = 256,
@@ -1944,6 +1956,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 +2038,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 +2121,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;
@@ -4664,6 +4683,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;
@@ -9286,6 +9308,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;

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/wmi_services.h

+5 −1
Original line number Diff line number Diff line
@@ -654,7 +654,11 @@ typedef enum { 
    WMI_SERVICE_P2P_DEVICE_UPDATE_MAC_ADDR_SUPPORT = 401, /* indicate FW support dynamic update mac address for P2P device */

    WMI_SERVICE_DCS_OBSS_INT_SUPPORT = 402, /* Indicates FW supports OBSS Interference detection */

    WMI_SERVICE_DYNAMIC_WSI_REMAP_SUPPORT = 403, /* WSI bypass remap is supported by Firmware */

    WMI_SERVICE_QMS_DLKM_SUPPORT = 404, /* FW code has qms_dlkm support enabled */

    WMI_SERVICE_QMS_DLKM_SUPPORT = 404, /* DEPRECATED */

    WMI_SERVICE_SMEM_MAILBOX_SUPPORT = 404, /* FW code has smem_mailbox support enabled */

    WMI_SERVICE_REG_CC_EXT2_EVENT_SUPPORT = 405, /* Indicate FW would send EXT2 REG_CC event having data which would be a continuation to EXT REG_CC event */

    WMI_SERVICE_MLO_MODE2_RECOVERY_SUPPORTED = 406, /* Indicate FW support for MLO mode2 recovery */

    WMI_SERVICE_MSDUQ_RECFG = 407, /* FW support the HTT MSDUQ_RECFG_REQ + MSDUQ_CFG_IND messages */





    WMI_MAX_EXT2_SERVICE

fw/wmi_tlv_defs.h

+29 −0
Original line number Diff line number Diff line
@@ -1428,6 +1428,10 @@ typedef enum { 
    WMITLV_TAG_STRUC_wmi_dcs_obss_int_t,

    WMITLV_TAG_STRUC_wmi_pdev_wifi_radar_cal_completion_status_event_param,

    WMITLV_TAG_STRUC_wmi_sar_flags,

    WMITLV_TAG_STRUC_wmi_pdev_enable_xlna_cmd_fixed_param,

    WMITLV_TAG_STRUC_wmi_pdev_enable_xlna_event_fixed_param,

    WMITLV_TAG_STRUC_wmi_reg_chan_list_cc_event_ext2_fixed_param,

    WMITLV_TAG_STRUC_wmi_pdev_set_custom_tx_power_per_mcs_cmd_fixed_param,

} WMITLV_TAG_ID;

/*

 * IMPORTANT: Please add _ALL_ WMI Commands Here.
@@ -1972,6 +1976,8 @@ typedef enum { 
    OP(WMI_PDEV_ENABLE_LED_BLINK_DOWNLOAD_TABLE_CMDID) \

    OP(WMI_VDEV_GET_TWT_SESSION_STATS_INFO_CMDID) \

    OP(WMI_PDEV_ENABLE_WIFI_RADAR_CMDID) \

    OP(WMI_PDEV_ENABLE_XLNA_CMDID) \

    OP(WMI_PDEV_SET_CUSTOM_TX_POWER_PER_MCS_CMDID) \

    /* add new CMD_LIST elements above this line */
@@ -2294,6 +2300,8 @@ typedef enum { 
    OP(WMI_AUDIO_TRANSPORT_SWITCH_TYPE_EVENTID) \

    OP(WMI_PDEV_WIFI_RADAR_CAL_COMPLETION_STATUS_EVENTID) \

    OP(WMI_MLO_LINK_INFO_SYNC_EVENTID) \

    OP(WMI_PDEV_ENABLE_XLNA_EVENTID) \

    OP(WMI_REG_CHAN_LIST_CC_EXT2_EVENTID) \

    /* add new EVT_LIST elements above this line */
@@ -5572,6 +5580,17 @@ WMITLV_CREATE_PARAM_STRUC(WMI_COEX_MULTIPLE_CONFIG_CMDID); 
    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_enable_wifi_radar_cmd_fixed_param, wmi_pdev_enable_wifi_radar_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)

WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_ENABLE_WIFI_RADAR_CMDID);



/* xLNA Enable command */

#define WMITLV_TABLE_WMI_PDEV_ENABLE_XLNA_CMDID(id,op,buf,len) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_enable_xlna_cmd_fixed_param, wmi_pdev_enable_xlna_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)

WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_ENABLE_XLNA_CMDID);



/* WMI cmd to set custom TX power backoff value per band/chain/mcs to PHY */

#define WMITLV_TABLE_WMI_PDEV_SET_CUSTOM_TX_POWER_PER_MCS_CMDID(id,op,buf,len) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_set_custom_tx_power_per_mcs_cmd_fixed_param, wmi_pdev_set_custom_tx_power_per_mcs_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, txpower_bkoff_array, WMITLV_SIZE_VAR)

WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_CUSTOM_TX_POWER_PER_MCS_CMDID);







/************************** TLV definitions of WMI events *******************************/
@@ -6767,6 +6786,12 @@ WMITLV_CREATE_PARAM_STRUC(WMI_REG_CHAN_LIST_CC_EVENTID); 
    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_regulatory_fcc_rule_struct, reg_fcc_rule, WMITLV_SIZE_VAR)

WMITLV_CREATE_PARAM_STRUC(WMI_REG_CHAN_LIST_CC_EXT_EVENTID);



/* Ext2 regulatory channel list of current country code */

#define WMITLV_TABLE_WMI_REG_CHAN_LIST_CC_EXT2_EVENTID(id,op,buf,len) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_reg_chan_list_cc_event_ext2_fixed_param, wmi_reg_chan_list_cc_event_ext2_fixed_param, fixed_param, WMITLV_SIZE_FIX) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_regulatory_rule_ext_struct, reg_rule_array, WMITLV_SIZE_VAR)

WMITLV_CREATE_PARAM_STRUC(WMI_REG_CHAN_LIST_CC_EXT2_EVENTID);



/* WMI AFC info event */

#define WMITLV_TABLE_WMI_AFC_EVENTID(id,op,buf,len) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_afc_event_fixed_param, wmi_afc_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
@@ -7607,6 +7632,10 @@ WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_OOB_CONNECTION_RESP_EVENTID); 
    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_wifi_radar_cal_completion_status_event_param, wmi_pdev_wifi_radar_cal_completion_status_event_param, cal_completion_status_event_param, WMITLV_SIZE_FIX)

WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_WIFI_RADAR_CAL_COMPLETION_STATUS_EVENTID);



/* xLNA Enable status event */

#define WMITLV_TABLE_WMI_PDEV_ENABLE_XLNA_EVENTID(id,op,buf,len) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_enable_xlna_event_fixed_param, wmi_pdev_enable_xlna_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)

WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_ENABLE_XLNA_EVENTID);





#ifdef __cplusplus