From: Dedy Lansky <qca_dlan...@qca.qualcomm.com>

Align to latest version of the auto generated wmi file
describing the interface with FW

Signed-off-by: Dedy Lansky <qca_dlan...@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_me...@qca.qualcomm.com>
---
 drivers/net/wireless/ath/wil6210/wmi.h | 73 ++++++++++++++++++++++++----------
 1 file changed, 52 insertions(+), 21 deletions(-)

diff --git a/drivers/net/wireless/ath/wil6210/wmi.h 
b/drivers/net/wireless/ath/wil6210/wmi.h
index 7c9fee5..f7f5f4f 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.h
+++ b/drivers/net/wireless/ath/wil6210/wmi.h
@@ -58,6 +58,7 @@ enum wmi_fw_capability {
        WMI_FW_CAPABILITY_MGMT_RETRY_LIMIT      = 3,
        WMI_FW_CAPABILITY_DISABLE_AP_SME        = 4,
        WMI_FW_CAPABILITY_WMI_ONLY              = 5,
+       WMI_FW_CAPABILITY_THERMAL_THROTTLING    = 7,
        WMI_FW_CAPABILITY_MAX,
 };
 
@@ -142,8 +143,6 @@ enum wmi_command_id {
        WMI_MAINTAIN_RESUME_CMDID                       = 0x851,
        WMI_RS_MGMT_CMDID                               = 0x852,
        WMI_RF_MGMT_CMDID                               = 0x853,
-       WMI_THERMAL_THROTTLING_CTRL_CMDID               = 0x854,
-       WMI_THERMAL_THROTTLING_GET_STATUS_CMDID         = 0x855,
        WMI_OTP_READ_CMDID                              = 0x856,
        WMI_OTP_WRITE_CMDID                             = 0x857,
        WMI_LED_CFG_CMDID                               = 0x858,
@@ -192,6 +191,8 @@ enum wmi_command_id {
        WMI_GET_MGMT_RETRY_LIMIT_CMDID                  = 0x931,
        WMI_NEW_STA_CMDID                               = 0x935,
        WMI_DEL_STA_CMDID                               = 0x936,
+       WMI_SET_THERMAL_THROTTLING_CFG_CMDID            = 0x940,
+       WMI_GET_THERMAL_THROTTLING_CFG_CMDID            = 0x941,
        WMI_TOF_SESSION_START_CMDID                     = 0x991,
        WMI_TOF_GET_CAPABILITIES_CMDID                  = 0x992,
        WMI_TOF_SET_LCR_CMDID                           = 0x993,
@@ -438,16 +439,6 @@ struct wmi_rf_mgmt_cmd {
        __le32 rf_mgmt_type;
 } __packed;
 
-/* WMI_THERMAL_THROTTLING_CTRL_CMDID */
-#define THERMAL_THROTTLING_USE_DEFAULT_MAX_TXOP_LENGTH (0xFFFFFFFF)
-
-/* WMI_THERMAL_THROTTLING_CTRL_CMDID */
-struct wmi_thermal_throttling_ctrl_cmd {
-       __le32 time_on_usec;
-       __le32 time_off_usec;
-       __le32 max_txop_length_usec;
-} __packed;
-
 /* WMI_RF_RX_TEST_CMDID */
 struct wmi_rf_rx_test_cmd {
        __le32 sector;
@@ -549,7 +540,7 @@ struct wmi_pcp_start_cmd {
        u8 hidden_ssid;
        u8 is_go;
        u8 reserved0[5];
-       /* abft_len override if non-0 */
+       /* A-BFT length override if non-0 */
        u8 abft_len;
        u8 disable_ap_sme;
        u8 network_type;
@@ -910,6 +901,39 @@ struct wmi_set_mgmt_retry_limit_cmd {
        u8 reserved[3];
 } __packed;
 
+/* Zones: HIGH, MAX, CRITICAL */
+#define WMI_NUM_OF_TT_ZONES    (3)
+
+struct wmi_tt_zone_limits {
+       /* Above this temperature this zone is active */
+       u8 temperature_high;
+       /* Below this temperature the adjacent lower zone is active */
+       u8 temperature_low;
+       u8 reserved[2];
+} __packed;
+
+/* Struct used for both configuration and status commands of thermal
+ * throttling
+ */
+struct wmi_tt_data {
+       /* Enable/Disable TT algorithm for baseband */
+       u8 bb_enabled;
+       u8 reserved0[3];
+       /* Define zones for baseband */
+       struct wmi_tt_zone_limits bb_zones[WMI_NUM_OF_TT_ZONES];
+       /* Enable/Disable TT algorithm for radio */
+       u8 rf_enabled;
+       u8 reserved1[3];
+       /* Define zones for all radio chips */
+       struct wmi_tt_zone_limits rf_zones[WMI_NUM_OF_TT_ZONES];
+} __packed;
+
+/* WMI_SET_THERMAL_THROTTLING_CFG_CMDID */
+struct wmi_set_thermal_throttling_cfg_cmd {
+       /* Command data */
+       struct wmi_tt_data tt_data;
+} __packed;
+
 /* WMI_NEW_STA_CMDID */
 struct wmi_new_sta_cmd {
        u8 dst_mac[WMI_MAC_LEN];
@@ -1040,7 +1064,6 @@ enum wmi_event_id {
        WMI_BF_RXSS_MGMT_DONE_EVENTID                   = 0x1839,
        WMI_RS_MGMT_DONE_EVENTID                        = 0x1852,
        WMI_RF_MGMT_STATUS_EVENTID                      = 0x1853,
-       WMI_THERMAL_THROTTLING_STATUS_EVENTID           = 0x1855,
        WMI_BF_SM_MGMT_DONE_EVENTID                     = 0x1838,
        WMI_RX_MGMT_PACKET_EVENTID                      = 0x1840,
        WMI_TX_MGMT_PACKET_EVENTID                      = 0x1841,
@@ -1090,6 +1113,8 @@ enum wmi_event_id {
        WMI_BRP_SET_ANT_LIMIT_EVENTID                   = 0x1924,
        WMI_SET_MGMT_RETRY_LIMIT_EVENTID                = 0x1930,
        WMI_GET_MGMT_RETRY_LIMIT_EVENTID                = 0x1931,
+       WMI_SET_THERMAL_THROTTLING_CFG_EVENTID          = 0x1940,
+       WMI_GET_THERMAL_THROTTLING_CFG_EVENTID          = 0x1941,
        WMI_TOF_SESSION_END_EVENTID                     = 0x1991,
        WMI_TOF_GET_CAPABILITIES_EVENTID                = 0x1992,
        WMI_TOF_SET_LCR_EVENTID                         = 0x1993,
@@ -1133,13 +1158,6 @@ struct wmi_rf_mgmt_status_event {
        __le32 rf_status;
 } __packed;
 
-/* WMI_THERMAL_THROTTLING_STATUS_EVENTID */
-struct wmi_thermal_throttling_status_event {
-       __le32 time_on_usec;
-       __le32 time_off_usec;
-       __le32 max_txop_length_usec;
-} __packed;
-
 /* WMI_GET_STATUS_DONE_EVENTID */
 struct wmi_get_status_done_event {
        __le32 is_associated;
@@ -2206,6 +2224,19 @@ struct wmi_tof_get_capabilities_event {
        __le32 aoa_supported_types;
 } __packed;
 
+/* WMI_SET_THERMAL_THROTTLING_CFG_EVENTID */
+struct wmi_set_thermal_throttling_cfg_event {
+       /* wmi_fw_status */
+       u8 status;
+       u8 reserved[3];
+} __packed;
+
+/* WMI_GET_THERMAL_THROTTLING_CFG_EVENTID */
+struct wmi_get_thermal_throttling_cfg_event {
+       /* Status data */
+       struct wmi_tt_data tt_data;
+} __packed;
+
 enum wmi_tof_session_end_status {
        WMI_TOF_SESSION_END_NO_ERROR            = 0x00,
        WMI_TOF_SESSION_END_FAIL                = 0x01,
-- 
1.9.1

Reply via email to