From 81b8a7bf506a61e38face0d2b3dbf2dee9d5947b Mon Sep 17 00:00:00 2001 From: spuligil Date: Wed, 18 Jan 2023 06:01:00 -0800 Subject: [PATCH] fw-api: CL 21180715 - update fw common interface files Change-Id: I4e96f7fea072b7bc95ac00a22110216ff33b3b43 WMI: add PDEV_SET_TGTR2P_TABLE_CMD,_EVENT msg defs CRs-Fixed: 2262693 --- fw/wmi_tlv_defs.h | 15 +++++++++++ fw/wmi_unified.h | 66 +++++++++++++++++++++++++++++++++++++++++++++++ fw/wmi_version.h | 2 +- 3 files changed, 82 insertions(+), 1 deletion(-) diff --git a/fw/wmi_tlv_defs.h b/fw/wmi_tlv_defs.h index e580a96ad2c6..58b40027e63c 100644 --- a/fw/wmi_tlv_defs.h +++ b/fw/wmi_tlv_defs.h @@ -1336,6 +1336,8 @@ typedef enum { WMITLV_TAG_STRUC_wmi_tdma_schedule_request_cmd_fixed_param, WMITLV_TAG_STRUC_wmi_hpa_cmd_fixed_param, WMITLV_TAG_STRUC_wmi_hpa_evt_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_set_tgtr2p_table_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_set_tgtr2p_table_event_fixed_param, } WMITLV_TAG_ID; /* @@ -1854,6 +1856,7 @@ typedef enum { OP(WMI_ESL_EGID_CMDID) \ OP(WMI_TDMA_SCHEDULE_REQUEST_CMDID) \ OP(WMI_HPA_CMDID) \ + OP(WMI_PDEV_SET_TGTR2P_TABLE_CMDID) \ /* add new CMD_LIST elements above this line */ @@ -2153,6 +2156,7 @@ typedef enum { OP(WMI_MLO_AP_VDEV_TID_TO_LINK_MAP_EVENTID) \ OP(WMI_TAS_POWER_HISTORY_EVENTID) \ OP(WMI_HPA_EVENTID) \ + OP(WMI_PDEV_SET_TGTR2P_TABLE_EVENTID) \ /* add new EVT_LIST elements above this line */ @@ -5270,6 +5274,12 @@ WMITLV_CREATE_PARAM_STRUC(WMI_TDMA_SCHEDULE_REQUEST_CMDID); WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, data, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_HPA_CMDID); +/* WMI cmd to set target rate to power table */ +#define WMITLV_TABLE_WMI_PDEV_SET_TGTR2P_TABLE_CMDID(id,op,buf,len) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_set_tgtr2p_table_cmd_fixed_param, wmi_pdev_set_tgtr2p_table_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_INT8, r2p_array, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_TGTR2P_TABLE_CMDID); + /************************** TLV definitions of WMI events *******************************/ @@ -7147,6 +7157,11 @@ WMITLV_CREATE_PARAM_STRUC(WMI_MLO_AP_VDEV_TID_TO_LINK_MAP_EVENTID); WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_hpa_evt_fixed_param, wmi_hpa_evt_fixed_param, fixed_param, WMITLV_SIZE_FIX) WMITLV_CREATE_PARAM_STRUC(WMI_HPA_EVENTID); +/* WMI target rate to power table return status event */ +#define WMITLV_TABLE_WMI_PDEV_SET_TGTR2P_TABLE_EVENTID(id,op,buf,len) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_set_tgtr2p_table_event_fixed_param, wmi_pdev_set_tgtr2p_table_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_TGTR2P_TABLE_EVENTID); + #ifdef __cplusplus diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index f4c3a70e34f4..8ada62d7fc5f 100644 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -515,6 +515,8 @@ typedef enum { WMI_PDEV_FEATURESET_CMDID, /** tag as Filter Pass category and the filters set for FP mode */ WMI_PDEV_MESH_RX_FILTER_ENABLE_CMDID, + /* WMI cmd to set Target rate to power table */ + WMI_PDEV_SET_TGTR2P_TABLE_CMDID, /* VDEV (virtual device) specific commands */ /** vdev create */ @@ -1715,6 +1717,9 @@ typedef enum { /* Event to indicate Schedule tid queue suspended info */ WMI_PDEV_SCHED_TIDQ_SUSP_INFO_EVENTID, + /* Event to send target rate to power table update status */ + WMI_PDEV_SET_TGTR2P_TABLE_EVENTID, + /* VDEV specific events */ /** VDEV started event in response to VDEV_START request */ @@ -33144,6 +33149,7 @@ static INLINE A_UINT8 *wmi_id_to_name(A_UINT32 wmi_command) WMI_RETURN_STRING(WMI_ESL_EGID_CMDID); WMI_RETURN_STRING(WMI_TDMA_SCHEDULE_REQUEST_CMDID); WMI_RETURN_STRING(WMI_HPA_CMDID); + WMI_RETURN_STRING(WMI_PDEV_SET_TGTR2P_TABLE_CMDID); /* To set target rate to power table */ } return (A_UINT8 *) "Invalid WMI cmd"; @@ -41464,6 +41470,66 @@ typedef struct { A_UINT32 ecwmax[WMI_AC_MAX]; } wmi_tdma_schedule_request_cmd_fixed_param; +typedef struct { + A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_set_tgtr2p_table _fixed_param */ + A_UINT32 pdev_id; + /* freq_band: + * Indicates the intended FreqBand for updating targetPowerR2PTable. + * 0: 5G + * 1: 2G + * 2: 6G + */ + A_UINT32 freq_band; + /* sub_band: + * Denotes band defined in targetPowerR2PFreqRangexG BDF fields. + * Valid values for each target is listed below + * For 11AX targets, + * 2G - 0 + * 5G/6G - 0/1/2 + * + * For 11BE targets, + * 2G - 0 + * 5G/6G - 0/1 + */ + A_UINT32 sub_band; + /* is_ext: + * Applicable only for 11BE targets + * 0 - Default targetPowerR2PTable + * 1 - To update targetPowerR2PTable in extension fields + * For 11AX targets, value is expected to be 0. + */ + A_UINT32 is_ext; + A_UINT32 target_type; /* 0 - IPQ95xx, 1 - QCN90xx, 0x10 - QCN92xx */ + A_UINT32 r2p_array_len; /* length of targetPowerR2PTable */ + /* end_of_r2ptable_update: + * This field can be used to indicate FW to trigger update of SW structures + * once user has updated for all the sub-bands of the Frequency band. + * This would be used when there are multiple sub-bands. + */ + A_UINT32 end_of_r2ptable_update; +/* + * Following this structure is the TLV containing targetPowerR2PTablexG + * of type INT8 and with a unit of 0.25dBm. + */ +} wmi_pdev_set_tgtr2p_table_cmd_fixed_param; + +typedef enum { + WMI_PDEV_TGTR2P_SUCCESS = 0, + WMI_PDEV_TGTR2P_SUCCESS_WAITING_FOR_END_OF_UPDATE, + WMI_PDEV_TGTR2P_ERROR_INVALID_FREQ_BAND, + WMI_PDEV_TGTR2P_ERROR_INVALID_SUB_BAND, + WMI_PDEV_TGTR2P_ERROR_EXTENSION_FIELDS_NOT_ENABLED_IN_BDF, + WMI_PDEV_TGTR2P_ERROR_INVALID_TARGET_TPYE, + WMI_PDEV_TGTR2P_ERROR_R2P_ARRAY_LEN_MISMATCH, +} wmi_pdev_set_tgtr2p_event_status_type; + +typedef struct { + A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_set_tgtr2p_table_event_fixed_param */ + A_UINT32 status; /* enum wmi_pdev_set_tgtr2p_event_status_type to indicate the status code/result */ +} wmi_pdev_set_tgtr2p_table_event_fixed_param; + + + /* ADD NEW DEFS HERE */ diff --git a/fw/wmi_version.h b/fw/wmi_version.h index 23c847aab56f..fc78608d14a7 100644 --- a/fw/wmi_version.h +++ b/fw/wmi_version.h @@ -37,7 +37,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility. */ -#define __WMI_REVISION_ 1260 +#define __WMI_REVISION_ 1261 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work