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

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

Merge 70073610 on remote branch 

Change-Id: Ief82a0a672ba94449bccd3aef3632717b8faaad0
parents 2c0c007b 70073610

fw/htt.h

+363 −120

File changed.

Preview size limit exceeded, changes collapsed.

fw/wlan_defs.h

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

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

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

 *

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

 *
@@ -351,6 +351,15 @@ enum { 
    REGDMN_MODE_11AXA_HE80_BIT         = 38, /* 5Ghz, HE80 */

    REGDMN_MODE_11AXA_HE160_BIT        = 39, /* 5Ghz, HE160 */

    REGDMN_MODE_11AXA_HE80_80_BIT      = 40, /* 5Ghz, HE80+80 */

    REGDMN_MODE_11BEG_EHT20_BIT        = 41, /* 2Ghz, EHT20 */

    REGDMN_MODE_11BEA_EHT20_BIT        = 42, /* 5Ghz, EHT20 */

    REGDMN_MODE_11BEG_EHT40PLUS_BIT    = 43, /* 2Ghz, EHT40+ */

    REGDMN_MODE_11BEG_EHT40MINUS_BIT   = 44, /* 2Ghz, EHT40- */

    REGDMN_MODE_11BEA_EHT40PLUS_BIT    = 45, /* 5Ghz, EHT40+ */

    REGDMN_MODE_11BEA_EHT40MINUS_BIT   = 46, /* 5Ghz, EHT40- */

    REGDMN_MODE_11BEA_EHT80_BIT        = 47, /* 5Ghz, EHT80 */

    REGDMN_MODE_11BEA_EHT160_BIT       = 48, /* 5Ghz, EHT160 */

    REGDMN_MODE_11BEA_EHT320_BIT       = 49, /* 5Ghz, EHT320 */

};



enum {
@@ -393,6 +402,15 @@ enum { 
    REGDMN_MODE_U32_11AXA_HE80      = 1 << (REGDMN_MODE_11AXA_HE80_BIT - 32),

    REGDMN_MODE_U32_11AXA_HE160     = 1 << (REGDMN_MODE_11AXA_HE160_BIT - 32),

    REGDMN_MODE_U32_11AXA_HE80_80   = 1 << (REGDMN_MODE_11AXA_HE80_80_BIT - 32),

    REGDMN_MODE_U32_11BEG_EHT20      = 1 << (REGDMN_MODE_11BEG_EHT20_BIT - 32),

    REGDMN_MODE_U32_11BEA_EHT20      = 1 << (REGDMN_MODE_11BEA_EHT20_BIT - 32),

    REGDMN_MODE_U32_11BEG_EHT40PLUS  = 1 << (REGDMN_MODE_11BEG_EHT40PLUS_BIT - 32),

    REGDMN_MODE_U32_11BEG_EHT40MINUS = 1 << (REGDMN_MODE_11BEG_EHT40MINUS_BIT - 32),

    REGDMN_MODE_U32_11BEA_EHT40PLUS  = 1 << (REGDMN_MODE_11BEA_EHT40PLUS_BIT - 32),

    REGDMN_MODE_U32_11BEA_EHT40MINUS = 1 << (REGDMN_MODE_11BEA_EHT40MINUS_BIT - 32),

    REGDMN_MODE_U32_11BEA_EHT80      = 1 << (REGDMN_MODE_11BEA_EHT80_BIT - 32),

    REGDMN_MODE_U32_11BEA_EHT160     = 1 << (REGDMN_MODE_11BEA_EHT160_BIT - 32),

    REGDMN_MODE_U32_11BEA_EHT320     = 1 << (REGDMN_MODE_11BEA_EHT320_BIT - 32),

};



#define REGDMN_MODE_ALL       (0xFFFFFFFF)       /* REGDMN_MODE_ALL is defined out of the enum
@@ -536,7 +554,7 @@ typedef struct { 


#define PROD_SCHED_BW_ENTRIES       (NUM_SCHED_ENTRIES * NUM_DYN_BW)



#if NUM_DYN_BW  > 4

#if NUM_DYN_BW  > 5

/* Extend rate table module first */

#error "Extend rate table module first"

#endif

fw/wlan_module_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ typedef enum { 
  WLAN_MODULE_CODE_COVER,               /* 0x55 */ /* code coverage */

  WLAN_MODULE_SHO,                      /* 0x56 */ /* SAP HW offload */

  WLAN_MODULE_MLO_MGR,                  /* 0x57 */ /* MLO manager */

  WLAN_MODULE_PEER_INIT,                /* 0x58 */ /* peer init connection handling */





  WLAN_MODULE_ID_MAX,

fw/wmi_services.h

+2 −0
Original line number Diff line number Diff line
@@ -528,6 +528,8 @@ typedef enum { 
    WMI_SERVICE_ENABLE_LOWER_6G_EDGE_CH_SUPP = 283, /* Indicates FW support for enabling lower 6 GHz edge channel 5935 */

    WMI_SERVICE_DISABLE_UPPER_6G_EDGE_CH_SUPP = 284, /* Indicates FW support for disabling upper 6 GHz edge channel 7115 */

    WMI_SERVICE_FORCED_DTIM_SUPP = 285, /* Indicates FW supports forced DTIM configuration */

    WMI_SERVICE_DCS_AWGN_INT_SUPPORT = 286, /* Indicates FW supports AWGN Int */

    WMI_SERVICE_IGMP_OFFLOAD_SUPPORT = 287, /* FW supports igmp offload during APPS suspend */





    WMI_MAX_EXT2_SERVICE

fw/wmi_tlv_defs.h

+53 −3
Original line number Diff line number Diff line
@@ -1141,6 +1141,15 @@ typedef enum { 
    WMITLV_TAG_STRUC_wmi_pdev_get_dpd_status_evt_fixed_param,

    WMITLV_TAG_STRUC_wmi_eht_rate_set,

    WMITLV_TAG_STRUC_wmi_dcs_awgn_int_t,

    WMITLV_TAG_STRUC_wmi_mlo_tx_send_params,

    WMITLV_TAG_STRUC_wmi_partner_link_params,

    WMITLV_TAG_STRUC_wmi_peer_assoc_mlo_partner_link_params,

    WMITLV_TAG_STRUC_wmi_mlo_setup_cmd_fixed_param,

    WMITLV_TAG_STRUC_wmi_mlo_setup_complete_event_fixed_param,

    WMITLV_TAG_STRUC_wmi_mlo_ready_cmd_fixed_param,

    WMITLV_TAG_STRUC_wmi_mlo_teardown_fixed_param,

    WMITLV_TAG_STRUC_wmi_mlo_teardown_complete_fixed_param,

    WMITLV_TAG_STRUC_wmi_igmp_offload_fixed_param,

} WMITLV_TAG_ID;



/*
@@ -1599,6 +1608,10 @@ typedef enum { 
    OP(WMI_PEER_TID_LATENCY_CONFIG_CMDID) \

    OP(WMI_MLO_LINK_SET_ACTIVE_CMDID) \

    OP(WMI_PDEV_GET_DPD_STATUS_CMDID) \

    OP(WMI_MLO_SETUP_CMDID) \

    OP(WMI_MLO_READY_CMDID) \

    OP(WMI_MLO_TEARDOWN_CMDID) \

    OP(WMI_VDEV_IGMP_OFFLOAD_CMDID) \

    /* add new CMD_LIST elements above this line */
@@ -1862,6 +1875,8 @@ typedef enum { 
    OP(WMI_TWT_NOTIFY_EVENTID) \

    OP(WMI_MLO_LINK_SET_ACTIVE_RESP_EVENTID) \

    OP(WMI_PDEV_GET_DPD_STATUS_EVENTID) \

    OP(WMI_MLO_SETUP_COMPLETE_EVENTID) \

    OP(WMI_MLO_TEARDOWN_COMPLETE_EVENTID) \

    /* add new EVT_LIST elements above this line */
@@ -2241,7 +2256,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_WMM_PARAMS_CMDID); 
    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_start_request_cmd_fixed_param, wmi_vdev_start_request_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_channel, wmi_channel, chan, WMITLV_SIZE_FIX) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_p2p_noa_descriptor, noa_descriptors, WMITLV_SIZE_VAR) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_vdev_start_mlo_params, mlo_params, WMITLV_SIZE_VAR)

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_vdev_start_mlo_params, mlo_params, WMITLV_SIZE_VAR) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_partner_link_params, partner_link_params, WMITLV_SIZE_VAR)



WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_START_REQUEST_CMDID);
@@ -2336,7 +2352,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_IPSEC_NATKEEPALIVE_FILTER_CMDID); 
    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vht_rate_set, wmi_vht_rate_set, peer_vht_rates, WMITLV_SIZE_FIX) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_he_rate_set, peer_he_rates, WMITLV_SIZE_VAR) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_peer_assoc_mlo_params, mlo_params, WMITLV_SIZE_VAR) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_eht_rate_set, peer_eht_rates, WMITLV_SIZE_VAR)

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_eht_rate_set, peer_eht_rates, WMITLV_SIZE_VAR) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_peer_assoc_mlo_partner_link_params, partner_link_params, WMITLV_SIZE_VAR)



WMITLV_CREATE_PARAM_STRUC(WMI_PEER_ASSOC_CMDID);
@@ -2708,7 +2725,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_MGMT_TX_CMDID); 
#define WMITLV_TABLE_WMI_MGMT_TX_SEND_CMDID(id,op,buf,len)  \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_mgmt_tx_send_cmd_fixed_param, wmi_mgmt_tx_send_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, bufp, WMITLV_SIZE_VAR) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_tx_send_params, wmi_tx_send_params, tx_send_params, WMITLV_SIZE_FIX)

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_tx_send_params, wmi_tx_send_params, tx_send_params, WMITLV_SIZE_FIX) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_mlo_tx_send_params, mlo_tx_send_params, WMITLV_SIZE_VAR)



WMITLV_CREATE_PARAM_STRUC(WMI_MGMT_TX_SEND_CMDID);
@@ -4610,6 +4628,28 @@ WMITLV_CREATE_PARAM_STRUC(WMI_MLO_LINK_SET_ACTIVE_CMDID); 
    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_get_dpd_status_cmd_fixed_param, wmi_pdev_get_dpd_status_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)

WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_GET_DPD_STATUS_CMDID);



/** WMI cmd used to indicate hw_links part of MLO */

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

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_mlo_setup_cmd_fixed_param, wmi_mlo_setup_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, hw_link_ids, WMITLV_SIZE_VAR)

WMITLV_CREATE_PARAM_STRUC(WMI_MLO_SETUP_CMDID);



/** WMI cmd used for init synchronization of hw_links part of MLO */

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

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_mlo_ready_cmd_fixed_param, wmi_mlo_ready_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)

WMITLV_CREATE_PARAM_STRUC(WMI_MLO_READY_CMDID);



/** WMI cmd used for tearing down a hw_link part of MLO */

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

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_mlo_teardown_fixed_param, wmi_mlo_teardown_fixed_param, fixed_param, WMITLV_SIZE_FIX)

WMITLV_CREATE_PARAM_STRUC(WMI_MLO_TEARDOWN_CMDID);



/* Mcast ipv4 address filter list cmd */

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

    WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_igmp_offload_fixed_param, wmi_igmp_offload_fixed_param, fixed_param, WMITLV_SIZE_FIX) \

    WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_FIXED_STRUC, WMI_IPV4_ADDR, mc_ipv4_list, WMITLV_SIZE_VAR)

WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_IGMP_OFFLOAD_CMDID);





/************************** TLV definitions of WMI events *******************************/
@@ -6224,6 +6264,16 @@ WMITLV_CREATE_PARAM_STRUC(WMI_MLO_LINK_SET_ACTIVE_RESP_EVENTID); 
    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_get_dpd_status_evt_fixed_param, wmi_pdev_get_dpd_status_evt_fixed_param, fixed_param, WMITLV_SIZE_FIX)

WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_GET_DPD_STATUS_EVENTID);



/* Response event for MLO setup cmd */

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

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_mlo_setup_complete_event_fixed_param, wmi_mlo_setup_complete_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)

WMITLV_CREATE_PARAM_STRUC(WMI_MLO_SETUP_COMPLETE_EVENTID);



/* Response event for MLO teardown cmd */

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

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_mlo_teardown_complete_fixed_param, wmi_mlo_teardown_complete_fixed_param, fixed_param, WMITLV_SIZE_FIX)

WMITLV_CREATE_PARAM_STRUC(WMI_MLO_TEARDOWN_COMPLETE_EVENTID);





#ifdef __cplusplus

}