Merge ath-next from ath.git
authorKalle Valo <kvalo@codeaurora.org>
Fri, 9 Jan 2015 16:38:46 +0000 (18:38 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Fri, 9 Jan 2015 16:45:35 +0000 (18:45 +0200)
Major changes in ath10k:

* Device tree support

* Major restructuring how to handle different WMI interface versions

* Add WMI TLV interface in preparation for new firmware interface support

* Support new firmware branch 10.2.4

* Add thermal cooling interface

* Add hwmon interface to read temparture from the device

And of course lots of small fixes and cleanups.

20 files changed:
Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt [new file with mode: 0644]
drivers/net/wireless/ath/ath10k/Makefile
drivers/net/wireless/ath/ath10k/ce.c
drivers/net/wireless/ath/ath10k/core.c
drivers/net/wireless/ath/ath10k/core.h
drivers/net/wireless/ath/ath10k/debug.c
drivers/net/wireless/ath/ath10k/htt_tx.c
drivers/net/wireless/ath/ath10k/hw.h
drivers/net/wireless/ath/ath10k/mac.c
drivers/net/wireless/ath/ath10k/pci.c
drivers/net/wireless/ath/ath10k/pci.h
drivers/net/wireless/ath/ath10k/spectral.c
drivers/net/wireless/ath/ath10k/testmode.c
drivers/net/wireless/ath/ath10k/thermal.c [new file with mode: 0644]
drivers/net/wireless/ath/ath10k/thermal.h [new file with mode: 0644]
drivers/net/wireless/ath/ath10k/wmi-ops.h [new file with mode: 0644]
drivers/net/wireless/ath/ath10k/wmi-tlv.c [new file with mode: 0644]
drivers/net/wireless/ath/ath10k/wmi-tlv.h [new file with mode: 0644]
drivers/net/wireless/ath/ath10k/wmi.c
drivers/net/wireless/ath/ath10k/wmi.h

diff --git a/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt b/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt
new file mode 100644 (file)
index 0000000..edefc26
--- /dev/null
@@ -0,0 +1,30 @@
+* Qualcomm Atheros ath10k wireless devices
+
+For ath10k devices the calibration data can be provided through Device
+Tree. The node is a child node of the PCI controller.
+
+Required properties:
+-compatible : Should be "qcom,ath10k"
+
+Optional properties:
+- qcom,ath10k-calibration-data : calibration data as an array, the
+                                length can vary between hw versions
+
+
+Example:
+
+pci {
+       pcie@0 {
+               reg = <0 0 0 0 0>;
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               device_type = "pci";
+
+               ath10k@0,0 {
+                       reg = <0 0 0 0 0>;
+                       device_type = "pci";
+                       qcom,ath10k-calibration-data = [ 01 02 03 ... ];
+               };
+       };
+};
index 8b1b1ad..ffa3b1a 100644 (file)
@@ -8,11 +8,13 @@ ath10k_core-y += mac.o \
                 htt_tx.o \
                 txrx.o \
                 wmi.o \
+                wmi-tlv.o \
                 bmi.o
 
 ath10k_core-$(CONFIG_ATH10K_DEBUGFS) += spectral.o
 ath10k_core-$(CONFIG_NL80211_TESTMODE) += testmode.o
 ath10k_core-$(CONFIG_ATH10K_TRACING) += trace.o
+ath10k_core-$(CONFIG_THERMAL) += thermal.o
 
 obj-$(CONFIG_ATH10K_PCI) += ath10k_pci.o
 ath10k_pci-y += pci.o \
index a156e6e..42ec793 100644 (file)
@@ -1093,6 +1093,8 @@ int ath10k_ce_alloc_pipe(struct ath10k *ar, int ce_id,
                     (CE_HTT_H2T_MSG_SRC_NENTRIES - 1));
        BUILD_BUG_ON(2*TARGET_10X_NUM_MSDU_DESC >
                     (CE_HTT_H2T_MSG_SRC_NENTRIES - 1));
+       BUILD_BUG_ON(2*TARGET_TLV_NUM_MSDU_DESC >
+                    (CE_HTT_H2T_MSG_SRC_NENTRIES - 1));
 
        ce_state->ar = ar;
        ce_state->id = ce_id;
index 7762061..2d0671e 100644 (file)
@@ -17,6 +17,7 @@
 
 #include <linux/module.h>
 #include <linux/firmware.h>
+#include <linux/of.h>
 
 #include "core.h"
 #include "mac.h"
 #include "debug.h"
 #include "htt.h"
 #include "testmode.h"
+#include "wmi-ops.h"
 
 unsigned int ath10k_debug_mask;
 static bool uart_print;
-static unsigned int ath10k_p2p;
 static bool skip_otp;
 
 module_param_named(debug_mask, ath10k_debug_mask, uint, 0644);
 module_param(uart_print, bool, 0644);
-module_param_named(p2p, ath10k_p2p, uint, 0644);
 module_param(skip_otp, bool, 0644);
 
 MODULE_PARM_DESC(debug_mask, "Debugging mask");
 MODULE_PARM_DESC(uart_print, "Uart target debugging");
-MODULE_PARM_DESC(p2p, "Enable ath10k P2P support");
 MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode");
 
 static const struct ath10k_hw_params ath10k_hw_params_list[] = {
@@ -48,11 +47,14 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .id = QCA988X_HW_2_0_VERSION,
                .name = "qca988x hw2.0",
                .patch_load_addr = QCA988X_HW_2_0_PATCH_LOAD_ADDR,
+               .uart_pin = 7,
                .fw = {
                        .dir = QCA988X_HW_2_0_FW_DIR,
                        .fw = QCA988X_HW_2_0_FW_FILE,
                        .otp = QCA988X_HW_2_0_OTP_FILE,
                        .board = QCA988X_HW_2_0_BOARD_DATA_FILE,
+                       .board_size = QCA988X_BOARD_DATA_SZ,
+                       .board_ext_size = QCA988X_BOARD_EXT_DATA_SZ,
                },
        },
 };
@@ -146,8 +148,8 @@ static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar,
 static int ath10k_push_board_ext_data(struct ath10k *ar, const void *data,
                                      size_t data_len)
 {
-       u32 board_data_size = QCA988X_BOARD_DATA_SZ;
-       u32 board_ext_data_size = QCA988X_BOARD_EXT_DATA_SZ;
+       u32 board_data_size = ar->hw_params.fw.board_size;
+       u32 board_ext_data_size = ar->hw_params.fw.board_ext_size;
        u32 board_ext_data_addr;
        int ret;
 
@@ -193,7 +195,7 @@ static int ath10k_push_board_ext_data(struct ath10k *ar, const void *data,
 static int ath10k_download_board_data(struct ath10k *ar, const void *data,
                                      size_t data_len)
 {
-       u32 board_data_size = QCA988X_BOARD_DATA_SZ;
+       u32 board_data_size = ar->hw_params.fw.board_size;
        u32 address;
        int ret;
 
@@ -249,6 +251,63 @@ static int ath10k_download_cal_file(struct ath10k *ar)
        return 0;
 }
 
+static int ath10k_download_cal_dt(struct ath10k *ar)
+{
+       struct device_node *node;
+       int data_len;
+       void *data;
+       int ret;
+
+       node = ar->dev->of_node;
+       if (!node)
+               /* Device Tree is optional, don't print any warnings if
+                * there's no node for ath10k.
+                */
+               return -ENOENT;
+
+       if (!of_get_property(node, "qcom,ath10k-calibration-data",
+                            &data_len)) {
+               /* The calibration data node is optional */
+               return -ENOENT;
+       }
+
+       if (data_len != QCA988X_CAL_DATA_LEN) {
+               ath10k_warn(ar, "invalid calibration data length in DT: %d\n",
+                           data_len);
+               ret = -EMSGSIZE;
+               goto out;
+       }
+
+       data = kmalloc(data_len, GFP_KERNEL);
+       if (!data) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       ret = of_property_read_u8_array(node, "qcom,ath10k-calibration-data",
+                                       data, data_len);
+       if (ret) {
+               ath10k_warn(ar, "failed to read calibration data from DT: %d\n",
+                           ret);
+               goto out_free;
+       }
+
+       ret = ath10k_download_board_data(ar, data, data_len);
+       if (ret) {
+               ath10k_warn(ar, "failed to download calibration data from Device Tree: %d\n",
+                           ret);
+               goto out_free;
+       }
+
+       ret = 0;
+
+out_free:
+       kfree(data);
+
+out:
+       return ret;
+}
+
 static int ath10k_download_and_run_otp(struct ath10k *ar)
 {
        u32 result, address = ar->hw_params.patch_load_addr;
@@ -447,7 +506,7 @@ static int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name)
        int ie_id, i, index, bit, ret;
        struct ath10k_fw_ie *hdr;
        const u8 *data;
-       __le32 *timestamp;
+       __le32 *timestamp, *version;
 
        /* first fetch the firmware file (firmware-*.bin) */
        ar->firmware = ath10k_fetch_fw_file(ar, ar->hw_params.fw.dir, name);
@@ -562,6 +621,17 @@ static int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name)
                        ar->otp_len = ie_len;
 
                        break;
+               case ATH10K_FW_IE_WMI_OP_VERSION:
+                       if (ie_len != sizeof(u32))
+                               break;
+
+                       version = (__le32 *)data;
+
+                       ar->wmi.op_version = le32_to_cpup(version);
+
+                       ath10k_dbg(ar, ATH10K_DBG_BOOT, "found fw ie wmi op version %d\n",
+                                  ar->wmi.op_version);
+                       break;
                default:
                        ath10k_warn(ar, "Unknown FW IE: %u\n",
                                    le32_to_cpu(hdr->id));
@@ -582,13 +652,6 @@ static int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name)
                goto err;
        }
 
-       if (test_bit(ATH10K_FW_FEATURE_WMI_10_2, ar->fw_features) &&
-           !test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {
-               ath10k_err(ar, "feature bits corrupted: 10.2 feature requires 10.x feature to be set as well");
-               ret = -EINVAL;
-               goto err;
-       }
-
        /* now fetch the board file */
        if (ar->hw_params.fw.board == NULL) {
                ath10k_err(ar, "board data file not defined");
@@ -624,6 +687,13 @@ static int ath10k_core_fetch_firmware_files(struct ath10k *ar)
        /* calibration file is optional, don't check for any errors */
        ath10k_fetch_cal_file(ar);
 
+       ar->fw_api = 4;
+       ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);
+
+       ret = ath10k_core_fetch_firmware_api_n(ar, ATH10K_FW_API4_FILE);
+       if (ret == 0)
+               goto success;
+
        ar->fw_api = 3;
        ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);
 
@@ -662,7 +732,17 @@ static int ath10k_download_cal_data(struct ath10k *ar)
        }
 
        ath10k_dbg(ar, ATH10K_DBG_BOOT,
-                  "boot did not find a calibration file, try OTP next: %d\n",
+                  "boot did not find a calibration file, try DT next: %d\n",
+                  ret);
+
+       ret = ath10k_download_cal_dt(ar);
+       if (ret == 0) {
+               ar->cal_mode = ATH10K_CAL_MODE_DT;
+               goto done;
+       }
+
+       ath10k_dbg(ar, ATH10K_DBG_BOOT,
+                  "boot did not find DT entry, try OTP next: %d\n",
                   ret);
 
        ret = ath10k_download_and_run_otp(ar);
@@ -696,7 +776,7 @@ static int ath10k_init_uart(struct ath10k *ar)
        if (!uart_print)
                return 0;
 
-       ret = ath10k_bmi_write32(ar, hi_dbg_uart_txpin, 7);
+       ret = ath10k_bmi_write32(ar, hi_dbg_uart_txpin, ar->hw_params.uart_pin);
        if (ret) {
                ath10k_warn(ar, "could not enable UART prints (%d)\n", ret);
                return ret;
@@ -764,6 +844,7 @@ static void ath10k_core_restart(struct work_struct *work)
        complete_all(&ar->offchan_tx_completed);
        complete_all(&ar->install_key_done);
        complete_all(&ar->vdev_setup_done);
+       complete_all(&ar->thermal.wmi_sync);
        wake_up(&ar->htt.empty_tx_wq);
        wake_up(&ar->wmi.tx_credits_wq);
        wake_up(&ar->peer_mapping_wq);
@@ -799,15 +880,62 @@ static void ath10k_core_restart(struct work_struct *work)
        mutex_unlock(&ar->conf_mutex);
 }
 
-static void ath10k_core_init_max_sta_count(struct ath10k *ar)
+static int ath10k_core_init_firmware_features(struct ath10k *ar)
 {
-       if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {
-               ar->max_num_peers = TARGET_10X_NUM_PEERS;
-               ar->max_num_stations = TARGET_10X_NUM_STATIONS;
-       } else {
+       if (test_bit(ATH10K_FW_FEATURE_WMI_10_2, ar->fw_features) &&
+           !test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {
+               ath10k_err(ar, "feature bits corrupted: 10.2 feature requires 10.x feature to be set as well");
+               return -EINVAL;
+       }
+
+       if (ar->wmi.op_version >= ATH10K_FW_WMI_OP_VERSION_MAX) {
+               ath10k_err(ar, "unsupported WMI OP version (max %d): %d\n",
+                          ATH10K_FW_WMI_OP_VERSION_MAX, ar->wmi.op_version);
+               return -EINVAL;
+       }
+
+       /* Backwards compatibility for firmwares without
+        * ATH10K_FW_IE_WMI_OP_VERSION.
+        */
+       if (ar->wmi.op_version == ATH10K_FW_WMI_OP_VERSION_UNSET) {
+               if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {
+                       if (test_bit(ATH10K_FW_FEATURE_WMI_10_2,
+                                    ar->fw_features))
+                               ar->wmi.op_version = ATH10K_FW_WMI_OP_VERSION_10_2;
+                       else
+                               ar->wmi.op_version = ATH10K_FW_WMI_OP_VERSION_10_1;
+               } else {
+                       ar->wmi.op_version = ATH10K_FW_WMI_OP_VERSION_MAIN;
+               }
+       }
+
+       switch (ar->wmi.op_version) {
+       case ATH10K_FW_WMI_OP_VERSION_MAIN:
                ar->max_num_peers = TARGET_NUM_PEERS;
                ar->max_num_stations = TARGET_NUM_STATIONS;
+               ar->max_num_vdevs = TARGET_NUM_VDEVS;
+               ar->htt.max_num_pending_tx = TARGET_NUM_MSDU_DESC;
+               break;
+       case ATH10K_FW_WMI_OP_VERSION_10_1:
+       case ATH10K_FW_WMI_OP_VERSION_10_2:
+       case ATH10K_FW_WMI_OP_VERSION_10_2_4:
+               ar->max_num_peers = TARGET_10X_NUM_PEERS;
+               ar->max_num_stations = TARGET_10X_NUM_STATIONS;
+               ar->max_num_vdevs = TARGET_10X_NUM_VDEVS;
+               ar->htt.max_num_pending_tx = TARGET_10X_NUM_MSDU_DESC;
+               break;
+       case ATH10K_FW_WMI_OP_VERSION_TLV:
+               ar->max_num_peers = TARGET_TLV_NUM_PEERS;
+               ar->max_num_stations = TARGET_TLV_NUM_STATIONS;
+               ar->htt.max_num_pending_tx = TARGET_TLV_NUM_MSDU_DESC;
+               break;
+       case ATH10K_FW_WMI_OP_VERSION_UNSET:
+       case ATH10K_FW_WMI_OP_VERSION_MAX:
+               WARN_ON(1);
+               return -EINVAL;
        }
+
+       return 0;
 }
 
 int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode)
@@ -945,10 +1073,7 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode)
        if (status)
                goto err_hif_stop;
 
-       if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features))
-               ar->free_vdev_map = (1LL << TARGET_10X_NUM_VDEVS) - 1;
-       else
-               ar->free_vdev_map = (1LL << TARGET_NUM_VDEVS) - 1;
+       ar->free_vdev_map = (1LL << ar->max_num_vdevs) - 1;
 
        INIT_LIST_HEAD(&ar->arvifs);
 
@@ -1025,8 +1150,7 @@ static int ath10k_core_probe_fw(struct ath10k *ar)
        ret = ath10k_bmi_get_target_info(ar, &target_info);
        if (ret) {
                ath10k_err(ar, "could not get target info (%d)\n", ret);
-               ath10k_hif_power_down(ar);
-               return ret;
+               goto err_power_down;
        }
 
        ar->target_version = target_info.version;
@@ -1035,28 +1159,28 @@ static int ath10k_core_probe_fw(struct ath10k *ar)
        ret = ath10k_init_hw_params(ar);
        if (ret) {
                ath10k_err(ar, "could not get hw params (%d)\n", ret);
-               ath10k_hif_power_down(ar);
-               return ret;
+               goto err_power_down;
        }
 
        ret = ath10k_core_fetch_firmware_files(ar);
        if (ret) {
                ath10k_err(ar, "could not fetch firmware files (%d)\n", ret);
-               ath10k_hif_power_down(ar);
-               return ret;
+               goto err_power_down;
        }
 
-       ath10k_core_init_max_sta_count(ar);
+       ret = ath10k_core_init_firmware_features(ar);
+       if (ret) {
+               ath10k_err(ar, "fatal problem with firmware features: %d\n",
+                          ret);
+               goto err_free_firmware_files;
+       }
 
        mutex_lock(&ar->conf_mutex);
 
        ret = ath10k_core_start(ar, ATH10K_FIRMWARE_MODE_NORMAL);
        if (ret) {
                ath10k_err(ar, "could not init core (%d)\n", ret);
-               ath10k_core_free_firmware_files(ar);
-               ath10k_hif_power_down(ar);
-               mutex_unlock(&ar->conf_mutex);
-               return ret;
+               goto err_unlock;
        }
 
        ath10k_print_driver_info(ar);
@@ -1066,34 +1190,17 @@ static int ath10k_core_probe_fw(struct ath10k *ar)
 
        ath10k_hif_power_down(ar);
        return 0;
-}
-
-static int ath10k_core_check_chip_id(struct ath10k *ar)
-{
-       u32 hw_revision = MS(ar->chip_id, SOC_CHIP_ID_REV);
-
-       ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot chip_id 0x%08x hw_revision 0x%x\n",
-                  ar->chip_id, hw_revision);
 
-       /* Check that we are not using hw1.0 (some of them have same pci id
-        * as hw2.0) before doing anything else as ath10k crashes horribly
-        * due to missing hw1.0 workarounds. */
-       switch (hw_revision) {
-       case QCA988X_HW_1_0_CHIP_ID_REV:
-               ath10k_err(ar, "ERROR: qca988x hw1.0 is not supported\n");
-               return -EOPNOTSUPP;
+err_unlock:
+       mutex_unlock(&ar->conf_mutex);
 
-       case QCA988X_HW_2_0_CHIP_ID_REV:
-               /* known hardware revision, continue normally */
-               return 0;
+err_free_firmware_files:
+       ath10k_core_free_firmware_files(ar);
 
-       default:
-               ath10k_warn(ar, "Warning: hardware revision unknown (0x%x), expect problems\n",
-                           ar->chip_id);
-               return 0;
-       }
+err_power_down:
+       ath10k_hif_power_down(ar);
 
-       return 0;
+       return ret;
 }
 
 static void ath10k_core_register_work(struct work_struct *work)
@@ -1125,9 +1232,18 @@ static void ath10k_core_register_work(struct work_struct *work)
                goto err_debug_destroy;
        }
 
+       status = ath10k_thermal_register(ar);
+       if (status) {
+               ath10k_err(ar, "could not register thermal device: %d\n",
+                          status);
+               goto err_spectral_destroy;
+       }
+
        set_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags);
        return;
 
+err_spectral_destroy:
+       ath10k_spectral_destroy(ar);
 err_debug_destroy:
        ath10k_debug_destroy(ar);
 err_unregister_mac:
@@ -1143,16 +1259,7 @@ err:
 
 int ath10k_core_register(struct ath10k *ar, u32 chip_id)
 {
-       int status;
-
        ar->chip_id = chip_id;
-
-       status = ath10k_core_check_chip_id(ar);
-       if (status) {
-               ath10k_err(ar, "Unsupported chip id 0x%08x\n", ar->chip_id);
-               return status;
-       }
-
        queue_work(ar->workqueue, &ar->register_work);
 
        return 0;
@@ -1166,6 +1273,7 @@ void ath10k_core_unregister(struct ath10k *ar)
        if (!test_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags))
                return;
 
+       ath10k_thermal_unregister(ar);
        /* Stop spectral before unregistering from mac80211 to remove the
         * relayfs debugfs file cleanly. Otherwise the parent debugfs tree
         * would be already be free'd recursively, leading to a double free.
@@ -1198,10 +1306,7 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,
 
        ar->ath_common.priv = ar;
        ar->ath_common.hw = ar->hw;
-
-       ar->p2p = !!ath10k_p2p;
        ar->dev = dev;
-
        ar->hif.ops = hif_ops;
        ar->hif.bus = bus;
 
@@ -1212,6 +1317,7 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,
 
        init_completion(&ar->install_key_done);
        init_completion(&ar->vdev_setup_done);
+       init_completion(&ar->thermal.wmi_sync);
 
        INIT_DELAYED_WORK(&ar->scan.timeout, ath10k_scan_timeout_work);
 
index 514c219..7b6d9e4 100644 (file)
@@ -34,6 +34,7 @@
 #include "../regd.h"
 #include "../dfs_pattern_detector.h"
 #include "spectral.h"
+#include "thermal.h"
 
 #define MS(_v, _f) (((_v) & _f##_MASK) >> _f##_LSB)
 #define SM(_v, _f) (((_v) << _f##_LSB) & _f##_MASK)
@@ -120,6 +121,7 @@ struct ath10k_mem_chunk {
 };
 
 struct ath10k_wmi {
+       enum ath10k_fw_wmi_op_version op_version;
        enum ath10k_htc_ep_id eid;
        struct completion service_ready;
        struct completion unified_ready;
@@ -128,6 +130,7 @@ struct ath10k_wmi {
        struct wmi_cmd_map *cmd;
        struct wmi_vdev_param_map *vdev_param;
        struct wmi_pdev_param_map *pdev_param;
+       const struct wmi_ops *ops;
 
        u32 num_mem_chunks;
        struct ath10k_mem_chunk mem_chunks[WMI_MAX_MEM_REQS];
@@ -325,6 +328,7 @@ struct ath10k_debug {
        u32 fw_dbglog_mask;
        u32 pktlog_filter;
        u32 reg_addr;
+       u32 nf_cal_period;
 
        u8 htt_max_amsdu;
        u8 htt_max_ampdu;
@@ -369,7 +373,7 @@ enum ath10k_fw_features {
        /* wmi_mgmt_rx_hdr contains extra RSSI information */
        ATH10K_FW_FEATURE_EXT_WMI_MGMT_RX = 0,
 
-       /* firmware from 10X branch */
+       /* Firmware from 10X branch. Deprecated, don't use in new code. */
        ATH10K_FW_FEATURE_WMI_10X = 1,
 
        /* firmware support tx frame management over WMI, otherwise it's HTT */
@@ -378,8 +382,9 @@ enum ath10k_fw_features {
        /* Firmware does not support P2P */
        ATH10K_FW_FEATURE_NO_P2P = 3,
 
-       /* Firmware 10.2 feature bit. The ATH10K_FW_FEATURE_WMI_10X feature bit
-        * is required to be set as well.
+       /* Firmware 10.2 feature bit. The ATH10K_FW_FEATURE_WMI_10X feature
+        * bit is required to be set as well. Deprecated, don't use in new
+        * code.
         */
        ATH10K_FW_FEATURE_WMI_10_2 = 4,
 
@@ -401,6 +406,7 @@ enum ath10k_dev_flags {
 enum ath10k_cal_mode {
        ATH10K_CAL_MODE_FILE,
        ATH10K_CAL_MODE_OTP,
+       ATH10K_CAL_MODE_DT,
 };
 
 static inline const char *ath10k_cal_mode_str(enum ath10k_cal_mode mode)
@@ -410,6 +416,8 @@ static inline const char *ath10k_cal_mode_str(enum ath10k_cal_mode mode)
                return "file";
        case ATH10K_CAL_MODE_OTP:
                return "otp";
+       case ATH10K_CAL_MODE_DT:
+               return "dt";
        }
 
        return "unknown";
@@ -480,12 +488,15 @@ struct ath10k {
                u32 id;
                const char *name;
                u32 patch_load_addr;
+               int uart_pin;
 
                struct ath10k_hw_params_fw {
                        const char *dir;
                        const char *fw;
                        const char *otp;
                        const char *board;
+                       size_t board_size;
+                       size_t board_ext_size;
                } fw;
        } hw_params;
 
@@ -571,6 +582,7 @@ struct ath10k {
 
        int max_num_peers;
        int max_num_stations;
+       int max_num_vdevs;
 
        struct work_struct offchan_tx_work;
        struct sk_buff_head offchan_tx_queue;
@@ -610,6 +622,7 @@ struct ath10k {
                /* protected by conf_mutex */
                const struct firmware *utf;
                DECLARE_BITMAP(orig_fw_features, ATH10K_FW_FEATURE_COUNT);
+               enum ath10k_fw_wmi_op_version orig_wmi_op_version;
 
                /* protected by data_lock */
                bool utf_monitor;
@@ -622,6 +635,8 @@ struct ath10k {
                u32 fw_cold_reset_counter;
        } stats;
 
+       struct ath10k_thermal thermal;
+
        /* must be last */
        u8 drv_priv[0] __aligned(sizeof(void *));
 };
index a716758..6ca2442 100644 (file)
@@ -23,6 +23,7 @@
 #include "core.h"
 #include "debug.h"
 #include "hif.h"
+#include "wmi-ops.h"
 
 /* ms */
 #define ATH10K_DEBUG_HTT_STATS_INTERVAL 1000
@@ -123,7 +124,7 @@ EXPORT_SYMBOL(ath10k_info);
 
 void ath10k_print_driver_info(struct ath10k *ar)
 {
-       ath10k_info(ar, "%s (0x%08x, 0x%08x) fw %s api %d htt %d.%d wmi %d.%d.%d.%d cal %s max_sta %d\n",
+       ath10k_info(ar, "%s (0x%08x, 0x%08x) fw %s api %d htt %d.%d wmi %d cal %s max_sta %d\n",
                    ar->hw_params.name,
                    ar->target_version,
                    ar->chip_id,
@@ -131,10 +132,7 @@ void ath10k_print_driver_info(struct ath10k *ar)
                    ar->fw_api,
                    ar->htt.target_version_major,
                    ar->htt.target_version_minor,
-                   ar->fw_version_major,
-                   ar->fw_version_minor,
-                   ar->fw_version_release,
-                   ar->fw_version_build,
+                   ar->wmi.op_version,
                    ath10k_cal_mode_str(ar->cal_mode),
                    ar->max_num_stations);
        ath10k_info(ar, "debug %d debugfs %d tracing %d dfs %d testmode %d\n",
@@ -1607,6 +1605,73 @@ static const struct file_operations fops_cal_data = {
        .llseek = default_llseek,
 };
 
+static ssize_t ath10k_read_nf_cal_period(struct file *file,
+                                        char __user *user_buf,
+                                        size_t count, loff_t *ppos)
+{
+       struct ath10k *ar = file->private_data;
+       unsigned int len;
+       char buf[32];
+
+       len = scnprintf(buf, sizeof(buf), "%d\n",
+                       ar->debug.nf_cal_period);
+
+       return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
+
+static ssize_t ath10k_write_nf_cal_period(struct file *file,
+                                         const char __user *user_buf,
+                                         size_t count, loff_t *ppos)
+{
+       struct ath10k *ar = file->private_data;
+       unsigned long period;
+       int ret;
+
+       ret = kstrtoul_from_user(user_buf, count, 0, &period);
+       if (ret)
+               return ret;
+
+       if (period > WMI_PDEV_PARAM_CAL_PERIOD_MAX)
+               return -EINVAL;
+
+       /* there's no way to switch back to the firmware default */
+       if (period == 0)
+               return -EINVAL;
+
+       mutex_lock(&ar->conf_mutex);
+
+       ar->debug.nf_cal_period = period;
+
+       if (ar->state != ATH10K_STATE_ON) {
+               /* firmware is not running, nothing else to do */
+               ret = count;
+               goto exit;
+       }
+
+       ret = ath10k_wmi_pdev_set_param(ar, ar->wmi.pdev_param->cal_period,
+                                       ar->debug.nf_cal_period);
+       if (ret) {
+               ath10k_warn(ar, "cal period cfg failed from debugfs: %d\n",
+                           ret);
+               goto exit;
+       }
+
+       ret = count;
+
+exit:
+       mutex_unlock(&ar->conf_mutex);
+
+       return ret;
+}
+
+static const struct file_operations fops_nf_cal_period = {
+       .read = ath10k_read_nf_cal_period,
+       .write = ath10k_write_nf_cal_period,
+       .open = simple_open,
+       .owner = THIS_MODULE,
+       .llseek = default_llseek,
+};
+
 int ath10k_debug_start(struct ath10k *ar)
 {
        int ret;
@@ -1642,6 +1707,16 @@ int ath10k_debug_start(struct ath10k *ar)
                        ath10k_warn(ar, "failed to disable pktlog: %d\n", ret);
        }
 
+       if (ar->debug.nf_cal_period) {
+               ret = ath10k_wmi_pdev_set_param(ar,
+                                               ar->wmi.pdev_param->cal_period,
+                                               ar->debug.nf_cal_period);
+               if (ret)
+                       /* not serious */
+                       ath10k_warn(ar, "cal period cfg failed from debug start: %d\n",
+                                   ret);
+       }
+
        return ret;
 }
 
@@ -1880,6 +1955,9 @@ int ath10k_debug_register(struct ath10k *ar)
        debugfs_create_file("cal_data", S_IRUSR, ar->debug.debugfs_phy,
                            ar, &fops_cal_data);
 
+       debugfs_create_file("nf_cal_period", S_IRUSR | S_IWUSR,
+                           ar->debug.debugfs_phy, ar, &fops_nf_cal_period);
+
        if (config_enabled(CONFIG_ATH10K_DFS_CERTIFIED)) {
                debugfs_create_file("dfs_simulate_radar", S_IWUSR,
                                    ar->debug.debugfs_phy, ar,
index 4bc51d8..a1bda41 100644 (file)
@@ -93,11 +93,6 @@ int ath10k_htt_tx_alloc(struct ath10k_htt *htt)
 
        spin_lock_init(&htt->tx_lock);
 
-       if (test_bit(ATH10K_FW_FEATURE_WMI_10X, htt->ar->fw_features))
-               htt->max_num_pending_tx = TARGET_10X_NUM_MSDU_DESC;
-       else
-               htt->max_num_pending_tx = TARGET_NUM_MSDU_DESC;
-
        ath10k_dbg(ar, ATH10K_DBG_BOOT, "htt tx max num pending tx %d\n",
                   htt->max_num_pending_tx);
 
index dfedfd0..5729901 100644 (file)
@@ -37,6 +37,9 @@
 #define ATH10K_FW_API2_FILE            "firmware-2.bin"
 #define ATH10K_FW_API3_FILE            "firmware-3.bin"
 
+/* added support for ATH10K_FW_IE_WMI_OP_VERSION */
+#define ATH10K_FW_API4_FILE            "firmware-4.bin"
+
 #define ATH10K_FW_UTF_FILE             "utf.bin"
 
 /* includes also the null byte */
@@ -58,6 +61,24 @@ enum ath10k_fw_ie_type {
        ATH10K_FW_IE_FEATURES = 2,
        ATH10K_FW_IE_FW_IMAGE = 3,
        ATH10K_FW_IE_OTP_IMAGE = 4,
+
+       /* WMI "operations" interface version, 32 bit value. Supported from
+        * FW API 4 and above.
+        */
+       ATH10K_FW_IE_WMI_OP_VERSION = 5,
+};
+
+enum ath10k_fw_wmi_op_version {
+       ATH10K_FW_WMI_OP_VERSION_UNSET = 0,
+
+       ATH10K_FW_WMI_OP_VERSION_MAIN = 1,
+       ATH10K_FW_WMI_OP_VERSION_10_1 = 2,
+       ATH10K_FW_WMI_OP_VERSION_10_2 = 3,
+       ATH10K_FW_WMI_OP_VERSION_TLV = 4,
+       ATH10K_FW_WMI_OP_VERSION_10_2_4 = 5,
+
+       /* keep last */
+       ATH10K_FW_WMI_OP_VERSION_MAX,
 };
 
 /* Known pecularities:
@@ -162,6 +183,15 @@ struct ath10k_pktlog_hdr {
 #define TARGET_10X_NUM_MSDU_DESC               (1024 + 400)
 #define TARGET_10X_MAX_FRAG_ENTRIES            0
 
+/* Target specific defines for WMI-TLV firmware */
+#define TARGET_TLV_NUM_VDEVS                   3
+#define TARGET_TLV_NUM_STATIONS                        32
+#define TARGET_TLV_NUM_PEERS                   ((TARGET_TLV_NUM_STATIONS) + \
+                                                (TARGET_TLV_NUM_VDEVS) + \
+                                                2)
+#define TARGET_TLV_NUM_TIDS                    ((TARGET_TLV_NUM_PEERS) * 2)
+#define TARGET_TLV_NUM_MSDU_DESC               (1024 + 32)
+
 /* Number of Copy Engines supported */
 #define CE_COUNT 8
 
index c400567..5085f55 100644 (file)
@@ -27,6 +27,8 @@
 #include "htt.h"
 #include "txrx.h"
 #include "testmode.h"
+#include "wmi.h"
+#include "wmi-ops.h"
 
 /**********/
 /* Crypto */
@@ -267,7 +269,10 @@ chan_to_phymode(const struct cfg80211_chan_def *chandef)
        case IEEE80211_BAND_2GHZ:
                switch (chandef->width) {
                case NL80211_CHAN_WIDTH_20_NOHT:
-                       phymode = MODE_11G;
+                       if (chandef->chan->flags & IEEE80211_CHAN_NO_OFDM)
+                               phymode = MODE_11B;
+                       else
+                               phymode = MODE_11G;
                        break;
                case NL80211_CHAN_WIDTH_20:
                        phymode = MODE_11NG_HT20;
@@ -1046,28 +1051,85 @@ static void ath10k_control_ibss(struct ath10k_vif *arvif,
                            arvif->vdev_id, ret);
 }
 
-/*
- * Review this when mac80211 gains per-interface powersave support.
- */
+static int ath10k_mac_vif_recalc_ps_wake_threshold(struct ath10k_vif *arvif)
+{
+       struct ath10k *ar = arvif->ar;
+       u32 param;
+       u32 value;
+       int ret;
+
+       lockdep_assert_held(&arvif->ar->conf_mutex);
+
+       if (arvif->u.sta.uapsd)
+               value = WMI_STA_PS_TX_WAKE_THRESHOLD_NEVER;
+       else
+               value = WMI_STA_PS_TX_WAKE_THRESHOLD_ALWAYS;
+
+       param = WMI_STA_PS_PARAM_TX_WAKE_THRESHOLD;
+       ret = ath10k_wmi_set_sta_ps_param(ar, arvif->vdev_id, param, value);
+       if (ret) {
+               ath10k_warn(ar, "failed to submit ps wake threshold %u on vdev %i: %d\n",
+                           value, arvif->vdev_id, ret);
+               return ret;
+       }
+
+       return 0;
+}
+
+static int ath10k_mac_vif_recalc_ps_poll_count(struct ath10k_vif *arvif)
+{
+       struct ath10k *ar = arvif->ar;
+       u32 param;
+       u32 value;
+       int ret;
+
+       lockdep_assert_held(&arvif->ar->conf_mutex);
+
+       if (arvif->u.sta.uapsd)
+               value = WMI_STA_PS_PSPOLL_COUNT_UAPSD;
+       else
+               value = WMI_STA_PS_PSPOLL_COUNT_NO_MAX;
+
+       param = WMI_STA_PS_PARAM_PSPOLL_COUNT;
+       ret = ath10k_wmi_set_sta_ps_param(ar, arvif->vdev_id,
+                                         param, value);
+       if (ret) {
+               ath10k_warn(ar, "failed to submit ps poll count %u on vdev %i: %d\n",
+                           value, arvif->vdev_id, ret);
+               return ret;
+       }
+
+       return 0;
+}
+
 static int ath10k_mac_vif_setup_ps(struct ath10k_vif *arvif)
 {
        struct ath10k *ar = arvif->ar;
+       struct ieee80211_vif *vif = arvif->vif;
        struct ieee80211_conf *conf = &ar->hw->conf;
        enum wmi_sta_powersave_param param;
        enum wmi_sta_ps_mode psmode;
        int ret;
+       int ps_timeout;
 
        lockdep_assert_held(&arvif->ar->conf_mutex);
 
        if (arvif->vif->type != NL80211_IFTYPE_STATION)
                return 0;
 
-       if (conf->flags & IEEE80211_CONF_PS) {
+       if (vif->bss_conf.ps) {
                psmode = WMI_STA_PS_MODE_ENABLED;
                param = WMI_STA_PS_PARAM_INACTIVITY_TIME;
 
+               ps_timeout = conf->dynamic_ps_timeout;
+               if (ps_timeout == 0) {
+                       /* Firmware doesn't like 0 */
+                       ps_timeout = ieee80211_tu_to_usec(
+                               vif->bss_conf.beacon_int) / 1000;
+               }
+
                ret = ath10k_wmi_set_sta_ps_param(ar, arvif->vdev_id, param,
-                                                 conf->dynamic_ps_timeout);
+                                                 ps_timeout);
                if (ret) {
                        ath10k_warn(ar, "failed to set inactivity time for vdev %d: %i\n",
                                    arvif->vdev_id, ret);
@@ -1409,9 +1471,22 @@ static void ath10k_peer_assoc_h_qos(struct ath10k *ar,
                if (vif->bss_conf.qos)
                        arg->peer_flags |= WMI_PEER_QOS;
                break;
+       case WMI_VDEV_TYPE_IBSS:
+               if (sta->wme)
+                       arg->peer_flags |= WMI_PEER_QOS;
+               break;
        default:
                break;
        }
+
+       ath10k_dbg(ar, ATH10K_DBG_MAC, "mac peer %pM qos %d\n",
+                  sta->addr, !!(arg->peer_flags & WMI_PEER_QOS));
+}
+
+static bool ath10k_mac_sta_has_11g_rates(struct ieee80211_sta *sta)
+{
+       /* First 4 rates in ath10k_rates are CCK (11b) rates. */
+       return sta->supp_rates[IEEE80211_BAND_2GHZ] >> 4;
 }
 
 static void ath10k_peer_assoc_h_phymode(struct ath10k *ar,
@@ -1428,8 +1503,10 @@ static void ath10k_peer_assoc_h_phymode(struct ath10k *ar,
                                phymode = MODE_11NG_HT40;
                        else
                                phymode = MODE_11NG_HT20;
-               } else {
+               } else if (ath10k_mac_sta_has_11g_rates(sta)) {
                        phymode = MODE_11G;
+               } else {
+                       phymode = MODE_11B;
                }
 
                break;
@@ -2894,10 +2971,11 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,
        arvif->vdev_id = bit;
        arvif->vdev_subtype = WMI_VDEV_SUBTYPE_NONE;
 
-       if (ar->p2p)
-               arvif->vdev_subtype = WMI_VDEV_SUBTYPE_P2P_DEVICE;
-
        switch (vif->type) {
+       case NL80211_IFTYPE_P2P_DEVICE:
+               arvif->vdev_type = WMI_VDEV_TYPE_STA;
+               arvif->vdev_subtype = WMI_VDEV_SUBTYPE_P2P_DEVICE;
+               break;
        case NL80211_IFTYPE_UNSPECIFIED:
        case NL80211_IFTYPE_STATION:
                arvif->vdev_type = WMI_VDEV_TYPE_STA;
@@ -3026,22 +3104,16 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,
                        goto err_peer_delete;
                }
 
-               param = WMI_STA_PS_PARAM_TX_WAKE_THRESHOLD;
-               value = WMI_STA_PS_TX_WAKE_THRESHOLD_ALWAYS;
-               ret = ath10k_wmi_set_sta_ps_param(ar, arvif->vdev_id,
-                                                 param, value);
+               ret = ath10k_mac_vif_recalc_ps_wake_threshold(arvif);
                if (ret) {
-                       ath10k_warn(ar, "failed to set vdev %i TX wake thresh: %d\n",
+                       ath10k_warn(ar, "failed to recalc ps wake threshold on vdev %i: %d\n",
                                    arvif->vdev_id, ret);
                        goto err_peer_delete;
                }
 
-               param = WMI_STA_PS_PARAM_PSPOLL_COUNT;
-               value = WMI_STA_PS_PSPOLL_COUNT_NO_MAX;
-               ret = ath10k_wmi_set_sta_ps_param(ar, arvif->vdev_id,
-                                                 param, value);
+               ret = ath10k_mac_vif_recalc_ps_poll_count(arvif);
                if (ret) {
-                       ath10k_warn(ar, "failed to set vdev %i PSPOLL count: %d\n",
+                       ath10k_warn(ar, "failed to recalc ps poll count on vdev %i: %d\n",
                                    arvif->vdev_id, ret);
                        goto err_peer_delete;
                }
@@ -3314,6 +3386,13 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,
                        ath10k_warn(ar, "failed to recalc tx power: %d\n", ret);
        }
 
+       if (changed & BSS_CHANGED_PS) {
+               ret = ath10k_mac_vif_setup_ps(arvif);
+               if (ret)
+                       ath10k_warn(ar, "failed to setup ps on vdev %i: %d\n",
+                                   arvif->vdev_id, ret);
+       }
+
        mutex_unlock(&ar->conf_mutex);
 }
 
@@ -3583,8 +3662,9 @@ static void ath10k_sta_rc_update_wk(struct work_struct *wk)
                                    sta->addr, smps, err);
        }
 
-       if (changed & IEEE80211_RC_SUPP_RATES_CHANGED) {
-               ath10k_dbg(ar, ATH10K_DBG_MAC, "mac update sta %pM supp rates\n",
+       if (changed & IEEE80211_RC_SUPP_RATES_CHANGED ||
+           changed & IEEE80211_RC_NSS_CHANGED) {
+               ath10k_dbg(ar, ATH10K_DBG_MAC, "mac update sta %pM supp rates/nss\n",
                           sta->addr);
 
                err = ath10k_station_assoc(ar, arvif->vif, sta, true);
@@ -3808,6 +3888,20 @@ static int ath10k_conf_tx_uapsd(struct ath10k *ar, struct ieee80211_vif *vif,
        if (ret)
                ath10k_warn(ar, "failed to set rx wake param: %d\n", ret);
 
+       ret = ath10k_mac_vif_recalc_ps_wake_threshold(arvif);
+       if (ret) {
+               ath10k_warn(ar, "failed to recalc ps wake threshold on vdev %i: %d\n",
+                           arvif->vdev_id, ret);
+               return ret;
+       }
+
+       ret = ath10k_mac_vif_recalc_ps_poll_count(arvif);
+       if (ret) {
+               ath10k_warn(ar, "failed to recalc ps poll count on vdev %i: %d\n",
+                           arvif->vdev_id, ret);
+               return ret;
+       }
+
 exit:
        return ret;
 }
@@ -3989,29 +4083,6 @@ static int ath10k_set_rts_threshold(struct ieee80211_hw *hw, u32 value)
        return ret;
 }
 
-static int ath10k_set_frag_threshold(struct ieee80211_hw *hw, u32 value)
-{
-       struct ath10k *ar = hw->priv;
-       struct ath10k_vif *arvif;
-       int ret = 0;
-
-       mutex_lock(&ar->conf_mutex);
-       list_for_each_entry(arvif, &ar->arvifs, list) {
-               ath10k_dbg(ar, ATH10K_DBG_MAC, "mac vdev %d fragmentation threshold %d\n",
-                          arvif->vdev_id, value);
-
-               ret = ath10k_mac_set_frag(arvif, value);
-               if (ret) {
-                       ath10k_warn(ar, "failed to set fragmentation threshold for vdev %d: %d\n",
-                                   arvif->vdev_id, ret);
-                       break;
-               }
-       }
-       mutex_unlock(&ar->conf_mutex);
-
-       return ret;
-}
-
 static void ath10k_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                         u32 queues, bool drop)
 {
@@ -4655,7 +4726,6 @@ static const struct ieee80211_ops ath10k_ops = {
        .remain_on_channel              = ath10k_remain_on_channel,
        .cancel_remain_on_channel       = ath10k_cancel_remain_on_channel,
        .set_rts_threshold              = ath10k_set_rts_threshold,
-       .set_frag_threshold             = ath10k_set_frag_threshold,
        .flush                          = ath10k_flush,
        .tx_last_beacon                 = ath10k_tx_last_beacon,
        .set_antenna                    = ath10k_set_antenna,
@@ -4746,6 +4816,9 @@ static const struct ieee80211_channel ath10k_5ghz_channels[] = {
        CHAN5G(165, 5825, 0),
 };
 
+/* Note: Be careful if you re-order these. There is code which depends on this
+ * ordering.
+ */
 static struct ieee80211_rate ath10k_rates[] = {
        /* CCK */
        RATETAB_ENT(10,  0x82, 0),
@@ -4799,6 +4872,10 @@ static const struct ieee80211_iface_limit ath10k_if_limits[] = {
        .types  = BIT(NL80211_IFTYPE_P2P_GO)
        },
        {
+       .max    = 1,
+       .types  = BIT(NL80211_IFTYPE_P2P_DEVICE)
+       },
+       {
        .max    = 7,
        .types  = BIT(NL80211_IFTYPE_AP)
        },
@@ -5018,6 +5095,7 @@ int ath10k_mac_register(struct ath10k *ar)
 
        if (!test_bit(ATH10K_FW_FEATURE_NO_P2P, ar->fw_features))
                ar->hw->wiphy->interface_modes |=
+                       BIT(NL80211_IFTYPE_P2P_DEVICE) |
                        BIT(NL80211_IFTYPE_P2P_CLIENT) |
                        BIT(NL80211_IFTYPE_P2P_GO);
 
@@ -5062,16 +5140,26 @@ int ath10k_mac_register(struct ath10k *ar)
         */
        ar->hw->queues = 4;
 
-       if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {
-               ar->hw->wiphy->iface_combinations = ath10k_10x_if_comb;
-               ar->hw->wiphy->n_iface_combinations =
-                       ARRAY_SIZE(ath10k_10x_if_comb);
-       } else {
+       switch (ar->wmi.op_version) {
+       case ATH10K_FW_WMI_OP_VERSION_MAIN:
+       case ATH10K_FW_WMI_OP_VERSION_TLV:
                ar->hw->wiphy->iface_combinations = ath10k_if_comb;
                ar->hw->wiphy->n_iface_combinations =
                        ARRAY_SIZE(ath10k_if_comb);
-
                ar->hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_ADHOC);
+               break;
+       case ATH10K_FW_WMI_OP_VERSION_10_1:
+       case ATH10K_FW_WMI_OP_VERSION_10_2:
+       case ATH10K_FW_WMI_OP_VERSION_10_2_4:
+               ar->hw->wiphy->iface_combinations = ath10k_10x_if_comb;
+               ar->hw->wiphy->n_iface_combinations =
+                       ARRAY_SIZE(ath10k_10x_if_comb);
+               break;
+       case ATH10K_FW_WMI_OP_VERSION_UNSET:
+       case ATH10K_FW_WMI_OP_VERSION_MAX:
+               WARN_ON(1);
+               ret = -EINVAL;
+               goto err_free;
        }
 
        ar->hw->netdev_features = NETIF_F_HW_CSUM;
index 7abb836..5e50214 100644 (file)
@@ -64,6 +64,14 @@ static const struct pci_device_id ath10k_pci_id_table[] = {
        {0}
 };
 
+static const struct ath10k_pci_supp_chip ath10k_pci_supp_chips[] = {
+       /* QCA988X pre 2.0 chips are not supported because they need some nasty
+        * hacks. ath10k doesn't have them and these devices crash horribly
+        * because of that.
+        */
+       { QCA988X_2_0_DEVICE_ID, QCA988X_HW_2_0_CHIP_ID_REV },
+};
+
 static void ath10k_pci_buffer_cleanup(struct ath10k *ar);
 static int ath10k_pci_cold_reset(struct ath10k *ar);
 static int ath10k_pci_warm_reset(struct ath10k *ar);
@@ -2476,6 +2484,23 @@ static void ath10k_pci_release(struct ath10k *ar)
        pci_disable_device(pdev);
 }
 
+static bool ath10k_pci_chip_is_supported(u32 dev_id, u32 chip_id)
+{
+       const struct ath10k_pci_supp_chip *supp_chip;
+       int i;
+       u32 rev_id = MS(chip_id, SOC_CHIP_ID_REV);
+
+       for (i = 0; i < ARRAY_SIZE(ath10k_pci_supp_chips); i++) {
+               supp_chip = &ath10k_pci_supp_chips[i];
+
+               if (supp_chip->dev_id == dev_id &&
+                   supp_chip->rev_id == rev_id)
+                       return true;
+       }
+
+       return false;
+}
+
 static int ath10k_pci_probe(struct pci_dev *pdev,
                            const struct pci_device_id *pci_dev)
 {
@@ -2521,6 +2546,12 @@ static int ath10k_pci_probe(struct pci_dev *pdev,
                goto err_sleep;
        }
 
+       if (!ath10k_pci_chip_is_supported(pdev->device, chip_id)) {
+               ath10k_err(ar, "device %04x with chip_id %08x isn't supported\n",
+                          pdev->device, chip_id);
+               goto err_sleep;
+       }
+
        ret = ath10k_pci_alloc_pipes(ar);
        if (ret) {
                ath10k_err(ar, "failed to allocate copy engine pipes: %d\n",
index cf36511..ce4a1ef 100644 (file)
@@ -152,6 +152,11 @@ struct ath10k_pci_pipe {
        struct tasklet_struct intr;
 };
 
+struct ath10k_pci_supp_chip {
+       u32 dev_id;
+       u32 rev_id;
+};
+
 struct ath10k_pci {
        struct pci_dev *pdev;
        struct device *dev;
index 63ce61f..d22addf 100644 (file)
@@ -17,6 +17,7 @@
 #include <linux/relay.h>
 #include "core.h"
 #include "debug.h"
+#include "wmi-ops.h"
 
 static void send_fft_sample(struct ath10k *ar,
                            const struct fft_sample_tlv *fft_sample_tlv)
index 483db9c..b084f88 100644 (file)
@@ -187,13 +187,14 @@ static int ath10k_tm_cmd_utf_start(struct ath10k *ar, struct nlattr *tb[])
 
        memcpy(ar->testmode.orig_fw_features, ar->fw_features,
               sizeof(ar->fw_features));
+       ar->testmode.orig_wmi_op_version = ar->wmi.op_version;
 
        /* utf.bin firmware image does not advertise firmware features. Do
         * an ugly hack where we force the firmware features so that wmi.c
         * will use the correct WMI interface.
         */
        memset(ar->fw_features, 0, sizeof(ar->fw_features));
-       __set_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features);
+       ar->wmi.op_version = ATH10K_FW_WMI_OP_VERSION_10_1;
 
        ret = ath10k_hif_power_up(ar);
        if (ret) {
@@ -224,6 +225,7 @@ err_fw_features:
        /* return the original firmware features */
        memcpy(ar->fw_features, ar->testmode.orig_fw_features,
               sizeof(ar->fw_features));
+       ar->wmi.op_version = ar->testmode.orig_wmi_op_version;
 
        release_firmware(ar->testmode.utf);
        ar->testmode.utf = NULL;
@@ -250,6 +252,7 @@ static void __ath10k_tm_cmd_utf_stop(struct ath10k *ar)
        /* return the original firmware features */
        memcpy(ar->fw_features, ar->testmode.orig_fw_features,
               sizeof(ar->fw_features));
+       ar->wmi.op_version = ar->testmode.orig_wmi_op_version;
 
        release_firmware(ar->testmode.utf);
        ar->testmode.utf = NULL;
diff --git a/drivers/net/wireless/ath/ath10k/thermal.c b/drivers/net/wireless/ath/ath10k/thermal.c
new file mode 100644 (file)
index 0000000..b14ae8d
--- /dev/null
@@ -0,0 +1,243 @@
+/*
+ * Copyright (c) 2014 Qualcomm Atheros, Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <linux/device.h>
+#include <linux/sysfs.h>
+#include <linux/thermal.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include "core.h"
+#include "debug.h"
+#include "wmi-ops.h"
+
+static int ath10k_thermal_get_active_vifs(struct ath10k *ar,
+                                         enum wmi_vdev_type type)
+{
+       struct ath10k_vif *arvif;
+       int count = 0;
+
+       lockdep_assert_held(&ar->conf_mutex);
+
+       list_for_each_entry(arvif, &ar->arvifs, list) {
+               if (!arvif->is_started)
+                       continue;
+
+               if (!arvif->is_up)
+                       continue;
+
+               if (arvif->vdev_type != type)
+                       continue;
+
+               count++;
+       }
+       return count;
+}
+
+static int ath10k_thermal_get_max_dutycycle(struct thermal_cooling_device *cdev,
+                                           unsigned long *state)
+{
+       *state = ATH10K_QUIET_DUTY_CYCLE_MAX;
+
+       return 0;
+}
+
+static int ath10k_thermal_get_cur_dutycycle(struct thermal_cooling_device *cdev,
+                                           unsigned long *state)
+{
+       struct ath10k *ar = cdev->devdata;
+
+       mutex_lock(&ar->conf_mutex);
+       *state = ar->thermal.duty_cycle;
+       mutex_unlock(&ar->conf_mutex);
+
+       return 0;
+}
+
+static int ath10k_thermal_set_cur_dutycycle(struct thermal_cooling_device *cdev,
+                                           unsigned long duty_cycle)
+{
+       struct ath10k *ar = cdev->devdata;
+       u32 period, duration, enabled;
+       int num_bss, ret = 0;
+
+       mutex_lock(&ar->conf_mutex);
+       if (ar->state != ATH10K_STATE_ON) {
+               ret = -ENETDOWN;
+               goto out;
+       }
+
+       if (duty_cycle > ATH10K_QUIET_DUTY_CYCLE_MAX) {
+               ath10k_warn(ar, "duty cycle %ld is exceeding the limit %d\n",
+                           duty_cycle, ATH10K_QUIET_DUTY_CYCLE_MAX);
+               ret = -EINVAL;
+               goto out;
+       }
+       /* TODO: Right now, thermal mitigation is handled only for single/multi
+        * vif AP mode. Since quiet param is not validated in STA mode, it needs
+        * to be investigated further to handle multi STA and multi-vif (AP+STA)
+        * mode properly.
+        */
+       num_bss = ath10k_thermal_get_active_vifs(ar, WMI_VDEV_TYPE_AP);
+       if (!num_bss) {
+               ath10k_warn(ar, "no active AP interfaces\n");
+               ret = -ENETDOWN;
+               goto out;
+       }
+       period = max(ATH10K_QUIET_PERIOD_MIN,
+                    (ATH10K_QUIET_PERIOD_DEFAULT / num_bss));
+       duration = period * (duty_cycle / 100);
+       enabled = duration ? 1 : 0;
+
+       ret = ath10k_wmi_pdev_set_quiet_mode(ar, period, duration,
+                                            ATH10K_QUIET_START_OFFSET,
+                                            enabled);
+       if (ret) {
+               ath10k_warn(ar, "failed to set quiet mode period %u duarion %u enabled %u ret %d\n",
+                           period, duration, enabled, ret);
+               goto out;
+       }
+       ar->thermal.duty_cycle = duty_cycle;
+out:
+       mutex_unlock(&ar->conf_mutex);
+       return ret;
+}
+
+static struct thermal_cooling_device_ops ath10k_thermal_ops = {
+       .get_max_state = ath10k_thermal_get_max_dutycycle,
+       .get_cur_state = ath10k_thermal_get_cur_dutycycle,
+       .set_cur_state = ath10k_thermal_set_cur_dutycycle,
+};
+
+static ssize_t ath10k_thermal_show_temp(struct device *dev,
+                                       struct device_attribute *attr,
+                                       char *buf)
+{
+       struct ath10k *ar = dev_get_drvdata(dev);
+       int ret, temperature;
+
+       mutex_lock(&ar->conf_mutex);
+
+       /* Can't get temperature when the card is off */
+       if (ar->state != ATH10K_STATE_ON) {
+               ret = -ENETDOWN;
+               goto out;
+       }
+
+       reinit_completion(&ar->thermal.wmi_sync);
+       ret = ath10k_wmi_pdev_get_temperature(ar);
+       if (ret) {
+               ath10k_warn(ar, "failed to read temperature %d\n", ret);
+               goto out;
+       }
+
+       if (test_bit(ATH10K_FLAG_CRASH_FLUSH, &ar->dev_flags)) {
+               ret = -ESHUTDOWN;
+               goto out;
+       }
+
+       ret = wait_for_completion_timeout(&ar->thermal.wmi_sync,
+                                         ATH10K_THERMAL_SYNC_TIMEOUT_HZ);
+       if (ret == 0) {
+               ath10k_warn(ar, "failed to synchronize thermal read\n");
+               ret = -ETIMEDOUT;
+               goto out;
+       }
+
+       spin_lock_bh(&ar->data_lock);
+       temperature = ar->thermal.temperature;
+       spin_unlock_bh(&ar->data_lock);
+
+       ret = snprintf(buf, PAGE_SIZE, "%d", temperature);
+out:
+       mutex_unlock(&ar->conf_mutex);
+       return ret;
+}
+
+void ath10k_thermal_event_temperature(struct ath10k *ar, int temperature)
+{
+       spin_lock_bh(&ar->data_lock);
+       ar->thermal.temperature = temperature;
+       spin_unlock_bh(&ar->data_lock);
+       complete(&ar->thermal.wmi_sync);
+}
+
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, ath10k_thermal_show_temp,
+                         NULL, 0);
+
+static struct attribute *ath10k_hwmon_attrs[] = {
+       &sensor_dev_attr_temp1_input.dev_attr.attr,
+       NULL,
+};
+ATTRIBUTE_GROUPS(ath10k_hwmon);
+
+int ath10k_thermal_register(struct ath10k *ar)
+{
+       struct thermal_cooling_device *cdev;
+       struct device *hwmon_dev;
+       int ret;
+
+       cdev = thermal_cooling_device_register("ath10k_thermal", ar,
+                                              &ath10k_thermal_ops);
+
+       if (IS_ERR(cdev)) {
+               ath10k_err(ar, "failed to setup thermal device result: %ld\n",
+                          PTR_ERR(cdev));
+               return -EINVAL;
+       }
+
+       ret = sysfs_create_link(&ar->dev->kobj, &cdev->device.kobj,
+                               "cooling_device");
+       if (ret) {
+               ath10k_err(ar, "failed to create thermal symlink\n");
+               goto err_cooling_destroy;
+       }
+
+       ar->thermal.cdev = cdev;
+
+       /* Do not register hwmon device when temperature reading is not
+        * supported by firmware
+        */
+       if (ar->wmi.op_version != ATH10K_FW_WMI_OP_VERSION_10_2_4)
+               return 0;
+
+       /* Avoid linking error on devm_hwmon_device_register_with_groups, I
+        * guess linux/hwmon.h is missing proper stubs. */
+       if (!config_enabled(HWMON))
+               return 0;
+
+       hwmon_dev = devm_hwmon_device_register_with_groups(ar->dev,
+                                                          "ath10k_hwmon", ar,
+                                                          ath10k_hwmon_groups);
+       if (IS_ERR(hwmon_dev)) {
+               ath10k_err(ar, "failed to register hwmon device: %ld\n",
+                          PTR_ERR(hwmon_dev));
+               ret = -EINVAL;
+               goto err_remove_link;
+       }
+       return 0;
+
+err_remove_link:
+       sysfs_remove_link(&ar->dev->kobj, "thermal_sensor");
+err_cooling_destroy:
+       thermal_cooling_device_unregister(cdev);
+       return ret;
+}
+
+void ath10k_thermal_unregister(struct ath10k *ar)
+{
+       thermal_cooling_device_unregister(ar->thermal.cdev);
+       sysfs_remove_link(&ar->dev->kobj, "cooling_device");
+}
diff --git a/drivers/net/wireless/ath/ath10k/thermal.h b/drivers/net/wireless/ath/ath10k/thermal.h
new file mode 100644 (file)
index 0000000..bccc17a
--- /dev/null
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2014 Qualcomm Atheros, Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#ifndef _THERMAL_
+#define _THERMAL_
+
+#define ATH10K_QUIET_PERIOD_DEFAULT     100
+#define ATH10K_QUIET_PERIOD_MIN         25
+#define ATH10K_QUIET_START_OFFSET       10
+#define ATH10K_QUIET_DUTY_CYCLE_MAX     70
+#define ATH10K_HWMON_NAME_LEN           15
+#define ATH10K_THERMAL_SYNC_TIMEOUT_HZ (5*HZ)
+
+struct ath10k_thermal {
+       struct thermal_cooling_device *cdev;
+       struct completion wmi_sync;
+
+       /* protected by conf_mutex */
+       u32 duty_cycle;
+       /* temperature value in Celcius degree
+        * protected by data_lock
+        */
+       int temperature;
+};
+
+#ifdef CONFIG_THERMAL
+int ath10k_thermal_register(struct ath10k *ar);
+void ath10k_thermal_unregister(struct ath10k *ar);
+void ath10k_thermal_event_temperature(struct ath10k *ar, int temperature);
+#else
+static inline int ath10k_thermal_register(struct ath10k *ar)
+{
+       return 0;
+}
+
+static inline void ath10k_thermal_unregister(struct ath10k *ar)
+{
+}
+
+static inline void ath10k_thermal_event_temperature(struct ath10k *ar,
+                                                   int temperature)
+{
+}
+
+#endif
+#endif /* _THERMAL_ */
diff --git a/drivers/net/wireless/ath/ath10k/wmi-ops.h b/drivers/net/wireless/ath/ath10k/wmi-ops.h
new file mode 100644 (file)
index 0000000..20e2c30
--- /dev/null
@@ -0,0 +1,860 @@
+/*
+ * Copyright (c) 2005-2011 Atheros Communications Inc.
+ * Copyright (c) 2011-2014 Qualcomm Atheros, Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _WMI_OPS_H_
+#define _WMI_OPS_H_
+
+struct ath10k;
+struct sk_buff;
+
+struct wmi_ops {
+       void (*rx)(struct ath10k *ar, struct sk_buff *skb);
+       void (*map_svc)(const __le32 *in, unsigned long *out, size_t len);
+
+       int (*pull_scan)(struct ath10k *ar, struct sk_buff *skb,
+                        struct wmi_scan_ev_arg *arg);
+       int (*pull_mgmt_rx)(struct ath10k *ar, struct sk_buff *skb,
+                           struct wmi_mgmt_rx_ev_arg *arg);
+       int (*pull_ch_info)(struct ath10k *ar, struct sk_buff *skb,
+                           struct wmi_ch_info_ev_arg *arg);
+       int (*pull_vdev_start)(struct ath10k *ar, struct sk_buff *skb,
+                              struct wmi_vdev_start_ev_arg *arg);
+       int (*pull_peer_kick)(struct ath10k *ar, struct sk_buff *skb,
+                             struct wmi_peer_kick_ev_arg *arg);
+       int (*pull_swba)(struct ath10k *ar, struct sk_buff *skb,
+                        struct wmi_swba_ev_arg *arg);
+       int (*pull_phyerr)(struct ath10k *ar, struct sk_buff *skb,
+                          struct wmi_phyerr_ev_arg *arg);
+       int (*pull_svc_rdy)(struct ath10k *ar, struct sk_buff *skb,
+                           struct wmi_svc_rdy_ev_arg *arg);
+       int (*pull_rdy)(struct ath10k *ar, struct sk_buff *skb,
+                       struct wmi_rdy_ev_arg *arg);
+       int (*pull_fw_stats)(struct ath10k *ar, struct sk_buff *skb,
+                            struct ath10k_fw_stats *stats);
+
+       struct sk_buff *(*gen_pdev_suspend)(struct ath10k *ar, u32 suspend_opt);
+       struct sk_buff *(*gen_pdev_resume)(struct ath10k *ar);
+       struct sk_buff *(*gen_pdev_set_rd)(struct ath10k *ar, u16 rd, u16 rd2g,
+                                          u16 rd5g, u16 ctl2g, u16 ctl5g,
+                                          enum wmi_dfs_region dfs_reg);
+       struct sk_buff *(*gen_pdev_set_param)(struct ath10k *ar, u32 id,
+                                             u32 value);
+       struct sk_buff *(*gen_init)(struct ath10k *ar);
+       struct sk_buff *(*gen_start_scan)(struct ath10k *ar,
+                                         const struct wmi_start_scan_arg *arg);
+       struct sk_buff *(*gen_stop_scan)(struct ath10k *ar,
+                                        const struct wmi_stop_scan_arg *arg);
+       struct sk_buff *(*gen_vdev_create)(struct ath10k *ar, u32 vdev_id,
+                                          enum wmi_vdev_type type,
+                                          enum wmi_vdev_subtype subtype,
+                                          const u8 macaddr[ETH_ALEN]);
+       struct sk_buff *(*gen_vdev_delete)(struct ath10k *ar, u32 vdev_id);
+       struct sk_buff *(*gen_vdev_start)(struct ath10k *ar,
+                                         const struct wmi_vdev_start_request_arg *arg,
+                                         bool restart);
+       struct sk_buff *(*gen_vdev_stop)(struct ath10k *ar, u32 vdev_id);
+       struct sk_buff *(*gen_vdev_up)(struct ath10k *ar, u32 vdev_id, u32 aid,
+                                      const u8 *bssid);
+       struct sk_buff *(*gen_vdev_down)(struct ath10k *ar, u32 vdev_id);
+       struct sk_buff *(*gen_vdev_set_param)(struct ath10k *ar, u32 vdev_id,
+                                             u32 param_id, u32 param_value);
+       struct sk_buff *(*gen_vdev_install_key)(struct ath10k *ar,
+                                               const struct wmi_vdev_install_key_arg *arg);
+       struct sk_buff *(*gen_vdev_spectral_conf)(struct ath10k *ar,
+                                                 const struct wmi_vdev_spectral_conf_arg *arg);
+       struct sk_buff *(*gen_vdev_spectral_enable)(struct ath10k *ar, u32 vdev_id,
+                                                   u32 trigger, u32 enable);
+       struct sk_buff *(*gen_peer_create)(struct ath10k *ar, u32 vdev_id,
+                                          const u8 peer_addr[ETH_ALEN]);
+       struct sk_buff *(*gen_peer_delete)(struct ath10k *ar, u32 vdev_id,
+                                          const u8 peer_addr[ETH_ALEN]);
+       struct sk_buff *(*gen_peer_flush)(struct ath10k *ar, u32 vdev_id,
+                                         const u8 peer_addr[ETH_ALEN],
+                                         u32 tid_bitmap);
+       struct sk_buff *(*gen_peer_set_param)(struct ath10k *ar, u32 vdev_id,
+                                             const u8 *peer_addr,
+                                             enum wmi_peer_param param_id,
+                                             u32 param_value);
+       struct sk_buff *(*gen_peer_assoc)(struct ath10k *ar,
+                                         const struct wmi_peer_assoc_complete_arg *arg);
+       struct sk_buff *(*gen_set_psmode)(struct ath10k *ar, u32 vdev_id,
+                                         enum wmi_sta_ps_mode psmode);
+       struct sk_buff *(*gen_set_sta_ps)(struct ath10k *ar, u32 vdev_id,
+                                         enum wmi_sta_powersave_param param_id,
+                                         u32 value);
+       struct sk_buff *(*gen_set_ap_ps)(struct ath10k *ar, u32 vdev_id,
+                                        const u8 *mac,
+                                        enum wmi_ap_ps_peer_param param_id,
+                                        u32 value);
+       struct sk_buff *(*gen_scan_chan_list)(struct ath10k *ar,
+                                             const struct wmi_scan_chan_list_arg *arg);
+       struct sk_buff *(*gen_beacon_dma)(struct ath10k_vif *arvif);
+       struct sk_buff *(*gen_pdev_set_wmm)(struct ath10k *ar,
+                                           const struct wmi_pdev_set_wmm_params_arg *arg);
+       struct sk_buff *(*gen_request_stats)(struct ath10k *ar,
+                                            enum wmi_stats_id stats_id);
+       struct sk_buff *(*gen_force_fw_hang)(struct ath10k *ar,
+                                            enum wmi_force_fw_hang_type type,
+                                            u32 delay_ms);
+       struct sk_buff *(*gen_mgmt_tx)(struct ath10k *ar, struct sk_buff *skb);
+       struct sk_buff *(*gen_dbglog_cfg)(struct ath10k *ar, u32 module_enable);
+       struct sk_buff *(*gen_pktlog_enable)(struct ath10k *ar, u32 filter);
+       struct sk_buff *(*gen_pktlog_disable)(struct ath10k *ar);
+       struct sk_buff *(*gen_pdev_set_quiet_mode)(struct ath10k *ar,
+                                                  u32 period, u32 duration,
+                                                  u32 next_offset,
+                                                  u32 enabled);
+       struct sk_buff *(*gen_pdev_get_temperature)(struct ath10k *ar);
+};
+
+int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id);
+
+static inline int
+ath10k_wmi_rx(struct ath10k *ar, struct sk_buff *skb)
+{
+       if (WARN_ON_ONCE(!ar->wmi.ops->rx))
+               return -EOPNOTSUPP;
+
+       ar->wmi.ops->rx(ar, skb);
+       return 0;
+}
+
+static inline int
+ath10k_wmi_map_svc(struct ath10k *ar, const __le32 *in, unsigned long *out,
+                  size_t len)
+{
+       if (!ar->wmi.ops->map_svc)
+               return -EOPNOTSUPP;
+
+       ar->wmi.ops->map_svc(in, out, len);
+       return 0;
+}
+
+static inline int
+ath10k_wmi_pull_scan(struct ath10k *ar, struct sk_buff *skb,
+                    struct wmi_scan_ev_arg *arg)
+{
+       if (!ar->wmi.ops->pull_scan)
+               return -EOPNOTSUPP;
+
+       return ar->wmi.ops->pull_scan(ar, skb, arg);
+}
+
+static inline int
+ath10k_wmi_pull_mgmt_rx(struct ath10k *ar, struct sk_buff *skb,
+                       struct wmi_mgmt_rx_ev_arg *arg)
+{
+       if (!ar->wmi.ops->pull_mgmt_rx)
+               return -EOPNOTSUPP;
+
+       return ar->wmi.ops->pull_mgmt_rx(ar, skb, arg);
+}
+
+static inline int
+ath10k_wmi_pull_ch_info(struct ath10k *ar, struct sk_buff *skb,
+                       struct wmi_ch_info_ev_arg *arg)
+{
+       if (!ar->wmi.ops->pull_ch_info)
+               return -EOPNOTSUPP;
+
+       return ar->wmi.ops->pull_ch_info(ar, skb, arg);
+}
+
+static inline int
+ath10k_wmi_pull_vdev_start(struct ath10k *ar, struct sk_buff *skb,
+                          struct wmi_vdev_start_ev_arg *arg)
+{
+       if (!ar->wmi.ops->pull_vdev_start)
+               return -EOPNOTSUPP;
+
+       return ar->wmi.ops->pull_vdev_start(ar, skb, arg);
+}
+
+static inline int
+ath10k_wmi_pull_peer_kick(struct ath10k *ar, struct sk_buff *skb,
+                         struct wmi_peer_kick_ev_arg *arg)
+{
+       if (!ar->wmi.ops->pull_peer_kick)
+               return -EOPNOTSUPP;
+
+       return ar->wmi.ops->pull_peer_kick(ar, skb, arg);
+}
+
+static inline int
+ath10k_wmi_pull_swba(struct ath10k *ar, struct sk_buff *skb,
+                    struct wmi_swba_ev_arg *arg)
+{
+       if (!ar->wmi.ops->pull_swba)
+               return -EOPNOTSUPP;
+
+       return ar->wmi.ops->pull_swba(ar, skb, arg);
+}
+
+static inline int
+ath10k_wmi_pull_phyerr(struct ath10k *ar, struct sk_buff *skb,
+                      struct wmi_phyerr_ev_arg *arg)
+{
+       if (!ar->wmi.ops->pull_phyerr)
+               return -EOPNOTSUPP;
+
+       return ar->wmi.ops->pull_phyerr(ar, skb, arg);
+}
+
+static inline int
+ath10k_wmi_pull_svc_rdy(struct ath10k *ar, struct sk_buff *skb,
+                       struct wmi_svc_rdy_ev_arg *arg)
+{
+       if (!ar->wmi.ops->pull_svc_rdy)
+               return -EOPNOTSUPP;
+
+       return ar->wmi.ops->pull_svc_rdy(ar, skb, arg);
+}
+
+static inline int
+ath10k_wmi_pull_rdy(struct ath10k *ar, struct sk_buff *skb,
+                   struct wmi_rdy_ev_arg *arg)
+{
+       if (!ar->wmi.ops->pull_rdy)
+               return -EOPNOTSUPP;
+
+       return ar->wmi.ops->pull_rdy(ar, skb, arg);
+}
+
+static inline int
+ath10k_wmi_pull_fw_stats(struct ath10k *ar, struct sk_buff *skb,
+                        struct ath10k_fw_stats *stats)
+{
+       if (!ar->wmi.ops->pull_fw_stats)
+               return -EOPNOTSUPP;
+
+       return ar->wmi.ops->pull_fw_stats(ar, skb, stats);
+}
+
+static inline int
+ath10k_wmi_mgmt_tx(struct ath10k *ar, struct sk_buff *msdu)
+{
+       struct ieee80211_tx_info *info = IEEE80211_SKB_CB(msdu);
+       struct sk_buff *skb;
+       int ret;
+
+       if (!ar->wmi.ops->gen_mgmt_tx)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_mgmt_tx(ar, msdu);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       ret = ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->mgmt_tx_cmdid);
+       if (ret)
+               return ret;
+
+       /* FIXME There's no ACK event for Management Tx. This probably
+        * shouldn't be called here either. */
+       info->flags |= IEEE80211_TX_STAT_ACK;
+       ieee80211_tx_status_irqsafe(ar->hw, msdu);
+
+       return 0;
+}
+
+static inline int
+ath10k_wmi_pdev_set_regdomain(struct ath10k *ar, u16 rd, u16 rd2g, u16 rd5g,
+                             u16 ctl2g, u16 ctl5g,
+                             enum wmi_dfs_region dfs_reg)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_pdev_set_rd)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_pdev_set_rd(ar, rd, rd2g, rd5g, ctl2g, ctl5g,
+                                          dfs_reg);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb,
+                                  ar->wmi.cmd->pdev_set_regdomain_cmdid);
+}
+
+static inline int
+ath10k_wmi_pdev_suspend_target(struct ath10k *ar, u32 suspend_opt)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_pdev_suspend)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_pdev_suspend(ar, suspend_opt);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->pdev_suspend_cmdid);
+}
+
+static inline int
+ath10k_wmi_pdev_resume_target(struct ath10k *ar)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_pdev_resume)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_pdev_resume(ar);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->pdev_resume_cmdid);
+}
+
+static inline int
+ath10k_wmi_pdev_set_param(struct ath10k *ar, u32 id, u32 value)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_pdev_set_param)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_pdev_set_param(ar, id, value);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->pdev_set_param_cmdid);
+}
+
+static inline int
+ath10k_wmi_cmd_init(struct ath10k *ar)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_init)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_init(ar);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->init_cmdid);
+}
+
+static inline int
+ath10k_wmi_start_scan(struct ath10k *ar,
+                     const struct wmi_start_scan_arg *arg)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_start_scan)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_start_scan(ar, arg);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->start_scan_cmdid);
+}
+
+static inline int
+ath10k_wmi_stop_scan(struct ath10k *ar, const struct wmi_stop_scan_arg *arg)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_stop_scan)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_stop_scan(ar, arg);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->stop_scan_cmdid);
+}
+
+static inline int
+ath10k_wmi_vdev_create(struct ath10k *ar, u32 vdev_id,
+                      enum wmi_vdev_type type,
+                      enum wmi_vdev_subtype subtype,
+                      const u8 macaddr[ETH_ALEN])
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_vdev_create)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_vdev_create(ar, vdev_id, type, subtype, macaddr);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->vdev_create_cmdid);
+}
+
+static inline int
+ath10k_wmi_vdev_delete(struct ath10k *ar, u32 vdev_id)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_vdev_delete)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_vdev_delete(ar, vdev_id);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->vdev_delete_cmdid);
+}
+
+static inline int
+ath10k_wmi_vdev_start(struct ath10k *ar,
+                     const struct wmi_vdev_start_request_arg *arg)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_vdev_start)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_vdev_start(ar, arg, false);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb,
+                                  ar->wmi.cmd->vdev_start_request_cmdid);
+}
+
+static inline int
+ath10k_wmi_vdev_restart(struct ath10k *ar,
+                       const struct wmi_vdev_start_request_arg *arg)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_vdev_start)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_vdev_start(ar, arg, true);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb,
+                                  ar->wmi.cmd->vdev_restart_request_cmdid);
+}
+
+static inline int
+ath10k_wmi_vdev_stop(struct ath10k *ar, u32 vdev_id)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_vdev_stop)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_vdev_stop(ar, vdev_id);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->vdev_stop_cmdid);
+}
+
+static inline int
+ath10k_wmi_vdev_up(struct ath10k *ar, u32 vdev_id, u32 aid, const u8 *bssid)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_vdev_up)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_vdev_up(ar, vdev_id, aid, bssid);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->vdev_up_cmdid);
+}
+
+static inline int
+ath10k_wmi_vdev_down(struct ath10k *ar, u32 vdev_id)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_vdev_down)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_vdev_down(ar, vdev_id);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->vdev_down_cmdid);
+}
+
+static inline int
+ath10k_wmi_vdev_set_param(struct ath10k *ar, u32 vdev_id, u32 param_id,
+                         u32 param_value)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_vdev_set_param)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_vdev_set_param(ar, vdev_id, param_id,
+                                             param_value);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->vdev_set_param_cmdid);
+}
+
+static inline int
+ath10k_wmi_vdev_install_key(struct ath10k *ar,
+                           const struct wmi_vdev_install_key_arg *arg)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_vdev_install_key)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_vdev_install_key(ar, arg);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb,
+                                  ar->wmi.cmd->vdev_install_key_cmdid);
+}
+
+static inline int
+ath10k_wmi_vdev_spectral_conf(struct ath10k *ar,
+                             const struct wmi_vdev_spectral_conf_arg *arg)
+{
+       struct sk_buff *skb;
+       u32 cmd_id;
+
+       skb = ar->wmi.ops->gen_vdev_spectral_conf(ar, arg);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       cmd_id = ar->wmi.cmd->vdev_spectral_scan_configure_cmdid;
+       return ath10k_wmi_cmd_send(ar, skb, cmd_id);
+}
+
+static inline int
+ath10k_wmi_vdev_spectral_enable(struct ath10k *ar, u32 vdev_id, u32 trigger,
+                               u32 enable)
+{
+       struct sk_buff *skb;
+       u32 cmd_id;
+
+       skb = ar->wmi.ops->gen_vdev_spectral_enable(ar, vdev_id, trigger,
+                                                   enable);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       cmd_id = ar->wmi.cmd->vdev_spectral_scan_enable_cmdid;
+       return ath10k_wmi_cmd_send(ar, skb, cmd_id);
+}
+
+static inline int
+ath10k_wmi_peer_create(struct ath10k *ar, u32 vdev_id,
+                      const u8 peer_addr[ETH_ALEN])
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_peer_create)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_peer_create(ar, vdev_id, peer_addr);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->peer_create_cmdid);
+}
+
+static inline int
+ath10k_wmi_peer_delete(struct ath10k *ar, u32 vdev_id,
+                      const u8 peer_addr[ETH_ALEN])
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_peer_delete)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_peer_delete(ar, vdev_id, peer_addr);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->peer_delete_cmdid);
+}
+
+static inline int
+ath10k_wmi_peer_flush(struct ath10k *ar, u32 vdev_id,
+                     const u8 peer_addr[ETH_ALEN], u32 tid_bitmap)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_peer_flush)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_peer_flush(ar, vdev_id, peer_addr, tid_bitmap);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->peer_flush_tids_cmdid);
+}
+
+static inline int
+ath10k_wmi_peer_set_param(struct ath10k *ar, u32 vdev_id, const u8 *peer_addr,
+                         enum wmi_peer_param param_id, u32 param_value)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_peer_set_param)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_peer_set_param(ar, vdev_id, peer_addr, param_id,
+                                             param_value);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->peer_set_param_cmdid);
+}
+
+static inline int
+ath10k_wmi_set_psmode(struct ath10k *ar, u32 vdev_id,
+                     enum wmi_sta_ps_mode psmode)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_set_psmode)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_set_psmode(ar, vdev_id, psmode);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb,
+                                  ar->wmi.cmd->sta_powersave_mode_cmdid);
+}
+
+static inline int
+ath10k_wmi_set_sta_ps_param(struct ath10k *ar, u32 vdev_id,
+                           enum wmi_sta_powersave_param param_id, u32 value)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_set_sta_ps)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_set_sta_ps(ar, vdev_id, param_id, value);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb,
+                                  ar->wmi.cmd->sta_powersave_param_cmdid);
+}
+
+static inline int
+ath10k_wmi_set_ap_ps_param(struct ath10k *ar, u32 vdev_id, const u8 *mac,
+                          enum wmi_ap_ps_peer_param param_id, u32 value)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_set_ap_ps)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_set_ap_ps(ar, vdev_id, mac, param_id, value);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb,
+                                  ar->wmi.cmd->ap_ps_peer_param_cmdid);
+}
+
+static inline int
+ath10k_wmi_scan_chan_list(struct ath10k *ar,
+                         const struct wmi_scan_chan_list_arg *arg)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_scan_chan_list)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_scan_chan_list(ar, arg);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->scan_chan_list_cmdid);
+}
+
+static inline int
+ath10k_wmi_peer_assoc(struct ath10k *ar,
+                     const struct wmi_peer_assoc_complete_arg *arg)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_peer_assoc)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_peer_assoc(ar, arg);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->peer_assoc_cmdid);
+}
+
+static inline int
+ath10k_wmi_beacon_send_ref_nowait(struct ath10k_vif *arvif)
+{
+       struct ath10k *ar = arvif->ar;
+       struct sk_buff *skb;
+       int ret;
+
+       if (!ar->wmi.ops->gen_beacon_dma)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_beacon_dma(arvif);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       ret = ath10k_wmi_cmd_send_nowait(ar, skb,
+                                        ar->wmi.cmd->pdev_send_bcn_cmdid);
+       if (ret) {
+               dev_kfree_skb(skb);
+               return ret;
+       }
+
+       return 0;
+}
+
+static inline int
+ath10k_wmi_pdev_set_wmm_params(struct ath10k *ar,
+                              const struct wmi_pdev_set_wmm_params_arg *arg)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_pdev_set_wmm)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_pdev_set_wmm(ar, arg);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb,
+                                  ar->wmi.cmd->pdev_set_wmm_params_cmdid);
+}
+
+static inline int
+ath10k_wmi_request_stats(struct ath10k *ar, enum wmi_stats_id stats_id)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_request_stats)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_request_stats(ar, stats_id);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->request_stats_cmdid);
+}
+
+static inline int
+ath10k_wmi_force_fw_hang(struct ath10k *ar,
+                        enum wmi_force_fw_hang_type type, u32 delay_ms)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_force_fw_hang)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_force_fw_hang(ar, type, delay_ms);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->force_fw_hang_cmdid);
+}
+
+static inline int
+ath10k_wmi_dbglog_cfg(struct ath10k *ar, u32 module_enable)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_dbglog_cfg)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_dbglog_cfg(ar, module_enable);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->dbglog_cfg_cmdid);
+}
+
+static inline int
+ath10k_wmi_pdev_pktlog_enable(struct ath10k *ar, u32 filter)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_pktlog_enable)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_pktlog_enable(ar, filter);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->pdev_pktlog_enable_cmdid);
+}
+
+static inline int
+ath10k_wmi_pdev_pktlog_disable(struct ath10k *ar)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_pktlog_disable)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_pktlog_disable(ar);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb,
+                                  ar->wmi.cmd->pdev_pktlog_disable_cmdid);
+}
+
+static inline int
+ath10k_wmi_pdev_set_quiet_mode(struct ath10k *ar, u32 period, u32 duration,
+                              u32 next_offset, u32 enabled)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_pdev_set_quiet_mode)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_pdev_set_quiet_mode(ar, period, duration,
+                                                  next_offset, enabled);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb,
+                                  ar->wmi.cmd->pdev_set_quiet_mode_cmdid);
+}
+
+static inline int
+ath10k_wmi_pdev_get_temperature(struct ath10k *ar)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_pdev_get_temperature)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_pdev_get_temperature(ar);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb,
+                                  ar->wmi.cmd->pdev_get_temperature_cmdid);
+}
+
+#endif
diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.c b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
new file mode 100644 (file)
index 0000000..4c050ce
--- /dev/null
@@ -0,0 +1,2222 @@
+/*
+ * Copyright (c) 2005-2011 Atheros Communications Inc.
+ * Copyright (c) 2011-2014 Qualcomm Atheros, Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#include "core.h"
+#include "debug.h"
+#include "hw.h"
+#include "wmi.h"
+#include "wmi-ops.h"
+#include "wmi-tlv.h"
+
+/***************/
+/* TLV helpers */
+/**************/
+
+struct wmi_tlv_policy {
+       size_t min_len;
+};
+
+static const struct wmi_tlv_policy wmi_tlv_policies[] = {
+       [WMI_TLV_TAG_ARRAY_BYTE]
+               = { .min_len = sizeof(u8) },
+       [WMI_TLV_TAG_ARRAY_UINT32]
+               = { .min_len = sizeof(u32) },
+       [WMI_TLV_TAG_STRUCT_SCAN_EVENT]
+               = { .min_len = sizeof(struct wmi_scan_event) },
+       [WMI_TLV_TAG_STRUCT_MGMT_RX_HDR]
+               = { .min_len = sizeof(struct wmi_tlv_mgmt_rx_ev) },
+       [WMI_TLV_TAG_STRUCT_CHAN_INFO_EVENT]
+               = { .min_len = sizeof(struct wmi_chan_info_event) },
+       [WMI_TLV_TAG_STRUCT_VDEV_START_RESPONSE_EVENT]
+               = { .min_len = sizeof(struct wmi_vdev_start_response_event) },
+       [WMI_TLV_TAG_STRUCT_PEER_STA_KICKOUT_EVENT]
+               = { .min_len = sizeof(struct wmi_peer_sta_kickout_event) },
+       [WMI_TLV_TAG_STRUCT_HOST_SWBA_EVENT]
+               = { .min_len = sizeof(struct wmi_host_swba_event) },
+       [WMI_TLV_TAG_STRUCT_TIM_INFO]
+               = { .min_len = sizeof(struct wmi_tim_info) },
+       [WMI_TLV_TAG_STRUCT_P2P_NOA_INFO]
+               = { .min_len = sizeof(struct wmi_p2p_noa_info) },
+       [WMI_TLV_TAG_STRUCT_SERVICE_READY_EVENT]
+               = { .min_len = sizeof(struct wmi_tlv_svc_rdy_ev) },
+       [WMI_TLV_TAG_STRUCT_HAL_REG_CAPABILITIES]
+               = { .min_len = sizeof(struct hal_reg_capabilities) },
+       [WMI_TLV_TAG_STRUCT_WLAN_HOST_MEM_REQ]
+               = { .min_len = sizeof(struct wlan_host_mem_req) },
+       [WMI_TLV_TAG_STRUCT_READY_EVENT]
+               = { .min_len = sizeof(struct wmi_tlv_rdy_ev) },
+};
+
+static int
+ath10k_wmi_tlv_iter(struct ath10k *ar, const void *ptr, size_t len,
+                   int (*iter)(struct ath10k *ar, u16 tag, u16 len,
+                               const void *ptr, void *data),
+                   void *data)
+{
+       const void *begin = ptr;
+       const struct wmi_tlv *tlv;
+       u16 tlv_tag, tlv_len;
+       int ret;
+
+       while (len > 0) {
+               if (len < sizeof(*tlv)) {
+                       ath10k_dbg(ar, ATH10K_DBG_WMI,
+                                  "wmi tlv parse failure at byte %zd (%zu bytes left, %zu expected)\n",
+                                  ptr - begin, len, sizeof(*tlv));
+                       return -EINVAL;
+               }
+
+               tlv = ptr;
+               tlv_tag = __le16_to_cpu(tlv->tag);
+               tlv_len = __le16_to_cpu(tlv->len);
+               ptr += sizeof(*tlv);
+               len -= sizeof(*tlv);
+
+               if (tlv_len > len) {
+                       ath10k_dbg(ar, ATH10K_DBG_WMI,
+                                  "wmi tlv parse failure of tag %hhu at byte %zd (%zu bytes left, %hhu expected)\n",
+                                  tlv_tag, ptr - begin, len, tlv_len);
+                       return -EINVAL;
+               }
+
+               if (tlv_tag < ARRAY_SIZE(wmi_tlv_policies) &&
+                   wmi_tlv_policies[tlv_tag].min_len &&
+                   wmi_tlv_policies[tlv_tag].min_len > tlv_len) {
+                       ath10k_dbg(ar, ATH10K_DBG_WMI,
+                                  "wmi tlv parse failure of tag %hhu at byte %zd (%hhu bytes is less than min length %zu)\n",
+                                  tlv_tag, ptr - begin, tlv_len,
+                                  wmi_tlv_policies[tlv_tag].min_len);
+                       return -EINVAL;
+               }
+
+               ret = iter(ar, tlv_tag, tlv_len, ptr, data);
+               if (ret)
+                       return ret;
+
+               ptr += tlv_len;
+               len -= tlv_len;
+       }
+
+       return 0;
+}
+
+static int ath10k_wmi_tlv_iter_parse(struct ath10k *ar, u16 tag, u16 len,
+                                    const void *ptr, void *data)
+{
+       const void **tb = data;
+
+       if (tag < WMI_TLV_TAG_MAX)
+               tb[tag] = ptr;
+
+       return 0;
+}
+
+static int ath10k_wmi_tlv_parse(struct ath10k *ar, const void **tb,
+                               const void *ptr, size_t len)
+{
+       return ath10k_wmi_tlv_iter(ar, ptr, len, ath10k_wmi_tlv_iter_parse,
+                                  (void *)tb);
+}
+
+static const void **
+ath10k_wmi_tlv_parse_alloc(struct ath10k *ar, const void *ptr,
+                          size_t len, gfp_t gfp)
+{
+       const void **tb;
+       int ret;
+
+       tb = kzalloc(sizeof(*tb) * WMI_TLV_TAG_MAX, gfp);
+       if (!tb)
+               return ERR_PTR(-ENOMEM);
+
+       ret = ath10k_wmi_tlv_parse(ar, tb, ptr, len);
+       if (ret) {
+               kfree(tb);
+               return ERR_PTR(ret);
+       }
+
+       return tb;
+}
+
+static u16 ath10k_wmi_tlv_len(const void *ptr)
+{
+       return __le16_to_cpu((((const struct wmi_tlv *)ptr) - 1)->len);
+}
+
+/***********/
+/* TLV ops */
+/***********/
+
+static void ath10k_wmi_tlv_op_rx(struct ath10k *ar, struct sk_buff *skb)
+{
+       struct wmi_cmd_hdr *cmd_hdr;
+       enum wmi_tlv_event_id id;
+
+       cmd_hdr = (struct wmi_cmd_hdr *)skb->data;
+       id = MS(__le32_to_cpu(cmd_hdr->cmd_id), WMI_CMD_HDR_CMD_ID);
+
+       if (skb_pull(skb, sizeof(struct wmi_cmd_hdr)) == NULL)
+               return;
+
+       trace_ath10k_wmi_event(ar, id, skb->data, skb->len);
+
+       switch (id) {
+       case WMI_TLV_MGMT_RX_EVENTID:
+               ath10k_wmi_event_mgmt_rx(ar, skb);
+               /* mgmt_rx() owns the skb now! */
+               return;
+       case WMI_TLV_SCAN_EVENTID:
+               ath10k_wmi_event_scan(ar, skb);
+               break;
+       case WMI_TLV_CHAN_INFO_EVENTID:
+               ath10k_wmi_event_chan_info(ar, skb);
+               break;
+       case WMI_TLV_ECHO_EVENTID:
+               ath10k_wmi_event_echo(ar, skb);
+               break;
+       case WMI_TLV_DEBUG_MESG_EVENTID:
+               ath10k_wmi_event_debug_mesg(ar, skb);
+               break;
+       case WMI_TLV_UPDATE_STATS_EVENTID:
+               ath10k_wmi_event_update_stats(ar, skb);
+               break;
+       case WMI_TLV_VDEV_START_RESP_EVENTID:
+               ath10k_wmi_event_vdev_start_resp(ar, skb);
+               break;
+       case WMI_TLV_VDEV_STOPPED_EVENTID:
+               ath10k_wmi_event_vdev_stopped(ar, skb);
+               break;
+       case WMI_TLV_PEER_STA_KICKOUT_EVENTID:
+               ath10k_wmi_event_peer_sta_kickout(ar, skb);
+               break;
+       case WMI_TLV_HOST_SWBA_EVENTID:
+               ath10k_wmi_event_host_swba(ar, skb);
+               break;
+       case WMI_TLV_TBTTOFFSET_UPDATE_EVENTID:
+               ath10k_wmi_event_tbttoffset_update(ar, skb);
+               break;
+       case WMI_TLV_PHYERR_EVENTID:
+               ath10k_wmi_event_phyerr(ar, skb);
+               break;
+       case WMI_TLV_ROAM_EVENTID:
+               ath10k_wmi_event_roam(ar, skb);
+               break;
+       case WMI_TLV_PROFILE_MATCH:
+               ath10k_wmi_event_profile_match(ar, skb);
+               break;
+       case WMI_TLV_DEBUG_PRINT_EVENTID:
+               ath10k_wmi_event_debug_print(ar, skb);
+               break;
+       case WMI_TLV_PDEV_QVIT_EVENTID:
+               ath10k_wmi_event_pdev_qvit(ar, skb);
+               break;
+       case WMI_TLV_WLAN_PROFILE_DATA_EVENTID:
+               ath10k_wmi_event_wlan_profile_data(ar, skb);
+               break;
+       case WMI_TLV_RTT_MEASUREMENT_REPORT_EVENTID:
+               ath10k_wmi_event_rtt_measurement_report(ar, skb);
+               break;
+       case WMI_TLV_TSF_MEASUREMENT_REPORT_EVENTID:
+               ath10k_wmi_event_tsf_measurement_report(ar, skb);
+               break;
+       case WMI_TLV_RTT_ERROR_REPORT_EVENTID:
+               ath10k_wmi_event_rtt_error_report(ar, skb);
+               break;
+       case WMI_TLV_WOW_WAKEUP_HOST_EVENTID:
+               ath10k_wmi_event_wow_wakeup_host(ar, skb);
+               break;
+       case WMI_TLV_DCS_INTERFERENCE_EVENTID:
+               ath10k_wmi_event_dcs_interference(ar, skb);
+               break;
+       case WMI_TLV_PDEV_TPC_CONFIG_EVENTID:
+               ath10k_wmi_event_pdev_tpc_config(ar, skb);
+               break;
+       case WMI_TLV_PDEV_FTM_INTG_EVENTID:
+               ath10k_wmi_event_pdev_ftm_intg(ar, skb);
+               break;
+       case WMI_TLV_GTK_OFFLOAD_STATUS_EVENTID:
+               ath10k_wmi_event_gtk_offload_status(ar, skb);
+               break;
+       case WMI_TLV_GTK_REKEY_FAIL_EVENTID:
+               ath10k_wmi_event_gtk_rekey_fail(ar, skb);
+               break;
+       case WMI_TLV_TX_DELBA_COMPLETE_EVENTID:
+               ath10k_wmi_event_delba_complete(ar, skb);
+               break;
+       case WMI_TLV_TX_ADDBA_COMPLETE_EVENTID:
+               ath10k_wmi_event_addba_complete(ar, skb);
+               break;
+       case WMI_TLV_VDEV_INSTALL_KEY_COMPLETE_EVENTID:
+               ath10k_wmi_event_vdev_install_key_complete(ar, skb);
+               break;
+       case WMI_TLV_SERVICE_READY_EVENTID:
+               ath10k_wmi_event_service_ready(ar, skb);
+               break;
+       case WMI_TLV_READY_EVENTID:
+               ath10k_wmi_event_ready(ar, skb);
+               break;
+       default:
+               ath10k_warn(ar, "Unknown eventid: %d\n", id);
+               break;
+       }
+
+       dev_kfree_skb(skb);
+}
+
+static int ath10k_wmi_tlv_op_pull_scan_ev(struct ath10k *ar,
+                                         struct sk_buff *skb,
+                                         struct wmi_scan_ev_arg *arg)
+{
+       const void **tb;
+       const struct wmi_scan_event *ev;
+       int ret;
+
+       tb = ath10k_wmi_tlv_parse_alloc(ar, skb->data, skb->len, GFP_ATOMIC);
+       if (IS_ERR(tb)) {
+               ret = PTR_ERR(tb);
+               ath10k_warn(ar, "failed to parse tlv: %d\n", ret);
+               return ret;
+       }
+
+       ev = tb[WMI_TLV_TAG_STRUCT_SCAN_EVENT];
+       if (!ev) {
+               kfree(tb);
+               return -EPROTO;
+       }
+
+       arg->event_type = ev->event_type;
+       arg->reason = ev->reason;
+       arg->channel_freq = ev->channel_freq;
+       arg->scan_req_id = ev->scan_req_id;
+       arg->scan_id = ev->scan_id;
+       arg->vdev_id = ev->vdev_id;
+
+       kfree(tb);
+       return 0;
+}
+
+static int ath10k_wmi_tlv_op_pull_mgmt_rx_ev(struct ath10k *ar,
+                                            struct sk_buff *skb,
+                                            struct wmi_mgmt_rx_ev_arg *arg)
+{
+       const void **tb;
+       const struct wmi_tlv_mgmt_rx_ev *ev;
+       const u8 *frame;
+       u32 msdu_len;
+       int ret;
+
+       tb = ath10k_wmi_tlv_parse_alloc(ar, skb->data, skb->len, GFP_ATOMIC);
+       if (IS_ERR(tb)) {
+               ret = PTR_ERR(tb);
+               ath10k_warn(ar, "failed to parse tlv: %d\n", ret);
+               return ret;
+       }
+
+       ev = tb[WMI_TLV_TAG_STRUCT_MGMT_RX_HDR];
+       frame = tb[WMI_TLV_TAG_ARRAY_BYTE];
+
+       if (!ev || !frame) {
+               kfree(tb);
+               return -EPROTO;
+       }
+
+       arg->channel = ev->channel;
+       arg->buf_len = ev->buf_len;
+       arg->status = ev->status;
+       arg->snr = ev->snr;
+       arg->phy_mode = ev->phy_mode;
+       arg->rate = ev->rate;
+
+       msdu_len = __le32_to_cpu(arg->buf_len);
+
+       if (skb->len < (frame - skb->data) + msdu_len) {
+               kfree(tb);
+               return -EPROTO;
+       }
+
+       /* shift the sk_buff to point to `frame` */
+       skb_trim(skb, 0);
+       skb_put(skb, frame - skb->data);
+       skb_pull(skb, frame - skb->data);
+       skb_put(skb, msdu_len);
+
+       kfree(tb);
+       return 0;
+}
+
+static int ath10k_wmi_tlv_op_pull_ch_info_ev(struct ath10k *ar,
+                                            struct sk_buff *skb,
+                                            struct wmi_ch_info_ev_arg *arg)
+{
+       const void **tb;
+       const struct wmi_chan_info_event *ev;
+       int ret;
+
+       tb = ath10k_wmi_tlv_parse_alloc(ar, skb->data, skb->len, GFP_ATOMIC);
+       if (IS_ERR(tb)) {
+               ret = PTR_ERR(tb);
+               ath10k_warn(ar, "failed to parse tlv: %d\n", ret);
+               return ret;
+       }
+
+       ev = tb[WMI_TLV_TAG_STRUCT_CHAN_INFO_EVENT];
+       if (!ev) {
+               kfree(tb);
+               return -EPROTO;
+       }
+
+       arg->err_code = ev->err_code;
+       arg->freq = ev->freq;
+       arg->cmd_flags = ev->cmd_flags;
+       arg->noise_floor = ev->noise_floor;
+       arg->rx_clear_count = ev->rx_clear_count;
+       arg->cycle_count = ev->cycle_count;
+
+       kfree(tb);
+       return 0;
+}
+
+static int
+ath10k_wmi_tlv_op_pull_vdev_start_ev(struct ath10k *ar, struct sk_buff *skb,
+                                    struct wmi_vdev_start_ev_arg *arg)
+{
+       const void **tb;
+       const struct wmi_vdev_start_response_event *ev;
+       int ret;
+
+       tb = ath10k_wmi_tlv_parse_alloc(ar, skb->data, skb->len, GFP_ATOMIC);
+       if (IS_ERR(tb)) {
+               ret = PTR_ERR(tb);
+               ath10k_warn(ar, "failed to parse tlv: %d\n", ret);
+               return ret;
+       }
+
+       ev = tb[WMI_TLV_TAG_STRUCT_VDEV_START_RESPONSE_EVENT];
+       if (!ev) {
+               kfree(tb);
+               return -EPROTO;
+       }
+
+       skb_pull(skb, sizeof(*ev));
+       arg->vdev_id = ev->vdev_id;
+       arg->req_id = ev->req_id;
+       arg->resp_type = ev->resp_type;
+       arg->status = ev->status;
+
+       kfree(tb);
+       return 0;
+}
+
+static int ath10k_wmi_tlv_op_pull_peer_kick_ev(struct ath10k *ar,
+                                              struct sk_buff *skb,
+                                              struct wmi_peer_kick_ev_arg *arg)
+{
+       const void **tb;
+       const struct wmi_peer_sta_kickout_event *ev;
+       int ret;
+
+       tb = ath10k_wmi_tlv_parse_alloc(ar, skb->data, skb->len, GFP_ATOMIC);
+       if (IS_ERR(tb)) {
+               ret = PTR_ERR(tb);
+               ath10k_warn(ar, "failed to parse tlv: %d\n", ret);
+               return ret;
+       }
+
+       ev = tb[WMI_TLV_TAG_STRUCT_PEER_STA_KICKOUT_EVENT];
+       if (!ev) {
+               kfree(tb);
+               return -EPROTO;
+       }
+
+       arg->mac_addr = ev->peer_macaddr.addr;
+
+       kfree(tb);
+       return 0;
+}
+
+struct wmi_tlv_swba_parse {
+       const struct wmi_host_swba_event *ev;
+       bool tim_done;
+       bool noa_done;
+       size_t n_tim;
+       size_t n_noa;
+       struct wmi_swba_ev_arg *arg;
+};
+
+static int ath10k_wmi_tlv_swba_tim_parse(struct ath10k *ar, u16 tag, u16 len,
+                                        const void *ptr, void *data)
+{
+       struct wmi_tlv_swba_parse *swba = data;
+
+       if (tag != WMI_TLV_TAG_STRUCT_TIM_INFO)
+               return -EPROTO;
+
+       if (swba->n_tim >= ARRAY_SIZE(swba->arg->tim_info))
+               return -ENOBUFS;
+
+       swba->arg->tim_info[swba->n_tim++] = ptr;
+       return 0;
+}
+
+static int ath10k_wmi_tlv_swba_noa_parse(struct ath10k *ar, u16 tag, u16 len,
+                                        const void *ptr, void *data)
+{
+       struct wmi_tlv_swba_parse *swba = data;
+
+       if (tag != WMI_TLV_TAG_STRUCT_P2P_NOA_INFO)
+               return -EPROTO;
+
+       if (swba->n_noa >= ARRAY_SIZE(swba->arg->noa_info))
+               return -ENOBUFS;
+
+       swba->arg->noa_info[swba->n_noa++] = ptr;
+       return 0;
+}
+
+static int ath10k_wmi_tlv_swba_parse(struct ath10k *ar, u16 tag, u16 len,
+                                    const void *ptr, void *data)
+{
+       struct wmi_tlv_swba_parse *swba = data;
+       int ret;
+
+       switch (tag) {
+       case WMI_TLV_TAG_STRUCT_HOST_SWBA_EVENT:
+               swba->ev = ptr;
+               break;
+       case WMI_TLV_TAG_ARRAY_STRUCT:
+               if (!swba->tim_done) {
+                       swba->tim_done = true;
+                       ret = ath10k_wmi_tlv_iter(ar, ptr, len,
+                                                 ath10k_wmi_tlv_swba_tim_parse,
+                                                 swba);
+                       if (ret)
+                               return ret;
+               } else if (!swba->noa_done) {
+                       swba->noa_done = true;
+                       ret = ath10k_wmi_tlv_iter(ar, ptr, len,
+                                                 ath10k_wmi_tlv_swba_noa_parse,
+                                                 swba);
+                       if (ret)
+                               return ret;
+               }
+               break;
+       default:
+               break;
+       }
+       return 0;
+}
+
+static int ath10k_wmi_tlv_op_pull_swba_ev(struct ath10k *ar,
+                                         struct sk_buff *skb,
+                                         struct wmi_swba_ev_arg *arg)
+{
+       struct wmi_tlv_swba_parse swba = { .arg = arg };
+       u32 map;
+       size_t n_vdevs;
+       int ret;
+
+       ret = ath10k_wmi_tlv_iter(ar, skb->data, skb->len,
+                                 ath10k_wmi_tlv_swba_parse, &swba);
+       if (ret) {
+               ath10k_warn(ar, "failed to parse tlv: %d\n", ret);
+               return ret;
+       }
+
+       if (!swba.ev)
+               return -EPROTO;
+
+       arg->vdev_map = swba.ev->vdev_map;
+
+       for (map = __le32_to_cpu(arg->vdev_map), n_vdevs = 0; map; map >>= 1)
+               if (map & BIT(0))
+                       n_vdevs++;
+
+       if (n_vdevs != swba.n_tim ||
+           n_vdevs != swba.n_noa)
+               return -EPROTO;
+
+       return 0;
+}
+
+static int ath10k_wmi_tlv_op_pull_phyerr_ev(struct ath10k *ar,
+                                           struct sk_buff *skb,
+                                           struct wmi_phyerr_ev_arg *arg)
+{
+       const void **tb;
+       const struct wmi_tlv_phyerr_ev *ev;
+       const void *phyerrs;
+       int ret;
+
+       tb = ath10k_wmi_tlv_parse_alloc(ar, skb->data, skb->len, GFP_ATOMIC);
+       if (IS_ERR(tb)) {
+               ret = PTR_ERR(tb);
+               ath10k_warn(ar, "failed to parse tlv: %d\n", ret);
+               return ret;
+       }
+
+       ev = tb[WMI_TLV_TAG_STRUCT_COMB_PHYERR_RX_HDR];
+       phyerrs = tb[WMI_TLV_TAG_ARRAY_BYTE];
+
+       if (!ev || !phyerrs) {
+               kfree(tb);
+               return -EPROTO;
+       }
+
+       arg->num_phyerrs  = ev->num_phyerrs;
+       arg->tsf_l32 = ev->tsf_l32;
+       arg->tsf_u32 = ev->tsf_u32;
+       arg->buf_len = ev->buf_len;
+       arg->phyerrs = phyerrs;
+
+       kfree(tb);
+       return 0;
+}
+
+#define WMI_TLV_ABI_VER_NS0 0x5F414351
+#define WMI_TLV_ABI_VER_NS1 0x00004C4D
+#define WMI_TLV_ABI_VER_NS2 0x00000000
+#define WMI_TLV_ABI_VER_NS3 0x00000000
+
+#define WMI_TLV_ABI_VER0_MAJOR 1
+#define WMI_TLV_ABI_VER0_MINOR 0
+#define WMI_TLV_ABI_VER0 ((((WMI_TLV_ABI_VER0_MAJOR) << 24) & 0xFF000000) | \
+                         (((WMI_TLV_ABI_VER0_MINOR) <<  0) & 0x00FFFFFF))
+#define WMI_TLV_ABI_VER1 53
+
+static int
+ath10k_wmi_tlv_parse_mem_reqs(struct ath10k *ar, u16 tag, u16 len,
+                             const void *ptr, void *data)
+{
+       struct wmi_svc_rdy_ev_arg *arg = data;
+       int i;
+
+       if (tag != WMI_TLV_TAG_STRUCT_WLAN_HOST_MEM_REQ)
+               return -EPROTO;
+
+       for (i = 0; i < ARRAY_SIZE(arg->mem_reqs); i++) {
+               if (!arg->mem_reqs[i]) {
+                       arg->mem_reqs[i] = ptr;
+                       return 0;
+               }
+       }
+
+       return -ENOMEM;
+}
+
+static int ath10k_wmi_tlv_op_pull_svc_rdy_ev(struct ath10k *ar,
+                                            struct sk_buff *skb,
+                                            struct wmi_svc_rdy_ev_arg *arg)
+{
+       const void **tb;
+       const struct hal_reg_capabilities *reg;
+       const struct wmi_tlv_svc_rdy_ev *ev;
+       const __le32 *svc_bmap;
+       const struct wlan_host_mem_req *mem_reqs;
+       int ret;
+
+       tb = ath10k_wmi_tlv_parse_alloc(ar, skb->data, skb->len, GFP_ATOMIC);
+       if (IS_ERR(tb)) {
+               ret = PTR_ERR(tb);
+               ath10k_warn(ar, "failed to parse tlv: %d\n", ret);
+               return ret;
+       }
+
+       ev = tb[WMI_TLV_TAG_STRUCT_SERVICE_READY_EVENT];
+       reg = tb[WMI_TLV_TAG_STRUCT_HAL_REG_CAPABILITIES];
+       svc_bmap = tb[WMI_TLV_TAG_ARRAY_UINT32];
+       mem_reqs = tb[WMI_TLV_TAG_ARRAY_STRUCT];
+
+       if (!ev || !reg || !svc_bmap || !mem_reqs) {
+               kfree(tb);
+               return -EPROTO;
+       }
+
+       /* This is an internal ABI compatibility check for WMI TLV so check it
+        * here instead of the generic WMI code.
+        */
+       ath10k_dbg(ar, ATH10K_DBG_WMI,
+                  "wmi tlv abi 0x%08x ?= 0x%08x, 0x%08x ?= 0x%08x, 0x%08x ?= 0x%08x, 0x%08x ?= 0x%08x, 0x%08x ?= 0x%08x\n",
+                  __le32_to_cpu(ev->abi.abi_ver0), WMI_TLV_ABI_VER0,
+                  __le32_to_cpu(ev->abi.abi_ver_ns0), WMI_TLV_ABI_VER_NS0,
+                  __le32_to_cpu(ev->abi.abi_ver_ns1), WMI_TLV_ABI_VER_NS1,
+                  __le32_to_cpu(ev->abi.abi_ver_ns2), WMI_TLV_ABI_VER_NS2,
+                  __le32_to_cpu(ev->abi.abi_ver_ns3), WMI_TLV_ABI_VER_NS3);
+
+       if (__le32_to_cpu(ev->abi.abi_ver0) != WMI_TLV_ABI_VER0 ||
+           __le32_to_cpu(ev->abi.abi_ver_ns0) != WMI_TLV_ABI_VER_NS0 ||
+           __le32_to_cpu(ev->abi.abi_ver_ns1) != WMI_TLV_ABI_VER_NS1 ||
+           __le32_to_cpu(ev->abi.abi_ver_ns2) != WMI_TLV_ABI_VER_NS2 ||
+           __le32_to_cpu(ev->abi.abi_ver_ns3) != WMI_TLV_ABI_VER_NS3) {
+               kfree(tb);
+               return -ENOTSUPP;
+       }
+
+       arg->min_tx_power = ev->hw_min_tx_power;
+       arg->max_tx_power = ev->hw_max_tx_power;
+       arg->ht_cap = ev->ht_cap_info;
+       arg->vht_cap = ev->vht_cap_info;
+       arg->sw_ver0 = ev->abi.abi_ver0;
+       arg->sw_ver1 = ev->abi.abi_ver1;
+       arg->fw_build = ev->fw_build_vers;
+       arg->phy_capab = ev->phy_capability;
+       arg->num_rf_chains = ev->num_rf_chains;
+       arg->eeprom_rd = reg->eeprom_rd;
+       arg->num_mem_reqs = ev->num_mem_reqs;
+       arg->service_map = svc_bmap;
+       arg->service_map_len = ath10k_wmi_tlv_len(svc_bmap);
+
+       ret = ath10k_wmi_tlv_iter(ar, mem_reqs, ath10k_wmi_tlv_len(mem_reqs),
+                                 ath10k_wmi_tlv_parse_mem_reqs, arg);
+       if (ret) {
+               kfree(tb);
+               ath10k_warn(ar, "failed to parse mem_reqs tlv: %d\n", ret);
+               return ret;
+       }
+
+       kfree(tb);
+       return 0;
+}
+
+static int ath10k_wmi_tlv_op_pull_rdy_ev(struct ath10k *ar,
+                                        struct sk_buff *skb,
+                                        struct wmi_rdy_ev_arg *arg)
+{
+       const void **tb;
+       const struct wmi_tlv_rdy_ev *ev;
+       int ret;
+
+       tb = ath10k_wmi_tlv_parse_alloc(ar, skb->data, skb->len, GFP_ATOMIC);
+       if (IS_ERR(tb)) {
+               ret = PTR_ERR(tb);
+               ath10k_warn(ar, "failed to parse tlv: %d\n", ret);
+               return ret;
+       }
+
+       ev = tb[WMI_TLV_TAG_STRUCT_READY_EVENT];
+       if (!ev) {
+               kfree(tb);
+               return -EPROTO;
+       }
+
+       arg->sw_version = ev->abi.abi_ver0;
+       arg->abi_version = ev->abi.abi_ver1;
+       arg->status = ev->status;
+       arg->mac_addr = ev->mac_addr.addr;
+
+       kfree(tb);
+       return 0;
+}
+
+static int ath10k_wmi_tlv_op_pull_fw_stats(struct ath10k *ar,
+                                          struct sk_buff *skb,
+                                          struct ath10k_fw_stats *stats)
+{
+       const void **tb;
+       const struct wmi_stats_event *ev;
+       const void *data;
+       u32 num_pdev_stats, num_vdev_stats, num_peer_stats;
+       size_t data_len;
+       int ret;
+
+       tb = ath10k_wmi_tlv_parse_alloc(ar, skb->data, skb->len, GFP_ATOMIC);
+       if (IS_ERR(tb)) {
+               ret = PTR_ERR(tb);
+               ath10k_warn(ar, "failed to parse tlv: %d\n", ret);
+               return ret;
+       }
+
+       ev = tb[WMI_TLV_TAG_STRUCT_STATS_EVENT];
+       data = tb[WMI_TLV_TAG_ARRAY_BYTE];
+
+       if (!ev || !data) {
+               kfree(tb);
+               return -EPROTO;
+       }
+
+       data_len = ath10k_wmi_tlv_len(data);
+       num_pdev_stats = __le32_to_cpu(ev->num_pdev_stats);
+       num_vdev_stats = __le32_to_cpu(ev->num_vdev_stats);
+       num_peer_stats = __le32_to_cpu(ev->num_peer_stats);
+
+       WARN_ON(1); /* FIXME: not implemented yet */
+
+       kfree(tb);
+       return 0;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_pdev_suspend(struct ath10k *ar, u32 opt)
+{
+       struct wmi_tlv_pdev_suspend *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*tlv) + sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       tlv = (void *)skb->data;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_PDEV_SUSPEND_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->opt = __cpu_to_le32(opt);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv pdev suspend\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_pdev_resume(struct ath10k *ar)
+{
+       struct wmi_tlv_resume_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*tlv) + sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       tlv = (void *)skb->data;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_PDEV_RESUME_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->reserved = __cpu_to_le32(0);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv pdev resume\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_pdev_set_rd(struct ath10k *ar,
+                                 u16 rd, u16 rd2g, u16 rd5g,
+                                 u16 ctl2g, u16 ctl5g,
+                                 enum wmi_dfs_region dfs_reg)
+{
+       struct wmi_tlv_pdev_set_rd_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*tlv) + sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       tlv = (void *)skb->data;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_PDEV_SET_REGDOMAIN_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->regd = __cpu_to_le32(rd);
+       cmd->regd_2ghz = __cpu_to_le32(rd2g);
+       cmd->regd_5ghz = __cpu_to_le32(rd5g);
+       cmd->conform_limit_2ghz = __cpu_to_le32(rd2g);
+       cmd->conform_limit_5ghz = __cpu_to_le32(rd5g);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv pdev set rd\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_pdev_set_param(struct ath10k *ar, u32 param_id,
+                                    u32 param_value)
+{
+       struct wmi_tlv_pdev_set_param_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*tlv) + sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       tlv = (void *)skb->data;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_PDEV_SET_PARAM_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->param_id = __cpu_to_le32(param_id);
+       cmd->param_value = __cpu_to_le32(param_value);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv pdev set param\n");
+       return skb;
+}
+
+static struct sk_buff *ath10k_wmi_tlv_op_gen_init(struct ath10k *ar)
+{
+       struct sk_buff *skb;
+       struct wmi_tlv *tlv;
+       struct wmi_tlv_init_cmd *cmd;
+       struct wmi_tlv_resource_config *cfg;
+       struct wmi_host_mem_chunks *chunks;
+       size_t len, chunks_len;
+       void *ptr;
+
+       chunks_len = ar->wmi.num_mem_chunks * sizeof(struct host_memory_chunk);
+       len = (sizeof(*tlv) + sizeof(*cmd)) +
+             (sizeof(*tlv) + sizeof(*cfg)) +
+             (sizeof(*tlv) + chunks_len);
+
+       skb = ath10k_wmi_alloc_skb(ar, len);
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       ptr = skb->data;
+
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_INIT_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       ptr += sizeof(*tlv);
+       ptr += sizeof(*cmd);
+
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_RESOURCE_CONFIG);
+       tlv->len = __cpu_to_le16(sizeof(*cfg));
+       cfg = (void *)tlv->value;
+       ptr += sizeof(*tlv);
+       ptr += sizeof(*cfg);
+
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_ARRAY_STRUCT);
+       tlv->len = __cpu_to_le16(chunks_len);
+       chunks = (void *)tlv->value;
+
+       ptr += sizeof(*tlv);
+       ptr += chunks_len;
+
+       cmd->abi.abi_ver0 = __cpu_to_le32(WMI_TLV_ABI_VER0);
+       cmd->abi.abi_ver1 = __cpu_to_le32(WMI_TLV_ABI_VER1);
+       cmd->abi.abi_ver_ns0 = __cpu_to_le32(WMI_TLV_ABI_VER_NS0);
+       cmd->abi.abi_ver_ns1 = __cpu_to_le32(WMI_TLV_ABI_VER_NS1);
+       cmd->abi.abi_ver_ns2 = __cpu_to_le32(WMI_TLV_ABI_VER_NS2);
+       cmd->abi.abi_ver_ns3 = __cpu_to_le32(WMI_TLV_ABI_VER_NS3);
+       cmd->num_host_mem_chunks = __cpu_to_le32(ar->wmi.num_mem_chunks);
+
+       cfg->num_vdevs = __cpu_to_le32(TARGET_TLV_NUM_VDEVS);
+       cfg->num_peers = __cpu_to_le32(TARGET_TLV_NUM_PEERS);
+       cfg->num_offload_peers = __cpu_to_le32(0);
+       cfg->num_offload_reorder_bufs = __cpu_to_le32(0);
+       cfg->num_peer_keys = __cpu_to_le32(2);
+       cfg->num_tids = __cpu_to_le32(TARGET_TLV_NUM_TIDS);
+       cfg->ast_skid_limit = __cpu_to_le32(0x10);
+       cfg->tx_chain_mask = __cpu_to_le32(0x7);
+       cfg->rx_chain_mask = __cpu_to_le32(0x7);
+       cfg->rx_timeout_pri[0] = __cpu_to_le32(0x64);
+       cfg->rx_timeout_pri[1] = __cpu_to_le32(0x64);
+       cfg->rx_timeout_pri[2] = __cpu_to_le32(0x64);
+       cfg->rx_timeout_pri[3] = __cpu_to_le32(0x28);
+       cfg->rx_decap_mode = __cpu_to_le32(1);
+       cfg->scan_max_pending_reqs = __cpu_to_le32(4);
+       cfg->bmiss_offload_max_vdev = __cpu_to_le32(3);
+       cfg->roam_offload_max_vdev = __cpu_to_le32(3);
+       cfg->roam_offload_max_ap_profiles = __cpu_to_le32(8);
+       cfg->num_mcast_groups = __cpu_to_le32(0);
+       cfg->num_mcast_table_elems = __cpu_to_le32(0);
+       cfg->mcast2ucast_mode = __cpu_to_le32(0);
+       cfg->tx_dbg_log_size = __cpu_to_le32(0x400);
+       cfg->num_wds_entries = __cpu_to_le32(0x20);
+       cfg->dma_burst_size = __cpu_to_le32(0);
+       cfg->mac_aggr_delim = __cpu_to_le32(0);
+       cfg->rx_skip_defrag_timeout_dup_detection_check = __cpu_to_le32(0);
+       cfg->vow_config = __cpu_to_le32(0);
+       cfg->gtk_offload_max_vdev = __cpu_to_le32(2);
+       cfg->num_msdu_desc = __cpu_to_le32(TARGET_TLV_NUM_MSDU_DESC);
+       cfg->max_frag_entries = __cpu_to_le32(2);
+       cfg->num_tdls_vdevs = __cpu_to_le32(1);
+       cfg->num_tdls_conn_table_entries = __cpu_to_le32(0x20);
+       cfg->beacon_tx_offload_max_vdev = __cpu_to_le32(2);
+       cfg->num_multicast_filter_entries = __cpu_to_le32(5);
+       cfg->num_wow_filters = __cpu_to_le32(0x16);
+       cfg->num_keep_alive_pattern = __cpu_to_le32(6);
+       cfg->keep_alive_pattern_size = __cpu_to_le32(0);
+       cfg->max_tdls_concurrent_sleep_sta = __cpu_to_le32(1);
+       cfg->max_tdls_concurrent_buffer_sta = __cpu_to_le32(1);
+
+       ath10k_wmi_put_host_mem_chunks(ar, chunks);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv init\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_start_scan(struct ath10k *ar,
+                                const struct wmi_start_scan_arg *arg)
+{
+       struct wmi_tlv_start_scan_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+       size_t len, chan_len, ssid_len, bssid_len, ie_len;
+       __le32 *chans;
+       struct wmi_ssid *ssids;
+       struct wmi_mac_addr *addrs;
+       void *ptr;
+       int i, ret;
+
+       ret = ath10k_wmi_start_scan_verify(arg);
+       if (ret)
+               return ERR_PTR(ret);
+
+       chan_len = arg->n_channels * sizeof(__le32);
+       ssid_len = arg->n_ssids * sizeof(struct wmi_ssid);
+       bssid_len = arg->n_bssids * sizeof(struct wmi_mac_addr);
+       ie_len = roundup(arg->ie_len, 4);
+       len = (sizeof(*tlv) + sizeof(*cmd)) +
+             (arg->n_channels ? sizeof(*tlv) + chan_len : 0) +
+             (arg->n_ssids ? sizeof(*tlv) + ssid_len : 0) +
+             (arg->n_bssids ? sizeof(*tlv) + bssid_len : 0) +
+             (arg->ie_len ? sizeof(*tlv) + ie_len : 0);
+
+       skb = ath10k_wmi_alloc_skb(ar, len);
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       ptr = (void *)skb->data;
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_START_SCAN_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+
+       ath10k_wmi_put_start_scan_common(&cmd->common, arg);
+       cmd->burst_duration_ms = __cpu_to_le32(0);
+       cmd->num_channels = __cpu_to_le32(arg->n_channels);
+       cmd->num_ssids = __cpu_to_le32(arg->n_ssids);
+       cmd->num_bssids = __cpu_to_le32(arg->n_bssids);
+       cmd->ie_len = __cpu_to_le32(arg->ie_len);
+       cmd->num_probes = __cpu_to_le32(3);
+
+       /* FIXME: There are some scan flag inconsistencies across firmwares,
+        * e.g. WMI-TLV inverts the logic behind the following flag.
+        */
+       cmd->common.scan_ctrl_flags ^= __cpu_to_le32(WMI_SCAN_FILTER_PROBE_REQ);
+
+       ptr += sizeof(*tlv);
+       ptr += sizeof(*cmd);
+
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_ARRAY_UINT32);
+       tlv->len = __cpu_to_le16(chan_len);
+       chans = (void *)tlv->value;
+       for (i = 0; i < arg->n_channels; i++)
+               chans[i] = __cpu_to_le32(arg->channels[i]);
+
+       ptr += sizeof(*tlv);
+       ptr += chan_len;
+
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_ARRAY_FIXED_STRUCT);
+       tlv->len = __cpu_to_le16(ssid_len);
+       ssids = (void *)tlv->value;
+       for (i = 0; i < arg->n_ssids; i++) {
+               ssids[i].ssid_len = __cpu_to_le32(arg->ssids[i].len);
+               memcpy(ssids[i].ssid, arg->ssids[i].ssid, arg->ssids[i].len);
+       }
+
+       ptr += sizeof(*tlv);
+       ptr += ssid_len;
+
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_ARRAY_FIXED_STRUCT);
+       tlv->len = __cpu_to_le16(bssid_len);
+       addrs = (void *)tlv->value;
+       for (i = 0; i < arg->n_bssids; i++)
+               ether_addr_copy(addrs[i].addr, arg->bssids[i].bssid);
+
+       ptr += sizeof(*tlv);
+       ptr += bssid_len;
+
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_ARRAY_BYTE);
+       tlv->len = __cpu_to_le16(ie_len);
+       memcpy(tlv->value, arg->ie, arg->ie_len);
+
+       ptr += sizeof(*tlv);
+       ptr += ie_len;
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv start scan\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_stop_scan(struct ath10k *ar,
+                               const struct wmi_stop_scan_arg *arg)
+{
+       struct wmi_stop_scan_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+       u32 scan_id;
+       u32 req_id;
+
+       if (arg->req_id > 0xFFF)
+               return ERR_PTR(-EINVAL);
+       if (arg->req_type == WMI_SCAN_STOP_ONE && arg->u.scan_id > 0xFFF)
+               return ERR_PTR(-EINVAL);
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*tlv) + sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       scan_id = arg->u.scan_id;
+       scan_id |= WMI_HOST_SCAN_REQ_ID_PREFIX;
+
+       req_id = arg->req_id;
+       req_id |= WMI_HOST_SCAN_REQUESTOR_ID_PREFIX;
+
+       tlv = (void *)skb->data;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_STOP_SCAN_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->req_type = __cpu_to_le32(arg->req_type);
+       cmd->vdev_id = __cpu_to_le32(arg->u.vdev_id);
+       cmd->scan_id = __cpu_to_le32(scan_id);
+       cmd->scan_req_id = __cpu_to_le32(req_id);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv stop scan\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_vdev_create(struct ath10k *ar,
+                                 u32 vdev_id,
+                                 enum wmi_vdev_type vdev_type,
+                                 enum wmi_vdev_subtype vdev_subtype,
+                                 const u8 mac_addr[ETH_ALEN])
+{
+       struct wmi_vdev_create_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*tlv) + sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       tlv = (void *)skb->data;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_VDEV_CREATE_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->vdev_id = __cpu_to_le32(vdev_id);
+       cmd->vdev_type = __cpu_to_le32(vdev_type);
+       cmd->vdev_subtype = __cpu_to_le32(vdev_subtype);
+       ether_addr_copy(cmd->vdev_macaddr.addr, mac_addr);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv vdev create\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_vdev_delete(struct ath10k *ar, u32 vdev_id)
+{
+       struct wmi_vdev_delete_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*tlv) + sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       tlv = (void *)skb->data;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_VDEV_DELETE_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->vdev_id = __cpu_to_le32(vdev_id);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv vdev delete\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_vdev_start(struct ath10k *ar,
+                                const struct wmi_vdev_start_request_arg *arg,
+                                bool restart)
+{
+       struct wmi_tlv_vdev_start_cmd *cmd;
+       struct wmi_channel *ch;
+       struct wmi_p2p_noa_descriptor *noa;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+       size_t len;
+       void *ptr;
+       u32 flags = 0;
+
+       if (WARN_ON(arg->ssid && arg->ssid_len == 0))
+               return ERR_PTR(-EINVAL);
+       if (WARN_ON(arg->hidden_ssid && !arg->ssid))
+               return ERR_PTR(-EINVAL);
+       if (WARN_ON(arg->ssid_len > sizeof(cmd->ssid.ssid)))
+               return ERR_PTR(-EINVAL);
+
+       len = (sizeof(*tlv) + sizeof(*cmd)) +
+             (sizeof(*tlv) + sizeof(*ch)) +
+             (sizeof(*tlv) + 0);
+       skb = ath10k_wmi_alloc_skb(ar, len);
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       if (arg->hidden_ssid)
+               flags |= WMI_VDEV_START_HIDDEN_SSID;
+       if (arg->pmf_enabled)
+               flags |= WMI_VDEV_START_PMF_ENABLED;
+
+       ptr = (void *)skb->data;
+
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_VDEV_START_REQUEST_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->vdev_id = __cpu_to_le32(arg->vdev_id);
+       cmd->bcn_intval = __cpu_to_le32(arg->bcn_intval);
+       cmd->dtim_period = __cpu_to_le32(arg->dtim_period);
+       cmd->flags = __cpu_to_le32(flags);
+       cmd->bcn_tx_rate = __cpu_to_le32(arg->bcn_tx_rate);
+       cmd->bcn_tx_power = __cpu_to_le32(arg->bcn_tx_power);
+       cmd->disable_hw_ack = __cpu_to_le32(arg->disable_hw_ack);
+
+       if (arg->ssid) {
+               cmd->ssid.ssid_len = __cpu_to_le32(arg->ssid_len);
+               memcpy(cmd->ssid.ssid, arg->ssid, arg->ssid_len);
+       }
+
+       ptr += sizeof(*tlv);
+       ptr += sizeof(*cmd);
+
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_CHANNEL);
+       tlv->len = __cpu_to_le16(sizeof(*ch));
+       ch = (void *)tlv->value;
+       ath10k_wmi_put_wmi_channel(ch, &arg->channel);
+
+       ptr += sizeof(*tlv);
+       ptr += sizeof(*ch);
+
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_ARRAY_STRUCT);
+       tlv->len = 0;
+       noa = (void *)tlv->value;
+
+       /* Note: This is a nested TLV containing:
+        * [wmi_tlv][wmi_p2p_noa_descriptor][wmi_tlv]..
+        */
+
+       ptr += sizeof(*tlv);
+       ptr += 0;
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv vdev start\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_vdev_stop(struct ath10k *ar, u32 vdev_id)
+{
+       struct wmi_vdev_stop_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*tlv) + sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       tlv = (void *)skb->data;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_VDEV_STOP_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->vdev_id = __cpu_to_le32(vdev_id);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv vdev stop\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_vdev_up(struct ath10k *ar, u32 vdev_id, u32 aid,
+                             const u8 *bssid)
+
+{
+       struct wmi_vdev_up_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*tlv) + sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       tlv = (void *)skb->data;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_VDEV_UP_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->vdev_id = __cpu_to_le32(vdev_id);
+       cmd->vdev_assoc_id = __cpu_to_le32(aid);
+       ether_addr_copy(cmd->vdev_bssid.addr, bssid);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv vdev up\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_vdev_down(struct ath10k *ar, u32 vdev_id)
+{
+       struct wmi_vdev_down_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*tlv) + sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       tlv = (void *)skb->data;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_VDEV_DOWN_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->vdev_id = __cpu_to_le32(vdev_id);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv vdev down\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_vdev_set_param(struct ath10k *ar, u32 vdev_id,
+                                    u32 param_id, u32 param_value)
+{
+       struct wmi_vdev_set_param_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*tlv) + sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       tlv = (void *)skb->data;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_VDEV_SET_PARAM_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->vdev_id = __cpu_to_le32(vdev_id);
+       cmd->param_id = __cpu_to_le32(param_id);
+       cmd->param_value = __cpu_to_le32(param_value);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv vdev set param\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_vdev_install_key(struct ath10k *ar,
+                                      const struct wmi_vdev_install_key_arg *arg)
+{
+       struct wmi_vdev_install_key_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+       size_t len;
+       void *ptr;
+
+       if (arg->key_cipher == WMI_CIPHER_NONE && arg->key_data != NULL)
+               return ERR_PTR(-EINVAL);
+       if (arg->key_cipher != WMI_CIPHER_NONE && arg->key_data == NULL)
+               return ERR_PTR(-EINVAL);
+
+       len = sizeof(*tlv) + sizeof(*cmd) +
+             sizeof(*tlv) + roundup(arg->key_len, sizeof(__le32));
+       skb = ath10k_wmi_alloc_skb(ar, len);
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       ptr = (void *)skb->data;
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_VDEV_INSTALL_KEY_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->vdev_id = __cpu_to_le32(arg->vdev_id);
+       cmd->key_idx = __cpu_to_le32(arg->key_idx);
+       cmd->key_flags = __cpu_to_le32(arg->key_flags);
+       cmd->key_cipher = __cpu_to_le32(arg->key_cipher);
+       cmd->key_len = __cpu_to_le32(arg->key_len);
+       cmd->key_txmic_len = __cpu_to_le32(arg->key_txmic_len);
+       cmd->key_rxmic_len = __cpu_to_le32(arg->key_rxmic_len);
+
+       if (arg->macaddr)
+               ether_addr_copy(cmd->peer_macaddr.addr, arg->macaddr);
+
+       ptr += sizeof(*tlv);
+       ptr += sizeof(*cmd);
+
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_ARRAY_BYTE);
+       tlv->len = __cpu_to_le16(roundup(arg->key_len, sizeof(__le32)));
+       if (arg->key_data)
+               memcpy(tlv->value, arg->key_data, arg->key_len);
+
+       ptr += sizeof(*tlv);
+       ptr += roundup(arg->key_len, sizeof(__le32));
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv vdev install key\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_peer_create(struct ath10k *ar, u32 vdev_id,
+                                 const u8 peer_addr[ETH_ALEN])
+{
+       struct wmi_tlv_peer_create_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*tlv) + sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       tlv = (void *)skb->data;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_PEER_CREATE_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->vdev_id = __cpu_to_le32(vdev_id);
+       cmd->peer_type = __cpu_to_le32(WMI_TLV_PEER_TYPE_DEFAULT); /* FIXME */
+       ether_addr_copy(cmd->peer_addr.addr, peer_addr);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv peer create\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_peer_delete(struct ath10k *ar, u32 vdev_id,
+                                 const u8 peer_addr[ETH_ALEN])
+{
+       struct wmi_peer_delete_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*tlv) + sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       tlv = (void *)skb->data;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_PEER_DELETE_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->vdev_id = __cpu_to_le32(vdev_id);
+       ether_addr_copy(cmd->peer_macaddr.addr, peer_addr);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv peer delete\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_peer_flush(struct ath10k *ar, u32 vdev_id,
+                                const u8 peer_addr[ETH_ALEN], u32 tid_bitmap)
+{
+       struct wmi_peer_flush_tids_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*tlv) + sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       tlv = (void *)skb->data;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_PEER_FLUSH_TIDS_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->vdev_id = __cpu_to_le32(vdev_id);
+       cmd->peer_tid_bitmap = __cpu_to_le32(tid_bitmap);
+       ether_addr_copy(cmd->peer_macaddr.addr, peer_addr);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv peer flush\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_peer_set_param(struct ath10k *ar, u32 vdev_id,
+                                    const u8 *peer_addr,
+                                    enum wmi_peer_param param_id,
+                                    u32 param_value)
+{
+       struct wmi_peer_set_param_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*tlv) + sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       tlv = (void *)skb->data;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_PEER_SET_PARAM_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->vdev_id = __cpu_to_le32(vdev_id);
+       cmd->param_id = __cpu_to_le32(param_id);
+       cmd->param_value = __cpu_to_le32(param_value);
+       ether_addr_copy(cmd->peer_macaddr.addr, peer_addr);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv peer set param\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_peer_assoc(struct ath10k *ar,
+                                const struct wmi_peer_assoc_complete_arg *arg)
+{
+       struct wmi_tlv_peer_assoc_cmd *cmd;
+       struct wmi_vht_rate_set *vht_rate;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+       size_t len, legacy_rate_len, ht_rate_len;
+       void *ptr;
+
+       if (arg->peer_mpdu_density > 16)
+               return ERR_PTR(-EINVAL);
+       if (arg->peer_legacy_rates.num_rates > MAX_SUPPORTED_RATES)
+               return ERR_PTR(-EINVAL);
+       if (arg->peer_ht_rates.num_rates > MAX_SUPPORTED_RATES)
+               return ERR_PTR(-EINVAL);
+
+       legacy_rate_len = roundup(arg->peer_legacy_rates.num_rates,
+                                 sizeof(__le32));
+       ht_rate_len = roundup(arg->peer_ht_rates.num_rates, sizeof(__le32));
+       len = (sizeof(*tlv) + sizeof(*cmd)) +
+             (sizeof(*tlv) + legacy_rate_len) +
+             (sizeof(*tlv) + ht_rate_len) +
+             (sizeof(*tlv) + sizeof(*vht_rate));
+       skb = ath10k_wmi_alloc_skb(ar, len);
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       ptr = (void *)skb->data;
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_PEER_ASSOC_COMPLETE_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+
+       cmd->vdev_id = __cpu_to_le32(arg->vdev_id);
+       cmd->new_assoc = __cpu_to_le32(arg->peer_reassoc ? 0 : 1);
+       cmd->assoc_id = __cpu_to_le32(arg->peer_aid);
+       cmd->flags = __cpu_to_le32(arg->peer_flags);
+       cmd->caps = __cpu_to_le32(arg->peer_caps);
+       cmd->listen_intval = __cpu_to_le32(arg->peer_listen_intval);
+       cmd->ht_caps = __cpu_to_le32(arg->peer_ht_caps);
+       cmd->max_mpdu = __cpu_to_le32(arg->peer_max_mpdu);
+       cmd->mpdu_density = __cpu_to_le32(arg->peer_mpdu_density);
+       cmd->rate_caps = __cpu_to_le32(arg->peer_rate_caps);
+       cmd->nss = __cpu_to_le32(arg->peer_num_spatial_streams);
+       cmd->vht_caps = __cpu_to_le32(arg->peer_vht_caps);
+       cmd->phy_mode = __cpu_to_le32(arg->peer_phymode);
+       cmd->num_legacy_rates = __cpu_to_le32(arg->peer_legacy_rates.num_rates);
+       cmd->num_ht_rates = __cpu_to_le32(arg->peer_ht_rates.num_rates);
+       ether_addr_copy(cmd->mac_addr.addr, arg->addr);
+
+       ptr += sizeof(*tlv);
+       ptr += sizeof(*cmd);
+
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_ARRAY_BYTE);
+       tlv->len = __cpu_to_le16(legacy_rate_len);
+       memcpy(tlv->value, arg->peer_legacy_rates.rates,
+              arg->peer_legacy_rates.num_rates);
+
+       ptr += sizeof(*tlv);
+       ptr += legacy_rate_len;
+
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_ARRAY_BYTE);
+       tlv->len = __cpu_to_le16(ht_rate_len);
+       memcpy(tlv->value, arg->peer_ht_rates.rates,
+              arg->peer_ht_rates.num_rates);
+
+       ptr += sizeof(*tlv);
+       ptr += ht_rate_len;
+
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_VHT_RATE_SET);
+       tlv->len = __cpu_to_le16(sizeof(*vht_rate));
+       vht_rate = (void *)tlv->value;
+
+       vht_rate->rx_max_rate = __cpu_to_le32(arg->peer_vht_rates.rx_max_rate);
+       vht_rate->rx_mcs_set = __cpu_to_le32(arg->peer_vht_rates.rx_mcs_set);
+       vht_rate->tx_max_rate = __cpu_to_le32(arg->peer_vht_rates.tx_max_rate);
+       vht_rate->tx_mcs_set = __cpu_to_le32(arg->peer_vht_rates.tx_mcs_set);
+
+       ptr += sizeof(*tlv);
+       ptr += sizeof(*vht_rate);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv peer assoc\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_set_psmode(struct ath10k *ar, u32 vdev_id,
+                                enum wmi_sta_ps_mode psmode)
+{
+       struct wmi_sta_powersave_mode_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*tlv) + sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       tlv = (void *)skb->data;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_STA_POWERSAVE_MODE_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->vdev_id = __cpu_to_le32(vdev_id);
+       cmd->sta_ps_mode = __cpu_to_le32(psmode);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv set psmode\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_set_sta_ps(struct ath10k *ar, u32 vdev_id,
+                                enum wmi_sta_powersave_param param_id,
+                                u32 param_value)
+{
+       struct wmi_sta_powersave_param_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*tlv) + sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       tlv = (void *)skb->data;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_STA_POWERSAVE_PARAM_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->vdev_id = __cpu_to_le32(vdev_id);
+       cmd->param_id = __cpu_to_le32(param_id);
+       cmd->param_value = __cpu_to_le32(param_value);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv set sta ps\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_set_ap_ps(struct ath10k *ar, u32 vdev_id, const u8 *mac,
+                               enum wmi_ap_ps_peer_param param_id, u32 value)
+{
+       struct wmi_ap_ps_peer_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+
+       if (!mac)
+               return ERR_PTR(-EINVAL);
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       tlv = (void *)skb->data;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_AP_PS_PEER_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->vdev_id = __cpu_to_le32(vdev_id);
+       cmd->param_id = __cpu_to_le32(param_id);
+       cmd->param_value = __cpu_to_le32(value);
+       ether_addr_copy(cmd->peer_macaddr.addr, mac);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv ap ps param\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_scan_chan_list(struct ath10k *ar,
+                                    const struct wmi_scan_chan_list_arg *arg)
+{
+       struct wmi_tlv_scan_chan_list_cmd *cmd;
+       struct wmi_channel *ci;
+       struct wmi_channel_arg *ch;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+       size_t chans_len, len;
+       int i;
+       void *ptr, *chans;
+
+       chans_len = arg->n_channels * (sizeof(*tlv) + sizeof(*ci));
+       len = (sizeof(*tlv) + sizeof(*cmd)) +
+             (sizeof(*tlv) + chans_len);
+
+       skb = ath10k_wmi_alloc_skb(ar, len);
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       ptr = (void *)skb->data;
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_SCAN_CHAN_LIST_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->num_scan_chans = __cpu_to_le32(arg->n_channels);
+
+       ptr += sizeof(*tlv);
+       ptr += sizeof(*cmd);
+
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_ARRAY_STRUCT);
+       tlv->len = __cpu_to_le16(chans_len);
+       chans = (void *)tlv->value;
+
+       for (i = 0; i < arg->n_channels; i++) {
+               ch = &arg->channels[i];
+
+               tlv = chans;
+               tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_CHANNEL);
+               tlv->len = __cpu_to_le16(sizeof(*ci));
+               ci = (void *)tlv->value;
+
+               ath10k_wmi_put_wmi_channel(ci, ch);
+
+               chans += sizeof(*tlv);
+               chans += sizeof(*ci);
+       }
+
+       ptr += sizeof(*tlv);
+       ptr += chans_len;
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv scan chan list\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_beacon_dma(struct ath10k_vif *arvif)
+{
+       struct ath10k *ar = arvif->ar;
+       struct wmi_bcn_tx_ref_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+       struct sk_buff *beacon = arvif->beacon;
+       struct ieee80211_hdr *hdr;
+       u16 fc;
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*tlv) + sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       hdr = (struct ieee80211_hdr *)beacon->data;
+       fc = le16_to_cpu(hdr->frame_control);
+
+       tlv = (void *)skb->data;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_BCN_SEND_FROM_HOST_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->vdev_id = __cpu_to_le32(arvif->vdev_id);
+       cmd->data_len = __cpu_to_le32(beacon->len);
+       cmd->data_ptr = __cpu_to_le32(ATH10K_SKB_CB(beacon)->paddr);
+       cmd->msdu_id = 0;
+       cmd->frame_control = __cpu_to_le32(fc);
+       cmd->flags = 0;
+
+       if (ATH10K_SKB_CB(beacon)->bcn.dtim_zero)
+               cmd->flags |= __cpu_to_le32(WMI_BCN_TX_REF_FLAG_DTIM_ZERO);
+
+       if (ATH10K_SKB_CB(beacon)->bcn.deliver_cab)
+               cmd->flags |= __cpu_to_le32(WMI_BCN_TX_REF_FLAG_DELIVER_CAB);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv beacon dma\n");
+       return skb;
+}
+
+static void *ath10k_wmi_tlv_put_wmm(void *ptr,
+                                   const struct wmi_wmm_params_arg *arg)
+{
+       struct wmi_wmm_params *wmm;
+       struct wmi_tlv *tlv;
+
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_WMM_PARAMS);
+       tlv->len = __cpu_to_le16(sizeof(*wmm));
+       wmm = (void *)tlv->value;
+       ath10k_wmi_pdev_set_wmm_param(wmm, arg);
+
+       return ptr + sizeof(*tlv) + sizeof(*wmm);
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_pdev_set_wmm(struct ath10k *ar,
+                                  const struct wmi_pdev_set_wmm_params_arg *arg)
+{
+       struct wmi_tlv_pdev_set_wmm_cmd *cmd;
+       struct wmi_wmm_params *wmm;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+       size_t len;
+       void *ptr;
+
+       len = (sizeof(*tlv) + sizeof(*cmd)) +
+             (4 * (sizeof(*tlv) + sizeof(*wmm)));
+       skb = ath10k_wmi_alloc_skb(ar, len);
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       ptr = (void *)skb->data;
+
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_PDEV_SET_WMM_PARAMS_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+
+       /* nothing to set here */
+
+       ptr += sizeof(*tlv);
+       ptr += sizeof(*cmd);
+
+       ptr = ath10k_wmi_tlv_put_wmm(ptr, &arg->ac_be);
+       ptr = ath10k_wmi_tlv_put_wmm(ptr, &arg->ac_bk);
+       ptr = ath10k_wmi_tlv_put_wmm(ptr, &arg->ac_vi);
+       ptr = ath10k_wmi_tlv_put_wmm(ptr, &arg->ac_vo);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv pdev set wmm\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_request_stats(struct ath10k *ar,
+                                   enum wmi_stats_id stats_id)
+{
+       struct wmi_request_stats_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*tlv) + sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       tlv = (void *)skb->data;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_REQUEST_STATS_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->stats_id = __cpu_to_le32(stats_id);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv request stats\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_force_fw_hang(struct ath10k *ar,
+                                   enum wmi_force_fw_hang_type type,
+                                   u32 delay_ms)
+{
+       struct wmi_force_fw_hang_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*tlv) + sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       tlv = (void *)skb->data;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_FORCE_FW_HANG_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->type = __cpu_to_le32(type);
+       cmd->delay_ms = __cpu_to_le32(delay_ms);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv force fw hang\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_dbglog_cfg(struct ath10k *ar, u32 module_enable)
+{
+       struct wmi_tlv_dbglog_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+       size_t len, bmap_len;
+       u32 value;
+       void *ptr;
+
+       if (module_enable) {
+               value = WMI_TLV_DBGLOG_LOG_LEVEL_VALUE(
+                               module_enable,
+                               WMI_TLV_DBGLOG_LOG_LEVEL_VERBOSE);
+       } else {
+               value = WMI_TLV_DBGLOG_LOG_LEVEL_VALUE(
+                               WMI_TLV_DBGLOG_ALL_MODULES,
+                               WMI_TLV_DBGLOG_LOG_LEVEL_WARN);
+       }
+
+       bmap_len = 0;
+       len = sizeof(*tlv) + sizeof(*cmd) + sizeof(*tlv) + bmap_len;
+       skb = ath10k_wmi_alloc_skb(ar, len);
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       ptr = (void *)skb->data;
+
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_DEBUG_LOG_CONFIG_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->param = __cpu_to_le32(WMI_TLV_DBGLOG_PARAM_LOG_LEVEL);
+       cmd->value = __cpu_to_le32(value);
+
+       ptr += sizeof(*tlv);
+       ptr += sizeof(*cmd);
+
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_ARRAY_UINT32);
+       tlv->len = __cpu_to_le16(bmap_len);
+
+       /* nothing to do here */
+
+       ptr += sizeof(*tlv);
+       ptr += sizeof(bmap_len);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv dbglog value 0x%08x\n", value);
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_pktlog_enable(struct ath10k *ar, u32 filter)
+{
+       struct wmi_tlv_pktlog_enable *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+       void *ptr;
+       size_t len;
+
+       len = sizeof(*tlv) + sizeof(*cmd);
+       skb = ath10k_wmi_alloc_skb(ar, len);
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       ptr = (void *)skb->data;
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_PDEV_PKTLOG_ENABLE_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+       cmd->filter = __cpu_to_le32(filter);
+
+       ptr += sizeof(*tlv);
+       ptr += sizeof(*cmd);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv pktlog enable filter 0x%08x\n",
+                  filter);
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_tlv_op_gen_pktlog_disable(struct ath10k *ar)
+{
+       struct wmi_tlv_pktlog_disable *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+       void *ptr;
+       size_t len;
+
+       len = sizeof(*tlv) + sizeof(*cmd);
+       skb = ath10k_wmi_alloc_skb(ar, len);
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       ptr = (void *)skb->data;
+       tlv = ptr;
+       tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_PDEV_PKTLOG_DISABLE_CMD);
+       tlv->len = __cpu_to_le16(sizeof(*cmd));
+       cmd = (void *)tlv->value;
+
+       ptr += sizeof(*tlv);
+       ptr += sizeof(*cmd);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv pktlog disable\n");
+       return skb;
+}
+
+/****************/
+/* TLV mappings */
+/****************/
+
+static struct wmi_cmd_map wmi_tlv_cmd_map = {
+       .init_cmdid = WMI_TLV_INIT_CMDID,
+       .start_scan_cmdid = WMI_TLV_START_SCAN_CMDID,
+       .stop_scan_cmdid = WMI_TLV_STOP_SCAN_CMDID,
+       .scan_chan_list_cmdid = WMI_TLV_SCAN_CHAN_LIST_CMDID,
+       .scan_sch_prio_tbl_cmdid = WMI_TLV_SCAN_SCH_PRIO_TBL_CMDID,
+       .pdev_set_regdomain_cmdid = WMI_TLV_PDEV_SET_REGDOMAIN_CMDID,
+       .pdev_set_channel_cmdid = WMI_TLV_PDEV_SET_CHANNEL_CMDID,
+       .pdev_set_param_cmdid = WMI_TLV_PDEV_SET_PARAM_CMDID,
+       .pdev_pktlog_enable_cmdid = WMI_TLV_PDEV_PKTLOG_ENABLE_CMDID,
+       .pdev_pktlog_disable_cmdid = WMI_TLV_PDEV_PKTLOG_DISABLE_CMDID,
+       .pdev_set_wmm_params_cmdid = WMI_TLV_PDEV_SET_WMM_PARAMS_CMDID,
+       .pdev_set_ht_cap_ie_cmdid = WMI_TLV_PDEV_SET_HT_CAP_IE_CMDID,
+       .pdev_set_vht_cap_ie_cmdid = WMI_TLV_PDEV_SET_VHT_CAP_IE_CMDID,
+       .pdev_set_dscp_tid_map_cmdid = WMI_TLV_PDEV_SET_DSCP_TID_MAP_CMDID,
+       .pdev_set_quiet_mode_cmdid = WMI_TLV_PDEV_SET_QUIET_MODE_CMDID,
+       .pdev_green_ap_ps_enable_cmdid = WMI_TLV_PDEV_GREEN_AP_PS_ENABLE_CMDID,
+       .pdev_get_tpc_config_cmdid = WMI_TLV_PDEV_GET_TPC_CONFIG_CMDID,
+       .pdev_set_base_macaddr_cmdid = WMI_TLV_PDEV_SET_BASE_MACADDR_CMDID,
+       .vdev_create_cmdid = WMI_TLV_VDEV_CREATE_CMDID,
+       .vdev_delete_cmdid = WMI_TLV_VDEV_DELETE_CMDID,
+       .vdev_start_request_cmdid = WMI_TLV_VDEV_START_REQUEST_CMDID,
+       .vdev_restart_request_cmdid = WMI_TLV_VDEV_RESTART_REQUEST_CMDID,
+       .vdev_up_cmdid = WMI_TLV_VDEV_UP_CMDID,
+       .vdev_stop_cmdid = WMI_TLV_VDEV_STOP_CMDID,
+       .vdev_down_cmdid = WMI_TLV_VDEV_DOWN_CMDID,
+       .vdev_set_param_cmdid = WMI_TLV_VDEV_SET_PARAM_CMDID,
+       .vdev_install_key_cmdid = WMI_TLV_VDEV_INSTALL_KEY_CMDID,
+       .peer_create_cmdid = WMI_TLV_PEER_CREATE_CMDID,
+       .peer_delete_cmdid = WMI_TLV_PEER_DELETE_CMDID,
+       .peer_flush_tids_cmdid = WMI_TLV_PEER_FLUSH_TIDS_CMDID,
+       .peer_set_param_cmdid = WMI_TLV_PEER_SET_PARAM_CMDID,
+       .peer_assoc_cmdid = WMI_TLV_PEER_ASSOC_CMDID,
+       .peer_add_wds_entry_cmdid = WMI_TLV_PEER_ADD_WDS_ENTRY_CMDID,
+       .peer_remove_wds_entry_cmdid = WMI_TLV_PEER_REMOVE_WDS_ENTRY_CMDID,
+       .peer_mcast_group_cmdid = WMI_TLV_PEER_MCAST_GROUP_CMDID,
+       .bcn_tx_cmdid = WMI_TLV_BCN_TX_CMDID,
+       .pdev_send_bcn_cmdid = WMI_TLV_PDEV_SEND_BCN_CMDID,
+       .bcn_tmpl_cmdid = WMI_TLV_BCN_TMPL_CMDID,
+       .bcn_filter_rx_cmdid = WMI_TLV_BCN_FILTER_RX_CMDID,
+       .prb_req_filter_rx_cmdid = WMI_TLV_PRB_REQ_FILTER_RX_CMDID,
+       .mgmt_tx_cmdid = WMI_TLV_MGMT_TX_CMDID,
+       .prb_tmpl_cmdid = WMI_TLV_PRB_TMPL_CMDID,
+       .addba_clear_resp_cmdid = WMI_TLV_ADDBA_CLEAR_RESP_CMDID,
+       .addba_send_cmdid = WMI_TLV_ADDBA_SEND_CMDID,
+       .addba_status_cmdid = WMI_TLV_ADDBA_STATUS_CMDID,
+       .delba_send_cmdid = WMI_TLV_DELBA_SEND_CMDID,
+       .addba_set_resp_cmdid = WMI_TLV_ADDBA_SET_RESP_CMDID,
+       .send_singleamsdu_cmdid = WMI_TLV_SEND_SINGLEAMSDU_CMDID,
+       .sta_powersave_mode_cmdid = WMI_TLV_STA_POWERSAVE_MODE_CMDID,
+       .sta_powersave_param_cmdid = WMI_TLV_STA_POWERSAVE_PARAM_CMDID,
+       .sta_mimo_ps_mode_cmdid = WMI_TLV_STA_MIMO_PS_MODE_CMDID,
+       .pdev_dfs_enable_cmdid = WMI_TLV_PDEV_DFS_ENABLE_CMDID,
+       .pdev_dfs_disable_cmdid = WMI_TLV_PDEV_DFS_DISABLE_CMDID,
+       .roam_scan_mode = WMI_TLV_ROAM_SCAN_MODE,
+       .roam_scan_rssi_threshold = WMI_TLV_ROAM_SCAN_RSSI_THRESHOLD,
+       .roam_scan_period = WMI_TLV_ROAM_SCAN_PERIOD,
+       .roam_scan_rssi_change_threshold =
+                               WMI_TLV_ROAM_SCAN_RSSI_CHANGE_THRESHOLD,
+       .roam_ap_profile = WMI_TLV_ROAM_AP_PROFILE,
+       .ofl_scan_add_ap_profile = WMI_TLV_ROAM_AP_PROFILE,
+       .ofl_scan_remove_ap_profile = WMI_TLV_OFL_SCAN_REMOVE_AP_PROFILE,
+       .ofl_scan_period = WMI_TLV_OFL_SCAN_PERIOD,
+       .p2p_dev_set_device_info = WMI_TLV_P2P_DEV_SET_DEVICE_INFO,
+       .p2p_dev_set_discoverability = WMI_TLV_P2P_DEV_SET_DISCOVERABILITY,
+       .p2p_go_set_beacon_ie = WMI_TLV_P2P_GO_SET_BEACON_IE,
+       .p2p_go_set_probe_resp_ie = WMI_TLV_P2P_GO_SET_PROBE_RESP_IE,
+       .p2p_set_vendor_ie_data_cmdid = WMI_TLV_P2P_SET_VENDOR_IE_DATA_CMDID,
+       .ap_ps_peer_param_cmdid = WMI_TLV_AP_PS_PEER_PARAM_CMDID,
+       .ap_ps_peer_uapsd_coex_cmdid = WMI_TLV_AP_PS_PEER_UAPSD_COEX_CMDID,
+       .peer_rate_retry_sched_cmdid = WMI_TLV_PEER_RATE_RETRY_SCHED_CMDID,
+       .wlan_profile_trigger_cmdid = WMI_TLV_WLAN_PROFILE_TRIGGER_CMDID,
+       .wlan_profile_set_hist_intvl_cmdid =
+                               WMI_TLV_WLAN_PROFILE_SET_HIST_INTVL_CMDID,
+       .wlan_profile_get_profile_data_cmdid =
+                               WMI_TLV_WLAN_PROFILE_GET_PROFILE_DATA_CMDID,
+       .wlan_profile_enable_profile_id_cmdid =
+                               WMI_TLV_WLAN_PROFILE_ENABLE_PROFILE_ID_CMDID,
+       .wlan_profile_list_profile_id_cmdid =
+                               WMI_TLV_WLAN_PROFILE_LIST_PROFILE_ID_CMDID,
+       .pdev_suspend_cmdid = WMI_TLV_PDEV_SUSPEND_CMDID,
+       .pdev_resume_cmdid = WMI_TLV_PDEV_RESUME_CMDID,
+       .add_bcn_filter_cmdid = WMI_TLV_ADD_BCN_FILTER_CMDID,
+       .rmv_bcn_filter_cmdid = WMI_TLV_RMV_BCN_FILTER_CMDID,
+       .wow_add_wake_pattern_cmdid = WMI_TLV_WOW_ADD_WAKE_PATTERN_CMDID,
+       .wow_del_wake_pattern_cmdid = WMI_TLV_WOW_DEL_WAKE_PATTERN_CMDID,
+       .wow_enable_disable_wake_event_cmdid =
+                               WMI_TLV_WOW_ENABLE_DISABLE_WAKE_EVENT_CMDID,
+       .wow_enable_cmdid = WMI_TLV_WOW_ENABLE_CMDID,
+       .wow_hostwakeup_from_sleep_cmdid =
+                               WMI_TLV_WOW_HOSTWAKEUP_FROM_SLEEP_CMDID,
+       .rtt_measreq_cmdid = WMI_TLV_RTT_MEASREQ_CMDID,
+       .rtt_tsf_cmdid = WMI_TLV_RTT_TSF_CMDID,
+       .vdev_spectral_scan_configure_cmdid = WMI_TLV_SPECTRAL_SCAN_CONF_CMDID,
+       .vdev_spectral_scan_enable_cmdid = WMI_TLV_SPECTRAL_SCAN_ENABLE_CMDID,
+       .request_stats_cmdid = WMI_TLV_REQUEST_STATS_CMDID,
+       .set_arp_ns_offload_cmdid = WMI_TLV_SET_ARP_NS_OFFLOAD_CMDID,
+       .network_list_offload_config_cmdid =
+                               WMI_TLV_NETWORK_LIST_OFFLOAD_CONFIG_CMDID,
+       .gtk_offload_cmdid = WMI_TLV_GTK_OFFLOAD_CMDID,
+       .csa_offload_enable_cmdid = WMI_TLV_CSA_OFFLOAD_ENABLE_CMDID,
+       .csa_offload_chanswitch_cmdid = WMI_TLV_CSA_OFFLOAD_CHANSWITCH_CMDID,
+       .chatter_set_mode_cmdid = WMI_TLV_CHATTER_SET_MODE_CMDID,
+       .peer_tid_addba_cmdid = WMI_TLV_PEER_TID_ADDBA_CMDID,
+       .peer_tid_delba_cmdid = WMI_TLV_PEER_TID_DELBA_CMDID,
+       .sta_dtim_ps_method_cmdid = WMI_TLV_STA_DTIM_PS_METHOD_CMDID,
+       .sta_uapsd_auto_trig_cmdid = WMI_TLV_STA_UAPSD_AUTO_TRIG_CMDID,
+       .sta_keepalive_cmd = WMI_TLV_STA_KEEPALIVE_CMDID,
+       .echo_cmdid = WMI_TLV_ECHO_CMDID,
+       .pdev_utf_cmdid = WMI_TLV_PDEV_UTF_CMDID,
+       .dbglog_cfg_cmdid = WMI_TLV_DBGLOG_CFG_CMDID,
+       .pdev_qvit_cmdid = WMI_TLV_PDEV_QVIT_CMDID,
+       .pdev_ftm_intg_cmdid = WMI_TLV_PDEV_FTM_INTG_CMDID,
+       .vdev_set_keepalive_cmdid = WMI_TLV_VDEV_SET_KEEPALIVE_CMDID,
+       .vdev_get_keepalive_cmdid = WMI_TLV_VDEV_GET_KEEPALIVE_CMDID,
+       .force_fw_hang_cmdid = WMI_TLV_FORCE_FW_HANG_CMDID,
+       .gpio_config_cmdid = WMI_TLV_GPIO_CONFIG_CMDID,
+       .gpio_output_cmdid = WMI_TLV_GPIO_OUTPUT_CMDID,
+       .pdev_get_temperature_cmdid = WMI_TLV_CMD_UNSUPPORTED,
+};
+
+static struct wmi_pdev_param_map wmi_tlv_pdev_param_map = {
+       .tx_chain_mask = WMI_TLV_PDEV_PARAM_TX_CHAIN_MASK,
+       .rx_chain_mask = WMI_TLV_PDEV_PARAM_RX_CHAIN_MASK,
+       .txpower_limit2g = WMI_TLV_PDEV_PARAM_TXPOWER_LIMIT2G,
+       .txpower_limit5g = WMI_TLV_PDEV_PARAM_TXPOWER_LIMIT5G,
+       .txpower_scale = WMI_TLV_PDEV_PARAM_TXPOWER_SCALE,
+       .beacon_gen_mode = WMI_TLV_PDEV_PARAM_BEACON_GEN_MODE,
+       .beacon_tx_mode = WMI_TLV_PDEV_PARAM_BEACON_TX_MODE,
+       .resmgr_offchan_mode = WMI_TLV_PDEV_PARAM_RESMGR_OFFCHAN_MODE,
+       .protection_mode = WMI_TLV_PDEV_PARAM_PROTECTION_MODE,
+       .dynamic_bw = WMI_TLV_PDEV_PARAM_DYNAMIC_BW,
+       .non_agg_sw_retry_th = WMI_TLV_PDEV_PARAM_NON_AGG_SW_RETRY_TH,
+       .agg_sw_retry_th = WMI_TLV_PDEV_PARAM_AGG_SW_RETRY_TH,
+       .sta_kickout_th = WMI_TLV_PDEV_PARAM_STA_KICKOUT_TH,
+       .ac_aggrsize_scaling = WMI_TLV_PDEV_PARAM_AC_AGGRSIZE_SCALING,
+       .ltr_enable = WMI_TLV_PDEV_PARAM_LTR_ENABLE,
+       .ltr_ac_latency_be = WMI_TLV_PDEV_PARAM_LTR_AC_LATENCY_BE,
+       .ltr_ac_latency_bk = WMI_TLV_PDEV_PARAM_LTR_AC_LATENCY_BK,
+       .ltr_ac_latency_vi = WMI_TLV_PDEV_PARAM_LTR_AC_LATENCY_VI,
+       .ltr_ac_latency_vo = WMI_TLV_PDEV_PARAM_LTR_AC_LATENCY_VO,
+       .ltr_ac_latency_timeout = WMI_TLV_PDEV_PARAM_LTR_AC_LATENCY_TIMEOUT,
+       .ltr_sleep_override = WMI_TLV_PDEV_PARAM_LTR_SLEEP_OVERRIDE,
+       .ltr_rx_override = WMI_TLV_PDEV_PARAM_LTR_RX_OVERRIDE,
+       .ltr_tx_activity_timeout = WMI_TLV_PDEV_PARAM_LTR_TX_ACTIVITY_TIMEOUT,
+       .l1ss_enable = WMI_TLV_PDEV_PARAM_L1SS_ENABLE,
+       .dsleep_enable = WMI_TLV_PDEV_PARAM_DSLEEP_ENABLE,
+       .pcielp_txbuf_flush = WMI_TLV_PDEV_PARAM_PCIELP_TXBUF_FLUSH,
+       .pcielp_txbuf_watermark = WMI_TLV_PDEV_PARAM_PCIELP_TXBUF_TMO_EN,
+       .pcielp_txbuf_tmo_en = WMI_TLV_PDEV_PARAM_PCIELP_TXBUF_TMO_EN,
+       .pcielp_txbuf_tmo_value = WMI_TLV_PDEV_PARAM_PCIELP_TXBUF_TMO_VALUE,
+       .pdev_stats_update_period = WMI_TLV_PDEV_PARAM_PDEV_STATS_UPDATE_PERIOD,
+       .vdev_stats_update_period = WMI_TLV_PDEV_PARAM_VDEV_STATS_UPDATE_PERIOD,
+       .peer_stats_update_period = WMI_TLV_PDEV_PARAM_PEER_STATS_UPDATE_PERIOD,
+       .bcnflt_stats_update_period =
+                               WMI_TLV_PDEV_PARAM_BCNFLT_STATS_UPDATE_PERIOD,
+       .pmf_qos = WMI_TLV_PDEV_PARAM_PMF_QOS,
+       .arp_ac_override = WMI_TLV_PDEV_PARAM_ARP_AC_OVERRIDE,
+       .dcs = WMI_TLV_PDEV_PARAM_DCS,
+       .ani_enable = WMI_TLV_PDEV_PARAM_ANI_ENABLE,
+       .ani_poll_period = WMI_TLV_PDEV_PARAM_ANI_POLL_PERIOD,
+       .ani_listen_period = WMI_TLV_PDEV_PARAM_ANI_LISTEN_PERIOD,
+       .ani_ofdm_level = WMI_TLV_PDEV_PARAM_ANI_OFDM_LEVEL,
+       .ani_cck_level = WMI_TLV_PDEV_PARAM_ANI_CCK_LEVEL,
+       .dyntxchain = WMI_TLV_PDEV_PARAM_DYNTXCHAIN,
+       .proxy_sta = WMI_TLV_PDEV_PARAM_PROXY_STA,
+       .idle_ps_config = WMI_TLV_PDEV_PARAM_IDLE_PS_CONFIG,
+       .power_gating_sleep = WMI_TLV_PDEV_PARAM_POWER_GATING_SLEEP,
+       .fast_channel_reset = WMI_TLV_PDEV_PARAM_UNSUPPORTED,
+       .burst_dur = WMI_TLV_PDEV_PARAM_BURST_DUR,
+       .burst_enable = WMI_TLV_PDEV_PARAM_BURST_ENABLE,
+       .cal_period = WMI_PDEV_PARAM_UNSUPPORTED,
+};
+
+static struct wmi_vdev_param_map wmi_tlv_vdev_param_map = {
+       .rts_threshold = WMI_TLV_VDEV_PARAM_RTS_THRESHOLD,
+       .fragmentation_threshold = WMI_TLV_VDEV_PARAM_FRAGMENTATION_THRESHOLD,
+       .beacon_interval = WMI_TLV_VDEV_PARAM_BEACON_INTERVAL,
+       .listen_interval = WMI_TLV_VDEV_PARAM_LISTEN_INTERVAL,
+       .multicast_rate = WMI_TLV_VDEV_PARAM_MULTICAST_RATE,
+       .mgmt_tx_rate = WMI_TLV_VDEV_PARAM_MGMT_TX_RATE,
+       .slot_time = WMI_TLV_VDEV_PARAM_SLOT_TIME,
+       .preamble = WMI_TLV_VDEV_PARAM_PREAMBLE,
+       .swba_time = WMI_TLV_VDEV_PARAM_SWBA_TIME,
+       .wmi_vdev_stats_update_period = WMI_TLV_VDEV_STATS_UPDATE_PERIOD,
+       .wmi_vdev_pwrsave_ageout_time = WMI_TLV_VDEV_PWRSAVE_AGEOUT_TIME,
+       .wmi_vdev_host_swba_interval = WMI_TLV_VDEV_HOST_SWBA_INTERVAL,
+       .dtim_period = WMI_TLV_VDEV_PARAM_DTIM_PERIOD,
+       .wmi_vdev_oc_scheduler_air_time_limit =
+                               WMI_TLV_VDEV_OC_SCHEDULER_AIR_TIME_LIMIT,
+       .wds = WMI_TLV_VDEV_PARAM_WDS,
+       .atim_window = WMI_TLV_VDEV_PARAM_ATIM_WINDOW,
+       .bmiss_count_max = WMI_TLV_VDEV_PARAM_BMISS_COUNT_MAX,
+       .bmiss_first_bcnt = WMI_TLV_VDEV_PARAM_BMISS_FIRST_BCNT,
+       .bmiss_final_bcnt = WMI_TLV_VDEV_PARAM_BMISS_FINAL_BCNT,
+       .feature_wmm = WMI_TLV_VDEV_PARAM_FEATURE_WMM,
+       .chwidth = WMI_TLV_VDEV_PARAM_CHWIDTH,
+       .chextoffset = WMI_TLV_VDEV_PARAM_CHEXTOFFSET,
+       .disable_htprotection = WMI_TLV_VDEV_PARAM_DISABLE_HTPROTECTION,
+       .sta_quickkickout = WMI_TLV_VDEV_PARAM_STA_QUICKKICKOUT,
+       .mgmt_rate = WMI_TLV_VDEV_PARAM_MGMT_RATE,
+       .protection_mode = WMI_TLV_VDEV_PARAM_PROTECTION_MODE,
+       .fixed_rate = WMI_TLV_VDEV_PARAM_FIXED_RATE,
+       .sgi = WMI_TLV_VDEV_PARAM_SGI,
+       .ldpc = WMI_TLV_VDEV_PARAM_LDPC,
+       .tx_stbc = WMI_TLV_VDEV_PARAM_TX_STBC,
+       .rx_stbc = WMI_TLV_VDEV_PARAM_RX_STBC,
+       .intra_bss_fwd = WMI_TLV_VDEV_PARAM_INTRA_BSS_FWD,
+       .def_keyid = WMI_TLV_VDEV_PARAM_DEF_KEYID,
+       .nss = WMI_TLV_VDEV_PARAM_NSS,
+       .bcast_data_rate = WMI_TLV_VDEV_PARAM_BCAST_DATA_RATE,
+       .mcast_data_rate = WMI_TLV_VDEV_PARAM_MCAST_DATA_RATE,
+       .mcast_indicate = WMI_TLV_VDEV_PARAM_MCAST_INDICATE,
+       .dhcp_indicate = WMI_TLV_VDEV_PARAM_DHCP_INDICATE,
+       .unknown_dest_indicate = WMI_TLV_VDEV_PARAM_UNKNOWN_DEST_INDICATE,
+       .ap_keepalive_min_idle_inactive_time_secs =
+               WMI_TLV_VDEV_PARAM_AP_KEEPALIVE_MIN_IDLE_INACTIVE_TIME_SECS,
+       .ap_keepalive_max_idle_inactive_time_secs =
+               WMI_TLV_VDEV_PARAM_AP_KEEPALIVE_MAX_IDLE_INACTIVE_TIME_SECS,
+       .ap_keepalive_max_unresponsive_time_secs =
+               WMI_TLV_VDEV_PARAM_AP_KEEPALIVE_MAX_UNRESPONSIVE_TIME_SECS,
+       .ap_enable_nawds = WMI_TLV_VDEV_PARAM_AP_ENABLE_NAWDS,
+       .mcast2ucast_set = WMI_TLV_VDEV_PARAM_UNSUPPORTED,
+       .enable_rtscts = WMI_TLV_VDEV_PARAM_ENABLE_RTSCTS,
+       .txbf = WMI_TLV_VDEV_PARAM_TXBF,
+       .packet_powersave = WMI_TLV_VDEV_PARAM_PACKET_POWERSAVE,
+       .drop_unencry = WMI_TLV_VDEV_PARAM_DROP_UNENCRY,
+       .tx_encap_type = WMI_TLV_VDEV_PARAM_TX_ENCAP_TYPE,
+       .ap_detect_out_of_sync_sleeping_sta_time_secs =
+                                       WMI_TLV_VDEV_PARAM_UNSUPPORTED,
+};
+
+static const struct wmi_ops wmi_tlv_ops = {
+       .rx = ath10k_wmi_tlv_op_rx,
+       .map_svc = wmi_tlv_svc_map,
+
+       .pull_scan = ath10k_wmi_tlv_op_pull_scan_ev,
+       .pull_mgmt_rx = ath10k_wmi_tlv_op_pull_mgmt_rx_ev,
+       .pull_ch_info = ath10k_wmi_tlv_op_pull_ch_info_ev,
+       .pull_vdev_start = ath10k_wmi_tlv_op_pull_vdev_start_ev,
+       .pull_peer_kick = ath10k_wmi_tlv_op_pull_peer_kick_ev,
+       .pull_swba = ath10k_wmi_tlv_op_pull_swba_ev,
+       .pull_phyerr = ath10k_wmi_tlv_op_pull_phyerr_ev,
+       .pull_svc_rdy = ath10k_wmi_tlv_op_pull_svc_rdy_ev,
+       .pull_rdy = ath10k_wmi_tlv_op_pull_rdy_ev,
+       .pull_fw_stats = ath10k_wmi_tlv_op_pull_fw_stats,
+
+       .gen_pdev_suspend = ath10k_wmi_tlv_op_gen_pdev_suspend,
+       .gen_pdev_resume = ath10k_wmi_tlv_op_gen_pdev_resume,
+       .gen_pdev_set_rd = ath10k_wmi_tlv_op_gen_pdev_set_rd,
+       .gen_pdev_set_param = ath10k_wmi_tlv_op_gen_pdev_set_param,
+       .gen_init = ath10k_wmi_tlv_op_gen_init,
+       .gen_start_scan = ath10k_wmi_tlv_op_gen_start_scan,
+       .gen_stop_scan = ath10k_wmi_tlv_op_gen_stop_scan,
+       .gen_vdev_create = ath10k_wmi_tlv_op_gen_vdev_create,
+       .gen_vdev_delete = ath10k_wmi_tlv_op_gen_vdev_delete,
+       .gen_vdev_start = ath10k_wmi_tlv_op_gen_vdev_start,
+       .gen_vdev_stop = ath10k_wmi_tlv_op_gen_vdev_stop,
+       .gen_vdev_up = ath10k_wmi_tlv_op_gen_vdev_up,
+       .gen_vdev_down = ath10k_wmi_tlv_op_gen_vdev_down,
+       .gen_vdev_set_param = ath10k_wmi_tlv_op_gen_vdev_set_param,
+       .gen_vdev_install_key = ath10k_wmi_tlv_op_gen_vdev_install_key,
+       .gen_peer_create = ath10k_wmi_tlv_op_gen_peer_create,
+       .gen_peer_delete = ath10k_wmi_tlv_op_gen_peer_delete,
+       .gen_peer_flush = ath10k_wmi_tlv_op_gen_peer_flush,
+       .gen_peer_set_param = ath10k_wmi_tlv_op_gen_peer_set_param,
+       .gen_peer_assoc = ath10k_wmi_tlv_op_gen_peer_assoc,
+       .gen_set_psmode = ath10k_wmi_tlv_op_gen_set_psmode,
+       .gen_set_sta_ps = ath10k_wmi_tlv_op_gen_set_sta_ps,
+       .gen_set_ap_ps = ath10k_wmi_tlv_op_gen_set_ap_ps,
+       .gen_scan_chan_list = ath10k_wmi_tlv_op_gen_scan_chan_list,
+       .gen_beacon_dma = ath10k_wmi_tlv_op_gen_beacon_dma,
+       .gen_pdev_set_wmm = ath10k_wmi_tlv_op_gen_pdev_set_wmm,
+       .gen_request_stats = ath10k_wmi_tlv_op_gen_request_stats,
+       .gen_force_fw_hang = ath10k_wmi_tlv_op_gen_force_fw_hang,
+       /* .gen_mgmt_tx = not implemented; HTT is used */
+       .gen_dbglog_cfg = ath10k_wmi_tlv_op_gen_dbglog_cfg,
+       .gen_pktlog_enable = ath10k_wmi_tlv_op_gen_pktlog_enable,
+       .gen_pktlog_disable = ath10k_wmi_tlv_op_gen_pktlog_disable,
+       /* .gen_pdev_set_quiet_mode not implemented */
+       /* .gen_pdev_get_temperature not implemented */
+};
+
+/************/
+/* TLV init */
+/************/
+
+void ath10k_wmi_tlv_attach(struct ath10k *ar)
+{
+       ar->wmi.cmd = &wmi_tlv_cmd_map;
+       ar->wmi.vdev_param = &wmi_tlv_vdev_param_map;
+       ar->wmi.pdev_param = &wmi_tlv_pdev_param_map;
+       ar->wmi.ops = &wmi_tlv_ops;
+}
diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.h b/drivers/net/wireless/ath/ath10k/wmi-tlv.h
new file mode 100644 (file)
index 0000000..54ffa12
--- /dev/null
@@ -0,0 +1,1380 @@
+/*
+ * Copyright (c) 2005-2011 Atheros Communications Inc.
+ * Copyright (c) 2011-2014 Qualcomm Atheros, Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#ifndef _WMI_TLV_H
+#define _WMI_TLV_H
+
+#define WMI_TLV_CMD(grp_id) (((grp_id) << 12) | 0x1)
+#define WMI_TLV_EV(grp_id) (((grp_id) << 12) | 0x1)
+#define WMI_TLV_CMD_UNSUPPORTED 0
+#define WMI_TLV_PDEV_PARAM_UNSUPPORTED 0
+#define WMI_TLV_VDEV_PARAM_UNSUPPORTED 0
+
+enum wmi_tlv_grp_id {
+       WMI_TLV_GRP_START = 0x3,
+       WMI_TLV_GRP_SCAN = WMI_TLV_GRP_START,
+       WMI_TLV_GRP_PDEV,
+       WMI_TLV_GRP_VDEV,
+       WMI_TLV_GRP_PEER,
+       WMI_TLV_GRP_MGMT,
+       WMI_TLV_GRP_BA_NEG,
+       WMI_TLV_GRP_STA_PS,
+       WMI_TLV_GRP_DFS,
+       WMI_TLV_GRP_ROAM,
+       WMI_TLV_GRP_OFL_SCAN,
+       WMI_TLV_GRP_P2P,
+       WMI_TLV_GRP_AP_PS,
+       WMI_TLV_GRP_RATECTL,
+       WMI_TLV_GRP_PROFILE,
+       WMI_TLV_GRP_SUSPEND,
+       WMI_TLV_GRP_BCN_FILTER,
+       WMI_TLV_GRP_WOW,
+       WMI_TLV_GRP_RTT,
+       WMI_TLV_GRP_SPECTRAL,
+       WMI_TLV_GRP_STATS,
+       WMI_TLV_GRP_ARP_NS_OFL,
+       WMI_TLV_GRP_NLO_OFL,
+       WMI_TLV_GRP_GTK_OFL,
+       WMI_TLV_GRP_CSA_OFL,
+       WMI_TLV_GRP_CHATTER,
+       WMI_TLV_GRP_TID_ADDBA,
+       WMI_TLV_GRP_MISC,
+       WMI_TLV_GRP_GPIO,
+       WMI_TLV_GRP_FWTEST,
+       WMI_TLV_GRP_TDLS,
+       WMI_TLV_GRP_RESMGR,
+       WMI_TLV_GRP_STA_SMPS,
+       WMI_TLV_GRP_WLAN_HB,
+       WMI_TLV_GRP_RMC,
+       WMI_TLV_GRP_MHF_OFL,
+       WMI_TLV_GRP_LOCATION_SCAN,
+       WMI_TLV_GRP_OEM,
+       WMI_TLV_GRP_NAN,
+       WMI_TLV_GRP_COEX,
+       WMI_TLV_GRP_OBSS_OFL,
+       WMI_TLV_GRP_LPI,
+       WMI_TLV_GRP_EXTSCAN,
+       WMI_TLV_GRP_DHCP_OFL,
+       WMI_TLV_GRP_IPA,
+       WMI_TLV_GRP_MDNS_OFL,
+       WMI_TLV_GRP_SAP_OFL,
+};
+
+enum wmi_tlv_cmd_id {
+       WMI_TLV_INIT_CMDID = 0x1,
+       WMI_TLV_START_SCAN_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_SCAN),
+       WMI_TLV_STOP_SCAN_CMDID,
+       WMI_TLV_SCAN_CHAN_LIST_CMDID,
+       WMI_TLV_SCAN_SCH_PRIO_TBL_CMDID,
+       WMI_TLV_SCAN_UPDATE_REQUEST_CMDID,
+       WMI_TLV_SCAN_PROB_REQ_OUI_CMDID,
+       WMI_TLV_PDEV_SET_REGDOMAIN_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_PDEV),
+       WMI_TLV_PDEV_SET_CHANNEL_CMDID,
+       WMI_TLV_PDEV_SET_PARAM_CMDID,
+       WMI_TLV_PDEV_PKTLOG_ENABLE_CMDID,
+       WMI_TLV_PDEV_PKTLOG_DISABLE_CMDID,
+       WMI_TLV_PDEV_SET_WMM_PARAMS_CMDID,
+       WMI_TLV_PDEV_SET_HT_CAP_IE_CMDID,
+       WMI_TLV_PDEV_SET_VHT_CAP_IE_CMDID,
+       WMI_TLV_PDEV_SET_DSCP_TID_MAP_CMDID,
+       WMI_TLV_PDEV_SET_QUIET_MODE_CMDID,
+       WMI_TLV_PDEV_GREEN_AP_PS_ENABLE_CMDID,
+       WMI_TLV_PDEV_GET_TPC_CONFIG_CMDID,
+       WMI_TLV_PDEV_SET_BASE_MACADDR_CMDID,
+       WMI_TLV_PDEV_DUMP_CMDID,
+       WMI_TLV_PDEV_SET_LED_CONFIG_CMDID,
+       WMI_TLV_PDEV_GET_TEMPERATURE_CMDID,
+       WMI_TLV_PDEV_SET_LED_FLASHING_CMDID,
+       WMI_TLV_VDEV_CREATE_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_VDEV),
+       WMI_TLV_VDEV_DELETE_CMDID,
+       WMI_TLV_VDEV_START_REQUEST_CMDID,
+       WMI_TLV_VDEV_RESTART_REQUEST_CMDID,
+       WMI_TLV_VDEV_UP_CMDID,
+       WMI_TLV_VDEV_STOP_CMDID,
+       WMI_TLV_VDEV_DOWN_CMDID,
+       WMI_TLV_VDEV_SET_PARAM_CMDID,
+       WMI_TLV_VDEV_INSTALL_KEY_CMDID,
+       WMI_TLV_VDEV_WNM_SLEEPMODE_CMDID,
+       WMI_TLV_VDEV_WMM_ADDTS_CMDID,
+       WMI_TLV_VDEV_WMM_DELTS_CMDID,
+       WMI_TLV_VDEV_SET_WMM_PARAMS_CMDID,
+       WMI_TLV_VDEV_SET_GTX_PARAMS_CMDID,
+       WMI_TLV_VDEV_IPSEC_NATKEEPALIVE_FILTER_CMDID,
+       WMI_TLV_VDEV_PLMREQ_START_CMDID,
+       WMI_TLV_VDEV_PLMREQ_STOP_CMDID,
+       WMI_TLV_PEER_CREATE_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_PEER),
+       WMI_TLV_PEER_DELETE_CMDID,
+       WMI_TLV_PEER_FLUSH_TIDS_CMDID,
+       WMI_TLV_PEER_SET_PARAM_CMDID,
+       WMI_TLV_PEER_ASSOC_CMDID,
+       WMI_TLV_PEER_ADD_WDS_ENTRY_CMDID,
+       WMI_TLV_PEER_REMOVE_WDS_ENTRY_CMDID,
+       WMI_TLV_PEER_MCAST_GROUP_CMDID,
+       WMI_TLV_PEER_INFO_REQ_CMDID,
+       WMI_TLV_PEER_GET_ESTIMATED_LINKSPEED_CMDID,
+       WMI_TLV_BCN_TX_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_MGMT),
+       WMI_TLV_PDEV_SEND_BCN_CMDID,
+       WMI_TLV_BCN_TMPL_CMDID,
+       WMI_TLV_BCN_FILTER_RX_CMDID,
+       WMI_TLV_PRB_REQ_FILTER_RX_CMDID,
+       WMI_TLV_MGMT_TX_CMDID,
+       WMI_TLV_PRB_TMPL_CMDID,
+       WMI_TLV_ADDBA_CLEAR_RESP_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_BA_NEG),
+       WMI_TLV_ADDBA_SEND_CMDID,
+       WMI_TLV_ADDBA_STATUS_CMDID,
+       WMI_TLV_DELBA_SEND_CMDID,
+       WMI_TLV_ADDBA_SET_RESP_CMDID,
+       WMI_TLV_SEND_SINGLEAMSDU_CMDID,
+       WMI_TLV_STA_POWERSAVE_MODE_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_STA_PS),
+       WMI_TLV_STA_POWERSAVE_PARAM_CMDID,
+       WMI_TLV_STA_MIMO_PS_MODE_CMDID,
+       WMI_TLV_PDEV_DFS_ENABLE_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_DFS),
+       WMI_TLV_PDEV_DFS_DISABLE_CMDID,
+       WMI_TLV_DFS_PHYERR_FILTER_ENA_CMDID,
+       WMI_TLV_DFS_PHYERR_FILTER_DIS_CMDID,
+       WMI_TLV_ROAM_SCAN_MODE = WMI_TLV_CMD(WMI_TLV_GRP_ROAM),
+       WMI_TLV_ROAM_SCAN_RSSI_THRESHOLD,
+       WMI_TLV_ROAM_SCAN_PERIOD,
+       WMI_TLV_ROAM_SCAN_RSSI_CHANGE_THRESHOLD,
+       WMI_TLV_ROAM_AP_PROFILE,
+       WMI_TLV_ROAM_CHAN_LIST,
+       WMI_TLV_ROAM_SCAN_CMD,
+       WMI_TLV_ROAM_SYNCH_COMPLETE,
+       WMI_TLV_ROAM_SET_RIC_REQUEST_CMDID,
+       WMI_TLV_ROAM_INVOKE_CMDID,
+       WMI_TLV_OFL_SCAN_ADD_AP_PROFILE = WMI_TLV_CMD(WMI_TLV_GRP_OFL_SCAN),
+       WMI_TLV_OFL_SCAN_REMOVE_AP_PROFILE,
+       WMI_TLV_OFL_SCAN_PERIOD,
+       WMI_TLV_P2P_DEV_SET_DEVICE_INFO = WMI_TLV_CMD(WMI_TLV_GRP_P2P),
+       WMI_TLV_P2P_DEV_SET_DISCOVERABILITY,
+       WMI_TLV_P2P_GO_SET_BEACON_IE,
+       WMI_TLV_P2P_GO_SET_PROBE_RESP_IE,
+       WMI_TLV_P2P_SET_VENDOR_IE_DATA_CMDID,
+       WMI_TLV_P2P_DISC_OFFLOAD_CONFIG_CMDID,
+       WMI_TLV_P2P_DISC_OFFLOAD_APPIE_CMDID,
+       WMI_TLV_P2P_DISC_OFFLOAD_PATTERN_CMDID,
+       WMI_TLV_P2P_SET_OPPPS_PARAM_CMDID,
+       WMI_TLV_AP_PS_PEER_PARAM_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_AP_PS),
+       WMI_TLV_AP_PS_PEER_UAPSD_COEX_CMDID,
+       WMI_TLV_PEER_RATE_RETRY_SCHED_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_RATECTL),
+       WMI_TLV_WLAN_PROFILE_TRIGGER_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_PROFILE),
+       WMI_TLV_WLAN_PROFILE_SET_HIST_INTVL_CMDID,
+       WMI_TLV_WLAN_PROFILE_GET_PROFILE_DATA_CMDID,
+       WMI_TLV_WLAN_PROFILE_ENABLE_PROFILE_ID_CMDID,
+       WMI_TLV_WLAN_PROFILE_LIST_PROFILE_ID_CMDID,
+       WMI_TLV_PDEV_SUSPEND_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_SUSPEND),
+       WMI_TLV_PDEV_RESUME_CMDID,
+       WMI_TLV_ADD_BCN_FILTER_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_BCN_FILTER),
+       WMI_TLV_RMV_BCN_FILTER_CMDID,
+       WMI_TLV_WOW_ADD_WAKE_PATTERN_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_WOW),
+       WMI_TLV_WOW_DEL_WAKE_PATTERN_CMDID,
+       WMI_TLV_WOW_ENABLE_DISABLE_WAKE_EVENT_CMDID,
+       WMI_TLV_WOW_ENABLE_CMDID,
+       WMI_TLV_WOW_HOSTWAKEUP_FROM_SLEEP_CMDID,
+       WMI_TLV_WOW_ACER_IOAC_ADD_KEEPALIVE_CMDID,
+       WMI_TLV_WOW_ACER_IOAC_DEL_KEEPALIVE_CMDID,
+       WMI_TLV_WOW_ACER_IOAC_ADD_WAKE_PATTERN_CMDID,
+       WMI_TLV_WOW_ACER_IOAC_DEL_WAKE_PATTERN_CMDID,
+       WMI_TLV_D0_WOW_ENABLE_DISABLE_CMDID,
+       WMI_TLV_EXTWOW_ENABLE_CMDID,
+       WMI_TLV_EXTWOW_SET_APP_TYPE1_PARAMS_CMDID,
+       WMI_TLV_EXTWOW_SET_APP_TYPE2_PARAMS_CMDID,
+       WMI_TLV_RTT_MEASREQ_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_RTT),
+       WMI_TLV_RTT_TSF_CMDID,
+       WMI_TLV_SPECTRAL_SCAN_CONF_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_SPECTRAL),
+       WMI_TLV_SPECTRAL_SCAN_ENABLE_CMDID,
+       WMI_TLV_REQUEST_STATS_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_STATS),
+       WMI_TLV_MCC_SCHED_TRAFFIC_STATS_CMDID,
+       WMI_TLV_REQUEST_STATS_EXT_CMDID,
+       WMI_TLV_REQUEST_LINK_STATS_CMDID,
+       WMI_TLV_START_LINK_STATS_CMDID,
+       WMI_TLV_CLEAR_LINK_STATS_CMDID,
+       WMI_TLV_SET_ARP_NS_OFFLOAD_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_ARP_NS_OFL),
+       WMI_TLV_ADD_PROACTIVE_ARP_RSP_PATTERN_CMDID,
+       WMI_TLV_DEL_PROACTIVE_ARP_RSP_PATTERN_CMDID,
+       WMI_TLV_NETWORK_LIST_OFFLOAD_CONFIG_CMDID =
+                       WMI_TLV_CMD(WMI_TLV_GRP_NLO_OFL),
+       WMI_TLV_APFIND_CMDID,
+       WMI_TLV_GTK_OFFLOAD_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_GTK_OFL),
+       WMI_TLV_CSA_OFFLOAD_ENABLE_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_CSA_OFL),
+       WMI_TLV_CSA_OFFLOAD_CHANSWITCH_CMDID,
+       WMI_TLV_CHATTER_SET_MODE_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_CHATTER),
+       WMI_TLV_CHATTER_ADD_COALESCING_FILTER_CMDID,
+       WMI_TLV_CHATTER_DELETE_COALESCING_FILTER_CMDID,
+       WMI_TLV_CHATTER_COALESCING_QUERY_CMDID,
+       WMI_TLV_PEER_TID_ADDBA_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_TID_ADDBA),
+       WMI_TLV_PEER_TID_DELBA_CMDID,
+       WMI_TLV_STA_DTIM_PS_METHOD_CMDID,
+       WMI_TLV_STA_UAPSD_AUTO_TRIG_CMDID,
+       WMI_TLV_STA_KEEPALIVE_CMDID,
+       WMI_TLV_BA_REQ_SSN_CMDID,
+       WMI_TLV_ECHO_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_MISC),
+       WMI_TLV_PDEV_UTF_CMDID,
+       WMI_TLV_DBGLOG_CFG_CMDID,
+       WMI_TLV_PDEV_QVIT_CMDID,
+       WMI_TLV_PDEV_FTM_INTG_CMDID,
+       WMI_TLV_VDEV_SET_KEEPALIVE_CMDID,
+       WMI_TLV_VDEV_GET_KEEPALIVE_CMDID,
+       WMI_TLV_FORCE_FW_HANG_CMDID,
+       WMI_TLV_SET_MCASTBCAST_FILTER_CMDID,
+       WMI_TLV_THERMAL_MGMT_CMDID,
+       WMI_TLV_HOST_AUTO_SHUTDOWN_CFG_CMDID,
+       WMI_TLV_TPC_CHAINMASK_CONFIG_CMDID,
+       WMI_TLV_SET_ANTENNA_DIVERSITY_CMDID,
+       WMI_TLV_GPIO_CONFIG_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_GPIO),
+       WMI_TLV_GPIO_OUTPUT_CMDID,
+       WMI_TLV_TXBF_CMDID,
+       WMI_TLV_FWTEST_VDEV_MCC_SET_TBTT_MODE_CMDID =
+                       WMI_TLV_CMD(WMI_TLV_GRP_FWTEST),
+       WMI_TLV_FWTEST_P2P_SET_NOA_PARAM_CMDID,
+       WMI_TLV_UNIT_TEST_CMDID,
+       WMI_TLV_TDLS_SET_STATE_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_TDLS),
+       WMI_TLV_TDLS_PEER_UPDATE_CMDID,
+       WMI_TLV_TDLS_SET_OFFCHAN_MODE_CMDID,
+       WMI_TLV_RESMGR_ADAPTIVE_OCS_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_RESMGR),
+       WMI_TLV_RESMGR_SET_CHAN_TIME_QUOTA_CMDID,
+       WMI_TLV_RESMGR_SET_CHAN_LATENCY_CMDID,
+       WMI_TLV_STA_SMPS_FORCE_MODE_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_STA_SMPS),
+       WMI_TLV_STA_SMPS_PARAM_CMDID,
+       WMI_TLV_HB_SET_ENABLE_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_WLAN_HB),
+       WMI_TLV_HB_SET_TCP_PARAMS_CMDID,
+       WMI_TLV_HB_SET_TCP_PKT_FILTER_CMDID,
+       WMI_TLV_HB_SET_UDP_PARAMS_CMDID,
+       WMI_TLV_HB_SET_UDP_PKT_FILTER_CMDID,
+       WMI_TLV_RMC_SET_MODE_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_RMC),
+       WMI_TLV_RMC_SET_ACTION_PERIOD_CMDID,
+       WMI_TLV_RMC_CONFIG_CMDID,
+       WMI_TLV_MHF_OFFLOAD_SET_MODE_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_MHF_OFL),
+       WMI_TLV_MHF_OFFLOAD_PLUMB_ROUTING_TBL_CMDID,
+       WMI_TLV_BATCH_SCAN_ENABLE_CMDID =
+                       WMI_TLV_CMD(WMI_TLV_GRP_LOCATION_SCAN),
+       WMI_TLV_BATCH_SCAN_DISABLE_CMDID,
+       WMI_TLV_BATCH_SCAN_TRIGGER_RESULT_CMDID,
+       WMI_TLV_OEM_REQ_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_OEM),
+       WMI_TLV_NAN_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_NAN),
+       WMI_TLV_MODEM_POWER_STATE_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_COEX),
+       WMI_TLV_CHAN_AVOID_UPDATE_CMDID,
+       WMI_TLV_OBSS_SCAN_ENABLE_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_OBSS_OFL),
+       WMI_TLV_OBSS_SCAN_DISABLE_CMDID,
+       WMI_TLV_LPI_MGMT_SNOOPING_CONFIG_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_LPI),
+       WMI_TLV_LPI_START_SCAN_CMDID,
+       WMI_TLV_LPI_STOP_SCAN_CMDID,
+       WMI_TLV_EXTSCAN_START_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_EXTSCAN),
+       WMI_TLV_EXTSCAN_STOP_CMDID,
+       WMI_TLV_EXTSCAN_CONFIGURE_WLAN_CHANGE_MONITOR_CMDID,
+       WMI_TLV_EXTSCAN_CONFIGURE_HOTLIST_MONITOR_CMDID,
+       WMI_TLV_EXTSCAN_GET_CACHED_RESULTS_CMDID,
+       WMI_TLV_EXTSCAN_GET_WLAN_CHANGE_RESULTS_CMDID,
+       WMI_TLV_EXTSCAN_SET_CAPABILITIES_CMDID,
+       WMI_TLV_EXTSCAN_GET_CAPABILITIES_CMDID,
+       WMI_TLV_SET_DHCP_SERVER_OFFLOAD_CMDID =
+                       WMI_TLV_CMD(WMI_TLV_GRP_DHCP_OFL),
+       WMI_TLV_IPA_OFFLOAD_ENABLE_DISABLE_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_IPA),
+       WMI_TLV_MDNS_OFFLOAD_ENABLE_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_MDNS_OFL),
+       WMI_TLV_MDNS_SET_FQDN_CMDID,
+       WMI_TLV_MDNS_SET_RESPONSE_CMDID,
+       WMI_TLV_MDNS_GET_STATS_CMDID,
+       WMI_TLV_SAP_OFL_ENABLE_CMDID = WMI_TLV_CMD(WMI_TLV_GRP_SAP_OFL),
+};
+
+enum wmi_tlv_event_id {
+       WMI_TLV_SERVICE_READY_EVENTID = 0x1,
+       WMI_TLV_READY_EVENTID,
+       WMI_TLV_SCAN_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_SCAN),
+       WMI_TLV_PDEV_TPC_CONFIG_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_PDEV),
+       WMI_TLV_CHAN_INFO_EVENTID,
+       WMI_TLV_PHYERR_EVENTID,
+       WMI_TLV_PDEV_DUMP_EVENTID,
+       WMI_TLV_TX_PAUSE_EVENTID,
+       WMI_TLV_DFS_RADAR_EVENTID,
+       WMI_TLV_PDEV_L1SS_TRACK_EVENTID,
+       WMI_TLV_PDEV_TEMPERATURE_EVENTID,
+       WMI_TLV_VDEV_START_RESP_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_VDEV),
+       WMI_TLV_VDEV_STOPPED_EVENTID,
+       WMI_TLV_VDEV_INSTALL_KEY_COMPLETE_EVENTID,
+       WMI_TLV_VDEV_MCC_BCN_INTERVAL_CHANGE_REQ_EVENTID,
+       WMI_TLV_PEER_STA_KICKOUT_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_PEER),
+       WMI_TLV_PEER_INFO_EVENTID,
+       WMI_TLV_PEER_TX_FAIL_CNT_THR_EVENTID,
+       WMI_TLV_PEER_ESTIMATED_LINKSPEED_EVENTID,
+       WMI_TLV_PEER_STATE_EVENTID,
+       WMI_TLV_MGMT_RX_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_MGMT),
+       WMI_TLV_HOST_SWBA_EVENTID,
+       WMI_TLV_TBTTOFFSET_UPDATE_EVENTID,
+       WMI_TLV_OFFLOAD_BCN_TX_STATUS_EVENTID,
+       WMI_TLV_OFFLOAD_PROB_RESP_TX_STATUS_EVENTID,
+       WMI_TLV_TX_DELBA_COMPLETE_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_BA_NEG),
+       WMI_TLV_TX_ADDBA_COMPLETE_EVENTID,
+       WMI_TLV_BA_RSP_SSN_EVENTID,
+       WMI_TLV_AGGR_STATE_TRIG_EVENTID,
+       WMI_TLV_ROAM_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_ROAM),
+       WMI_TLV_PROFILE_MATCH,
+       WMI_TLV_ROAM_SYNCH_EVENTID,
+       WMI_TLV_P2P_DISC_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_P2P),
+       WMI_TLV_P2P_NOA_EVENTID,
+       WMI_TLV_PDEV_RESUME_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_SUSPEND),
+       WMI_TLV_WOW_WAKEUP_HOST_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_WOW),
+       WMI_TLV_D0_WOW_DISABLE_ACK_EVENTID,
+       WMI_TLV_RTT_MEASUREMENT_REPORT_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_RTT),
+       WMI_TLV_TSF_MEASUREMENT_REPORT_EVENTID,
+       WMI_TLV_RTT_ERROR_REPORT_EVENTID,
+       WMI_TLV_STATS_EXT_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_STATS),
+       WMI_TLV_IFACE_LINK_STATS_EVENTID,
+       WMI_TLV_PEER_LINK_STATS_EVENTID,
+       WMI_TLV_RADIO_LINK_STATS_EVENTID,
+       WMI_TLV_NLO_MATCH_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_NLO_OFL),
+       WMI_TLV_NLO_SCAN_COMPLETE_EVENTID,
+       WMI_TLV_APFIND_EVENTID,
+       WMI_TLV_GTK_OFFLOAD_STATUS_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_GTK_OFL),
+       WMI_TLV_GTK_REKEY_FAIL_EVENTID,
+       WMI_TLV_CSA_HANDLING_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_CSA_OFL),
+       WMI_TLV_CHATTER_PC_QUERY_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_CHATTER),
+       WMI_TLV_ECHO_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_MISC),
+       WMI_TLV_PDEV_UTF_EVENTID,
+       WMI_TLV_DEBUG_MESG_EVENTID,
+       WMI_TLV_UPDATE_STATS_EVENTID,
+       WMI_TLV_DEBUG_PRINT_EVENTID,
+       WMI_TLV_DCS_INTERFERENCE_EVENTID,
+       WMI_TLV_PDEV_QVIT_EVENTID,
+       WMI_TLV_WLAN_PROFILE_DATA_EVENTID,
+       WMI_TLV_PDEV_FTM_INTG_EVENTID,
+       WMI_TLV_WLAN_FREQ_AVOID_EVENTID,
+       WMI_TLV_VDEV_GET_KEEPALIVE_EVENTID,
+       WMI_TLV_THERMAL_MGMT_EVENTID,
+       WMI_TLV_DIAG_DATA_CONTAINER_EVENTID,
+       WMI_TLV_HOST_AUTO_SHUTDOWN_EVENTID,
+       WMI_TLV_UPDATE_WHAL_MIB_STATS_EVENTID,
+       WMI_TLV_UPDATE_VDEV_RATE_STATS_EVENTID,
+       WMI_TLV_DIAG_EVENTID,
+       WMI_TLV_GPIO_INPUT_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_GPIO),
+       WMI_TLV_UPLOADH_EVENTID,
+       WMI_TLV_CAPTUREH_EVENTID,
+       WMI_TLV_RFKILL_STATE_CHANGE_EVENTID,
+       WMI_TLV_TDLS_PEER_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_TDLS),
+       WMI_TLV_BATCH_SCAN_ENABLED_EVENTID =
+                       WMI_TLV_EV(WMI_TLV_GRP_LOCATION_SCAN),
+       WMI_TLV_BATCH_SCAN_RESULT_EVENTID,
+       WMI_TLV_OEM_CAPABILITY_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_OEM),
+       WMI_TLV_OEM_MEASUREMENT_REPORT_EVENTID,
+       WMI_TLV_OEM_ERROR_REPORT_EVENTID,
+       WMI_TLV_NAN_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_NAN),
+       WMI_TLV_LPI_RESULT_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_LPI),
+       WMI_TLV_LPI_STATUS_EVENTID,
+       WMI_TLV_LPI_HANDOFF_EVENTID,
+       WMI_TLV_EXTSCAN_START_STOP_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_EXTSCAN),
+       WMI_TLV_EXTSCAN_OPERATION_EVENTID,
+       WMI_TLV_EXTSCAN_TABLE_USAGE_EVENTID,
+       WMI_TLV_EXTSCAN_CACHED_RESULTS_EVENTID,
+       WMI_TLV_EXTSCAN_WLAN_CHANGE_RESULTS_EVENTID,
+       WMI_TLV_EXTSCAN_HOTLIST_MATCH_EVENTID,
+       WMI_TLV_EXTSCAN_CAPABILITIES_EVENTID,
+       WMI_TLV_MDNS_STATS_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_MDNS_OFL),
+       WMI_TLV_SAP_OFL_ADD_STA_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_SAP_OFL),
+       WMI_TLV_SAP_OFL_DEL_STA_EVENTID,
+};
+
+enum wmi_tlv_pdev_param {
+       WMI_TLV_PDEV_PARAM_TX_CHAIN_MASK = 0x1,
+       WMI_TLV_PDEV_PARAM_RX_CHAIN_MASK,
+       WMI_TLV_PDEV_PARAM_TXPOWER_LIMIT2G,
+       WMI_TLV_PDEV_PARAM_TXPOWER_LIMIT5G,
+       WMI_TLV_PDEV_PARAM_TXPOWER_SCALE,
+       WMI_TLV_PDEV_PARAM_BEACON_GEN_MODE,
+       WMI_TLV_PDEV_PARAM_BEACON_TX_MODE,
+       WMI_TLV_PDEV_PARAM_RESMGR_OFFCHAN_MODE,
+       WMI_TLV_PDEV_PARAM_PROTECTION_MODE,
+       WMI_TLV_PDEV_PARAM_DYNAMIC_BW,
+       WMI_TLV_PDEV_PARAM_NON_AGG_SW_RETRY_TH,
+       WMI_TLV_PDEV_PARAM_AGG_SW_RETRY_TH,
+       WMI_TLV_PDEV_PARAM_STA_KICKOUT_TH,
+       WMI_TLV_PDEV_PARAM_AC_AGGRSIZE_SCALING,
+       WMI_TLV_PDEV_PARAM_LTR_ENABLE,
+       WMI_TLV_PDEV_PARAM_LTR_AC_LATENCY_BE,
+       WMI_TLV_PDEV_PARAM_LTR_AC_LATENCY_BK,
+       WMI_TLV_PDEV_PARAM_LTR_AC_LATENCY_VI,
+       WMI_TLV_PDEV_PARAM_LTR_AC_LATENCY_VO,
+       WMI_TLV_PDEV_PARAM_LTR_AC_LATENCY_TIMEOUT,
+       WMI_TLV_PDEV_PARAM_LTR_SLEEP_OVERRIDE,
+       WMI_TLV_PDEV_PARAM_LTR_RX_OVERRIDE,
+       WMI_TLV_PDEV_PARAM_LTR_TX_ACTIVITY_TIMEOUT,
+       WMI_TLV_PDEV_PARAM_L1SS_ENABLE,
+       WMI_TLV_PDEV_PARAM_DSLEEP_ENABLE,
+       WMI_TLV_PDEV_PARAM_PCIELP_TXBUF_FLUSH,
+       WMI_TLV_PDEV_PARAM_PCIELP_TXBUF_WATERMARK,
+       WMI_TLV_PDEV_PARAM_PCIELP_TXBUF_TMO_EN,
+       WMI_TLV_PDEV_PARAM_PCIELP_TXBUF_TMO_VALUE,
+       WMI_TLV_PDEV_PARAM_PDEV_STATS_UPDATE_PERIOD,
+       WMI_TLV_PDEV_PARAM_VDEV_STATS_UPDATE_PERIOD,
+       WMI_TLV_PDEV_PARAM_PEER_STATS_UPDATE_PERIOD,
+       WMI_TLV_PDEV_PARAM_BCNFLT_STATS_UPDATE_PERIOD,
+       WMI_TLV_PDEV_PARAM_PMF_QOS,
+       WMI_TLV_PDEV_PARAM_ARP_AC_OVERRIDE,
+       WMI_TLV_PDEV_PARAM_DCS,
+       WMI_TLV_PDEV_PARAM_ANI_ENABLE,
+       WMI_TLV_PDEV_PARAM_ANI_POLL_PERIOD,
+       WMI_TLV_PDEV_PARAM_ANI_LISTEN_PERIOD,
+       WMI_TLV_PDEV_PARAM_ANI_OFDM_LEVEL,
+       WMI_TLV_PDEV_PARAM_ANI_CCK_LEVEL,
+       WMI_TLV_PDEV_PARAM_DYNTXCHAIN,
+       WMI_TLV_PDEV_PARAM_PROXY_STA,
+       WMI_TLV_PDEV_PARAM_IDLE_PS_CONFIG,
+       WMI_TLV_PDEV_PARAM_POWER_GATING_SLEEP,
+       WMI_TLV_PDEV_PARAM_RFKILL_ENABLE,
+       WMI_TLV_PDEV_PARAM_BURST_DUR,
+       WMI_TLV_PDEV_PARAM_BURST_ENABLE,
+       WMI_TLV_PDEV_PARAM_HW_RFKILL_CONFIG,
+       WMI_TLV_PDEV_PARAM_LOW_POWER_RF_ENABLE,
+       WMI_TLV_PDEV_PARAM_L1SS_TRACK,
+       WMI_TLV_PDEV_PARAM_HYST_EN,
+       WMI_TLV_PDEV_PARAM_POWER_COLLAPSE_ENABLE,
+       WMI_TLV_PDEV_PARAM_LED_SYS_STATE,
+       WMI_TLV_PDEV_PARAM_LED_ENABLE,
+       WMI_TLV_PDEV_PARAM_AUDIO_OVER_WLAN_LATENCY,
+       WMI_TLV_PDEV_PARAM_AUDIO_OVER_WLAN_ENABLE,
+       WMI_TLV_PDEV_PARAM_WHAL_MIB_STATS_UPDATE_ENABLE,
+       WMI_TLV_PDEV_PARAM_VDEV_RATE_STATS_UPDATE_PERIOD,
+       WMI_TLV_PDEV_PARAM_TXPOWER_REASON_NONE,
+       WMI_TLV_PDEV_PARAM_TXPOWER_REASON_SAR,
+       WMI_TLV_PDEV_PARAM_TXPOWER_REASON_MAX,
+};
+
+enum wmi_tlv_vdev_param {
+       WMI_TLV_VDEV_PARAM_RTS_THRESHOLD = 0x1,
+       WMI_TLV_VDEV_PARAM_FRAGMENTATION_THRESHOLD,
+       WMI_TLV_VDEV_PARAM_BEACON_INTERVAL,
+       WMI_TLV_VDEV_PARAM_LISTEN_INTERVAL,
+       WMI_TLV_VDEV_PARAM_MULTICAST_RATE,
+       WMI_TLV_VDEV_PARAM_MGMT_TX_RATE,
+       WMI_TLV_VDEV_PARAM_SLOT_TIME,
+       WMI_TLV_VDEV_PARAM_PREAMBLE,
+       WMI_TLV_VDEV_PARAM_SWBA_TIME,
+       WMI_TLV_VDEV_STATS_UPDATE_PERIOD,
+       WMI_TLV_VDEV_PWRSAVE_AGEOUT_TIME,
+       WMI_TLV_VDEV_HOST_SWBA_INTERVAL,
+       WMI_TLV_VDEV_PARAM_DTIM_PERIOD,
+       WMI_TLV_VDEV_OC_SCHEDULER_AIR_TIME_LIMIT,
+       WMI_TLV_VDEV_PARAM_WDS,
+       WMI_TLV_VDEV_PARAM_ATIM_WINDOW,
+       WMI_TLV_VDEV_PARAM_BMISS_COUNT_MAX,
+       WMI_TLV_VDEV_PARAM_BMISS_FIRST_BCNT,
+       WMI_TLV_VDEV_PARAM_BMISS_FINAL_BCNT,
+       WMI_TLV_VDEV_PARAM_FEATURE_WMM,
+       WMI_TLV_VDEV_PARAM_CHWIDTH,
+       WMI_TLV_VDEV_PARAM_CHEXTOFFSET,
+       WMI_TLV_VDEV_PARAM_DISABLE_HTPROTECTION,
+       WMI_TLV_VDEV_PARAM_STA_QUICKKICKOUT,
+       WMI_TLV_VDEV_PARAM_MGMT_RATE,
+       WMI_TLV_VDEV_PARAM_PROTECTION_MODE,
+       WMI_TLV_VDEV_PARAM_FIXED_RATE,
+       WMI_TLV_VDEV_PARAM_SGI,
+       WMI_TLV_VDEV_PARAM_LDPC,
+       WMI_TLV_VDEV_PARAM_TX_STBC,
+       WMI_TLV_VDEV_PARAM_RX_STBC,
+       WMI_TLV_VDEV_PARAM_INTRA_BSS_FWD,
+       WMI_TLV_VDEV_PARAM_DEF_KEYID,
+       WMI_TLV_VDEV_PARAM_NSS,
+       WMI_TLV_VDEV_PARAM_BCAST_DATA_RATE,
+       WMI_TLV_VDEV_PARAM_MCAST_DATA_RATE,
+       WMI_TLV_VDEV_PARAM_MCAST_INDICATE,
+       WMI_TLV_VDEV_PARAM_DHCP_INDICATE,
+       WMI_TLV_VDEV_PARAM_UNKNOWN_DEST_INDICATE,
+       WMI_TLV_VDEV_PARAM_AP_KEEPALIVE_MIN_IDLE_INACTIVE_TIME_SECS,
+       WMI_TLV_VDEV_PARAM_AP_KEEPALIVE_MAX_IDLE_INACTIVE_TIME_SECS,
+       WMI_TLV_VDEV_PARAM_AP_KEEPALIVE_MAX_UNRESPONSIVE_TIME_SECS,
+       WMI_TLV_VDEV_PARAM_AP_ENABLE_NAWDS,
+       WMI_TLV_VDEV_PARAM_ENABLE_RTSCTS,
+       WMI_TLV_VDEV_PARAM_TXBF,
+       WMI_TLV_VDEV_PARAM_PACKET_POWERSAVE,
+       WMI_TLV_VDEV_PARAM_DROP_UNENCRY,
+       WMI_TLV_VDEV_PARAM_TX_ENCAP_TYPE,
+       WMI_TLV_VDEV_PARAM_AP_DETECT_OUT_OF_SYNC_SLEEPING_STA_TIME_SECS,
+       WMI_TLV_VDEV_PARAM_EARLY_RX_ADJUST_ENABLE,
+       WMI_TLV_VDEV_PARAM_EARLY_RX_TGT_BMISS_NUM,
+       WMI_TLV_VDEV_PARAM_EARLY_RX_BMISS_SAMPLE_CYCLE,
+       WMI_TLV_VDEV_PARAM_EARLY_RX_SLOP_STEP,
+       WMI_TLV_VDEV_PARAM_EARLY_RX_INIT_SLOP,
+       WMI_TLV_VDEV_PARAM_EARLY_RX_ADJUST_PAUSE,
+       WMI_TLV_VDEV_PARAM_TX_PWRLIMIT,
+       WMI_TLV_VDEV_PARAM_SNR_NUM_FOR_CAL,
+       WMI_TLV_VDEV_PARAM_ROAM_FW_OFFLOAD,
+       WMI_TLV_VDEV_PARAM_ENABLE_RMC,
+       WMI_TLV_VDEV_PARAM_IBSS_MAX_BCN_LOST_MS,
+       WMI_TLV_VDEV_PARAM_MAX_RATE,
+       WMI_TLV_VDEV_PARAM_EARLY_RX_DRIFT_SAMPLE,
+       WMI_TLV_VDEV_PARAM_SET_IBSS_TX_FAIL_CNT_THR,
+       WMI_TLV_VDEV_PARAM_EBT_RESYNC_TIMEOUT,
+       WMI_TLV_VDEV_PARAM_AGGR_TRIG_EVENT_ENABLE,
+       WMI_TLV_VDEV_PARAM_IS_IBSS_POWER_SAVE_ALLOWED,
+       WMI_TLV_VDEV_PARAM_IS_POWER_COLLAPSE_ALLOWED,
+       WMI_TLV_VDEV_PARAM_IS_AWAKE_ON_TXRX_ENABLED,
+       WMI_TLV_VDEV_PARAM_INACTIVITY_CNT,
+       WMI_TLV_VDEV_PARAM_TXSP_END_INACTIVITY_TIME_MS,
+       WMI_TLV_VDEV_PARAM_DTIM_POLICY,
+       WMI_TLV_VDEV_PARAM_IBSS_PS_WARMUP_TIME_SECS,
+       WMI_TLV_VDEV_PARAM_IBSS_PS_1RX_CHAIN_IN_ATIM_WINDOW_ENABLE,
+};
+
+enum wmi_tlv_tag {
+       WMI_TLV_TAG_LAST_RESERVED = 15,
+
+       WMI_TLV_TAG_FIRST_ARRAY_ENUM,
+       WMI_TLV_TAG_ARRAY_UINT32 = WMI_TLV_TAG_FIRST_ARRAY_ENUM,
+       WMI_TLV_TAG_ARRAY_BYTE,
+       WMI_TLV_TAG_ARRAY_STRUCT,
+       WMI_TLV_TAG_ARRAY_FIXED_STRUCT,
+       WMI_TLV_TAG_LAST_ARRAY_ENUM = 31,
+
+       WMI_TLV_TAG_STRUCT_SERVICE_READY_EVENT,
+       WMI_TLV_TAG_STRUCT_HAL_REG_CAPABILITIES,
+       WMI_TLV_TAG_STRUCT_WLAN_HOST_MEM_REQ,
+       WMI_TLV_TAG_STRUCT_READY_EVENT,
+       WMI_TLV_TAG_STRUCT_SCAN_EVENT,
+       WMI_TLV_TAG_STRUCT_PDEV_TPC_CONFIG_EVENT,
+       WMI_TLV_TAG_STRUCT_CHAN_INFO_EVENT,
+       WMI_TLV_TAG_STRUCT_COMB_PHYERR_RX_HDR,
+       WMI_TLV_TAG_STRUCT_VDEV_START_RESPONSE_EVENT,
+       WMI_TLV_TAG_STRUCT_VDEV_STOPPED_EVENT,
+       WMI_TLV_TAG_STRUCT_VDEV_INSTALL_KEY_COMPLETE_EVENT,
+       WMI_TLV_TAG_STRUCT_PEER_STA_KICKOUT_EVENT,
+       WMI_TLV_TAG_STRUCT_MGMT_RX_HDR,
+       WMI_TLV_TAG_STRUCT_TBTT_OFFSET_EVENT,
+       WMI_TLV_TAG_STRUCT_TX_DELBA_COMPLETE_EVENT,
+       WMI_TLV_TAG_STRUCT_TX_ADDBA_COMPLETE_EVENT,
+       WMI_TLV_TAG_STRUCT_ROAM_EVENT,
+       WMI_TLV_TAG_STRUCT_WOW_EVENT_INFO,
+       WMI_TLV_TAG_STRUCT_WOW_EVENT_INFO_SECTION_BITMAP,
+       WMI_TLV_TAG_STRUCT_RTT_EVENT_HEADER,
+       WMI_TLV_TAG_STRUCT_RTT_ERROR_REPORT_EVENT,
+       WMI_TLV_TAG_STRUCT_RTT_MEAS_EVENT,
+       WMI_TLV_TAG_STRUCT_ECHO_EVENT,
+       WMI_TLV_TAG_STRUCT_FTM_INTG_EVENT,
+       WMI_TLV_TAG_STRUCT_VDEV_GET_KEEPALIVE_EVENT,
+       WMI_TLV_TAG_STRUCT_GPIO_INPUT_EVENT,
+       WMI_TLV_TAG_STRUCT_CSA_EVENT,
+       WMI_TLV_TAG_STRUCT_GTK_OFFLOAD_STATUS_EVENT,
+       WMI_TLV_TAG_STRUCT_IGTK_INFO,
+       WMI_TLV_TAG_STRUCT_DCS_INTERFERENCE_EVENT,
+       WMI_TLV_TAG_STRUCT_ATH_DCS_CW_INT,
+       WMI_TLV_TAG_STRUCT_ATH_DCS_WLAN_INT_STAT,
+       WMI_TLV_TAG_STRUCT_WLAN_PROFILE_CTX_T,
+       WMI_TLV_TAG_STRUCT_WLAN_PROFILE_T,
+       WMI_TLV_TAG_STRUCT_PDEV_QVIT_EVENT,
+       WMI_TLV_TAG_STRUCT_HOST_SWBA_EVENT,
+       WMI_TLV_TAG_STRUCT_TIM_INFO,
+       WMI_TLV_TAG_STRUCT_P2P_NOA_INFO,
+       WMI_TLV_TAG_STRUCT_STATS_EVENT,
+       WMI_TLV_TAG_STRUCT_AVOID_FREQ_RANGES_EVENT,
+       WMI_TLV_TAG_STRUCT_AVOID_FREQ_RANGE_DESC,
+       WMI_TLV_TAG_STRUCT_GTK_REKEY_FAIL_EVENT,
+       WMI_TLV_TAG_STRUCT_INIT_CMD,
+       WMI_TLV_TAG_STRUCT_RESOURCE_CONFIG,
+       WMI_TLV_TAG_STRUCT_WLAN_HOST_MEMORY_CHUNK,
+       WMI_TLV_TAG_STRUCT_START_SCAN_CMD,
+       WMI_TLV_TAG_STRUCT_STOP_SCAN_CMD,
+       WMI_TLV_TAG_STRUCT_SCAN_CHAN_LIST_CMD,
+       WMI_TLV_TAG_STRUCT_CHANNEL,
+       WMI_TLV_TAG_STRUCT_PDEV_SET_REGDOMAIN_CMD,
+       WMI_TLV_TAG_STRUCT_PDEV_SET_PARAM_CMD,
+       WMI_TLV_TAG_STRUCT_PDEV_SET_WMM_PARAMS_CMD,
+       WMI_TLV_TAG_STRUCT_WMM_PARAMS,
+       WMI_TLV_TAG_STRUCT_PDEV_SET_QUIET_CMD,
+       WMI_TLV_TAG_STRUCT_VDEV_CREATE_CMD,
+       WMI_TLV_TAG_STRUCT_VDEV_DELETE_CMD,
+       WMI_TLV_TAG_STRUCT_VDEV_START_REQUEST_CMD,
+       WMI_TLV_TAG_STRUCT_P2P_NOA_DESCRIPTOR,
+       WMI_TLV_TAG_STRUCT_P2P_GO_SET_BEACON_IE,
+       WMI_TLV_TAG_STRUCT_GTK_OFFLOAD_CMD,
+       WMI_TLV_TAG_STRUCT_VDEV_UP_CMD,
+       WMI_TLV_TAG_STRUCT_VDEV_STOP_CMD,
+       WMI_TLV_TAG_STRUCT_VDEV_DOWN_CMD,
+       WMI_TLV_TAG_STRUCT_VDEV_SET_PARAM_CMD,
+       WMI_TLV_TAG_STRUCT_VDEV_INSTALL_KEY_CMD,
+       WMI_TLV_TAG_STRUCT_PEER_CREATE_CMD,
+       WMI_TLV_TAG_STRUCT_PEER_DELETE_CMD,
+       WMI_TLV_TAG_STRUCT_PEER_FLUSH_TIDS_CMD,
+       WMI_TLV_TAG_STRUCT_PEER_SET_PARAM_CMD,
+       WMI_TLV_TAG_STRUCT_PEER_ASSOC_COMPLETE_CMD,
+       WMI_TLV_TAG_STRUCT_VHT_RATE_SET,
+       WMI_TLV_TAG_STRUCT_BCN_TMPL_CMD,
+       WMI_TLV_TAG_STRUCT_PRB_TMPL_CMD,
+       WMI_TLV_TAG_STRUCT_BCN_PRB_INFO,
+       WMI_TLV_TAG_STRUCT_PEER_TID_ADDBA_CMD,
+       WMI_TLV_TAG_STRUCT_PEER_TID_DELBA_CMD,
+       WMI_TLV_TAG_STRUCT_STA_POWERSAVE_MODE_CMD,
+       WMI_TLV_TAG_STRUCT_STA_POWERSAVE_PARAM_CMD,
+       WMI_TLV_TAG_STRUCT_STA_DTIM_PS_METHOD_CMD,
+       WMI_TLV_TAG_STRUCT_ROAM_SCAN_MODE,
+       WMI_TLV_TAG_STRUCT_ROAM_SCAN_RSSI_THRESHOLD,
+       WMI_TLV_TAG_STRUCT_ROAM_SCAN_PERIOD,
+       WMI_TLV_TAG_STRUCT_ROAM_SCAN_RSSI_CHANGE_THRESHOLD,
+       WMI_TLV_TAG_STRUCT_PDEV_SUSPEND_CMD,
+       WMI_TLV_TAG_STRUCT_PDEV_RESUME_CMD,
+       WMI_TLV_TAG_STRUCT_ADD_BCN_FILTER_CMD,
+       WMI_TLV_TAG_STRUCT_RMV_BCN_FILTER_CMD,
+       WMI_TLV_TAG_STRUCT_WOW_ENABLE_CMD,
+       WMI_TLV_TAG_STRUCT_WOW_HOSTWAKEUP_FROM_SLEEP_CMD,
+       WMI_TLV_TAG_STRUCT_STA_UAPSD_AUTO_TRIG_CMD,
+       WMI_TLV_TAG_STRUCT_STA_UAPSD_AUTO_TRIG_PARAM,
+       WMI_TLV_TAG_STRUCT_SET_ARP_NS_OFFLOAD_CMD,
+       WMI_TLV_TAG_STRUCT_ARP_OFFLOAD_TUPLE,
+       WMI_TLV_TAG_STRUCT_NS_OFFLOAD_TUPLE,
+       WMI_TLV_TAG_STRUCT_FTM_INTG_CMD,
+       WMI_TLV_TAG_STRUCT_STA_KEEPALIVE_CMD,
+       WMI_TLV_TAG_STRUCT_STA_KEEPALVE_ARP_RESPONSE,
+       WMI_TLV_TAG_STRUCT_P2P_SET_VENDOR_IE_DATA_CMD,
+       WMI_TLV_TAG_STRUCT_AP_PS_PEER_CMD,
+       WMI_TLV_TAG_STRUCT_PEER_RATE_RETRY_SCHED_CMD,
+       WMI_TLV_TAG_STRUCT_WLAN_PROFILE_TRIGGER_CMD,
+       WMI_TLV_TAG_STRUCT_WLAN_PROFILE_SET_HIST_INTVL_CMD,
+       WMI_TLV_TAG_STRUCT_WLAN_PROFILE_GET_PROF_DATA_CMD,
+       WMI_TLV_TAG_STRUCT_WLAN_PROFILE_ENABLE_PROFILE_ID_CMD,
+       WMI_TLV_TAG_STRUCT_WOW_DEL_PATTERN_CMD,
+       WMI_TLV_TAG_STRUCT_WOW_ADD_DEL_EVT_CMD,
+       WMI_TLV_TAG_STRUCT_RTT_MEASREQ_HEAD,
+       WMI_TLV_TAG_STRUCT_RTT_MEASREQ_BODY,
+       WMI_TLV_TAG_STRUCT_RTT_TSF_CMD,
+       WMI_TLV_TAG_STRUCT_VDEV_SPECTRAL_CONFIGURE_CMD,
+       WMI_TLV_TAG_STRUCT_VDEV_SPECTRAL_ENABLE_CMD,
+       WMI_TLV_TAG_STRUCT_REQUEST_STATS_CMD,
+       WMI_TLV_TAG_STRUCT_NLO_CONFIG_CMD,
+       WMI_TLV_TAG_STRUCT_NLO_CONFIGURED_PARAMETERS,
+       WMI_TLV_TAG_STRUCT_CSA_OFFLOAD_ENABLE_CMD,
+       WMI_TLV_TAG_STRUCT_CSA_OFFLOAD_CHANSWITCH_CMD,
+       WMI_TLV_TAG_STRUCT_CHATTER_SET_MODE_CMD,
+       WMI_TLV_TAG_STRUCT_ECHO_CMD,
+       WMI_TLV_TAG_STRUCT_VDEV_SET_KEEPALIVE_CMD,
+       WMI_TLV_TAG_STRUCT_VDEV_GET_KEEPALIVE_CMD,
+       WMI_TLV_TAG_STRUCT_FORCE_FW_HANG_CMD,
+       WMI_TLV_TAG_STRUCT_GPIO_CONFIG_CMD,
+       WMI_TLV_TAG_STRUCT_GPIO_OUTPUT_CMD,
+       WMI_TLV_TAG_STRUCT_PEER_ADD_WDS_ENTRY_CMD,
+       WMI_TLV_TAG_STRUCT_PEER_REMOVE_WDS_ENTRY_CMD,
+       WMI_TLV_TAG_STRUCT_BCN_TX_HDR,
+       WMI_TLV_TAG_STRUCT_BCN_SEND_FROM_HOST_CMD,
+       WMI_TLV_TAG_STRUCT_MGMT_TX_HDR,
+       WMI_TLV_TAG_STRUCT_ADDBA_CLEAR_RESP_CMD,
+       WMI_TLV_TAG_STRUCT_ADDBA_SEND_CMD,
+       WMI_TLV_TAG_STRUCT_DELBA_SEND_CMD,
+       WMI_TLV_TAG_STRUCT_ADDBA_SETRESPONSE_CMD,
+       WMI_TLV_TAG_STRUCT_SEND_SINGLEAMSDU_CMD,
+       WMI_TLV_TAG_STRUCT_PDEV_PKTLOG_ENABLE_CMD,
+       WMI_TLV_TAG_STRUCT_PDEV_PKTLOG_DISABLE_CMD,
+       WMI_TLV_TAG_STRUCT_PDEV_SET_HT_IE_CMD,
+       WMI_TLV_TAG_STRUCT_PDEV_SET_VHT_IE_CMD,
+       WMI_TLV_TAG_STRUCT_PDEV_SET_DSCP_TID_MAP_CMD,
+       WMI_TLV_TAG_STRUCT_PDEV_GREEN_AP_PS_ENABLE_CMD,
+       WMI_TLV_TAG_STRUCT_PDEV_GET_TPC_CONFIG_CMD,
+       WMI_TLV_TAG_STRUCT_PDEV_SET_BASE_MACADDR_CMD,
+       WMI_TLV_TAG_STRUCT_PEER_MCAST_GROUP_CMD,
+       WMI_TLV_TAG_STRUCT_ROAM_AP_PROFILE,
+       WMI_TLV_TAG_STRUCT_AP_PROFILE,
+       WMI_TLV_TAG_STRUCT_SCAN_SCH_PRIORITY_TABLE_CMD,
+       WMI_TLV_TAG_STRUCT_PDEV_DFS_ENABLE_CMD,
+       WMI_TLV_TAG_STRUCT_PDEV_DFS_DISABLE_CMD,
+       WMI_TLV_TAG_STRUCT_WOW_ADD_PATTERN_CMD,
+       WMI_TLV_TAG_STRUCT_WOW_BITMAP_PATTERN_T,
+       WMI_TLV_TAG_STRUCT_WOW_IPV4_SYNC_PATTERN_T,
+       WMI_TLV_TAG_STRUCT_WOW_IPV6_SYNC_PATTERN_T,
+       WMI_TLV_TAG_STRUCT_WOW_MAGIC_PATTERN_CMD,
+       WMI_TLV_TAG_STRUCT_SCAN_UPDATE_REQUEST_CMD,
+       WMI_TLV_TAG_STRUCT_CHATTER_PKT_COALESCING_FILTER,
+       WMI_TLV_TAG_STRUCT_CHATTER_COALESCING_ADD_FILTER_CMD,
+       WMI_TLV_TAG_STRUCT_CHATTER_COALESCING_DELETE_FILTER_CMD,
+       WMI_TLV_TAG_STRUCT_CHATTER_COALESCING_QUERY_CMD,
+       WMI_TLV_TAG_STRUCT_TXBF_CMD,
+       WMI_TLV_TAG_STRUCT_DEBUG_LOG_CONFIG_CMD,
+       WMI_TLV_TAG_STRUCT_NLO_EVENT,
+       WMI_TLV_TAG_STRUCT_CHATTER_QUERY_REPLY_EVENT,
+       WMI_TLV_TAG_STRUCT_UPLOAD_H_HDR,
+       WMI_TLV_TAG_STRUCT_CAPTURE_H_EVENT_HDR,
+       WMI_TLV_TAG_STRUCT_VDEV_WNM_SLEEPMODE_CMD,
+       WMI_TLV_TAG_STRUCT_VDEV_IPSEC_NATKEEPALIVE_FILTER_CMD,
+       WMI_TLV_TAG_STRUCT_VDEV_WMM_ADDTS_CMD,
+       WMI_TLV_TAG_STRUCT_VDEV_WMM_DELTS_CMD,
+       WMI_TLV_TAG_STRUCT_VDEV_SET_WMM_PARAMS_CMD,
+       WMI_TLV_TAG_STRUCT_TDLS_SET_STATE_CMD,
+       WMI_TLV_TAG_STRUCT_TDLS_PEER_UPDATE_CMD,
+       WMI_TLV_TAG_STRUCT_TDLS_PEER_EVENT,
+       WMI_TLV_TAG_STRUCT_TDLS_PEER_CAPABILITIES,
+       WMI_TLV_TAG_STRUCT_VDEV_MCC_SET_TBTT_MODE_CMD,
+       WMI_TLV_TAG_STRUCT_ROAM_CHAN_LIST,
+       WMI_TLV_TAG_STRUCT_VDEV_MCC_BCN_INTVL_CHANGE_EVENT,
+       WMI_TLV_TAG_STRUCT_RESMGR_ADAPTIVE_OCS_CMD,
+       WMI_TLV_TAG_STRUCT_RESMGR_SET_CHAN_TIME_QUOTA_CMD,
+       WMI_TLV_TAG_STRUCT_RESMGR_SET_CHAN_LATENCY_CMD,
+       WMI_TLV_TAG_STRUCT_BA_REQ_SSN_CMD,
+       WMI_TLV_TAG_STRUCT_BA_RSP_SSN_EVENT,
+       WMI_TLV_TAG_STRUCT_STA_SMPS_FORCE_MODE_CMD,
+       WMI_TLV_TAG_STRUCT_SET_MCASTBCAST_FILTER_CMD,
+       WMI_TLV_TAG_STRUCT_P2P_SET_OPPPS_CMD,
+       WMI_TLV_TAG_STRUCT_P2P_SET_NOA_CMD,
+       WMI_TLV_TAG_STRUCT_BA_REQ_SSN_CMD_SUB_STRUCT_PARAM,
+       WMI_TLV_TAG_STRUCT_BA_REQ_SSN_EVENT_SUB_STRUCT_PARAM,
+       WMI_TLV_TAG_STRUCT_STA_SMPS_PARAM_CMD,
+       WMI_TLV_TAG_STRUCT_VDEV_SET_GTX_PARAMS_CMD,
+       WMI_TLV_TAG_STRUCT_MCC_SCHED_TRAFFIC_STATS_CMD,
+       WMI_TLV_TAG_STRUCT_MCC_SCHED_STA_TRAFFIC_STATS,
+       WMI_TLV_TAG_STRUCT_OFFLOAD_BCN_TX_STATUS_EVENT,
+       WMI_TLV_TAG_STRUCT_P2P_NOA_EVENT,
+       WMI_TLV_TAG_STRUCT_HB_SET_ENABLE_CMD,
+       WMI_TLV_TAG_STRUCT_HB_SET_TCP_PARAMS_CMD,
+       WMI_TLV_TAG_STRUCT_HB_SET_TCP_PKT_FILTER_CMD,
+       WMI_TLV_TAG_STRUCT_HB_SET_UDP_PARAMS_CMD,
+       WMI_TLV_TAG_STRUCT_HB_SET_UDP_PKT_FILTER_CMD,
+       WMI_TLV_TAG_STRUCT_HB_IND_EVENT,
+       WMI_TLV_TAG_STRUCT_TX_PAUSE_EVENT,
+       WMI_TLV_TAG_STRUCT_RFKILL_EVENT,
+       WMI_TLV_TAG_STRUCT_DFS_RADAR_EVENT,
+       WMI_TLV_TAG_STRUCT_DFS_PHYERR_FILTER_ENA_CMD,
+       WMI_TLV_TAG_STRUCT_DFS_PHYERR_FILTER_DIS_CMD,
+       WMI_TLV_TAG_STRUCT_BATCH_SCAN_RESULT_SCAN_LIST,
+       WMI_TLV_TAG_STRUCT_BATCH_SCAN_RESULT_NETWORK_INFO,
+       WMI_TLV_TAG_STRUCT_BATCH_SCAN_ENABLE_CMD,
+       WMI_TLV_TAG_STRUCT_BATCH_SCAN_DISABLE_CMD,
+       WMI_TLV_TAG_STRUCT_BATCH_SCAN_TRIGGER_RESULT_CMD,
+       WMI_TLV_TAG_STRUCT_BATCH_SCAN_ENABLED_EVENT,
+       WMI_TLV_TAG_STRUCT_BATCH_SCAN_RESULT_EVENT,
+       WMI_TLV_TAG_STRUCT_VDEV_PLMREQ_START_CMD,
+       WMI_TLV_TAG_STRUCT_VDEV_PLMREQ_STOP_CMD,
+       WMI_TLV_TAG_STRUCT_THERMAL_MGMT_CMD,
+       WMI_TLV_TAG_STRUCT_THERMAL_MGMT_EVENT,
+       WMI_TLV_TAG_STRUCT_PEER_INFO_REQ_CMD,
+       WMI_TLV_TAG_STRUCT_PEER_INFO_EVENT,
+       WMI_TLV_TAG_STRUCT_PEER_INFO,
+       WMI_TLV_TAG_STRUCT_PEER_TX_FAIL_CNT_THR_EVENT,
+       WMI_TLV_TAG_STRUCT_RMC_SET_MODE_CMD,
+       WMI_TLV_TAG_STRUCT_RMC_SET_ACTION_PERIOD_CMD,
+       WMI_TLV_TAG_STRUCT_RMC_CONFIG_CMD,
+       WMI_TLV_TAG_STRUCT_MHF_OFFLOAD_SET_MODE_CMD,
+       WMI_TLV_TAG_STRUCT_MHF_OFFLOAD_PLUMB_ROUTING_TABLE_CMD,
+       WMI_TLV_TAG_STRUCT_ADD_PROACTIVE_ARP_RSP_PATTERN_CMD,
+       WMI_TLV_TAG_STRUCT_DEL_PROACTIVE_ARP_RSP_PATTERN_CMD,
+       WMI_TLV_TAG_STRUCT_NAN_CMD_PARAM,
+       WMI_TLV_TAG_STRUCT_NAN_EVENT_HDR,
+       WMI_TLV_TAG_STRUCT_PDEV_L1SS_TRACK_EVENT,
+       WMI_TLV_TAG_STRUCT_DIAG_DATA_CONTAINER_EVENT,
+       WMI_TLV_TAG_STRUCT_MODEM_POWER_STATE_CMD_PARAM,
+       WMI_TLV_TAG_STRUCT_PEER_GET_ESTIMATED_LINKSPEED_CMD,
+       WMI_TLV_TAG_STRUCT_PEER_ESTIMATED_LINKSPEED_EVENT,
+       WMI_TLV_TAG_STRUCT_AGGR_STATE_TRIG_EVENT,
+       WMI_TLV_TAG_STRUCT_MHF_OFFLOAD_ROUTING_TABLE_ENTRY,
+       WMI_TLV_TAG_STRUCT_ROAM_SCAN_CMD,
+       WMI_TLV_TAG_STRUCT_REQ_STATS_EXT_CMD,
+       WMI_TLV_TAG_STRUCT_STATS_EXT_EVENT,
+       WMI_TLV_TAG_STRUCT_OBSS_SCAN_ENABLE_CMD,
+       WMI_TLV_TAG_STRUCT_OBSS_SCAN_DISABLE_CMD,
+       WMI_TLV_TAG_STRUCT_OFFLOAD_PRB_RSP_TX_STATUS_EVENT,
+       WMI_TLV_TAG_STRUCT_PDEV_SET_LED_CONFIG_CMD,
+       WMI_TLV_TAG_STRUCT_HOST_AUTO_SHUTDOWN_CFG_CMD,
+       WMI_TLV_TAG_STRUCT_HOST_AUTO_SHUTDOWN_EVENT,
+       WMI_TLV_TAG_STRUCT_UPDATE_WHAL_MIB_STATS_EVENT,
+       WMI_TLV_TAG_STRUCT_CHAN_AVOID_UPDATE_CMD_PARAM,
+       WMI_TLV_TAG_STRUCT_WOW_ACER_IOAC_PKT_PATTERN_T,
+       WMI_TLV_TAG_STRUCT_WOW_ACER_IOAC_TMR_PATTERN_T,
+       WMI_TLV_TAG_STRUCT_WOW_IOAC_ADD_KEEPALIVE_CMD,
+       WMI_TLV_TAG_STRUCT_WOW_IOAC_DEL_KEEPALIVE_CMD,
+       WMI_TLV_TAG_STRUCT_WOW_IOAC_KEEPALIVE_T,
+       WMI_TLV_TAG_STRUCT_WOW_ACER_IOAC_ADD_PATTERN_CMD,
+       WMI_TLV_TAG_STRUCT_WOW_ACER_IOAC_DEL_PATTERN_CMD,
+       WMI_TLV_TAG_STRUCT_START_LINK_STATS_CMD,
+       WMI_TLV_TAG_STRUCT_CLEAR_LINK_STATS_CMD,
+       WMI_TLV_TAG_STRUCT_REQUEST_LINK_STATS_CMD,
+       WMI_TLV_TAG_STRUCT_IFACE_LINK_STATS_EVENT,
+       WMI_TLV_TAG_STRUCT_RADIO_LINK_STATS_EVENT,
+       WMI_TLV_TAG_STRUCT_PEER_STATS_EVENT,
+       WMI_TLV_TAG_STRUCT_CHANNEL_STATS,
+       WMI_TLV_TAG_STRUCT_RADIO_LINK_STATS,
+       WMI_TLV_TAG_STRUCT_RATE_STATS,
+       WMI_TLV_TAG_STRUCT_PEER_LINK_STATS,
+       WMI_TLV_TAG_STRUCT_WMM_AC_STATS,
+       WMI_TLV_TAG_STRUCT_IFACE_LINK_STATS,
+       WMI_TLV_TAG_STRUCT_LPI_MGMT_SNOOPING_CONFIG_CMD,
+       WMI_TLV_TAG_STRUCT_LPI_START_SCAN_CMD,
+       WMI_TLV_TAG_STRUCT_LPI_STOP_SCAN_CMD,
+       WMI_TLV_TAG_STRUCT_LPI_RESULT_EVENT,
+       WMI_TLV_TAG_STRUCT_PEER_STATE_EVENT,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_BUCKET_CMD,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_BUCKET_CHANNEL_EVENT,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_START_CMD,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_STOP_CMD,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_CONFIGURE_WLAN_CHANGE_MONITOR_CMD,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_WLAN_CHANGE_BSSID_PARAM_CMD,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_CONFIGURE_HOTLIST_MONITOR_CMD,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_GET_CACHED_RESULTS_CMD,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_GET_WLAN_CHANGE_RESULTS_CMD,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_SET_CAPABILITIES_CMD,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_GET_CAPABILITIES_CMD,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_OPERATION_EVENT,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_START_STOP_EVENT,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_TABLE_USAGE_EVENT,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_WLAN_DESCRIPTOR_EVENT,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_RSSI_INFO_EVENT,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_CACHED_RESULTS_EVENT,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_WLAN_CHANGE_RESULTS_EVENT,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_WLAN_CHANGE_RESULT_BSSID_EVENT,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_HOTLIST_MATCH_EVENT,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_CAPABILITIES_EVENT,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_CACHE_CAPABILITIES_EVENT,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_WLAN_CHANGE_MONITOR_CAPABILITIES_EVENT,
+       WMI_TLV_TAG_STRUCT_EXTSCAN_HOTLIST_MONITOR_CAPABILITIES_EVENT,
+       WMI_TLV_TAG_STRUCT_D0_WOW_ENABLE_DISABLE_CMD,
+       WMI_TLV_TAG_STRUCT_D0_WOW_DISABLE_ACK_EVENT,
+       WMI_TLV_TAG_STRUCT_UNIT_TEST_CMD,
+       WMI_TLV_TAG_STRUCT_ROAM_OFFLOAD_TLV_PARAM,
+       WMI_TLV_TAG_STRUCT_ROAM_11I_OFFLOAD_TLV_PARAM,
+       WMI_TLV_TAG_STRUCT_ROAM_11R_OFFLOAD_TLV_PARAM,
+       WMI_TLV_TAG_STRUCT_ROAM_ESE_OFFLOAD_TLV_PARAM,
+       WMI_TLV_TAG_STRUCT_ROAM_SYNCH_EVENT,
+       WMI_TLV_TAG_STRUCT_ROAM_SYNCH_COMPLETE,
+       WMI_TLV_TAG_STRUCT_EXTWOW_ENABLE_CMD,
+       WMI_TLV_TAG_STRUCT_EXTWOW_SET_APP_TYPE1_PARAMS_CMD,
+       WMI_TLV_TAG_STRUCT_EXTWOW_SET_APP_TYPE2_PARAMS_CMD,
+       WMI_TLV_TAG_STRUCT_LPI_STATUS_EVENT,
+       WMI_TLV_TAG_STRUCT_LPI_HANDOFF_EVENT,
+       WMI_TLV_TAG_STRUCT_VDEV_RATE_STATS_EVENT,
+       WMI_TLV_TAG_STRUCT_VDEV_RATE_HT_INFO,
+       WMI_TLV_TAG_STRUCT_RIC_REQUEST,
+       WMI_TLV_TAG_STRUCT_PDEV_GET_TEMPERATURE_CMD,
+       WMI_TLV_TAG_STRUCT_PDEV_TEMPERATURE_EVENT,
+       WMI_TLV_TAG_STRUCT_SET_DHCP_SERVER_OFFLOAD_CMD,
+       WMI_TLV_TAG_STRUCT_TPC_CHAINMASK_CONFIG_CMD,
+       WMI_TLV_TAG_STRUCT_RIC_TSPEC,
+       WMI_TLV_TAG_STRUCT_TPC_CHAINMASK_CONFIG,
+       WMI_TLV_TAG_STRUCT_IPA_OFFLOAD_CMD,
+       WMI_TLV_TAG_STRUCT_SCAN_PROB_REQ_OUI_CMD,
+       WMI_TLV_TAG_STRUCT_KEY_MATERIAL,
+       WMI_TLV_TAG_STRUCT_TDLS_SET_OFFCHAN_MODE_CMD,
+       WMI_TLV_TAG_STRUCT_SET_LED_FLASHING_CMD,
+       WMI_TLV_TAG_STRUCT_MDNS_OFFLOAD_CMD,
+       WMI_TLV_TAG_STRUCT_MDNS_SET_FQDN_CMD,
+       WMI_TLV_TAG_STRUCT_MDNS_SET_RESP_CMD,
+       WMI_TLV_TAG_STRUCT_MDNS_GET_STATS_CMD,
+       WMI_TLV_TAG_STRUCT_MDNS_STATS_EVENT,
+       WMI_TLV_TAG_STRUCT_ROAM_INVOKE_CMD,
+       WMI_TLV_TAG_STRUCT_PDEV_RESUME_EVENT,
+       WMI_TLV_TAG_STRUCT_PDEV_SET_ANTENNA_DIVERSITY_CMD,
+       WMI_TLV_TAG_STRUCT_SAP_OFL_ENABLE_CMD,
+       WMI_TLV_TAG_STRUCT_SAP_OFL_ADD_STA_EVENT,
+       WMI_TLV_TAG_STRUCT_SAP_OFL_DEL_STA_EVENT,
+       WMI_TLV_TAG_STRUCT_APFIND_CMD_PARAM,
+       WMI_TLV_TAG_STRUCT_APFIND_EVENT_HDR,
+
+       WMI_TLV_TAG_MAX
+};
+
+enum wmi_tlv_service {
+       WMI_TLV_SERVICE_BEACON_OFFLOAD = 0,
+       WMI_TLV_SERVICE_SCAN_OFFLOAD,
+       WMI_TLV_SERVICE_ROAM_SCAN_OFFLOAD,
+       WMI_TLV_SERVICE_BCN_MISS_OFFLOAD,
+       WMI_TLV_SERVICE_STA_PWRSAVE,
+       WMI_TLV_SERVICE_STA_ADVANCED_PWRSAVE,
+       WMI_TLV_SERVICE_AP_UAPSD,
+       WMI_TLV_SERVICE_AP_DFS,
+       WMI_TLV_SERVICE_11AC,
+       WMI_TLV_SERVICE_BLOCKACK,
+       WMI_TLV_SERVICE_PHYERR,
+       WMI_TLV_SERVICE_BCN_FILTER,
+       WMI_TLV_SERVICE_RTT,
+       WMI_TLV_SERVICE_WOW,
+       WMI_TLV_SERVICE_RATECTRL_CACHE,
+       WMI_TLV_SERVICE_IRAM_TIDS,
+       WMI_TLV_SERVICE_ARPNS_OFFLOAD,
+       WMI_TLV_SERVICE_NLO,
+       WMI_TLV_SERVICE_GTK_OFFLOAD,
+       WMI_TLV_SERVICE_SCAN_SCH,
+       WMI_TLV_SERVICE_CSA_OFFLOAD,
+       WMI_TLV_SERVICE_CHATTER,
+       WMI_TLV_SERVICE_COEX_FREQAVOID,
+       WMI_TLV_SERVICE_PACKET_POWER_SAVE,
+       WMI_TLV_SERVICE_FORCE_FW_HANG,
+       WMI_TLV_SERVICE_GPIO,
+       WMI_TLV_SERVICE_STA_DTIM_PS_MODULATED_DTIM,
+       WMI_TLV_SERVICE_STA_UAPSD_BASIC_AUTO_TRIG,
+       WMI_TLV_SERVICE_STA_UAPSD_VAR_AUTO_TRIG,
+       WMI_TLV_SERVICE_STA_KEEP_ALIVE,
+       WMI_TLV_SERVICE_TX_ENCAP,
+       WMI_TLV_SERVICE_AP_PS_DETECT_OUT_OF_SYNC,
+       WMI_TLV_SERVICE_EARLY_RX,
+       WMI_TLV_SERVICE_STA_SMPS,
+       WMI_TLV_SERVICE_FWTEST,
+       WMI_TLV_SERVICE_STA_WMMAC,
+       WMI_TLV_SERVICE_TDLS,
+       WMI_TLV_SERVICE_BURST,
+       WMI_TLV_SERVICE_MCC_BCN_INTERVAL_CHANGE,
+       WMI_TLV_SERVICE_ADAPTIVE_OCS,
+       WMI_TLV_SERVICE_BA_SSN_SUPPORT,
+       WMI_TLV_SERVICE_FILTER_IPSEC_NATKEEPALIVE,
+       WMI_TLV_SERVICE_WLAN_HB,
+       WMI_TLV_SERVICE_LTE_ANT_SHARE_SUPPORT,
+       WMI_TLV_SERVICE_BATCH_SCAN,
+       WMI_TLV_SERVICE_QPOWER,
+       WMI_TLV_SERVICE_PLMREQ,
+       WMI_TLV_SERVICE_THERMAL_MGMT,
+       WMI_TLV_SERVICE_RMC,
+       WMI_TLV_SERVICE_MHF_OFFLOAD,
+       WMI_TLV_SERVICE_COEX_SAR,
+       WMI_TLV_SERVICE_BCN_TXRATE_OVERRIDE,
+       WMI_TLV_SERVICE_NAN,
+       WMI_TLV_SERVICE_L1SS_STAT,
+       WMI_TLV_SERVICE_ESTIMATE_LINKSPEED,
+       WMI_TLV_SERVICE_OBSS_SCAN,
+       WMI_TLV_SERVICE_TDLS_OFFCHAN,
+       WMI_TLV_SERVICE_TDLS_UAPSD_BUFFER_STA,
+       WMI_TLV_SERVICE_TDLS_UAPSD_SLEEP_STA,
+       WMI_TLV_SERVICE_IBSS_PWRSAVE,
+       WMI_TLV_SERVICE_LPASS,
+       WMI_TLV_SERVICE_EXTSCAN,
+       WMI_TLV_SERVICE_D0WOW,
+       WMI_TLV_SERVICE_HSOFFLOAD,
+       WMI_TLV_SERVICE_ROAM_HO_OFFLOAD,
+       WMI_TLV_SERVICE_RX_FULL_REORDER,
+       WMI_TLV_SERVICE_DHCP_OFFLOAD,
+       WMI_TLV_SERVICE_STA_RX_IPA_OFFLOAD_SUPPORT,
+       WMI_TLV_SERVICE_MDNS_OFFLOAD,
+       WMI_TLV_SERVICE_SAP_AUTH_OFFLOAD,
+};
+
+#define WMI_SERVICE_IS_ENABLED(wmi_svc_bmap, svc_id, len) \
+       ((svc_id) < (len) && \
+        __le32_to_cpu((wmi_svc_bmap)[(svc_id)/(sizeof(u32))]) & \
+        BIT((svc_id)%(sizeof(u32))))
+
+#define SVCMAP(x, y, len) \
+       do { \
+               if (WMI_SERVICE_IS_ENABLED((in), (x), (len))) \
+                       __set_bit(y, out); \
+       } while (0)
+
+static inline void
+wmi_tlv_svc_map(const __le32 *in, unsigned long *out, size_t len)
+{
+       SVCMAP(WMI_TLV_SERVICE_BEACON_OFFLOAD,
+              WMI_SERVICE_BEACON_OFFLOAD, len);
+       SVCMAP(WMI_TLV_SERVICE_SCAN_OFFLOAD,
+              WMI_SERVICE_SCAN_OFFLOAD, len);
+       SVCMAP(WMI_TLV_SERVICE_ROAM_SCAN_OFFLOAD,
+              WMI_SERVICE_ROAM_SCAN_OFFLOAD, len);
+       SVCMAP(WMI_TLV_SERVICE_BCN_MISS_OFFLOAD,
+              WMI_SERVICE_BCN_MISS_OFFLOAD, len);
+       SVCMAP(WMI_TLV_SERVICE_STA_PWRSAVE,
+              WMI_SERVICE_STA_PWRSAVE, len);
+       SVCMAP(WMI_TLV_SERVICE_STA_ADVANCED_PWRSAVE,
+              WMI_SERVICE_STA_ADVANCED_PWRSAVE, len);
+       SVCMAP(WMI_TLV_SERVICE_AP_UAPSD,
+              WMI_SERVICE_AP_UAPSD, len);
+       SVCMAP(WMI_TLV_SERVICE_AP_DFS,
+              WMI_SERVICE_AP_DFS, len);
+       SVCMAP(WMI_TLV_SERVICE_11AC,
+              WMI_SERVICE_11AC, len);
+       SVCMAP(WMI_TLV_SERVICE_BLOCKACK,
+              WMI_SERVICE_BLOCKACK, len);
+       SVCMAP(WMI_TLV_SERVICE_PHYERR,
+              WMI_SERVICE_PHYERR, len);
+       SVCMAP(WMI_TLV_SERVICE_BCN_FILTER,
+              WMI_SERVICE_BCN_FILTER, len);
+       SVCMAP(WMI_TLV_SERVICE_RTT,
+              WMI_SERVICE_RTT, len);
+       SVCMAP(WMI_TLV_SERVICE_WOW,
+              WMI_SERVICE_WOW, len);
+       SVCMAP(WMI_TLV_SERVICE_RATECTRL_CACHE,
+              WMI_SERVICE_RATECTRL_CACHE, len);
+       SVCMAP(WMI_TLV_SERVICE_IRAM_TIDS,
+              WMI_SERVICE_IRAM_TIDS, len);
+       SVCMAP(WMI_TLV_SERVICE_ARPNS_OFFLOAD,
+              WMI_SERVICE_ARPNS_OFFLOAD, len);
+       SVCMAP(WMI_TLV_SERVICE_NLO,
+              WMI_SERVICE_NLO, len);
+       SVCMAP(WMI_TLV_SERVICE_GTK_OFFLOAD,
+              WMI_SERVICE_GTK_OFFLOAD, len);
+       SVCMAP(WMI_TLV_SERVICE_SCAN_SCH,
+              WMI_SERVICE_SCAN_SCH, len);
+       SVCMAP(WMI_TLV_SERVICE_CSA_OFFLOAD,
+              WMI_SERVICE_CSA_OFFLOAD, len);
+       SVCMAP(WMI_TLV_SERVICE_CHATTER,
+              WMI_SERVICE_CHATTER, len);
+       SVCMAP(WMI_TLV_SERVICE_COEX_FREQAVOID,
+              WMI_SERVICE_COEX_FREQAVOID, len);
+       SVCMAP(WMI_TLV_SERVICE_PACKET_POWER_SAVE,
+              WMI_SERVICE_PACKET_POWER_SAVE, len);
+       SVCMAP(WMI_TLV_SERVICE_FORCE_FW_HANG,
+              WMI_SERVICE_FORCE_FW_HANG, len);
+       SVCMAP(WMI_TLV_SERVICE_GPIO,
+              WMI_SERVICE_GPIO, len);
+       SVCMAP(WMI_TLV_SERVICE_STA_DTIM_PS_MODULATED_DTIM,
+              WMI_SERVICE_STA_DTIM_PS_MODULATED_DTIM, len);
+       SVCMAP(WMI_TLV_SERVICE_STA_UAPSD_BASIC_AUTO_TRIG,
+              WMI_SERVICE_STA_UAPSD_BASIC_AUTO_TRIG, len);
+       SVCMAP(WMI_TLV_SERVICE_STA_UAPSD_VAR_AUTO_TRIG,
+              WMI_SERVICE_STA_UAPSD_VAR_AUTO_TRIG, len);
+       SVCMAP(WMI_TLV_SERVICE_STA_KEEP_ALIVE,
+              WMI_SERVICE_STA_KEEP_ALIVE, len);
+       SVCMAP(WMI_TLV_SERVICE_TX_ENCAP,
+              WMI_SERVICE_TX_ENCAP, len);
+       SVCMAP(WMI_TLV_SERVICE_AP_PS_DETECT_OUT_OF_SYNC,
+              WMI_SERVICE_AP_PS_DETECT_OUT_OF_SYNC, len);
+       SVCMAP(WMI_TLV_SERVICE_EARLY_RX,
+              WMI_SERVICE_EARLY_RX, len);
+       SVCMAP(WMI_TLV_SERVICE_STA_SMPS,
+              WMI_SERVICE_STA_SMPS, len);
+       SVCMAP(WMI_TLV_SERVICE_FWTEST,
+              WMI_SERVICE_FWTEST, len);
+       SVCMAP(WMI_TLV_SERVICE_STA_WMMAC,
+              WMI_SERVICE_STA_WMMAC, len);
+       SVCMAP(WMI_TLV_SERVICE_TDLS,
+              WMI_SERVICE_TDLS, len);
+       SVCMAP(WMI_TLV_SERVICE_BURST,
+              WMI_SERVICE_BURST, len);
+       SVCMAP(WMI_TLV_SERVICE_MCC_BCN_INTERVAL_CHANGE,
+              WMI_SERVICE_MCC_BCN_INTERVAL_CHANGE, len);
+       SVCMAP(WMI_TLV_SERVICE_ADAPTIVE_OCS,
+              WMI_SERVICE_ADAPTIVE_OCS, len);
+       SVCMAP(WMI_TLV_SERVICE_BA_SSN_SUPPORT,
+              WMI_SERVICE_BA_SSN_SUPPORT, len);
+       SVCMAP(WMI_TLV_SERVICE_FILTER_IPSEC_NATKEEPALIVE,
+              WMI_SERVICE_FILTER_IPSEC_NATKEEPALIVE, len);
+       SVCMAP(WMI_TLV_SERVICE_WLAN_HB,
+              WMI_SERVICE_WLAN_HB, len);
+       SVCMAP(WMI_TLV_SERVICE_LTE_ANT_SHARE_SUPPORT,
+              WMI_SERVICE_LTE_ANT_SHARE_SUPPORT, len);
+       SVCMAP(WMI_TLV_SERVICE_BATCH_SCAN,
+              WMI_SERVICE_BATCH_SCAN, len);
+       SVCMAP(WMI_TLV_SERVICE_QPOWER,
+              WMI_SERVICE_QPOWER, len);
+       SVCMAP(WMI_TLV_SERVICE_PLMREQ,
+              WMI_SERVICE_PLMREQ, len);
+       SVCMAP(WMI_TLV_SERVICE_THERMAL_MGMT,
+              WMI_SERVICE_THERMAL_MGMT, len);
+       SVCMAP(WMI_TLV_SERVICE_RMC,
+              WMI_SERVICE_RMC, len);
+       SVCMAP(WMI_TLV_SERVICE_MHF_OFFLOAD,
+              WMI_SERVICE_MHF_OFFLOAD, len);
+       SVCMAP(WMI_TLV_SERVICE_COEX_SAR,
+              WMI_SERVICE_COEX_SAR, len);
+       SVCMAP(WMI_TLV_SERVICE_BCN_TXRATE_OVERRIDE,
+              WMI_SERVICE_BCN_TXRATE_OVERRIDE, len);
+       SVCMAP(WMI_TLV_SERVICE_NAN,
+              WMI_SERVICE_NAN, len);
+       SVCMAP(WMI_TLV_SERVICE_L1SS_STAT,
+              WMI_SERVICE_L1SS_STAT, len);
+       SVCMAP(WMI_TLV_SERVICE_ESTIMATE_LINKSPEED,
+              WMI_SERVICE_ESTIMATE_LINKSPEED, len);
+       SVCMAP(WMI_TLV_SERVICE_OBSS_SCAN,
+              WMI_SERVICE_OBSS_SCAN, len);
+       SVCMAP(WMI_TLV_SERVICE_TDLS_OFFCHAN,
+              WMI_SERVICE_TDLS_OFFCHAN, len);
+       SVCMAP(WMI_TLV_SERVICE_TDLS_UAPSD_BUFFER_STA,
+              WMI_SERVICE_TDLS_UAPSD_BUFFER_STA, len);
+       SVCMAP(WMI_TLV_SERVICE_TDLS_UAPSD_SLEEP_STA,
+              WMI_SERVICE_TDLS_UAPSD_SLEEP_STA, len);
+       SVCMAP(WMI_TLV_SERVICE_IBSS_PWRSAVE,
+              WMI_SERVICE_IBSS_PWRSAVE, len);
+       SVCMAP(WMI_TLV_SERVICE_LPASS,
+              WMI_SERVICE_LPASS, len);
+       SVCMAP(WMI_TLV_SERVICE_EXTSCAN,
+              WMI_SERVICE_EXTSCAN, len);
+       SVCMAP(WMI_TLV_SERVICE_D0WOW,
+              WMI_SERVICE_D0WOW, len);
+       SVCMAP(WMI_TLV_SERVICE_HSOFFLOAD,
+              WMI_SERVICE_HSOFFLOAD, len);
+       SVCMAP(WMI_TLV_SERVICE_ROAM_HO_OFFLOAD,
+              WMI_SERVICE_ROAM_HO_OFFLOAD, len);
+       SVCMAP(WMI_TLV_SERVICE_RX_FULL_REORDER,
+              WMI_SERVICE_RX_FULL_REORDER, len);
+       SVCMAP(WMI_TLV_SERVICE_DHCP_OFFLOAD,
+              WMI_SERVICE_DHCP_OFFLOAD, len);
+       SVCMAP(WMI_TLV_SERVICE_STA_RX_IPA_OFFLOAD_SUPPORT,
+              WMI_SERVICE_STA_RX_IPA_OFFLOAD_SUPPORT, len);
+       SVCMAP(WMI_TLV_SERVICE_MDNS_OFFLOAD,
+              WMI_SERVICE_MDNS_OFFLOAD, len);
+       SVCMAP(WMI_TLV_SERVICE_SAP_AUTH_OFFLOAD,
+              WMI_SERVICE_SAP_AUTH_OFFLOAD, len);
+}
+
+#undef SVCMAP
+
+struct wmi_tlv {
+       __le16 len;
+       __le16 tag;
+       u8 value[0];
+} __packed;
+
+#define WMI_TLV_MGMT_RX_NUM_RSSI 4
+
+struct wmi_tlv_mgmt_rx_ev {
+       __le32 channel;
+       __le32 snr;
+       __le32 rate;
+       __le32 phy_mode;
+       __le32 buf_len;
+       __le32 status;
+       __le32 rssi[WMI_TLV_MGMT_RX_NUM_RSSI];
+} __packed;
+
+struct wmi_tlv_abi_version {
+       __le32 abi_ver0;
+       __le32 abi_ver1;
+       __le32 abi_ver_ns0;
+       __le32 abi_ver_ns1;
+       __le32 abi_ver_ns2;
+       __le32 abi_ver_ns3;
+} __packed;
+
+enum wmi_tlv_hw_bd_id {
+       WMI_TLV_HW_BD_LEGACY = 0,
+       WMI_TLV_HW_BD_QCA6174 = 1,
+       WMI_TLV_HW_BD_QCA2582 = 2,
+};
+
+struct wmi_tlv_hw_bd_info {
+       u8 rev;
+       u8 project_id;
+       u8 custom_id;
+       u8 reference_design_id;
+} __packed;
+
+struct wmi_tlv_svc_rdy_ev {
+       __le32 fw_build_vers;
+       struct wmi_tlv_abi_version abi;
+       __le32 phy_capability;
+       __le32 max_frag_entry;
+       __le32 num_rf_chains;
+       __le32 ht_cap_info;
+       __le32 vht_cap_info;
+       __le32 vht_supp_mcs;
+       __le32 hw_min_tx_power;
+       __le32 hw_max_tx_power;
+       __le32 sys_cap_info;
+       __le32 min_pkt_size_enable;
+       __le32 max_bcn_ie_size;
+       __le32 num_mem_reqs;
+       __le32 max_num_scan_chans;
+       __le32 hw_bd_id; /* 0 means hw_bd_info is invalid */
+       struct wmi_tlv_hw_bd_info hw_bd_info[5];
+} __packed;
+
+struct wmi_tlv_rdy_ev {
+       struct wmi_tlv_abi_version abi;
+       struct wmi_mac_addr mac_addr;
+       __le32 status;
+} __packed;
+
+struct wmi_tlv_resource_config {
+       __le32 num_vdevs;
+       __le32 num_peers;
+       __le32 num_offload_peers;
+       __le32 num_offload_reorder_bufs;
+       __le32 num_peer_keys;
+       __le32 num_tids;
+       __le32 ast_skid_limit;
+       __le32 tx_chain_mask;
+       __le32 rx_chain_mask;
+       __le32 rx_timeout_pri[4];
+       __le32 rx_decap_mode;
+       __le32 scan_max_pending_reqs;
+       __le32 bmiss_offload_max_vdev;
+       __le32 roam_offload_max_vdev;
+       __le32 roam_offload_max_ap_profiles;
+       __le32 num_mcast_groups;
+       __le32 num_mcast_table_elems;
+       __le32 mcast2ucast_mode;
+       __le32 tx_dbg_log_size;
+       __le32 num_wds_entries;
+       __le32 dma_burst_size;
+       __le32 mac_aggr_delim;
+       __le32 rx_skip_defrag_timeout_dup_detection_check;
+       __le32 vow_config;
+       __le32 gtk_offload_max_vdev;
+       __le32 num_msdu_desc;
+       __le32 max_frag_entries;
+       __le32 num_tdls_vdevs;
+       __le32 num_tdls_conn_table_entries;
+       __le32 beacon_tx_offload_max_vdev;
+       __le32 num_multicast_filter_entries;
+       __le32 num_wow_filters;
+       __le32 num_keep_alive_pattern;
+       __le32 keep_alive_pattern_size;
+       __le32 max_tdls_concurrent_sleep_sta;
+       __le32 max_tdls_concurrent_buffer_sta;
+} __packed;
+
+struct wmi_tlv_init_cmd {
+       struct wmi_tlv_abi_version abi;
+       __le32 num_host_mem_chunks;
+} __packed;
+
+struct wmi_tlv_pdev_set_param_cmd {
+       __le32 pdev_id; /* not used yet */
+       __le32 param_id;
+       __le32 param_value;
+} __packed;
+
+struct wmi_tlv_pdev_set_rd_cmd {
+       __le32 pdev_id; /* not used yet */
+       __le32 regd;
+       __le32 regd_2ghz;
+       __le32 regd_5ghz;
+       __le32 conform_limit_2ghz;
+       __le32 conform_limit_5ghz;
+} __packed;
+
+struct wmi_tlv_scan_chan_list_cmd {
+       __le32 num_scan_chans;
+} __packed;
+
+struct wmi_tlv_start_scan_cmd {
+       struct wmi_start_scan_common common;
+       __le32 burst_duration_ms;
+       __le32 num_channels;
+       __le32 num_bssids;
+       __le32 num_ssids;
+       __le32 ie_len;
+       __le32 num_probes;
+} __packed;
+
+struct wmi_tlv_vdev_start_cmd {
+       __le32 vdev_id;
+       __le32 requestor_id;
+       __le32 bcn_intval;
+       __le32 dtim_period;
+       __le32 flags;
+       struct wmi_ssid ssid;
+       __le32 bcn_tx_rate;
+       __le32 bcn_tx_power;
+       __le32 num_noa_descr;
+       __le32 disable_hw_ack;
+} __packed;
+
+enum {
+       WMI_TLV_PEER_TYPE_DEFAULT = 0, /* generic / non-BSS / self-peer */
+       WMI_TLV_PEER_TYPE_BSS = 1,
+       WMI_TLV_PEER_TYPE_TDLS = 2,
+       WMI_TLV_PEER_TYPE_HOST_MAX = 127,
+       WMI_TLV_PEER_TYPE_ROAMOFFLOAD_TMP = 128,
+};
+
+struct wmi_tlv_peer_create_cmd {
+       __le32 vdev_id;
+       struct wmi_mac_addr peer_addr;
+       __le32 peer_type;
+} __packed;
+
+struct wmi_tlv_peer_assoc_cmd {
+       struct wmi_mac_addr mac_addr;
+       __le32 vdev_id;
+       __le32 new_assoc;
+       __le32 assoc_id;
+       __le32 flags;
+       __le32 caps;
+       __le32 listen_intval;
+       __le32 ht_caps;
+       __le32 max_mpdu;
+       __le32 mpdu_density;
+       __le32 rate_caps;
+       __le32 nss;
+       __le32 vht_caps;
+       __le32 phy_mode;
+       __le32 ht_info[2];
+       __le32 num_legacy_rates;
+       __le32 num_ht_rates;
+} __packed;
+
+struct wmi_tlv_pdev_suspend {
+       __le32 pdev_id; /* not used yet */
+       __le32 opt;
+} __packed;
+
+struct wmi_tlv_pdev_set_wmm_cmd {
+       __le32 pdev_id; /* not used yet */
+       __le32 dg_type; /* no idea.. */
+} __packed;
+
+struct wmi_tlv_phyerr_ev {
+       __le32 num_phyerrs;
+       __le32 tsf_l32;
+       __le32 tsf_u32;
+       __le32 buf_len;
+} __packed;
+
+enum wmi_tlv_dbglog_param {
+       WMI_TLV_DBGLOG_PARAM_LOG_LEVEL = 1,
+       WMI_TLV_DBGLOG_PARAM_VDEV_ENABLE,
+       WMI_TLV_DBGLOG_PARAM_VDEV_DISABLE,
+       WMI_TLV_DBGLOG_PARAM_VDEV_ENABLE_BITMAP,
+       WMI_TLV_DBGLOG_PARAM_VDEV_DISABLE_BITMAP,
+};
+
+enum wmi_tlv_dbglog_log_level {
+       WMI_TLV_DBGLOG_LOG_LEVEL_VERBOSE = 0,
+       WMI_TLV_DBGLOG_LOG_LEVEL_INFO,
+       WMI_TLV_DBGLOG_LOG_LEVEL_INFO_LVL_1,
+       WMI_TLV_DBGLOG_LOG_LEVEL_INFO_LVL_2,
+       WMI_TLV_DBGLOG_LOG_LEVEL_WARN,
+       WMI_TLV_DBGLOG_LOG_LEVEL_ERR,
+};
+
+#define WMI_TLV_DBGLOG_BITMAP_MAX_IDS 512
+#define WMI_TLV_DBGLOG_BITMAP_MAX_WORDS (WMI_TLV_DBGLOG_BITMAP_MAX_IDS / \
+                                        sizeof(__le32))
+#define WMI_TLV_DBGLOG_ALL_MODULES 0xffff
+#define WMI_TLV_DBGLOG_LOG_LEVEL_VALUE(module_id, log_level) \
+               (((module_id << 16) & 0xffff0000) | \
+                ((log_level <<  0) & 0x000000ff))
+
+struct wmi_tlv_dbglog_cmd {
+       __le32 param;
+       __le32 value;
+} __packed;
+
+struct wmi_tlv_resume_cmd {
+       __le32 reserved;
+} __packed;
+
+struct wmi_tlv_req_stats_cmd {
+       __le32 stats_id; /* wmi_stats_id */
+       __le32 vdev_id;
+       struct wmi_mac_addr peer_macaddr;
+} __packed;
+
+struct wmi_tlv_vdev_stats {
+       __le32 vdev_id;
+       __le32 beacon_snr;
+       __le32 data_snr;
+       __le32 num_tx_frames[4]; /* per-AC */
+       __le32 num_rx_frames;
+       __le32 num_tx_frames_retries[4];
+       __le32 num_tx_frames_failures[4];
+       __le32 num_rts_fail;
+       __le32 num_rts_success;
+       __le32 num_rx_err;
+       __le32 num_rx_discard;
+       __le32 num_tx_not_acked;
+       __le32 tx_rate_history[10];
+       __le32 beacon_rssi_history[10];
+} __packed;
+
+struct wmi_tlv_pktlog_enable {
+       __le32 reserved;
+       __le32 filter;
+} __packed;
+
+struct wmi_tlv_pktlog_disable {
+       __le32 reserved;
+} __packed;
+
+void ath10k_wmi_tlv_attach(struct ath10k *ar);
+
+#endif
index c0f3e4d..ac74290 100644 (file)
 #include "htc.h"
 #include "debug.h"
 #include "wmi.h"
+#include "wmi-tlv.h"
 #include "mac.h"
 #include "testmode.h"
+#include "wmi-ops.h"
 
 /* MAIN WMI cmd track */
 static struct wmi_cmd_map wmi_cmd_map = {
@@ -143,6 +145,7 @@ static struct wmi_cmd_map wmi_cmd_map = {
        .force_fw_hang_cmdid = WMI_FORCE_FW_HANG_CMDID,
        .gpio_config_cmdid = WMI_GPIO_CONFIG_CMDID,
        .gpio_output_cmdid = WMI_GPIO_OUTPUT_CMDID,
+       .pdev_get_temperature_cmdid = WMI_CMD_UNSUPPORTED,
 };
 
 /* 10.X WMI cmd track */
@@ -265,6 +268,129 @@ static struct wmi_cmd_map wmi_10x_cmd_map = {
        .force_fw_hang_cmdid = WMI_CMD_UNSUPPORTED,
        .gpio_config_cmdid = WMI_10X_GPIO_CONFIG_CMDID,
        .gpio_output_cmdid = WMI_10X_GPIO_OUTPUT_CMDID,
+       .pdev_get_temperature_cmdid = WMI_CMD_UNSUPPORTED,
+};
+
+/* 10.2.4 WMI cmd track */
+static struct wmi_cmd_map wmi_10_2_4_cmd_map = {
+       .init_cmdid = WMI_10_2_INIT_CMDID,
+       .start_scan_cmdid = WMI_10_2_START_SCAN_CMDID,
+       .stop_scan_cmdid = WMI_10_2_STOP_SCAN_CMDID,
+       .scan_chan_list_cmdid = WMI_10_2_SCAN_CHAN_LIST_CMDID,
+       .scan_sch_prio_tbl_cmdid = WMI_CMD_UNSUPPORTED,
+       .pdev_set_regdomain_cmdid = WMI_10_2_PDEV_SET_REGDOMAIN_CMDID,
+       .pdev_set_channel_cmdid = WMI_10_2_PDEV_SET_CHANNEL_CMDID,
+       .pdev_set_param_cmdid = WMI_10_2_PDEV_SET_PARAM_CMDID,
+       .pdev_pktlog_enable_cmdid = WMI_10_2_PDEV_PKTLOG_ENABLE_CMDID,
+       .pdev_pktlog_disable_cmdid = WMI_10_2_PDEV_PKTLOG_DISABLE_CMDID,
+       .pdev_set_wmm_params_cmdid = WMI_10_2_PDEV_SET_WMM_PARAMS_CMDID,
+       .pdev_set_ht_cap_ie_cmdid = WMI_10_2_PDEV_SET_HT_CAP_IE_CMDID,
+       .pdev_set_vht_cap_ie_cmdid = WMI_10_2_PDEV_SET_VHT_CAP_IE_CMDID,
+       .pdev_set_quiet_mode_cmdid = WMI_10_2_PDEV_SET_QUIET_MODE_CMDID,
+       .pdev_green_ap_ps_enable_cmdid = WMI_10_2_PDEV_GREEN_AP_PS_ENABLE_CMDID,
+       .pdev_get_tpc_config_cmdid = WMI_10_2_PDEV_GET_TPC_CONFIG_CMDID,
+       .pdev_set_base_macaddr_cmdid = WMI_10_2_PDEV_SET_BASE_MACADDR_CMDID,
+       .vdev_create_cmdid = WMI_10_2_VDEV_CREATE_CMDID,
+       .vdev_delete_cmdid = WMI_10_2_VDEV_DELETE_CMDID,
+       .vdev_start_request_cmdid = WMI_10_2_VDEV_START_REQUEST_CMDID,
+       .vdev_restart_request_cmdid = WMI_10_2_VDEV_RESTART_REQUEST_CMDID,
+       .vdev_up_cmdid = WMI_10_2_VDEV_UP_CMDID,
+       .vdev_stop_cmdid = WMI_10_2_VDEV_STOP_CMDID,
+       .vdev_down_cmdid = WMI_10_2_VDEV_DOWN_CMDID,
+       .vdev_set_param_cmdid = WMI_10_2_VDEV_SET_PARAM_CMDID,
+       .vdev_install_key_cmdid = WMI_10_2_VDEV_INSTALL_KEY_CMDID,
+       .peer_create_cmdid = WMI_10_2_PEER_CREATE_CMDID,
+       .peer_delete_cmdid = WMI_10_2_PEER_DELETE_CMDID,
+       .peer_flush_tids_cmdid = WMI_10_2_PEER_FLUSH_TIDS_CMDID,
+       .peer_set_param_cmdid = WMI_10_2_PEER_SET_PARAM_CMDID,
+       .peer_assoc_cmdid = WMI_10_2_PEER_ASSOC_CMDID,
+       .peer_add_wds_entry_cmdid = WMI_10_2_PEER_ADD_WDS_ENTRY_CMDID,
+       .peer_remove_wds_entry_cmdid = WMI_10_2_PEER_REMOVE_WDS_ENTRY_CMDID,
+       .peer_mcast_group_cmdid = WMI_10_2_PEER_MCAST_GROUP_CMDID,
+       .bcn_tx_cmdid = WMI_10_2_BCN_TX_CMDID,
+       .pdev_send_bcn_cmdid = WMI_10_2_PDEV_SEND_BCN_CMDID,
+       .bcn_tmpl_cmdid = WMI_CMD_UNSUPPORTED,
+       .bcn_filter_rx_cmdid = WMI_10_2_BCN_FILTER_RX_CMDID,
+       .prb_req_filter_rx_cmdid = WMI_10_2_PRB_REQ_FILTER_RX_CMDID,
+       .mgmt_tx_cmdid = WMI_10_2_MGMT_TX_CMDID,
+       .prb_tmpl_cmdid = WMI_CMD_UNSUPPORTED,
+       .addba_clear_resp_cmdid = WMI_10_2_ADDBA_CLEAR_RESP_CMDID,
+       .addba_send_cmdid = WMI_10_2_ADDBA_SEND_CMDID,
+       .addba_status_cmdid = WMI_10_2_ADDBA_STATUS_CMDID,
+       .delba_send_cmdid = WMI_10_2_DELBA_SEND_CMDID,
+       .addba_set_resp_cmdid = WMI_10_2_ADDBA_SET_RESP_CMDID,
+       .send_singleamsdu_cmdid = WMI_10_2_SEND_SINGLEAMSDU_CMDID,
+       .sta_powersave_mode_cmdid = WMI_10_2_STA_POWERSAVE_MODE_CMDID,
+       .sta_powersave_param_cmdid = WMI_10_2_STA_POWERSAVE_PARAM_CMDID,
+       .sta_mimo_ps_mode_cmdid = WMI_10_2_STA_MIMO_PS_MODE_CMDID,
+       .pdev_dfs_enable_cmdid = WMI_10_2_PDEV_DFS_ENABLE_CMDID,
+       .pdev_dfs_disable_cmdid = WMI_10_2_PDEV_DFS_DISABLE_CMDID,
+       .roam_scan_mode = WMI_10_2_ROAM_SCAN_MODE,
+       .roam_scan_rssi_threshold = WMI_10_2_ROAM_SCAN_RSSI_THRESHOLD,
+       .roam_scan_period = WMI_10_2_ROAM_SCAN_PERIOD,
+       .roam_scan_rssi_change_threshold =
+                               WMI_10_2_ROAM_SCAN_RSSI_CHANGE_THRESHOLD,
+       .roam_ap_profile = WMI_10_2_ROAM_AP_PROFILE,
+       .ofl_scan_add_ap_profile = WMI_10_2_OFL_SCAN_ADD_AP_PROFILE,
+       .ofl_scan_remove_ap_profile = WMI_10_2_OFL_SCAN_REMOVE_AP_PROFILE,
+       .ofl_scan_period = WMI_10_2_OFL_SCAN_PERIOD,
+       .p2p_dev_set_device_info = WMI_10_2_P2P_DEV_SET_DEVICE_INFO,
+       .p2p_dev_set_discoverability = WMI_10_2_P2P_DEV_SET_DISCOVERABILITY,
+       .p2p_go_set_beacon_ie = WMI_10_2_P2P_GO_SET_BEACON_IE,
+       .p2p_go_set_probe_resp_ie = WMI_10_2_P2P_GO_SET_PROBE_RESP_IE,
+       .p2p_set_vendor_ie_data_cmdid = WMI_CMD_UNSUPPORTED,
+       .ap_ps_peer_param_cmdid = WMI_10_2_AP_PS_PEER_PARAM_CMDID,
+       .ap_ps_peer_uapsd_coex_cmdid = WMI_CMD_UNSUPPORTED,
+       .peer_rate_retry_sched_cmdid = WMI_10_2_PEER_RATE_RETRY_SCHED_CMDID,
+       .wlan_profile_trigger_cmdid = WMI_10_2_WLAN_PROFILE_TRIGGER_CMDID,
+       .wlan_profile_set_hist_intvl_cmdid =
+                               WMI_10_2_WLAN_PROFILE_SET_HIST_INTVL_CMDID,
+       .wlan_profile_get_profile_data_cmdid =
+                               WMI_10_2_WLAN_PROFILE_GET_PROFILE_DATA_CMDID,
+       .wlan_profile_enable_profile_id_cmdid =
+                               WMI_10_2_WLAN_PROFILE_ENABLE_PROFILE_ID_CMDID,
+       .wlan_profile_list_profile_id_cmdid =
+                               WMI_10_2_WLAN_PROFILE_LIST_PROFILE_ID_CMDID,
+       .pdev_suspend_cmdid = WMI_10_2_PDEV_SUSPEND_CMDID,
+       .pdev_resume_cmdid = WMI_10_2_PDEV_RESUME_CMDID,
+       .add_bcn_filter_cmdid = WMI_10_2_ADD_BCN_FILTER_CMDID,
+       .rmv_bcn_filter_cmdid = WMI_10_2_RMV_BCN_FILTER_CMDID,
+       .wow_add_wake_pattern_cmdid = WMI_10_2_WOW_ADD_WAKE_PATTERN_CMDID,
+       .wow_del_wake_pattern_cmdid = WMI_10_2_WOW_DEL_WAKE_PATTERN_CMDID,
+       .wow_enable_disable_wake_event_cmdid =
+                               WMI_10_2_WOW_ENABLE_DISABLE_WAKE_EVENT_CMDID,
+       .wow_enable_cmdid = WMI_10_2_WOW_ENABLE_CMDID,
+       .wow_hostwakeup_from_sleep_cmdid =
+                               WMI_10_2_WOW_HOSTWAKEUP_FROM_SLEEP_CMDID,
+       .rtt_measreq_cmdid = WMI_10_2_RTT_MEASREQ_CMDID,
+       .rtt_tsf_cmdid = WMI_10_2_RTT_TSF_CMDID,
+       .vdev_spectral_scan_configure_cmdid =
+                               WMI_10_2_VDEV_SPECTRAL_SCAN_CONFIGURE_CMDID,
+       .vdev_spectral_scan_enable_cmdid =
+                               WMI_10_2_VDEV_SPECTRAL_SCAN_ENABLE_CMDID,
+       .request_stats_cmdid = WMI_10_2_REQUEST_STATS_CMDID,
+       .set_arp_ns_offload_cmdid = WMI_CMD_UNSUPPORTED,
+       .network_list_offload_config_cmdid = WMI_CMD_UNSUPPORTED,
+       .gtk_offload_cmdid = WMI_CMD_UNSUPPORTED,
+       .csa_offload_enable_cmdid = WMI_CMD_UNSUPPORTED,
+       .csa_offload_chanswitch_cmdid = WMI_CMD_UNSUPPORTED,
+       .chatter_set_mode_cmdid = WMI_CMD_UNSUPPORTED,
+       .peer_tid_addba_cmdid = WMI_CMD_UNSUPPORTED,
+       .peer_tid_delba_cmdid = WMI_CMD_UNSUPPORTED,
+       .sta_dtim_ps_method_cmdid = WMI_CMD_UNSUPPORTED,
+       .sta_uapsd_auto_trig_cmdid = WMI_CMD_UNSUPPORTED,
+       .sta_keepalive_cmd = WMI_CMD_UNSUPPORTED,
+       .echo_cmdid = WMI_10_2_ECHO_CMDID,
+       .pdev_utf_cmdid = WMI_10_2_PDEV_UTF_CMDID,
+       .dbglog_cfg_cmdid = WMI_10_2_DBGLOG_CFG_CMDID,
+       .pdev_qvit_cmdid = WMI_10_2_PDEV_QVIT_CMDID,
+       .pdev_ftm_intg_cmdid = WMI_CMD_UNSUPPORTED,
+       .vdev_set_keepalive_cmdid = WMI_CMD_UNSUPPORTED,
+       .vdev_get_keepalive_cmdid = WMI_CMD_UNSUPPORTED,
+       .force_fw_hang_cmdid = WMI_CMD_UNSUPPORTED,
+       .gpio_config_cmdid = WMI_10_2_GPIO_CONFIG_CMDID,
+       .gpio_output_cmdid = WMI_10_2_GPIO_OUTPUT_CMDID,
+       .pdev_get_temperature_cmdid = WMI_10_2_PDEV_GET_TEMPERATURE_CMDID,
 };
 
 /* MAIN WMI VDEV param map */
@@ -385,6 +511,64 @@ static struct wmi_vdev_param_map wmi_10x_vdev_param_map = {
                WMI_10X_VDEV_PARAM_AP_DETECT_OUT_OF_SYNC_SLEEPING_STA_TIME_SECS,
 };
 
+static struct wmi_vdev_param_map wmi_10_2_4_vdev_param_map = {
+       .rts_threshold = WMI_10X_VDEV_PARAM_RTS_THRESHOLD,
+       .fragmentation_threshold = WMI_10X_VDEV_PARAM_FRAGMENTATION_THRESHOLD,
+       .beacon_interval = WMI_10X_VDEV_PARAM_BEACON_INTERVAL,
+       .listen_interval = WMI_10X_VDEV_PARAM_LISTEN_INTERVAL,
+       .multicast_rate = WMI_10X_VDEV_PARAM_MULTICAST_RATE,
+       .mgmt_tx_rate = WMI_10X_VDEV_PARAM_MGMT_TX_RATE,
+       .slot_time = WMI_10X_VDEV_PARAM_SLOT_TIME,
+       .preamble = WMI_10X_VDEV_PARAM_PREAMBLE,
+       .swba_time = WMI_10X_VDEV_PARAM_SWBA_TIME,
+       .wmi_vdev_stats_update_period = WMI_10X_VDEV_STATS_UPDATE_PERIOD,
+       .wmi_vdev_pwrsave_ageout_time = WMI_10X_VDEV_PWRSAVE_AGEOUT_TIME,
+       .wmi_vdev_host_swba_interval = WMI_10X_VDEV_HOST_SWBA_INTERVAL,
+       .dtim_period = WMI_10X_VDEV_PARAM_DTIM_PERIOD,
+       .wmi_vdev_oc_scheduler_air_time_limit =
+                               WMI_10X_VDEV_OC_SCHEDULER_AIR_TIME_LIMIT,
+       .wds = WMI_10X_VDEV_PARAM_WDS,
+       .atim_window = WMI_10X_VDEV_PARAM_ATIM_WINDOW,
+       .bmiss_count_max = WMI_10X_VDEV_PARAM_BMISS_COUNT_MAX,
+       .bmiss_first_bcnt = WMI_VDEV_PARAM_UNSUPPORTED,
+       .bmiss_final_bcnt = WMI_VDEV_PARAM_UNSUPPORTED,
+       .feature_wmm = WMI_10X_VDEV_PARAM_FEATURE_WMM,
+       .chwidth = WMI_10X_VDEV_PARAM_CHWIDTH,
+       .chextoffset = WMI_10X_VDEV_PARAM_CHEXTOFFSET,
+       .disable_htprotection = WMI_10X_VDEV_PARAM_DISABLE_HTPROTECTION,
+       .sta_quickkickout = WMI_10X_VDEV_PARAM_STA_QUICKKICKOUT,
+       .mgmt_rate = WMI_10X_VDEV_PARAM_MGMT_RATE,
+       .protection_mode = WMI_10X_VDEV_PARAM_PROTECTION_MODE,
+       .fixed_rate = WMI_10X_VDEV_PARAM_FIXED_RATE,
+       .sgi = WMI_10X_VDEV_PARAM_SGI,
+       .ldpc = WMI_10X_VDEV_PARAM_LDPC,
+       .tx_stbc = WMI_10X_VDEV_PARAM_TX_STBC,
+       .rx_stbc = WMI_10X_VDEV_PARAM_RX_STBC,
+       .intra_bss_fwd = WMI_10X_VDEV_PARAM_INTRA_BSS_FWD,
+       .def_keyid = WMI_10X_VDEV_PARAM_DEF_KEYID,
+       .nss = WMI_10X_VDEV_PARAM_NSS,
+       .bcast_data_rate = WMI_10X_VDEV_PARAM_BCAST_DATA_RATE,
+       .mcast_data_rate = WMI_10X_VDEV_PARAM_MCAST_DATA_RATE,
+       .mcast_indicate = WMI_10X_VDEV_PARAM_MCAST_INDICATE,
+       .dhcp_indicate = WMI_10X_VDEV_PARAM_DHCP_INDICATE,
+       .unknown_dest_indicate = WMI_10X_VDEV_PARAM_UNKNOWN_DEST_INDICATE,
+       .ap_keepalive_min_idle_inactive_time_secs =
+               WMI_10X_VDEV_PARAM_AP_KEEPALIVE_MIN_IDLE_INACTIVE_TIME_SECS,
+       .ap_keepalive_max_idle_inactive_time_secs =
+               WMI_10X_VDEV_PARAM_AP_KEEPALIVE_MAX_IDLE_INACTIVE_TIME_SECS,
+       .ap_keepalive_max_unresponsive_time_secs =
+               WMI_10X_VDEV_PARAM_AP_KEEPALIVE_MAX_UNRESPONSIVE_TIME_SECS,
+       .ap_enable_nawds = WMI_10X_VDEV_PARAM_AP_ENABLE_NAWDS,
+       .mcast2ucast_set = WMI_10X_VDEV_PARAM_MCAST2UCAST_SET,
+       .enable_rtscts = WMI_10X_VDEV_PARAM_ENABLE_RTSCTS,
+       .txbf = WMI_VDEV_PARAM_UNSUPPORTED,
+       .packet_powersave = WMI_VDEV_PARAM_UNSUPPORTED,
+       .drop_unencry = WMI_VDEV_PARAM_UNSUPPORTED,
+       .tx_encap_type = WMI_VDEV_PARAM_UNSUPPORTED,
+       .ap_detect_out_of_sync_sleeping_sta_time_secs =
+               WMI_10X_VDEV_PARAM_AP_DETECT_OUT_OF_SYNC_SLEEPING_STA_TIME_SECS,
+};
+
 static struct wmi_pdev_param_map wmi_pdev_param_map = {
        .tx_chain_mask = WMI_PDEV_PARAM_TX_CHAIN_MASK,
        .rx_chain_mask = WMI_PDEV_PARAM_RX_CHAIN_MASK,
@@ -434,6 +618,7 @@ static struct wmi_pdev_param_map wmi_pdev_param_map = {
        .fast_channel_reset = WMI_PDEV_PARAM_UNSUPPORTED,
        .burst_dur = WMI_PDEV_PARAM_UNSUPPORTED,
        .burst_enable = WMI_PDEV_PARAM_UNSUPPORTED,
+       .cal_period = WMI_PDEV_PARAM_UNSUPPORTED,
 };
 
 static struct wmi_pdev_param_map wmi_10x_pdev_param_map = {
@@ -486,6 +671,60 @@ static struct wmi_pdev_param_map wmi_10x_pdev_param_map = {
        .fast_channel_reset = WMI_10X_PDEV_PARAM_FAST_CHANNEL_RESET,
        .burst_dur = WMI_10X_PDEV_PARAM_BURST_DUR,
        .burst_enable = WMI_10X_PDEV_PARAM_BURST_ENABLE,
+       .cal_period = WMI_10X_PDEV_PARAM_CAL_PERIOD,
+};
+
+static struct wmi_pdev_param_map wmi_10_2_4_pdev_param_map = {
+       .tx_chain_mask = WMI_10X_PDEV_PARAM_TX_CHAIN_MASK,
+       .rx_chain_mask = WMI_10X_PDEV_PARAM_RX_CHAIN_MASK,
+       .txpower_limit2g = WMI_10X_PDEV_PARAM_TXPOWER_LIMIT2G,
+       .txpower_limit5g = WMI_10X_PDEV_PARAM_TXPOWER_LIMIT5G,
+       .txpower_scale = WMI_10X_PDEV_PARAM_TXPOWER_SCALE,
+       .beacon_gen_mode = WMI_10X_PDEV_PARAM_BEACON_GEN_MODE,
+       .beacon_tx_mode = WMI_10X_PDEV_PARAM_BEACON_TX_MODE,
+       .resmgr_offchan_mode = WMI_10X_PDEV_PARAM_RESMGR_OFFCHAN_MODE,
+       .protection_mode = WMI_10X_PDEV_PARAM_PROTECTION_MODE,
+       .dynamic_bw = WMI_10X_PDEV_PARAM_DYNAMIC_BW,
+       .non_agg_sw_retry_th = WMI_10X_PDEV_PARAM_NON_AGG_SW_RETRY_TH,
+       .agg_sw_retry_th = WMI_10X_PDEV_PARAM_AGG_SW_RETRY_TH,
+       .sta_kickout_th = WMI_10X_PDEV_PARAM_STA_KICKOUT_TH,
+       .ac_aggrsize_scaling = WMI_10X_PDEV_PARAM_AC_AGGRSIZE_SCALING,
+       .ltr_enable = WMI_10X_PDEV_PARAM_LTR_ENABLE,
+       .ltr_ac_latency_be = WMI_10X_PDEV_PARAM_LTR_AC_LATENCY_BE,
+       .ltr_ac_latency_bk = WMI_10X_PDEV_PARAM_LTR_AC_LATENCY_BK,
+       .ltr_ac_latency_vi = WMI_10X_PDEV_PARAM_LTR_AC_LATENCY_VI,
+       .ltr_ac_latency_vo = WMI_10X_PDEV_PARAM_LTR_AC_LATENCY_VO,
+       .ltr_ac_latency_timeout = WMI_10X_PDEV_PARAM_LTR_AC_LATENCY_TIMEOUT,
+       .ltr_sleep_override = WMI_10X_PDEV_PARAM_LTR_SLEEP_OVERRIDE,
+       .ltr_rx_override = WMI_10X_PDEV_PARAM_LTR_RX_OVERRIDE,
+       .ltr_tx_activity_timeout = WMI_10X_PDEV_PARAM_LTR_TX_ACTIVITY_TIMEOUT,
+       .l1ss_enable = WMI_10X_PDEV_PARAM_L1SS_ENABLE,
+       .dsleep_enable = WMI_10X_PDEV_PARAM_DSLEEP_ENABLE,
+       .pcielp_txbuf_flush = WMI_PDEV_PARAM_UNSUPPORTED,
+       .pcielp_txbuf_watermark = WMI_PDEV_PARAM_UNSUPPORTED,
+       .pcielp_txbuf_tmo_en = WMI_PDEV_PARAM_UNSUPPORTED,
+       .pcielp_txbuf_tmo_value = WMI_PDEV_PARAM_UNSUPPORTED,
+       .pdev_stats_update_period = WMI_10X_PDEV_PARAM_PDEV_STATS_UPDATE_PERIOD,
+       .vdev_stats_update_period = WMI_10X_PDEV_PARAM_VDEV_STATS_UPDATE_PERIOD,
+       .peer_stats_update_period = WMI_10X_PDEV_PARAM_PEER_STATS_UPDATE_PERIOD,
+       .bcnflt_stats_update_period =
+                               WMI_10X_PDEV_PARAM_BCNFLT_STATS_UPDATE_PERIOD,
+       .pmf_qos = WMI_10X_PDEV_PARAM_PMF_QOS,
+       .arp_ac_override = WMI_10X_PDEV_PARAM_ARPDHCP_AC_OVERRIDE,
+       .dcs = WMI_10X_PDEV_PARAM_DCS,
+       .ani_enable = WMI_10X_PDEV_PARAM_ANI_ENABLE,
+       .ani_poll_period = WMI_10X_PDEV_PARAM_ANI_POLL_PERIOD,
+       .ani_listen_period = WMI_10X_PDEV_PARAM_ANI_LISTEN_PERIOD,
+       .ani_ofdm_level = WMI_10X_PDEV_PARAM_ANI_OFDM_LEVEL,
+       .ani_cck_level = WMI_10X_PDEV_PARAM_ANI_CCK_LEVEL,
+       .dyntxchain = WMI_10X_PDEV_PARAM_DYNTXCHAIN,
+       .proxy_sta = WMI_PDEV_PARAM_UNSUPPORTED,
+       .idle_ps_config = WMI_PDEV_PARAM_UNSUPPORTED,
+       .power_gating_sleep = WMI_PDEV_PARAM_UNSUPPORTED,
+       .fast_channel_reset = WMI_10X_PDEV_PARAM_FAST_CHANNEL_RESET,
+       .burst_dur = WMI_10X_PDEV_PARAM_BURST_DUR,
+       .burst_enable = WMI_10X_PDEV_PARAM_BURST_ENABLE,
+       .cal_period = WMI_10X_PDEV_PARAM_CAL_PERIOD,
 };
 
 /* firmware 10.2 specific mappings */
@@ -607,11 +846,11 @@ static struct wmi_cmd_map wmi_10_2_cmd_map = {
        .force_fw_hang_cmdid = WMI_CMD_UNSUPPORTED,
        .gpio_config_cmdid = WMI_10_2_GPIO_CONFIG_CMDID,
        .gpio_output_cmdid = WMI_10_2_GPIO_OUTPUT_CMDID,
+       .pdev_get_temperature_cmdid = WMI_CMD_UNSUPPORTED,
 };
 
-static void
-ath10k_wmi_put_wmi_channel(struct wmi_channel *ch,
-                          const struct wmi_channel_arg *arg)
+void ath10k_wmi_put_wmi_channel(struct wmi_channel *ch,
+                               const struct wmi_channel_arg *arg)
 {
        u32 flags = 0;
 
@@ -685,8 +924,8 @@ static void ath10k_wmi_htc_tx_complete(struct ath10k *ar, struct sk_buff *skb)
        dev_kfree_skb(skb);
 }
 
-static int ath10k_wmi_cmd_send_nowait(struct ath10k *ar, struct sk_buff *skb,
-                                     u32 cmd_id)
+int ath10k_wmi_cmd_send_nowait(struct ath10k *ar, struct sk_buff *skb,
+                              u32 cmd_id)
 {
        struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(skb);
        struct wmi_cmd_hdr *cmd_hdr;
@@ -792,24 +1031,23 @@ int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id)
        return ret;
 }
 
-int ath10k_wmi_mgmt_tx(struct ath10k *ar, struct sk_buff *skb)
+static struct sk_buff *
+ath10k_wmi_op_gen_mgmt_tx(struct ath10k *ar, struct sk_buff *msdu)
 {
-       int ret = 0;
        struct wmi_mgmt_tx_cmd *cmd;
        struct ieee80211_hdr *hdr;
-       struct sk_buff *wmi_skb;
-       struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+       struct sk_buff *skb;
        int len;
-       u32 buf_len = skb->len;
+       u32 buf_len = msdu->len;
        u16 fc;
 
-       hdr = (struct ieee80211_hdr *)skb->data;
+       hdr = (struct ieee80211_hdr *)msdu->data;
        fc = le16_to_cpu(hdr->frame_control);
 
        if (WARN_ON_ONCE(!ieee80211_is_mgmt(hdr->frame_control)))
-               return -EINVAL;
+               return ERR_PTR(-EINVAL);
 
-       len = sizeof(cmd->hdr) + skb->len;
+       len = sizeof(cmd->hdr) + msdu->len;
 
        if ((ieee80211_is_action(hdr->frame_control) ||
             ieee80211_is_deauth(hdr->frame_control) ||
@@ -821,36 +1059,27 @@ int ath10k_wmi_mgmt_tx(struct ath10k *ar, struct sk_buff *skb)
 
        len = round_up(len, 4);
 
-       wmi_skb = ath10k_wmi_alloc_skb(ar, len);
-       if (!wmi_skb)
-               return -ENOMEM;
+       skb = ath10k_wmi_alloc_skb(ar, len);
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
 
-       cmd = (struct wmi_mgmt_tx_cmd *)wmi_skb->data;
+       cmd = (struct wmi_mgmt_tx_cmd *)skb->data;
 
-       cmd->hdr.vdev_id = __cpu_to_le32(ATH10K_SKB_CB(skb)->vdev_id);
+       cmd->hdr.vdev_id = __cpu_to_le32(ATH10K_SKB_CB(msdu)->vdev_id);
        cmd->hdr.tx_rate = 0;
        cmd->hdr.tx_power = 0;
        cmd->hdr.buf_len = __cpu_to_le32(buf_len);
 
        ether_addr_copy(cmd->hdr.peer_macaddr.addr, ieee80211_get_DA(hdr));
-       memcpy(cmd->buf, skb->data, skb->len);
+       memcpy(cmd->buf, msdu->data, msdu->len);
 
        ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi mgmt tx skb %p len %d ftype %02x stype %02x\n",
-                  wmi_skb, wmi_skb->len, fc & IEEE80211_FCTL_FTYPE,
+                  msdu, skb->len, fc & IEEE80211_FCTL_FTYPE,
                   fc & IEEE80211_FCTL_STYPE);
        trace_ath10k_tx_hdr(ar, skb->data, skb->len);
        trace_ath10k_tx_payload(ar, skb->data, skb->len);
 
-       /* Send the management frame buffer to the target */
-       ret = ath10k_wmi_cmd_send(ar, wmi_skb, ar->wmi.cmd->mgmt_tx_cmdid);
-       if (ret)
-               return ret;
-
-       /* TODO: report tx status to mac80211 - temporary just ACK */
-       info->flags |= IEEE80211_TX_STAT_ACK;
-       ieee80211_tx_status_irqsafe(ar->hw, skb);
-
-       return ret;
+       return skb;
 }
 
 static void ath10k_wmi_event_scan_started(struct ath10k *ar)
@@ -977,22 +1206,48 @@ ath10k_wmi_event_scan_type_str(enum wmi_scan_event_type type,
        }
 }
 
-static int ath10k_wmi_event_scan(struct ath10k *ar, struct sk_buff *skb)
+static int ath10k_wmi_op_pull_scan_ev(struct ath10k *ar, struct sk_buff *skb,
+                                     struct wmi_scan_ev_arg *arg)
+{
+       struct wmi_scan_event *ev = (void *)skb->data;
+
+       if (skb->len < sizeof(*ev))
+               return -EPROTO;
+
+       skb_pull(skb, sizeof(*ev));
+       arg->event_type = ev->event_type;
+       arg->reason = ev->reason;
+       arg->channel_freq = ev->channel_freq;
+       arg->scan_req_id = ev->scan_req_id;
+       arg->scan_id = ev->scan_id;
+       arg->vdev_id = ev->vdev_id;
+
+       return 0;
+}
+
+int ath10k_wmi_event_scan(struct ath10k *ar, struct sk_buff *skb)
 {
-       struct wmi_scan_event *event = (struct wmi_scan_event *)skb->data;
+       struct wmi_scan_ev_arg arg = {};
        enum wmi_scan_event_type event_type;
        enum wmi_scan_completion_reason reason;
        u32 freq;
        u32 req_id;
        u32 scan_id;
        u32 vdev_id;
+       int ret;
+
+       ret = ath10k_wmi_pull_scan(ar, skb, &arg);
+       if (ret) {
+               ath10k_warn(ar, "failed to parse scan event: %d\n", ret);
+               return ret;
+       }
 
-       event_type = __le32_to_cpu(event->event_type);
-       reason     = __le32_to_cpu(event->reason);
-       freq       = __le32_to_cpu(event->channel_freq);
-       req_id     = __le32_to_cpu(event->scan_req_id);
-       scan_id    = __le32_to_cpu(event->scan_id);
-       vdev_id    = __le32_to_cpu(event->vdev_id);
+       event_type = __le32_to_cpu(arg.event_type);
+       reason = __le32_to_cpu(arg.reason);
+       freq = __le32_to_cpu(arg.channel_freq);
+       req_id = __le32_to_cpu(arg.scan_req_id);
+       scan_id = __le32_to_cpu(arg.scan_id);
+       vdev_id = __le32_to_cpu(arg.vdev_id);
 
        spin_lock_bh(&ar->data_lock);
 
@@ -1147,11 +1402,51 @@ static void ath10k_wmi_handle_wep_reauth(struct ath10k *ar,
        }
 }
 
-static int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb)
+static int ath10k_wmi_op_pull_mgmt_rx_ev(struct ath10k *ar, struct sk_buff *skb,
+                                        struct wmi_mgmt_rx_ev_arg *arg)
 {
        struct wmi_mgmt_rx_event_v1 *ev_v1;
        struct wmi_mgmt_rx_event_v2 *ev_v2;
        struct wmi_mgmt_rx_hdr_v1 *ev_hdr;
+       size_t pull_len;
+       u32 msdu_len;
+
+       if (test_bit(ATH10K_FW_FEATURE_EXT_WMI_MGMT_RX, ar->fw_features)) {
+               ev_v2 = (struct wmi_mgmt_rx_event_v2 *)skb->data;
+               ev_hdr = &ev_v2->hdr.v1;
+               pull_len = sizeof(*ev_v2);
+       } else {
+               ev_v1 = (struct wmi_mgmt_rx_event_v1 *)skb->data;
+               ev_hdr = &ev_v1->hdr;
+               pull_len = sizeof(*ev_v1);
+       }
+
+       if (skb->len < pull_len)
+               return -EPROTO;
+
+       skb_pull(skb, pull_len);
+       arg->channel = ev_hdr->channel;
+       arg->buf_len = ev_hdr->buf_len;
+       arg->status = ev_hdr->status;
+       arg->snr = ev_hdr->snr;
+       arg->phy_mode = ev_hdr->phy_mode;
+       arg->rate = ev_hdr->rate;
+
+       msdu_len = __le32_to_cpu(arg->buf_len);
+       if (skb->len < msdu_len)
+               return -EPROTO;
+
+       /* the WMI buffer might've ended up being padded to 4 bytes due to HTC
+        * trailer with credit update. Trim the excess garbage.
+        */
+       skb_trim(skb, msdu_len);
+
+       return 0;
+}
+
+int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb)
+{
+       struct wmi_mgmt_rx_ev_arg arg = {};
        struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
        struct ieee80211_hdr *hdr;
        u32 rx_status;
@@ -1161,24 +1456,20 @@ static int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb)
        u32 rate;
        u32 buf_len;
        u16 fc;
-       int pull_len;
+       int ret;
 
-       if (test_bit(ATH10K_FW_FEATURE_EXT_WMI_MGMT_RX, ar->fw_features)) {
-               ev_v2 = (struct wmi_mgmt_rx_event_v2 *)skb->data;
-               ev_hdr = &ev_v2->hdr.v1;
-               pull_len = sizeof(*ev_v2);
-       } else {
-               ev_v1 = (struct wmi_mgmt_rx_event_v1 *)skb->data;
-               ev_hdr = &ev_v1->hdr;
-               pull_len = sizeof(*ev_v1);
+       ret = ath10k_wmi_pull_mgmt_rx(ar, skb, &arg);
+       if (ret) {
+               ath10k_warn(ar, "failed to parse mgmt rx event: %d\n", ret);
+               return ret;
        }
 
-       channel   = __le32_to_cpu(ev_hdr->channel);
-       buf_len   = __le32_to_cpu(ev_hdr->buf_len);
-       rx_status = __le32_to_cpu(ev_hdr->status);
-       snr       = __le32_to_cpu(ev_hdr->snr);
-       phy_mode  = __le32_to_cpu(ev_hdr->phy_mode);
-       rate      = __le32_to_cpu(ev_hdr->rate);
+       channel = __le32_to_cpu(arg.channel);
+       buf_len = __le32_to_cpu(arg.buf_len);
+       rx_status = __le32_to_cpu(arg.status);
+       snr = __le32_to_cpu(arg.snr);
+       phy_mode = __le32_to_cpu(arg.phy_mode);
+       rate = __le32_to_cpu(arg.rate);
 
        memset(status, 0, sizeof(*status));
 
@@ -1232,8 +1523,6 @@ static int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb)
        status->signal = snr + ATH10K_DEFAULT_NOISE_FLOOR;
        status->rate_idx = get_rate_idx(rate, status->band);
 
-       skb_pull(skb, pull_len);
-
        hdr = (struct ieee80211_hdr *)skb->data;
        fc = le16_to_cpu(hdr->frame_control);
 
@@ -1266,12 +1555,6 @@ static int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb)
                   status->freq, status->band, status->signal,
                   status->rate_idx);
 
-       /*
-        * packets from HTC come aligned to 4byte boundaries
-        * because they can originally come in along with a trailer
-        */
-       skb_trim(skb, buf_len);
-
        ieee80211_rx(ar->hw, skb);
        return 0;
 }
@@ -1295,21 +1578,44 @@ exit:
        return idx;
 }
 
-static void ath10k_wmi_event_chan_info(struct ath10k *ar, struct sk_buff *skb)
+static int ath10k_wmi_op_pull_ch_info_ev(struct ath10k *ar, struct sk_buff *skb,
+                                        struct wmi_ch_info_ev_arg *arg)
+{
+       struct wmi_chan_info_event *ev = (void *)skb->data;
+
+       if (skb->len < sizeof(*ev))
+               return -EPROTO;
+
+       skb_pull(skb, sizeof(*ev));
+       arg->err_code = ev->err_code;
+       arg->freq = ev->freq;
+       arg->cmd_flags = ev->cmd_flags;
+       arg->noise_floor = ev->noise_floor;
+       arg->rx_clear_count = ev->rx_clear_count;
+       arg->cycle_count = ev->cycle_count;
+
+       return 0;
+}
+
+void ath10k_wmi_event_chan_info(struct ath10k *ar, struct sk_buff *skb)
 {
-       struct wmi_chan_info_event *ev;
+       struct wmi_ch_info_ev_arg arg = {};
        struct survey_info *survey;
        u32 err_code, freq, cmd_flags, noise_floor, rx_clear_count, cycle_count;
-       int idx;
+       int idx, ret;
 
-       ev = (struct wmi_chan_info_event *)skb->data;
+       ret = ath10k_wmi_pull_ch_info(ar, skb, &arg);
+       if (ret) {
+               ath10k_warn(ar, "failed to parse chan info event: %d\n", ret);
+               return;
+       }
 
-       err_code = __le32_to_cpu(ev->err_code);
-       freq = __le32_to_cpu(ev->freq);
-       cmd_flags = __le32_to_cpu(ev->cmd_flags);
-       noise_floor = __le32_to_cpu(ev->noise_floor);
-       rx_clear_count = __le32_to_cpu(ev->rx_clear_count);
-       cycle_count = __le32_to_cpu(ev->cycle_count);
+       err_code = __le32_to_cpu(arg.err_code);
+       freq = __le32_to_cpu(arg.freq);
+       cmd_flags = __le32_to_cpu(arg.cmd_flags);
+       noise_floor = __le32_to_cpu(arg.noise_floor);
+       rx_clear_count = __le32_to_cpu(arg.rx_clear_count);
+       cycle_count = __le32_to_cpu(arg.cycle_count);
 
        ath10k_dbg(ar, ATH10K_DBG_WMI,
                   "chan info err_code %d freq %d cmd_flags %d noise_floor %d rx_clear_count %d cycle_count %d\n",
@@ -1359,12 +1665,12 @@ exit:
        spin_unlock_bh(&ar->data_lock);
 }
 
-static void ath10k_wmi_event_echo(struct ath10k *ar, struct sk_buff *skb)
+void ath10k_wmi_event_echo(struct ath10k *ar, struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_ECHO_EVENTID\n");
 }
 
-static int ath10k_wmi_event_debug_mesg(struct ath10k *ar, struct sk_buff *skb)
+int ath10k_wmi_event_debug_mesg(struct ath10k *ar, struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi event debug mesg len %d\n",
                   skb->len);
@@ -1374,8 +1680,8 @@ static int ath10k_wmi_event_debug_mesg(struct ath10k *ar, struct sk_buff *skb)
        return 0;
 }
 
-static void ath10k_wmi_pull_pdev_stats(const struct wmi_pdev_stats *src,
-                                      struct ath10k_fw_stats_pdev *dst)
+void ath10k_wmi_pull_pdev_stats(const struct wmi_pdev_stats *src,
+                               struct ath10k_fw_stats_pdev *dst)
 {
        const struct wal_dbg_tx_stats *tx = &src->wal.tx;
        const struct wal_dbg_rx_stats *rx = &src->wal.rx;
@@ -1427,17 +1733,17 @@ static void ath10k_wmi_pull_pdev_stats(const struct wmi_pdev_stats *src,
        dst->mpdu_errs = __le32_to_cpu(rx->mpdu_errs);
 }
 
-static void ath10k_wmi_pull_peer_stats(const struct wmi_peer_stats *src,
-                                      struct ath10k_fw_stats_peer *dst)
+void ath10k_wmi_pull_peer_stats(const struct wmi_peer_stats *src,
+                               struct ath10k_fw_stats_peer *dst)
 {
        ether_addr_copy(dst->peer_macaddr, src->peer_macaddr.addr);
        dst->peer_rssi = __le32_to_cpu(src->peer_rssi);
        dst->peer_tx_rate = __le32_to_cpu(src->peer_tx_rate);
 }
 
-static int ath10k_wmi_main_pull_fw_stats(struct ath10k *ar,
-                                        struct sk_buff *skb,
-                                        struct ath10k_fw_stats *stats)
+static int ath10k_wmi_main_op_pull_fw_stats(struct ath10k *ar,
+                                           struct sk_buff *skb,
+                                           struct ath10k_fw_stats *stats)
 {
        const struct wmi_stats_event *ev = (void *)skb->data;
        u32 num_pdev_stats, num_vdev_stats, num_peer_stats;
@@ -1487,9 +1793,9 @@ static int ath10k_wmi_main_pull_fw_stats(struct ath10k *ar,
        return 0;
 }
 
-static int ath10k_wmi_10x_pull_fw_stats(struct ath10k *ar,
-                                       struct sk_buff *skb,
-                                       struct ath10k_fw_stats *stats)
+static int ath10k_wmi_10x_op_pull_fw_stats(struct ath10k *ar,
+                                          struct sk_buff *skb,
+                                          struct ath10k_fw_stats *stats)
 {
        const struct wmi_stats_event *ev = (void *)skb->data;
        u32 num_pdev_stats, num_vdev_stats, num_peer_stats;
@@ -1550,61 +1856,92 @@ static int ath10k_wmi_10x_pull_fw_stats(struct ath10k *ar,
        return 0;
 }
 
-int ath10k_wmi_pull_fw_stats(struct ath10k *ar, struct sk_buff *skb,
-                            struct ath10k_fw_stats *stats)
+void ath10k_wmi_event_update_stats(struct ath10k *ar, struct sk_buff *skb)
 {
-       if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features))
-               return ath10k_wmi_10x_pull_fw_stats(ar, skb, stats);
-       else
-               return ath10k_wmi_main_pull_fw_stats(ar, skb, stats);
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_UPDATE_STATS_EVENTID\n");
+       ath10k_debug_fw_stats_process(ar, skb);
 }
 
-static void ath10k_wmi_event_update_stats(struct ath10k *ar,
-                                         struct sk_buff *skb)
+static int
+ath10k_wmi_op_pull_vdev_start_ev(struct ath10k *ar, struct sk_buff *skb,
+                                struct wmi_vdev_start_ev_arg *arg)
 {
-       ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_UPDATE_STATS_EVENTID\n");
-       ath10k_debug_fw_stats_process(ar, skb);
+       struct wmi_vdev_start_response_event *ev = (void *)skb->data;
+
+       if (skb->len < sizeof(*ev))
+               return -EPROTO;
+
+       skb_pull(skb, sizeof(*ev));
+       arg->vdev_id = ev->vdev_id;
+       arg->req_id = ev->req_id;
+       arg->resp_type = ev->resp_type;
+       arg->status = ev->status;
+
+       return 0;
 }
 
-static void ath10k_wmi_event_vdev_start_resp(struct ath10k *ar,
-                                            struct sk_buff *skb)
+void ath10k_wmi_event_vdev_start_resp(struct ath10k *ar, struct sk_buff *skb)
 {
-       struct wmi_vdev_start_response_event *ev;
+       struct wmi_vdev_start_ev_arg arg = {};
+       int ret;
 
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_VDEV_START_RESP_EVENTID\n");
 
-       ev = (struct wmi_vdev_start_response_event *)skb->data;
+       ret = ath10k_wmi_pull_vdev_start(ar, skb, &arg);
+       if (ret) {
+               ath10k_warn(ar, "failed to parse vdev start event: %d\n", ret);
+               return;
+       }
 
-       if (WARN_ON(__le32_to_cpu(ev->status)))
+       if (WARN_ON(__le32_to_cpu(arg.status)))
                return;
 
        complete(&ar->vdev_setup_done);
 }
 
-static void ath10k_wmi_event_vdev_stopped(struct ath10k *ar,
-                                         struct sk_buff *skb)
+void ath10k_wmi_event_vdev_stopped(struct ath10k *ar, struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_VDEV_STOPPED_EVENTID\n");
        complete(&ar->vdev_setup_done);
 }
 
-static void ath10k_wmi_event_peer_sta_kickout(struct ath10k *ar,
-                                             struct sk_buff *skb)
+static int
+ath10k_wmi_op_pull_peer_kick_ev(struct ath10k *ar, struct sk_buff *skb,
+                               struct wmi_peer_kick_ev_arg *arg)
+{
+       struct wmi_peer_sta_kickout_event *ev = (void *)skb->data;
+
+       if (skb->len < sizeof(*ev))
+               return -EPROTO;
+
+       skb_pull(skb, sizeof(*ev));
+       arg->mac_addr = ev->peer_macaddr.addr;
+
+       return 0;
+}
+
+void ath10k_wmi_event_peer_sta_kickout(struct ath10k *ar, struct sk_buff *skb)
 {
-       struct wmi_peer_sta_kickout_event *ev;
+       struct wmi_peer_kick_ev_arg arg = {};
        struct ieee80211_sta *sta;
+       int ret;
 
-       ev = (struct wmi_peer_sta_kickout_event *)skb->data;
+       ret = ath10k_wmi_pull_peer_kick(ar, skb, &arg);
+       if (ret) {
+               ath10k_warn(ar, "failed to parse peer kickout event: %d\n",
+                           ret);
+               return;
+       }
 
        ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi event peer sta kickout %pM\n",
-                  ev->peer_macaddr.addr);
+                  arg.mac_addr);
 
        rcu_read_lock();
 
-       sta = ieee80211_find_sta_by_ifaddr(ar->hw, ev->peer_macaddr.addr, NULL);
+       sta = ieee80211_find_sta_by_ifaddr(ar->hw, arg.mac_addr, NULL);
        if (!sta) {
                ath10k_warn(ar, "Spurious quick kickout for STA %pM\n",
-                           ev->peer_macaddr.addr);
+                           arg.mac_addr);
                goto exit;
        }
 
@@ -1641,7 +1978,7 @@ exit:
 static void ath10k_wmi_update_tim(struct ath10k *ar,
                                  struct ath10k_vif *arvif,
                                  struct sk_buff *bcn,
-                                 struct wmi_bcn_info *bcn_info)
+                                 const struct wmi_tim_info *tim_info)
 {
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)bcn->data;
        struct ieee80211_tim_ie *tim;
@@ -1652,14 +1989,14 @@ static void ath10k_wmi_update_tim(struct ath10k *ar,
 
        /* if next SWBA has no tim_changed the tim_bitmap is garbage.
         * we must copy the bitmap upon change and reuse it later */
-       if (__le32_to_cpu(bcn_info->tim_info.tim_changed)) {
+       if (__le32_to_cpu(tim_info->tim_changed)) {
                int i;
 
                BUILD_BUG_ON(sizeof(arvif->u.ap.tim_bitmap) !=
-                            sizeof(bcn_info->tim_info.tim_bitmap));
+                            sizeof(tim_info->tim_bitmap));
 
                for (i = 0; i < sizeof(arvif->u.ap.tim_bitmap); i++) {
-                       t = bcn_info->tim_info.tim_bitmap[i / 4];
+                       t = tim_info->tim_bitmap[i / 4];
                        v = __le32_to_cpu(t);
                        arvif->u.ap.tim_bitmap[i] = (v >> ((i % 4) * 8)) & 0xFF;
                }
@@ -1711,13 +2048,13 @@ static void ath10k_wmi_update_tim(struct ath10k *ar,
                return;
        }
 
-       tim->bitmap_ctrl = !!__le32_to_cpu(bcn_info->tim_info.tim_mcast);
+       tim->bitmap_ctrl = !!__le32_to_cpu(tim_info->tim_mcast);
        memcpy(tim->virtual_map, arvif->u.ap.tim_bitmap, pvm_len);
 
        if (tim->dtim_count == 0) {
                ATH10K_SKB_CB(bcn)->bcn.dtim_zero = true;
 
-               if (__le32_to_cpu(bcn_info->tim_info.tim_mcast) == 1)
+               if (__le32_to_cpu(tim_info->tim_mcast) == 1)
                        ATH10K_SKB_CB(bcn)->bcn.deliver_cab = true;
        }
 
@@ -1727,7 +2064,7 @@ static void ath10k_wmi_update_tim(struct ath10k *ar,
 }
 
 static void ath10k_p2p_fill_noa_ie(u8 *data, u32 len,
-                                  struct wmi_p2p_noa_info *noa)
+                                  const struct wmi_p2p_noa_info *noa)
 {
        struct ieee80211_p2p_noa_attr *noa_attr;
        u8  ctwindow_oppps = noa->ctwindow_oppps;
@@ -1769,7 +2106,7 @@ static void ath10k_p2p_fill_noa_ie(u8 *data, u32 len,
        *noa_attr_len = __cpu_to_le16(attr_len);
 }
 
-static u32 ath10k_p2p_calc_noa_ie_len(struct wmi_p2p_noa_info *noa)
+static u32 ath10k_p2p_calc_noa_ie_len(const struct wmi_p2p_noa_info *noa)
 {
        u32 len = 0;
        u8 noa_descriptors = noa->num_descriptors;
@@ -1789,9 +2126,8 @@ static u32 ath10k_p2p_calc_noa_ie_len(struct wmi_p2p_noa_info *noa)
 
 static void ath10k_wmi_update_noa(struct ath10k *ar, struct ath10k_vif *arvif,
                                  struct sk_buff *bcn,
-                                 struct wmi_bcn_info *bcn_info)
+                                 const struct wmi_p2p_noa_info *noa)
 {
-       struct wmi_p2p_noa_info *noa = &bcn_info->p2p_noa_info;
        u8 *new_data, *old_data = arvif->u.ap.noa_data;
        u32 new_len;
 
@@ -1832,22 +2168,59 @@ cleanup:
        kfree(old_data);
 }
 
-static void ath10k_wmi_event_host_swba(struct ath10k *ar, struct sk_buff *skb)
+static int ath10k_wmi_op_pull_swba_ev(struct ath10k *ar, struct sk_buff *skb,
+                                     struct wmi_swba_ev_arg *arg)
 {
-       struct wmi_host_swba_event *ev;
+       struct wmi_host_swba_event *ev = (void *)skb->data;
+       u32 map;
+       size_t i;
+
+       if (skb->len < sizeof(*ev))
+               return -EPROTO;
+
+       skb_pull(skb, sizeof(*ev));
+       arg->vdev_map = ev->vdev_map;
+
+       for (i = 0, map = __le32_to_cpu(ev->vdev_map); map; map >>= 1) {
+               if (!(map & BIT(0)))
+                       continue;
+
+               /* If this happens there were some changes in firmware and
+                * ath10k should update the max size of tim_info array.
+                */
+               if (WARN_ON_ONCE(i == ARRAY_SIZE(arg->tim_info)))
+                       break;
+
+               arg->tim_info[i] = &ev->bcn_info[i].tim_info;
+               arg->noa_info[i] = &ev->bcn_info[i].p2p_noa_info;
+               i++;
+       }
+
+       return 0;
+}
+
+void ath10k_wmi_event_host_swba(struct ath10k *ar, struct sk_buff *skb)
+{
+       struct wmi_swba_ev_arg arg = {};
        u32 map;
        int i = -1;
-       struct wmi_bcn_info *bcn_info;
+       const struct wmi_tim_info *tim_info;
+       const struct wmi_p2p_noa_info *noa_info;
        struct ath10k_vif *arvif;
        struct sk_buff *bcn;
        dma_addr_t paddr;
        int ret, vdev_id = 0;
 
-       ev = (struct wmi_host_swba_event *)skb->data;
-       map = __le32_to_cpu(ev->vdev_map);
+       ret = ath10k_wmi_pull_swba(ar, skb, &arg);
+       if (ret) {
+               ath10k_warn(ar, "failed to parse swba event: %d\n", ret);
+               return;
+       }
+
+       map = __le32_to_cpu(arg.vdev_map);
 
        ath10k_dbg(ar, ATH10K_DBG_MGMT, "mgmt swba vdev_map 0x%x\n",
-                  ev->vdev_map);
+                  map);
 
        for (; map; map >>= 1, vdev_id++) {
                if (!(map & 0x1))
@@ -1860,19 +2233,20 @@ static void ath10k_wmi_event_host_swba(struct ath10k *ar, struct sk_buff *skb)
                        break;
                }
 
-               bcn_info = &ev->bcn_info[i];
+               tim_info = arg.tim_info[i];
+               noa_info = arg.noa_info[i];
 
                ath10k_dbg(ar, ATH10K_DBG_MGMT,
                           "mgmt event bcn_info %d tim_len %d mcast %d changed %d num_ps_pending %d bitmap 0x%08x%08x%08x%08x\n",
                           i,
-                          __le32_to_cpu(bcn_info->tim_info.tim_len),
-                          __le32_to_cpu(bcn_info->tim_info.tim_mcast),
-                          __le32_to_cpu(bcn_info->tim_info.tim_changed),
-                          __le32_to_cpu(bcn_info->tim_info.tim_num_ps_pending),
-                          __le32_to_cpu(bcn_info->tim_info.tim_bitmap[3]),
-                          __le32_to_cpu(bcn_info->tim_info.tim_bitmap[2]),
-                          __le32_to_cpu(bcn_info->tim_info.tim_bitmap[1]),
-                          __le32_to_cpu(bcn_info->tim_info.tim_bitmap[0]));
+                          __le32_to_cpu(tim_info->tim_len),
+                          __le32_to_cpu(tim_info->tim_mcast),
+                          __le32_to_cpu(tim_info->tim_changed),
+                          __le32_to_cpu(tim_info->tim_num_ps_pending),
+                          __le32_to_cpu(tim_info->tim_bitmap[3]),
+                          __le32_to_cpu(tim_info->tim_bitmap[2]),
+                          __le32_to_cpu(tim_info->tim_bitmap[1]),
+                          __le32_to_cpu(tim_info->tim_bitmap[0]));
 
                arvif = ath10k_get_arvif(ar, vdev_id);
                if (arvif == NULL) {
@@ -1899,8 +2273,8 @@ static void ath10k_wmi_event_host_swba(struct ath10k *ar, struct sk_buff *skb)
                }
 
                ath10k_tx_h_seq_no(arvif->vif, bcn);
-               ath10k_wmi_update_tim(ar, arvif, bcn, bcn_info);
-               ath10k_wmi_update_noa(ar, arvif, bcn, bcn_info);
+               ath10k_wmi_update_tim(ar, arvif, bcn, tim_info);
+               ath10k_wmi_update_noa(ar, arvif, bcn, noa_info);
 
                spin_lock_bh(&ar->data_lock);
 
@@ -1946,8 +2320,7 @@ skip:
        }
 }
 
-static void ath10k_wmi_event_tbttoffset_update(struct ath10k *ar,
-                                              struct sk_buff *skb)
+void ath10k_wmi_event_tbttoffset_update(struct ath10k *ar, struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_TBTTOFFSET_UPDATE_EVENTID\n");
 }
@@ -2068,9 +2441,9 @@ static int ath10k_dfs_fft_report(struct ath10k *ar,
        return 0;
 }
 
-static void ath10k_wmi_event_dfs(struct ath10k *ar,
-                                const struct wmi_phyerr *phyerr,
-                                u64 tsf)
+void ath10k_wmi_event_dfs(struct ath10k *ar,
+                         const struct wmi_phyerr *phyerr,
+                         u64 tsf)
 {
        int buf_len, tlv_len, res, i = 0;
        const struct phyerr_tlv *tlv;
@@ -2133,10 +2506,9 @@ static void ath10k_wmi_event_dfs(struct ath10k *ar,
        }
 }
 
-static void
-ath10k_wmi_event_spectral_scan(struct ath10k *ar,
-                              const struct wmi_phyerr *phyerr,
-                              u64 tsf)
+void ath10k_wmi_event_spectral_scan(struct ath10k *ar,
+                                   const struct wmi_phyerr *phyerr,
+                                   u64 tsf)
 {
        int buf_len, tlv_len, res, i = 0;
        struct phyerr_tlv *tlv;
@@ -2188,37 +2560,53 @@ ath10k_wmi_event_spectral_scan(struct ath10k *ar,
        }
 }
 
-static void ath10k_wmi_event_phyerr(struct ath10k *ar, struct sk_buff *skb)
+static int ath10k_wmi_op_pull_phyerr_ev(struct ath10k *ar, struct sk_buff *skb,
+                                       struct wmi_phyerr_ev_arg *arg)
 {
-       const struct wmi_phyerr_event *ev;
+       struct wmi_phyerr_event *ev = (void *)skb->data;
+
+       if (skb->len < sizeof(*ev))
+               return -EPROTO;
+
+       arg->num_phyerrs = ev->num_phyerrs;
+       arg->tsf_l32 = ev->tsf_l32;
+       arg->tsf_u32 = ev->tsf_u32;
+       arg->buf_len = __cpu_to_le32(skb->len - sizeof(*ev));
+       arg->phyerrs = ev->phyerrs;
+
+       return 0;
+}
+
+void ath10k_wmi_event_phyerr(struct ath10k *ar, struct sk_buff *skb)
+{
+       struct wmi_phyerr_ev_arg arg = {};
        const struct wmi_phyerr *phyerr;
        u32 count, i, buf_len, phy_err_code;
        u64 tsf;
-       int left_len = skb->len;
+       int left_len, ret;
 
        ATH10K_DFS_STAT_INC(ar, phy_errors);
 
-       /* Check if combined event available */
-       if (left_len < sizeof(*ev)) {
-               ath10k_warn(ar, "wmi phyerr combined event wrong len\n");
+       ret = ath10k_wmi_pull_phyerr(ar, skb, &arg);
+       if (ret) {
+               ath10k_warn(ar, "failed to parse phyerr event: %d\n", ret);
                return;
        }
 
-       left_len -= sizeof(*ev);
+       left_len = __le32_to_cpu(arg.buf_len);
 
        /* Check number of included events */
-       ev = (const struct wmi_phyerr_event *)skb->data;
-       count = __le32_to_cpu(ev->num_phyerrs);
+       count = __le32_to_cpu(arg.num_phyerrs);
 
-       tsf = __le32_to_cpu(ev->tsf_u32);
+       tsf = __le32_to_cpu(arg.tsf_u32);
        tsf <<= 32;
-       tsf |= __le32_to_cpu(ev->tsf_l32);
+       tsf |= __le32_to_cpu(arg.tsf_l32);
 
        ath10k_dbg(ar, ATH10K_DBG_WMI,
                   "wmi event phyerr count %d tsf64 0x%llX\n",
                   count, tsf);
 
-       phyerr = ev->phyerrs;
+       phyerr = arg.phyerrs;
        for (i = 0; i < count; i++) {
                /* Check if we can read event header */
                if (left_len < sizeof(*phyerr)) {
@@ -2258,19 +2646,17 @@ static void ath10k_wmi_event_phyerr(struct ath10k *ar, struct sk_buff *skb)
        }
 }
 
-static void ath10k_wmi_event_roam(struct ath10k *ar, struct sk_buff *skb)
+void ath10k_wmi_event_roam(struct ath10k *ar, struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_ROAM_EVENTID\n");
 }
 
-static void ath10k_wmi_event_profile_match(struct ath10k *ar,
-                                          struct sk_buff *skb)
+void ath10k_wmi_event_profile_match(struct ath10k *ar, struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_PROFILE_MATCH\n");
 }
 
-static void ath10k_wmi_event_debug_print(struct ath10k *ar,
-                                        struct sk_buff *skb)
+void ath10k_wmi_event_debug_print(struct ath10k *ar, struct sk_buff *skb)
 {
        char buf[101], c;
        int i;
@@ -2303,103 +2689,90 @@ static void ath10k_wmi_event_debug_print(struct ath10k *ar,
        ath10k_dbg(ar, ATH10K_DBG_WMI_PRINT, "wmi print '%s'\n", buf);
 }
 
-static void ath10k_wmi_event_pdev_qvit(struct ath10k *ar, struct sk_buff *skb)
+void ath10k_wmi_event_pdev_qvit(struct ath10k *ar, struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_PDEV_QVIT_EVENTID\n");
 }
 
-static void ath10k_wmi_event_wlan_profile_data(struct ath10k *ar,
-                                              struct sk_buff *skb)
+void ath10k_wmi_event_wlan_profile_data(struct ath10k *ar, struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_WLAN_PROFILE_DATA_EVENTID\n");
 }
 
-static void ath10k_wmi_event_rtt_measurement_report(struct ath10k *ar,
-                                                   struct sk_buff *skb)
+void ath10k_wmi_event_rtt_measurement_report(struct ath10k *ar,
+                                            struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_RTT_MEASUREMENT_REPORT_EVENTID\n");
 }
 
-static void ath10k_wmi_event_tsf_measurement_report(struct ath10k *ar,
-                                                   struct sk_buff *skb)
+void ath10k_wmi_event_tsf_measurement_report(struct ath10k *ar,
+                                            struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_TSF_MEASUREMENT_REPORT_EVENTID\n");
 }
 
-static void ath10k_wmi_event_rtt_error_report(struct ath10k *ar,
-                                             struct sk_buff *skb)
+void ath10k_wmi_event_rtt_error_report(struct ath10k *ar, struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_RTT_ERROR_REPORT_EVENTID\n");
 }
 
-static void ath10k_wmi_event_wow_wakeup_host(struct ath10k *ar,
-                                            struct sk_buff *skb)
+void ath10k_wmi_event_wow_wakeup_host(struct ath10k *ar, struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_WOW_WAKEUP_HOST_EVENTID\n");
 }
 
-static void ath10k_wmi_event_dcs_interference(struct ath10k *ar,
-                                             struct sk_buff *skb)
+void ath10k_wmi_event_dcs_interference(struct ath10k *ar, struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_DCS_INTERFERENCE_EVENTID\n");
 }
 
-static void ath10k_wmi_event_pdev_tpc_config(struct ath10k *ar,
-                                            struct sk_buff *skb)
+void ath10k_wmi_event_pdev_tpc_config(struct ath10k *ar, struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_PDEV_TPC_CONFIG_EVENTID\n");
 }
 
-static void ath10k_wmi_event_pdev_ftm_intg(struct ath10k *ar,
-                                          struct sk_buff *skb)
+void ath10k_wmi_event_pdev_ftm_intg(struct ath10k *ar, struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_PDEV_FTM_INTG_EVENTID\n");
 }
 
-static void ath10k_wmi_event_gtk_offload_status(struct ath10k *ar,
-                                               struct sk_buff *skb)
+void ath10k_wmi_event_gtk_offload_status(struct ath10k *ar, struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_GTK_OFFLOAD_STATUS_EVENTID\n");
 }
 
-static void ath10k_wmi_event_gtk_rekey_fail(struct ath10k *ar,
-                                           struct sk_buff *skb)
+void ath10k_wmi_event_gtk_rekey_fail(struct ath10k *ar, struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_GTK_REKEY_FAIL_EVENTID\n");
 }
 
-static void ath10k_wmi_event_delba_complete(struct ath10k *ar,
-                                           struct sk_buff *skb)
+void ath10k_wmi_event_delba_complete(struct ath10k *ar, struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_TX_DELBA_COMPLETE_EVENTID\n");
 }
 
-static void ath10k_wmi_event_addba_complete(struct ath10k *ar,
-                                           struct sk_buff *skb)
+void ath10k_wmi_event_addba_complete(struct ath10k *ar, struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_TX_ADDBA_COMPLETE_EVENTID\n");
 }
 
-static void ath10k_wmi_event_vdev_install_key_complete(struct ath10k *ar,
-                                                      struct sk_buff *skb)
+void ath10k_wmi_event_vdev_install_key_complete(struct ath10k *ar,
+                                               struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_VDEV_INSTALL_KEY_COMPLETE_EVENTID\n");
 }
 
-static void ath10k_wmi_event_inst_rssi_stats(struct ath10k *ar,
-                                            struct sk_buff *skb)
+void ath10k_wmi_event_inst_rssi_stats(struct ath10k *ar, struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_INST_RSSI_STATS_EVENTID\n");
 }
 
-static void ath10k_wmi_event_vdev_standby_req(struct ath10k *ar,
-                                             struct sk_buff *skb)
+void ath10k_wmi_event_vdev_standby_req(struct ath10k *ar, struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_VDEV_STANDBY_REQ_EVENTID\n");
 }
 
-static void ath10k_wmi_event_vdev_resume_req(struct ath10k *ar,
-                                            struct sk_buff *skb)
+void ath10k_wmi_event_vdev_resume_req(struct ath10k *ar, struct sk_buff *skb)
 {
        ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_VDEV_RESUME_REQ_EVENTID\n");
 }
@@ -2435,8 +2808,9 @@ static int ath10k_wmi_alloc_host_mem(struct ath10k *ar, u32 req_id,
        return 0;
 }
 
-static int ath10k_wmi_main_pull_svc_rdy_ev(struct sk_buff *skb,
-                                          struct wmi_svc_rdy_ev_arg *arg)
+static int
+ath10k_wmi_main_op_pull_svc_rdy_ev(struct ath10k *ar, struct sk_buff *skb,
+                                  struct wmi_svc_rdy_ev_arg *arg)
 {
        struct wmi_service_ready_event *ev;
        size_t i, n;
@@ -2471,8 +2845,9 @@ static int ath10k_wmi_main_pull_svc_rdy_ev(struct sk_buff *skb,
        return 0;
 }
 
-static int ath10k_wmi_10x_pull_svc_rdy_ev(struct sk_buff *skb,
-                                         struct wmi_svc_rdy_ev_arg *arg)
+static int
+ath10k_wmi_10x_op_pull_svc_rdy_ev(struct ath10k *ar, struct sk_buff *skb,
+                                 struct wmi_svc_rdy_ev_arg *arg)
 {
        struct wmi_10x_service_ready_event *ev;
        int i, n;
@@ -2506,30 +2881,22 @@ static int ath10k_wmi_10x_pull_svc_rdy_ev(struct sk_buff *skb,
        return 0;
 }
 
-static void ath10k_wmi_event_service_ready(struct ath10k *ar,
-                                          struct sk_buff *skb)
+void ath10k_wmi_event_service_ready(struct ath10k *ar, struct sk_buff *skb)
 {
        struct wmi_svc_rdy_ev_arg arg = {};
        u32 num_units, req_id, unit_size, num_mem_reqs, num_unit_info, i;
        int ret;
 
-       memset(&ar->wmi.svc_map, 0, sizeof(ar->wmi.svc_map));
-
-       if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {
-               ret = ath10k_wmi_10x_pull_svc_rdy_ev(skb, &arg);
-               wmi_10x_svc_map(arg.service_map, ar->wmi.svc_map,
-                               arg.service_map_len);
-       } else {
-               ret = ath10k_wmi_main_pull_svc_rdy_ev(skb, &arg);
-               wmi_main_svc_map(arg.service_map, ar->wmi.svc_map,
-                                arg.service_map_len);
-       }
-
+       ret = ath10k_wmi_pull_svc_rdy(ar, skb, &arg);
        if (ret) {
                ath10k_warn(ar, "failed to parse service ready: %d\n", ret);
                return;
        }
 
+       memset(&ar->wmi.svc_map, 0, sizeof(ar->wmi.svc_map));
+       ath10k_wmi_map_svc(ar, arg.service_map, ar->wmi.svc_map,
+                          arg.service_map_len);
+
        ar->hw_min_tx_power = __le32_to_cpu(arg.min_tx_power);
        ar->hw_max_tx_power = __le32_to_cpu(arg.max_tx_power);
        ar->ht_cap_info = __le32_to_cpu(arg.ht_cap);
@@ -2607,13 +2974,14 @@ static void ath10k_wmi_event_service_ready(struct ath10k *ar,
        }
 
        ath10k_dbg(ar, ATH10K_DBG_WMI,
-                  "wmi event service ready min_tx_power 0x%08x max_tx_power 0x%08x ht_cap 0x%08x vht_cap 0x%08x sw_ver0 0x%08x sw_ver1 0x%08x phy_capab 0x%08x num_rf_chains 0x%08x eeprom_rd 0x%08x num_mem_reqs 0x%08x\n",
+                  "wmi event service ready min_tx_power 0x%08x max_tx_power 0x%08x ht_cap 0x%08x vht_cap 0x%08x sw_ver0 0x%08x sw_ver1 0x%08x fw_build 0x%08x phy_capab 0x%08x num_rf_chains 0x%08x eeprom_rd 0x%08x num_mem_reqs 0x%08x\n",
                   __le32_to_cpu(arg.min_tx_power),
                   __le32_to_cpu(arg.max_tx_power),
                   __le32_to_cpu(arg.ht_cap),
                   __le32_to_cpu(arg.vht_cap),
                   __le32_to_cpu(arg.sw_ver0),
                   __le32_to_cpu(arg.sw_ver1),
+                  __le32_to_cpu(arg.fw_build),
                   __le32_to_cpu(arg.phy_capab),
                   __le32_to_cpu(arg.num_rf_chains),
                   __le32_to_cpu(arg.eeprom_rd),
@@ -2622,27 +2990,59 @@ static void ath10k_wmi_event_service_ready(struct ath10k *ar,
        complete(&ar->wmi.service_ready);
 }
 
-static int ath10k_wmi_event_ready(struct ath10k *ar, struct sk_buff *skb)
+static int ath10k_wmi_op_pull_rdy_ev(struct ath10k *ar, struct sk_buff *skb,
+                                    struct wmi_rdy_ev_arg *arg)
+{
+       struct wmi_ready_event *ev = (void *)skb->data;
+
+       if (skb->len < sizeof(*ev))
+               return -EPROTO;
+
+       skb_pull(skb, sizeof(*ev));
+       arg->sw_version = ev->sw_version;
+       arg->abi_version = ev->abi_version;
+       arg->status = ev->status;
+       arg->mac_addr = ev->mac_addr.addr;
+
+       return 0;
+}
+
+int ath10k_wmi_event_ready(struct ath10k *ar, struct sk_buff *skb)
+{
+       struct wmi_rdy_ev_arg arg = {};
+       int ret;
+
+       ret = ath10k_wmi_pull_rdy(ar, skb, &arg);
+       if (ret) {
+               ath10k_warn(ar, "failed to parse ready event: %d\n", ret);
+               return ret;
+       }
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI,
+                  "wmi event ready sw_version %u abi_version %u mac_addr %pM status %d\n",
+                  __le32_to_cpu(arg.sw_version),
+                  __le32_to_cpu(arg.abi_version),
+                  arg.mac_addr,
+                  __le32_to_cpu(arg.status));
+
+       ether_addr_copy(ar->mac_addr, arg.mac_addr);
+       complete(&ar->wmi.unified_ready);
+       return 0;
+}
+
+static int ath10k_wmi_event_temperature(struct ath10k *ar, struct sk_buff *skb)
 {
-       struct wmi_ready_event *ev = (struct wmi_ready_event *)skb->data;
+       const struct wmi_pdev_temperature_event *ev;
 
+       ev = (struct wmi_pdev_temperature_event *)skb->data;
        if (WARN_ON(skb->len < sizeof(*ev)))
-               return -EINVAL;
-
-       ether_addr_copy(ar->mac_addr, ev->mac_addr.addr);
-
-       ath10k_dbg(ar, ATH10K_DBG_WMI,
-                  "wmi event ready sw_version %u abi_version %u mac_addr %pM status %d skb->len %i ev-sz %zu\n",
-                  __le32_to_cpu(ev->sw_version),
-                  __le32_to_cpu(ev->abi_version),
-                  ev->mac_addr.addr,
-                  __le32_to_cpu(ev->status), skb->len, sizeof(*ev));
+               return -EPROTO;
 
-       complete(&ar->wmi.unified_ready);
+       ath10k_thermal_event_temperature(ar, __le32_to_cpu(ev->temperature));
        return 0;
 }
 
-static void ath10k_wmi_main_process_rx(struct ath10k *ar, struct sk_buff *skb)
+static void ath10k_wmi_op_rx(struct ath10k *ar, struct sk_buff *skb)
 {
        struct wmi_cmd_hdr *cmd_hdr;
        enum wmi_event_id id;
@@ -2758,7 +3158,7 @@ static void ath10k_wmi_main_process_rx(struct ath10k *ar, struct sk_buff *skb)
        dev_kfree_skb(skb);
 }
 
-static void ath10k_wmi_10x_process_rx(struct ath10k *ar, struct sk_buff *skb)
+static void ath10k_wmi_10_1_op_rx(struct ath10k *ar, struct sk_buff *skb)
 {
        struct wmi_cmd_hdr *cmd_hdr;
        enum wmi_10x_event_id id;
@@ -2882,7 +3282,7 @@ out:
        dev_kfree_skb(skb);
 }
 
-static void ath10k_wmi_10_2_process_rx(struct ath10k *ar, struct sk_buff *skb)
+static void ath10k_wmi_10_2_op_rx(struct ath10k *ar, struct sk_buff *skb)
 {
        struct wmi_cmd_hdr *cmd_hdr;
        enum wmi_10_2_event_id id;
@@ -2981,6 +3381,9 @@ static void ath10k_wmi_10_2_process_rx(struct ath10k *ar, struct sk_buff *skb)
        case WMI_10_2_READY_EVENTID:
                ath10k_wmi_event_ready(ar, skb);
                break;
+       case WMI_10_2_PDEV_TEMPERATURE_EVENTID:
+               ath10k_wmi_event_temperature(ar, skb);
+               break;
        case WMI_10_2_RTT_KEEPALIVE_EVENTID:
        case WMI_10_2_GPIO_INPUT_EVENTID:
        case WMI_10_2_PEER_RATECODE_LIST_EVENTID:
@@ -3001,14 +3404,11 @@ static void ath10k_wmi_10_2_process_rx(struct ath10k *ar, struct sk_buff *skb)
 
 static void ath10k_wmi_process_rx(struct ath10k *ar, struct sk_buff *skb)
 {
-       if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {
-               if (test_bit(ATH10K_FW_FEATURE_WMI_10_2, ar->fw_features))
-                       ath10k_wmi_10_2_process_rx(ar, skb);
-               else
-                       ath10k_wmi_10x_process_rx(ar, skb);
-       } else {
-               ath10k_wmi_main_process_rx(ar, skb);
-       }
+       int ret;
+
+       ret = ath10k_wmi_rx(ar, skb);
+       if (ret)
+               ath10k_warn(ar, "failed to process wmi rx: %d\n", ret);
 }
 
 int ath10k_wmi_connect(struct ath10k *ar)
@@ -3039,16 +3439,17 @@ int ath10k_wmi_connect(struct ath10k *ar)
        return 0;
 }
 
-static int ath10k_wmi_main_pdev_set_regdomain(struct ath10k *ar, u16 rd,
-                                             u16 rd2g, u16 rd5g, u16 ctl2g,
-                                             u16 ctl5g)
+static struct sk_buff *
+ath10k_wmi_op_gen_pdev_set_rd(struct ath10k *ar, u16 rd, u16 rd2g, u16 rd5g,
+                             u16 ctl2g, u16 ctl5g,
+                             enum wmi_dfs_region dfs_reg)
 {
        struct wmi_pdev_set_regdomain_cmd *cmd;
        struct sk_buff *skb;
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_pdev_set_regdomain_cmd *)skb->data;
        cmd->reg_domain = __cpu_to_le32(rd);
@@ -3060,22 +3461,20 @@ static int ath10k_wmi_main_pdev_set_regdomain(struct ath10k *ar, u16 rd,
        ath10k_dbg(ar, ATH10K_DBG_WMI,
                   "wmi pdev regdomain rd %x rd2g %x rd5g %x ctl2g %x ctl5g %x\n",
                   rd, rd2g, rd5g, ctl2g, ctl5g);
-
-       return ath10k_wmi_cmd_send(ar, skb,
-                                  ar->wmi.cmd->pdev_set_regdomain_cmdid);
+       return skb;
 }
 
-static int ath10k_wmi_10x_pdev_set_regdomain(struct ath10k *ar, u16 rd,
-                                            u16 rd2g, u16 rd5g,
-                                            u16 ctl2g, u16 ctl5g,
-                                            enum wmi_dfs_region dfs_reg)
+static struct sk_buff *
+ath10k_wmi_10x_op_gen_pdev_set_rd(struct ath10k *ar, u16 rd, u16 rd2g, u16
+                                 rd5g, u16 ctl2g, u16 ctl5g,
+                                 enum wmi_dfs_region dfs_reg)
 {
        struct wmi_pdev_set_regdomain_cmd_10x *cmd;
        struct sk_buff *skb;
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_pdev_set_regdomain_cmd_10x *)skb->data;
        cmd->reg_domain = __cpu_to_le32(rd);
@@ -3088,50 +3487,39 @@ static int ath10k_wmi_10x_pdev_set_regdomain(struct ath10k *ar, u16 rd,
        ath10k_dbg(ar, ATH10K_DBG_WMI,
                   "wmi pdev regdomain rd %x rd2g %x rd5g %x ctl2g %x ctl5g %x dfs_region %x\n",
                   rd, rd2g, rd5g, ctl2g, ctl5g, dfs_reg);
-
-       return ath10k_wmi_cmd_send(ar, skb,
-                                  ar->wmi.cmd->pdev_set_regdomain_cmdid);
-}
-
-int ath10k_wmi_pdev_set_regdomain(struct ath10k *ar, u16 rd, u16 rd2g,
-                                 u16 rd5g, u16 ctl2g, u16 ctl5g,
-                                 enum wmi_dfs_region dfs_reg)
-{
-       if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features))
-               return ath10k_wmi_10x_pdev_set_regdomain(ar, rd, rd2g, rd5g,
-                                                       ctl2g, ctl5g, dfs_reg);
-       else
-               return ath10k_wmi_main_pdev_set_regdomain(ar, rd, rd2g, rd5g,
-                                                        ctl2g, ctl5g);
+       return skb;
 }
 
-int ath10k_wmi_pdev_suspend_target(struct ath10k *ar, u32 suspend_opt)
+static struct sk_buff *
+ath10k_wmi_op_gen_pdev_suspend(struct ath10k *ar, u32 suspend_opt)
 {
        struct wmi_pdev_suspend_cmd *cmd;
        struct sk_buff *skb;
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_pdev_suspend_cmd *)skb->data;
        cmd->suspend_opt = __cpu_to_le32(suspend_opt);
 
-       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->pdev_suspend_cmdid);
+       return skb;
 }
 
-int ath10k_wmi_pdev_resume_target(struct ath10k *ar)
+static struct sk_buff *
+ath10k_wmi_op_gen_pdev_resume(struct ath10k *ar)
 {
        struct sk_buff *skb;
 
        skb = ath10k_wmi_alloc_skb(ar, 0);
-       if (skb == NULL)
-               return -ENOMEM;
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
 
-       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->pdev_resume_cmdid);
+       return skb;
 }
 
-int ath10k_wmi_pdev_set_param(struct ath10k *ar, u32 id, u32 value)
+static struct sk_buff *
+ath10k_wmi_op_gen_pdev_set_param(struct ath10k *ar, u32 id, u32 value)
 {
        struct wmi_pdev_set_param_cmd *cmd;
        struct sk_buff *skb;
@@ -3139,12 +3527,12 @@ int ath10k_wmi_pdev_set_param(struct ath10k *ar, u32 id, u32 value)
        if (id == WMI_PDEV_PARAM_UNSUPPORTED) {
                ath10k_warn(ar, "pdev param %d not supported by firmware\n",
                            id);
-               return -EOPNOTSUPP;
+               return ERR_PTR(-EOPNOTSUPP);
        }
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_pdev_set_param_cmd *)skb->data;
        cmd->param_id    = __cpu_to_le32(id);
@@ -3152,11 +3540,11 @@ int ath10k_wmi_pdev_set_param(struct ath10k *ar, u32 id, u32 value)
 
        ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi pdev set param %d value %d\n",
                   id, value);
-       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->pdev_set_param_cmdid);
+       return skb;
 }
 
-static void ath10k_wmi_put_host_mem_chunks(struct ath10k *ar,
-                                          struct wmi_host_mem_chunks *chunks)
+void ath10k_wmi_put_host_mem_chunks(struct ath10k *ar,
+                                   struct wmi_host_mem_chunks *chunks)
 {
        struct host_memory_chunk *chunk;
        int i;
@@ -3177,7 +3565,7 @@ static void ath10k_wmi_put_host_mem_chunks(struct ath10k *ar,
        }
 }
 
-static int ath10k_wmi_main_cmd_init(struct ath10k *ar)
+static struct sk_buff *ath10k_wmi_op_gen_init(struct ath10k *ar)
 {
        struct wmi_init_cmd *cmd;
        struct sk_buff *buf;
@@ -3240,7 +3628,7 @@ static int ath10k_wmi_main_cmd_init(struct ath10k *ar)
 
        buf = ath10k_wmi_alloc_skb(ar, len);
        if (!buf)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_init_cmd *)buf->data;
 
@@ -3248,10 +3636,10 @@ static int ath10k_wmi_main_cmd_init(struct ath10k *ar)
        ath10k_wmi_put_host_mem_chunks(ar, &cmd->mem_chunks);
 
        ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi init\n");
-       return ath10k_wmi_cmd_send(ar, buf, ar->wmi.cmd->init_cmdid);
+       return buf;
 }
 
-static int ath10k_wmi_10x_cmd_init(struct ath10k *ar)
+static struct sk_buff *ath10k_wmi_10_1_op_gen_init(struct ath10k *ar)
 {
        struct wmi_init_cmd_10x *cmd;
        struct sk_buff *buf;
@@ -3306,7 +3694,7 @@ static int ath10k_wmi_10x_cmd_init(struct ath10k *ar)
 
        buf = ath10k_wmi_alloc_skb(ar, len);
        if (!buf)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_init_cmd_10x *)buf->data;
 
@@ -3314,10 +3702,10 @@ static int ath10k_wmi_10x_cmd_init(struct ath10k *ar)
        ath10k_wmi_put_host_mem_chunks(ar, &cmd->mem_chunks);
 
        ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi init 10x\n");
-       return ath10k_wmi_cmd_send(ar, buf, ar->wmi.cmd->init_cmdid);
+       return buf;
 }
 
-static int ath10k_wmi_10_2_cmd_init(struct ath10k *ar)
+static struct sk_buff *ath10k_wmi_10_2_op_gen_init(struct ath10k *ar)
 {
        struct wmi_init_cmd_10_2 *cmd;
        struct sk_buff *buf;
@@ -3372,7 +3760,7 @@ static int ath10k_wmi_10_2_cmd_init(struct ath10k *ar)
 
        buf = ath10k_wmi_alloc_skb(ar, len);
        if (!buf)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_init_cmd_10_2 *)buf->data;
 
@@ -3380,26 +3768,10 @@ static int ath10k_wmi_10_2_cmd_init(struct ath10k *ar)
        ath10k_wmi_put_host_mem_chunks(ar, &cmd->mem_chunks);
 
        ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi init 10.2\n");
-       return ath10k_wmi_cmd_send(ar, buf, ar->wmi.cmd->init_cmdid);
-}
-
-int ath10k_wmi_cmd_init(struct ath10k *ar)
-{
-       int ret;
-
-       if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {
-               if (test_bit(ATH10K_FW_FEATURE_WMI_10_2, ar->fw_features))
-                       ret = ath10k_wmi_10_2_cmd_init(ar);
-               else
-                       ret = ath10k_wmi_10x_cmd_init(ar);
-       } else {
-               ret = ath10k_wmi_main_cmd_init(ar);
-       }
-
-       return ret;
+       return buf;
 }
 
-static int ath10k_wmi_start_scan_verify(const struct wmi_start_scan_arg *arg)
+int ath10k_wmi_start_scan_verify(const struct wmi_start_scan_arg *arg)
 {
        if (arg->ie_len && !arg->ie)
                return -EINVAL;
@@ -3450,9 +3822,8 @@ ath10k_wmi_start_scan_tlvs_len(const struct wmi_start_scan_arg *arg)
        return len;
 }
 
-static void
-ath10k_wmi_put_start_scan_common(struct wmi_start_scan_common *cmn,
-                                const struct wmi_start_scan_arg *arg)
+void ath10k_wmi_put_start_scan_common(struct wmi_start_scan_common *cmn,
+                                     const struct wmi_start_scan_arg *arg)
 {
        u32 scan_id;
        u32 scan_req_id;
@@ -3546,46 +3917,60 @@ ath10k_wmi_put_start_scan_tlvs(struct wmi_start_scan_tlvs *tlvs,
        }
 }
 
-int ath10k_wmi_start_scan(struct ath10k *ar,
-                         const struct wmi_start_scan_arg *arg)
+static struct sk_buff *
+ath10k_wmi_op_gen_start_scan(struct ath10k *ar,
+                            const struct wmi_start_scan_arg *arg)
 {
+       struct wmi_start_scan_cmd *cmd;
        struct sk_buff *skb;
        size_t len;
        int ret;
 
        ret = ath10k_wmi_start_scan_verify(arg);
        if (ret)
-               return ret;
-
-       if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features))
-               len = sizeof(struct wmi_10x_start_scan_cmd) +
-                     ath10k_wmi_start_scan_tlvs_len(arg);
-       else
-               len = sizeof(struct wmi_start_scan_cmd) +
-                     ath10k_wmi_start_scan_tlvs_len(arg);
+               return ERR_PTR(ret);
 
+       len = sizeof(*cmd) + ath10k_wmi_start_scan_tlvs_len(arg);
        skb = ath10k_wmi_alloc_skb(ar, len);
        if (!skb)
-               return -ENOMEM;
-
-       if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {
-               struct wmi_10x_start_scan_cmd *cmd;
+               return ERR_PTR(-ENOMEM);
 
-               cmd = (struct wmi_10x_start_scan_cmd *)skb->data;
-               ath10k_wmi_put_start_scan_common(&cmd->common, arg);
-               ath10k_wmi_put_start_scan_tlvs(&cmd->tlvs, arg);
-       } else {
-               struct wmi_start_scan_cmd *cmd;
+       cmd = (struct wmi_start_scan_cmd *)skb->data;
 
-               cmd = (struct wmi_start_scan_cmd *)skb->data;
-               cmd->burst_duration_ms = __cpu_to_le32(0);
+       ath10k_wmi_put_start_scan_common(&cmd->common, arg);
+       ath10k_wmi_put_start_scan_tlvs(&cmd->tlvs, arg);
 
-               ath10k_wmi_put_start_scan_common(&cmd->common, arg);
-               ath10k_wmi_put_start_scan_tlvs(&cmd->tlvs, arg);
-       }
+       cmd->burst_duration_ms = __cpu_to_le32(0);
 
        ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi start scan\n");
-       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->start_scan_cmdid);
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_10x_op_gen_start_scan(struct ath10k *ar,
+                                const struct wmi_start_scan_arg *arg)
+{
+       struct wmi_10x_start_scan_cmd *cmd;
+       struct sk_buff *skb;
+       size_t len;
+       int ret;
+
+       ret = ath10k_wmi_start_scan_verify(arg);
+       if (ret)
+               return ERR_PTR(ret);
+
+       len = sizeof(*cmd) + ath10k_wmi_start_scan_tlvs_len(arg);
+       skb = ath10k_wmi_alloc_skb(ar, len);
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       cmd = (struct wmi_10x_start_scan_cmd *)skb->data;
+
+       ath10k_wmi_put_start_scan_common(&cmd->common, arg);
+       ath10k_wmi_put_start_scan_tlvs(&cmd->tlvs, arg);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi 10x start scan\n");
+       return skb;
 }
 
 void ath10k_wmi_start_scan_init(struct ath10k *ar,
@@ -3614,7 +3999,9 @@ void ath10k_wmi_start_scan_init(struct ath10k *ar,
        arg->bssids[0].bssid = "\xFF\xFF\xFF\xFF\xFF\xFF";
 }
 
-int ath10k_wmi_stop_scan(struct ath10k *ar, const struct wmi_stop_scan_arg *arg)
+static struct sk_buff *
+ath10k_wmi_op_gen_stop_scan(struct ath10k *ar,
+                           const struct wmi_stop_scan_arg *arg)
 {
        struct wmi_stop_scan_cmd *cmd;
        struct sk_buff *skb;
@@ -3622,13 +4009,13 @@ int ath10k_wmi_stop_scan(struct ath10k *ar, const struct wmi_stop_scan_arg *arg)
        u32 req_id;
 
        if (arg->req_id > 0xFFF)
-               return -EINVAL;
+               return ERR_PTR(-EINVAL);
        if (arg->req_type == WMI_SCAN_STOP_ONE && arg->u.scan_id > 0xFFF)
-               return -EINVAL;
+               return ERR_PTR(-EINVAL);
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        scan_id = arg->u.scan_id;
        scan_id |= WMI_HOST_SCAN_REQ_ID_PREFIX;
@@ -3645,20 +4032,21 @@ int ath10k_wmi_stop_scan(struct ath10k *ar, const struct wmi_stop_scan_arg *arg)
        ath10k_dbg(ar, ATH10K_DBG_WMI,
                   "wmi stop scan reqid %d req_type %d vdev/scan_id %d\n",
                   arg->req_id, arg->req_type, arg->u.scan_id);
-       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->stop_scan_cmdid);
+       return skb;
 }
 
-int ath10k_wmi_vdev_create(struct ath10k *ar, u32 vdev_id,
-                          enum wmi_vdev_type type,
-                          enum wmi_vdev_subtype subtype,
-                          const u8 macaddr[ETH_ALEN])
+static struct sk_buff *
+ath10k_wmi_op_gen_vdev_create(struct ath10k *ar, u32 vdev_id,
+                             enum wmi_vdev_type type,
+                             enum wmi_vdev_subtype subtype,
+                             const u8 macaddr[ETH_ALEN])
 {
        struct wmi_vdev_create_cmd *cmd;
        struct sk_buff *skb;
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_vdev_create_cmd *)skb->data;
        cmd->vdev_id      = __cpu_to_le32(vdev_id);
@@ -3669,58 +4057,52 @@ int ath10k_wmi_vdev_create(struct ath10k *ar, u32 vdev_id,
        ath10k_dbg(ar, ATH10K_DBG_WMI,
                   "WMI vdev create: id %d type %d subtype %d macaddr %pM\n",
                   vdev_id, type, subtype, macaddr);
-
-       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->vdev_create_cmdid);
+       return skb;
 }
 
-int ath10k_wmi_vdev_delete(struct ath10k *ar, u32 vdev_id)
+static struct sk_buff *
+ath10k_wmi_op_gen_vdev_delete(struct ath10k *ar, u32 vdev_id)
 {
        struct wmi_vdev_delete_cmd *cmd;
        struct sk_buff *skb;
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_vdev_delete_cmd *)skb->data;
        cmd->vdev_id = __cpu_to_le32(vdev_id);
 
        ath10k_dbg(ar, ATH10K_DBG_WMI,
                   "WMI vdev delete id %d\n", vdev_id);
-
-       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->vdev_delete_cmdid);
+       return skb;
 }
 
-static int
-ath10k_wmi_vdev_start_restart(struct ath10k *ar,
-                             const struct wmi_vdev_start_request_arg *arg,
-                             u32 cmd_id)
+static struct sk_buff *
+ath10k_wmi_op_gen_vdev_start(struct ath10k *ar,
+                            const struct wmi_vdev_start_request_arg *arg,
+                            bool restart)
 {
        struct wmi_vdev_start_request_cmd *cmd;
        struct sk_buff *skb;
        const char *cmdname;
        u32 flags = 0;
 
-       if (cmd_id != ar->wmi.cmd->vdev_start_request_cmdid &&
-           cmd_id != ar->wmi.cmd->vdev_restart_request_cmdid)
-               return -EINVAL;
        if (WARN_ON(arg->ssid && arg->ssid_len == 0))
-               return -EINVAL;
+               return ERR_PTR(-EINVAL);
        if (WARN_ON(arg->hidden_ssid && !arg->ssid))
-               return -EINVAL;
+               return ERR_PTR(-EINVAL);
        if (WARN_ON(arg->ssid_len > sizeof(cmd->ssid.ssid)))
-               return -EINVAL;
+               return ERR_PTR(-EINVAL);
 
-       if (cmd_id == ar->wmi.cmd->vdev_start_request_cmdid)
-               cmdname = "start";
-       else if (cmd_id == ar->wmi.cmd->vdev_restart_request_cmdid)
+       if (restart)
                cmdname = "restart";
        else
-               return -EINVAL; /* should not happen, we already check cmd_id */
+               cmdname = "start";
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        if (arg->hidden_ssid)
                flags |= WMI_VDEV_START_HIDDEN_SSID;
@@ -3749,50 +4131,36 @@ ath10k_wmi_vdev_start_restart(struct ath10k *ar,
                   flags, arg->channel.freq, arg->channel.mode,
                   cmd->chan.flags, arg->channel.max_power);
 
-       return ath10k_wmi_cmd_send(ar, skb, cmd_id);
-}
-
-int ath10k_wmi_vdev_start(struct ath10k *ar,
-                         const struct wmi_vdev_start_request_arg *arg)
-{
-       u32 cmd_id = ar->wmi.cmd->vdev_start_request_cmdid;
-
-       return ath10k_wmi_vdev_start_restart(ar, arg, cmd_id);
-}
-
-int ath10k_wmi_vdev_restart(struct ath10k *ar,
-                           const struct wmi_vdev_start_request_arg *arg)
-{
-       u32 cmd_id = ar->wmi.cmd->vdev_restart_request_cmdid;
-
-       return ath10k_wmi_vdev_start_restart(ar, arg, cmd_id);
+       return skb;
 }
 
-int ath10k_wmi_vdev_stop(struct ath10k *ar, u32 vdev_id)
+static struct sk_buff *
+ath10k_wmi_op_gen_vdev_stop(struct ath10k *ar, u32 vdev_id)
 {
        struct wmi_vdev_stop_cmd *cmd;
        struct sk_buff *skb;
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_vdev_stop_cmd *)skb->data;
        cmd->vdev_id = __cpu_to_le32(vdev_id);
 
        ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi vdev stop id 0x%x\n", vdev_id);
-
-       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->vdev_stop_cmdid);
+       return skb;
 }
 
-int ath10k_wmi_vdev_up(struct ath10k *ar, u32 vdev_id, u32 aid, const u8 *bssid)
+static struct sk_buff *
+ath10k_wmi_op_gen_vdev_up(struct ath10k *ar, u32 vdev_id, u32 aid,
+                         const u8 *bssid)
 {
        struct wmi_vdev_up_cmd *cmd;
        struct sk_buff *skb;
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_vdev_up_cmd *)skb->data;
        cmd->vdev_id       = __cpu_to_le32(vdev_id);
@@ -3802,30 +4170,30 @@ int ath10k_wmi_vdev_up(struct ath10k *ar, u32 vdev_id, u32 aid, const u8 *bssid)
        ath10k_dbg(ar, ATH10K_DBG_WMI,
                   "wmi mgmt vdev up id 0x%x assoc id %d bssid %pM\n",
                   vdev_id, aid, bssid);
-
-       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->vdev_up_cmdid);
+       return skb;
 }
 
-int ath10k_wmi_vdev_down(struct ath10k *ar, u32 vdev_id)
+static struct sk_buff *
+ath10k_wmi_op_gen_vdev_down(struct ath10k *ar, u32 vdev_id)
 {
        struct wmi_vdev_down_cmd *cmd;
        struct sk_buff *skb;
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_vdev_down_cmd *)skb->data;
        cmd->vdev_id = __cpu_to_le32(vdev_id);
 
        ath10k_dbg(ar, ATH10K_DBG_WMI,
                   "wmi mgmt vdev down id 0x%x\n", vdev_id);
-
-       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->vdev_down_cmdid);
+       return skb;
 }
 
-int ath10k_wmi_vdev_set_param(struct ath10k *ar, u32 vdev_id,
-                             u32 param_id, u32 param_value)
+static struct sk_buff *
+ath10k_wmi_op_gen_vdev_set_param(struct ath10k *ar, u32 vdev_id,
+                                u32 param_id, u32 param_value)
 {
        struct wmi_vdev_set_param_cmd *cmd;
        struct sk_buff *skb;
@@ -3834,12 +4202,12 @@ int ath10k_wmi_vdev_set_param(struct ath10k *ar, u32 vdev_id,
                ath10k_dbg(ar, ATH10K_DBG_WMI,
                           "vdev param %d not supported by firmware\n",
                            param_id);
-               return -EOPNOTSUPP;
+               return ERR_PTR(-EOPNOTSUPP);
        }
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_vdev_set_param_cmd *)skb->data;
        cmd->vdev_id     = __cpu_to_le32(vdev_id);
@@ -3849,24 +4217,24 @@ int ath10k_wmi_vdev_set_param(struct ath10k *ar, u32 vdev_id,
        ath10k_dbg(ar, ATH10K_DBG_WMI,
                   "wmi vdev id 0x%x set param %d value %d\n",
                   vdev_id, param_id, param_value);
-
-       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->vdev_set_param_cmdid);
+       return skb;
 }
 
-int ath10k_wmi_vdev_install_key(struct ath10k *ar,
-                               const struct wmi_vdev_install_key_arg *arg)
+static struct sk_buff *
+ath10k_wmi_op_gen_vdev_install_key(struct ath10k *ar,
+                                  const struct wmi_vdev_install_key_arg *arg)
 {
        struct wmi_vdev_install_key_cmd *cmd;
        struct sk_buff *skb;
 
        if (arg->key_cipher == WMI_CIPHER_NONE && arg->key_data != NULL)
-               return -EINVAL;
+               return ERR_PTR(-EINVAL);
        if (arg->key_cipher != WMI_CIPHER_NONE && arg->key_data == NULL)
-               return -EINVAL;
+               return ERR_PTR(-EINVAL);
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd) + arg->key_len);
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_vdev_install_key_cmd *)skb->data;
        cmd->vdev_id       = __cpu_to_le32(arg->vdev_id);
@@ -3885,20 +4253,19 @@ int ath10k_wmi_vdev_install_key(struct ath10k *ar,
        ath10k_dbg(ar, ATH10K_DBG_WMI,
                   "wmi vdev install key idx %d cipher %d len %d\n",
                   arg->key_idx, arg->key_cipher, arg->key_len);
-       return ath10k_wmi_cmd_send(ar, skb,
-                                  ar->wmi.cmd->vdev_install_key_cmdid);
+       return skb;
 }
 
-int ath10k_wmi_vdev_spectral_conf(struct ath10k *ar,
-                                 const struct wmi_vdev_spectral_conf_arg *arg)
+static struct sk_buff *
+ath10k_wmi_op_gen_vdev_spectral_conf(struct ath10k *ar,
+                                    const struct wmi_vdev_spectral_conf_arg *arg)
 {
        struct wmi_vdev_spectral_conf_cmd *cmd;
        struct sk_buff *skb;
-       u32 cmdid;
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_vdev_spectral_conf_cmd *)skb->data;
        cmd->vdev_id = __cpu_to_le32(arg->vdev_id);
@@ -3921,39 +4288,38 @@ int ath10k_wmi_vdev_spectral_conf(struct ath10k *ar,
        cmd->scan_dbm_adj = __cpu_to_le32(arg->scan_dbm_adj);
        cmd->scan_chn_mask = __cpu_to_le32(arg->scan_chn_mask);
 
-       cmdid = ar->wmi.cmd->vdev_spectral_scan_configure_cmdid;
-       return ath10k_wmi_cmd_send(ar, skb, cmdid);
+       return skb;
 }
 
-int ath10k_wmi_vdev_spectral_enable(struct ath10k *ar, u32 vdev_id, u32 trigger,
-                                   u32 enable)
+static struct sk_buff *
+ath10k_wmi_op_gen_vdev_spectral_enable(struct ath10k *ar, u32 vdev_id,
+                                      u32 trigger, u32 enable)
 {
        struct wmi_vdev_spectral_enable_cmd *cmd;
        struct sk_buff *skb;
-       u32 cmdid;
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_vdev_spectral_enable_cmd *)skb->data;
        cmd->vdev_id = __cpu_to_le32(vdev_id);
        cmd->trigger_cmd = __cpu_to_le32(trigger);
        cmd->enable_cmd = __cpu_to_le32(enable);
 
-       cmdid = ar->wmi.cmd->vdev_spectral_scan_enable_cmdid;
-       return ath10k_wmi_cmd_send(ar, skb, cmdid);
+       return skb;
 }
 
-int ath10k_wmi_peer_create(struct ath10k *ar, u32 vdev_id,
-                          const u8 peer_addr[ETH_ALEN])
+static struct sk_buff *
+ath10k_wmi_op_gen_peer_create(struct ath10k *ar, u32 vdev_id,
+                             const u8 peer_addr[ETH_ALEN])
 {
        struct wmi_peer_create_cmd *cmd;
        struct sk_buff *skb;
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_peer_create_cmd *)skb->data;
        cmd->vdev_id = __cpu_to_le32(vdev_id);
@@ -3962,18 +4328,19 @@ int ath10k_wmi_peer_create(struct ath10k *ar, u32 vdev_id,
        ath10k_dbg(ar, ATH10K_DBG_WMI,
                   "wmi peer create vdev_id %d peer_addr %pM\n",
                   vdev_id, peer_addr);
-       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->peer_create_cmdid);
+       return skb;
 }
 
-int ath10k_wmi_peer_delete(struct ath10k *ar, u32 vdev_id,
-                          const u8 peer_addr[ETH_ALEN])
+static struct sk_buff *
+ath10k_wmi_op_gen_peer_delete(struct ath10k *ar, u32 vdev_id,
+                             const u8 peer_addr[ETH_ALEN])
 {
        struct wmi_peer_delete_cmd *cmd;
        struct sk_buff *skb;
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_peer_delete_cmd *)skb->data;
        cmd->vdev_id = __cpu_to_le32(vdev_id);
@@ -3982,18 +4349,19 @@ int ath10k_wmi_peer_delete(struct ath10k *ar, u32 vdev_id,
        ath10k_dbg(ar, ATH10K_DBG_WMI,
                   "wmi peer delete vdev_id %d peer_addr %pM\n",
                   vdev_id, peer_addr);
-       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->peer_delete_cmdid);
+       return skb;
 }
 
-int ath10k_wmi_peer_flush(struct ath10k *ar, u32 vdev_id,
-                         const u8 peer_addr[ETH_ALEN], u32 tid_bitmap)
+static struct sk_buff *
+ath10k_wmi_op_gen_peer_flush(struct ath10k *ar, u32 vdev_id,
+                            const u8 peer_addr[ETH_ALEN], u32 tid_bitmap)
 {
        struct wmi_peer_flush_tids_cmd *cmd;
        struct sk_buff *skb;
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_peer_flush_tids_cmd *)skb->data;
        cmd->vdev_id         = __cpu_to_le32(vdev_id);
@@ -4003,19 +4371,21 @@ int ath10k_wmi_peer_flush(struct ath10k *ar, u32 vdev_id,
        ath10k_dbg(ar, ATH10K_DBG_WMI,
                   "wmi peer flush vdev_id %d peer_addr %pM tids %08x\n",
                   vdev_id, peer_addr, tid_bitmap);
-       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->peer_flush_tids_cmdid);
+       return skb;
 }
 
-int ath10k_wmi_peer_set_param(struct ath10k *ar, u32 vdev_id,
-                             const u8 *peer_addr, enum wmi_peer_param param_id,
-                             u32 param_value)
+static struct sk_buff *
+ath10k_wmi_op_gen_peer_set_param(struct ath10k *ar, u32 vdev_id,
+                                const u8 *peer_addr,
+                                enum wmi_peer_param param_id,
+                                u32 param_value)
 {
        struct wmi_peer_set_param_cmd *cmd;
        struct sk_buff *skb;
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_peer_set_param_cmd *)skb->data;
        cmd->vdev_id     = __cpu_to_le32(vdev_id);
@@ -4026,19 +4396,19 @@ int ath10k_wmi_peer_set_param(struct ath10k *ar, u32 vdev_id,
        ath10k_dbg(ar, ATH10K_DBG_WMI,
                   "wmi vdev %d peer 0x%pM set param %d value %d\n",
                   vdev_id, peer_addr, param_id, param_value);
-
-       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->peer_set_param_cmdid);
+       return skb;
 }
 
-int ath10k_wmi_set_psmode(struct ath10k *ar, u32 vdev_id,
-                         enum wmi_sta_ps_mode psmode)
+static struct sk_buff *
+ath10k_wmi_op_gen_set_psmode(struct ath10k *ar, u32 vdev_id,
+                            enum wmi_sta_ps_mode psmode)
 {
        struct wmi_sta_powersave_mode_cmd *cmd;
        struct sk_buff *skb;
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_sta_powersave_mode_cmd *)skb->data;
        cmd->vdev_id     = __cpu_to_le32(vdev_id);
@@ -4047,21 +4417,20 @@ int ath10k_wmi_set_psmode(struct ath10k *ar, u32 vdev_id,
        ath10k_dbg(ar, ATH10K_DBG_WMI,
                   "wmi set powersave id 0x%x mode %d\n",
                   vdev_id, psmode);
-
-       return ath10k_wmi_cmd_send(ar, skb,
-                                  ar->wmi.cmd->sta_powersave_mode_cmdid);
+       return skb;
 }
 
-int ath10k_wmi_set_sta_ps_param(struct ath10k *ar, u32 vdev_id,
-                               enum wmi_sta_powersave_param param_id,
-                               u32 value)
+static struct sk_buff *
+ath10k_wmi_op_gen_set_sta_ps(struct ath10k *ar, u32 vdev_id,
+                            enum wmi_sta_powersave_param param_id,
+                            u32 value)
 {
        struct wmi_sta_powersave_param_cmd *cmd;
        struct sk_buff *skb;
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_sta_powersave_param_cmd *)skb->data;
        cmd->vdev_id     = __cpu_to_le32(vdev_id);
@@ -4071,22 +4440,22 @@ int ath10k_wmi_set_sta_ps_param(struct ath10k *ar, u32 vdev_id,
        ath10k_dbg(ar, ATH10K_DBG_WMI,
                   "wmi sta ps param vdev_id 0x%x param %d value %d\n",
                   vdev_id, param_id, value);
-       return ath10k_wmi_cmd_send(ar, skb,
-                                  ar->wmi.cmd->sta_powersave_param_cmdid);
+       return skb;
 }
 
-int ath10k_wmi_set_ap_ps_param(struct ath10k *ar, u32 vdev_id, const u8 *mac,
-                              enum wmi_ap_ps_peer_param param_id, u32 value)
+static struct sk_buff *
+ath10k_wmi_op_gen_set_ap_ps(struct ath10k *ar, u32 vdev_id, const u8 *mac,
+                           enum wmi_ap_ps_peer_param param_id, u32 value)
 {
        struct wmi_ap_ps_peer_cmd *cmd;
        struct sk_buff *skb;
 
        if (!mac)
-               return -EINVAL;
+               return ERR_PTR(-EINVAL);
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_ap_ps_peer_cmd *)skb->data;
        cmd->vdev_id = __cpu_to_le32(vdev_id);
@@ -4097,13 +4466,12 @@ int ath10k_wmi_set_ap_ps_param(struct ath10k *ar, u32 vdev_id, const u8 *mac,
        ath10k_dbg(ar, ATH10K_DBG_WMI,
                   "wmi ap ps param vdev_id 0x%X param %d value %d mac_addr %pM\n",
                   vdev_id, param_id, value, mac);
-
-       return ath10k_wmi_cmd_send(ar, skb,
-                                  ar->wmi.cmd->ap_ps_peer_param_cmdid);
+       return skb;
 }
 
-int ath10k_wmi_scan_chan_list(struct ath10k *ar,
-                             const struct wmi_scan_chan_list_arg *arg)
+static struct sk_buff *
+ath10k_wmi_op_gen_scan_chan_list(struct ath10k *ar,
+                                const struct wmi_scan_chan_list_arg *arg)
 {
        struct wmi_scan_chan_list_cmd *cmd;
        struct sk_buff *skb;
@@ -4116,7 +4484,7 @@ int ath10k_wmi_scan_chan_list(struct ath10k *ar,
 
        skb = ath10k_wmi_alloc_skb(ar, len);
        if (!skb)
-               return -EINVAL;
+               return ERR_PTR(-EINVAL);
 
        cmd = (struct wmi_scan_chan_list_cmd *)skb->data;
        cmd->num_scan_chans = __cpu_to_le32(arg->n_channels);
@@ -4128,7 +4496,7 @@ int ath10k_wmi_scan_chan_list(struct ath10k *ar,
                ath10k_wmi_put_wmi_channel(ci, ch);
        }
 
-       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->scan_chan_list_cmdid);
+       return skb;
 }
 
 static void
@@ -4209,12 +4577,9 @@ ath10k_wmi_peer_assoc_fill_10_2(struct ath10k *ar, void *buf,
        cmd->info0 = __cpu_to_le32(info0);
 }
 
-int ath10k_wmi_peer_assoc(struct ath10k *ar,
-                         const struct wmi_peer_assoc_complete_arg *arg)
+static int
+ath10k_wmi_peer_assoc_check_arg(const struct wmi_peer_assoc_complete_arg *arg)
 {
-       struct sk_buff *skb;
-       int len;
-
        if (arg->peer_mpdu_density > 16)
                return -EINVAL;
        if (arg->peer_legacy_rates.num_rates > MAX_SUPPORTED_RATES)
@@ -4222,49 +4587,111 @@ int ath10k_wmi_peer_assoc(struct ath10k *ar,
        if (arg->peer_ht_rates.num_rates > MAX_SUPPORTED_RATES)
                return -EINVAL;
 
-       if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {
-               if (test_bit(ATH10K_FW_FEATURE_WMI_10_2, ar->fw_features))
-                       len = sizeof(struct wmi_10_2_peer_assoc_complete_cmd);
-               else
-                       len = sizeof(struct wmi_10_1_peer_assoc_complete_cmd);
-       } else {
-               len = sizeof(struct wmi_main_peer_assoc_complete_cmd);
-       }
+       return 0;
+}
+
+static struct sk_buff *
+ath10k_wmi_op_gen_peer_assoc(struct ath10k *ar,
+                            const struct wmi_peer_assoc_complete_arg *arg)
+{
+       size_t len = sizeof(struct wmi_main_peer_assoc_complete_cmd);
+       struct sk_buff *skb;
+       int ret;
+
+       ret = ath10k_wmi_peer_assoc_check_arg(arg);
+       if (ret)
+               return ERR_PTR(ret);
 
        skb = ath10k_wmi_alloc_skb(ar, len);
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
-       if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {
-               if (test_bit(ATH10K_FW_FEATURE_WMI_10_2, ar->fw_features))
-                       ath10k_wmi_peer_assoc_fill_10_2(ar, skb->data, arg);
-               else
-                       ath10k_wmi_peer_assoc_fill_10_1(ar, skb->data, arg);
-       } else {
-               ath10k_wmi_peer_assoc_fill_main(ar, skb->data, arg);
-       }
+       ath10k_wmi_peer_assoc_fill_main(ar, skb->data, arg);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI,
+                  "wmi peer assoc vdev %d addr %pM (%s)\n",
+                  arg->vdev_id, arg->addr,
+                  arg->peer_reassoc ? "reassociate" : "new");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_10_1_op_gen_peer_assoc(struct ath10k *ar,
+                                 const struct wmi_peer_assoc_complete_arg *arg)
+{
+       size_t len = sizeof(struct wmi_10_1_peer_assoc_complete_cmd);
+       struct sk_buff *skb;
+       int ret;
+
+       ret = ath10k_wmi_peer_assoc_check_arg(arg);
+       if (ret)
+               return ERR_PTR(ret);
+
+       skb = ath10k_wmi_alloc_skb(ar, len);
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       ath10k_wmi_peer_assoc_fill_10_1(ar, skb->data, arg);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI,
+                  "wmi peer assoc vdev %d addr %pM (%s)\n",
+                  arg->vdev_id, arg->addr,
+                  arg->peer_reassoc ? "reassociate" : "new");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_10_2_op_gen_peer_assoc(struct ath10k *ar,
+                                 const struct wmi_peer_assoc_complete_arg *arg)
+{
+       size_t len = sizeof(struct wmi_10_2_peer_assoc_complete_cmd);
+       struct sk_buff *skb;
+       int ret;
+
+       ret = ath10k_wmi_peer_assoc_check_arg(arg);
+       if (ret)
+               return ERR_PTR(ret);
+
+       skb = ath10k_wmi_alloc_skb(ar, len);
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       ath10k_wmi_peer_assoc_fill_10_2(ar, skb->data, arg);
 
        ath10k_dbg(ar, ATH10K_DBG_WMI,
                   "wmi peer assoc vdev %d addr %pM (%s)\n",
                   arg->vdev_id, arg->addr,
                   arg->peer_reassoc ? "reassociate" : "new");
-       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->peer_assoc_cmdid);
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_10_2_op_gen_pdev_get_temperature(struct ath10k *ar)
+{
+       struct sk_buff *skb;
+
+       skb = ath10k_wmi_alloc_skb(ar, 0);
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi pdev get temperature\n");
+       return skb;
 }
 
 /* This function assumes the beacon is already DMA mapped */
-int ath10k_wmi_beacon_send_ref_nowait(struct ath10k_vif *arvif)
+static struct sk_buff *
+ath10k_wmi_op_gen_beacon_dma(struct ath10k_vif *arvif)
 {
+       struct ath10k *ar = arvif->ar;
        struct wmi_bcn_tx_ref_cmd *cmd;
        struct sk_buff *skb;
        struct sk_buff *beacon = arvif->beacon;
-       struct ath10k *ar = arvif->ar;
        struct ieee80211_hdr *hdr;
-       int ret;
        u16 fc;
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        hdr = (struct ieee80211_hdr *)beacon->data;
        fc = le16_to_cpu(hdr->frame_control);
@@ -4284,17 +4711,11 @@ int ath10k_wmi_beacon_send_ref_nowait(struct ath10k_vif *arvif)
        if (ATH10K_SKB_CB(beacon)->bcn.deliver_cab)
                cmd->flags |= __cpu_to_le32(WMI_BCN_TX_REF_FLAG_DELIVER_CAB);
 
-       ret = ath10k_wmi_cmd_send_nowait(ar, skb,
-                                        ar->wmi.cmd->pdev_send_bcn_cmdid);
-
-       if (ret)
-               dev_kfree_skb(skb);
-
-       return ret;
+       return skb;
 }
 
-static void ath10k_wmi_pdev_set_wmm_param(struct wmi_wmm_params *params,
-                                         const struct wmi_wmm_params_arg *arg)
+void ath10k_wmi_pdev_set_wmm_param(struct wmi_wmm_params *params,
+                                  const struct wmi_wmm_params_arg *arg)
 {
        params->cwmin  = __cpu_to_le32(arg->cwmin);
        params->cwmax  = __cpu_to_le32(arg->cwmax);
@@ -4304,15 +4725,16 @@ static void ath10k_wmi_pdev_set_wmm_param(struct wmi_wmm_params *params,
        params->no_ack = __cpu_to_le32(arg->no_ack);
 }
 
-int ath10k_wmi_pdev_set_wmm_params(struct ath10k *ar,
-                                  const struct wmi_pdev_set_wmm_params_arg *arg)
+static struct sk_buff *
+ath10k_wmi_op_gen_pdev_set_wmm(struct ath10k *ar,
+                              const struct wmi_pdev_set_wmm_params_arg *arg)
 {
        struct wmi_pdev_set_wmm_params *cmd;
        struct sk_buff *skb;
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_pdev_set_wmm_params *)skb->data;
        ath10k_wmi_pdev_set_wmm_param(&cmd->ac_be, &arg->ac_be);
@@ -4321,35 +4743,36 @@ int ath10k_wmi_pdev_set_wmm_params(struct ath10k *ar,
        ath10k_wmi_pdev_set_wmm_param(&cmd->ac_vo, &arg->ac_vo);
 
        ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi pdev set wmm params\n");
-       return ath10k_wmi_cmd_send(ar, skb,
-                                  ar->wmi.cmd->pdev_set_wmm_params_cmdid);
+       return skb;
 }
 
-int ath10k_wmi_request_stats(struct ath10k *ar, enum wmi_stats_id stats_id)
+static struct sk_buff *
+ath10k_wmi_op_gen_request_stats(struct ath10k *ar, enum wmi_stats_id stats_id)
 {
        struct wmi_request_stats_cmd *cmd;
        struct sk_buff *skb;
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_request_stats_cmd *)skb->data;
        cmd->stats_id = __cpu_to_le32(stats_id);
 
        ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi request stats %d\n", (int)stats_id);
-       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->request_stats_cmdid);
+       return skb;
 }
 
-int ath10k_wmi_force_fw_hang(struct ath10k *ar,
-                            enum wmi_force_fw_hang_type type, u32 delay_ms)
+static struct sk_buff *
+ath10k_wmi_op_gen_force_fw_hang(struct ath10k *ar,
+                               enum wmi_force_fw_hang_type type, u32 delay_ms)
 {
        struct wmi_force_fw_hang_cmd *cmd;
        struct sk_buff *skb;
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_force_fw_hang_cmd *)skb->data;
        cmd->type = __cpu_to_le32(type);
@@ -4357,10 +4780,11 @@ int ath10k_wmi_force_fw_hang(struct ath10k *ar,
 
        ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi force fw hang %d delay %d\n",
                   type, delay_ms);
-       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->force_fw_hang_cmdid);
+       return skb;
 }
 
-int ath10k_wmi_dbglog_cfg(struct ath10k *ar, u32 module_enable)
+static struct sk_buff *
+ath10k_wmi_op_gen_dbglog_cfg(struct ath10k *ar, u32 module_enable)
 {
        struct wmi_dbglog_cfg_cmd *cmd;
        struct sk_buff *skb;
@@ -4368,7 +4792,7 @@ int ath10k_wmi_dbglog_cfg(struct ath10k *ar, u32 module_enable)
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_dbglog_cfg_cmd *)skb->data;
 
@@ -4393,57 +4817,318 @@ int ath10k_wmi_dbglog_cfg(struct ath10k *ar, u32 module_enable)
                   __le32_to_cpu(cmd->module_valid),
                   __le32_to_cpu(cmd->config_enable),
                   __le32_to_cpu(cmd->config_valid));
-
-       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->dbglog_cfg_cmdid);
+       return skb;
 }
 
-int ath10k_wmi_pdev_pktlog_enable(struct ath10k *ar, u32 ev_bitmap)
+static struct sk_buff *
+ath10k_wmi_op_gen_pktlog_enable(struct ath10k *ar, u32 ev_bitmap)
 {
        struct wmi_pdev_pktlog_enable_cmd *cmd;
        struct sk_buff *skb;
 
        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        ev_bitmap &= ATH10K_PKTLOG_ANY;
-       ath10k_dbg(ar, ATH10K_DBG_WMI,
-                  "wmi enable pktlog filter:%x\n", ev_bitmap);
 
        cmd = (struct wmi_pdev_pktlog_enable_cmd *)skb->data;
        cmd->ev_bitmap = __cpu_to_le32(ev_bitmap);
-       return ath10k_wmi_cmd_send(ar, skb,
-                                  ar->wmi.cmd->pdev_pktlog_enable_cmdid);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi enable pktlog filter 0x%08x\n",
+                  ev_bitmap);
+       return skb;
 }
 
-int ath10k_wmi_pdev_pktlog_disable(struct ath10k *ar)
+static struct sk_buff *
+ath10k_wmi_op_gen_pktlog_disable(struct ath10k *ar)
 {
        struct sk_buff *skb;
 
        skb = ath10k_wmi_alloc_skb(ar, 0);
        if (!skb)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi disable pktlog\n");
+       return skb;
+}
+
+static struct sk_buff *
+ath10k_wmi_op_gen_pdev_set_quiet_mode(struct ath10k *ar, u32 period,
+                                     u32 duration, u32 next_offset,
+                                     u32 enabled)
+{
+       struct wmi_pdev_set_quiet_cmd *cmd;
+       struct sk_buff *skb;
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
 
-       return ath10k_wmi_cmd_send(ar, skb,
-                                  ar->wmi.cmd->pdev_pktlog_disable_cmdid);
+       cmd = (struct wmi_pdev_set_quiet_cmd *)skb->data;
+       cmd->period = __cpu_to_le32(period);
+       cmd->duration = __cpu_to_le32(duration);
+       cmd->next_start = __cpu_to_le32(next_offset);
+       cmd->enabled = __cpu_to_le32(enabled);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI,
+                  "wmi quiet param: period %u duration %u enabled %d\n",
+                  period, duration, enabled);
+       return skb;
 }
 
+static const struct wmi_ops wmi_ops = {
+       .rx = ath10k_wmi_op_rx,
+       .map_svc = wmi_main_svc_map,
+
+       .pull_scan = ath10k_wmi_op_pull_scan_ev,
+       .pull_mgmt_rx = ath10k_wmi_op_pull_mgmt_rx_ev,
+       .pull_ch_info = ath10k_wmi_op_pull_ch_info_ev,
+       .pull_vdev_start = ath10k_wmi_op_pull_vdev_start_ev,
+       .pull_peer_kick = ath10k_wmi_op_pull_peer_kick_ev,
+       .pull_swba = ath10k_wmi_op_pull_swba_ev,
+       .pull_phyerr = ath10k_wmi_op_pull_phyerr_ev,
+       .pull_svc_rdy = ath10k_wmi_main_op_pull_svc_rdy_ev,
+       .pull_rdy = ath10k_wmi_op_pull_rdy_ev,
+       .pull_fw_stats = ath10k_wmi_main_op_pull_fw_stats,
+
+       .gen_pdev_suspend = ath10k_wmi_op_gen_pdev_suspend,
+       .gen_pdev_resume = ath10k_wmi_op_gen_pdev_resume,
+       .gen_pdev_set_rd = ath10k_wmi_op_gen_pdev_set_rd,
+       .gen_pdev_set_param = ath10k_wmi_op_gen_pdev_set_param,
+       .gen_init = ath10k_wmi_op_gen_init,
+       .gen_start_scan = ath10k_wmi_op_gen_start_scan,
+       .gen_stop_scan = ath10k_wmi_op_gen_stop_scan,
+       .gen_vdev_create = ath10k_wmi_op_gen_vdev_create,
+       .gen_vdev_delete = ath10k_wmi_op_gen_vdev_delete,
+       .gen_vdev_start = ath10k_wmi_op_gen_vdev_start,
+       .gen_vdev_stop = ath10k_wmi_op_gen_vdev_stop,
+       .gen_vdev_up = ath10k_wmi_op_gen_vdev_up,
+       .gen_vdev_down = ath10k_wmi_op_gen_vdev_down,
+       .gen_vdev_set_param = ath10k_wmi_op_gen_vdev_set_param,
+       .gen_vdev_install_key = ath10k_wmi_op_gen_vdev_install_key,
+       .gen_vdev_spectral_conf = ath10k_wmi_op_gen_vdev_spectral_conf,
+       .gen_vdev_spectral_enable = ath10k_wmi_op_gen_vdev_spectral_enable,
+       .gen_peer_create = ath10k_wmi_op_gen_peer_create,
+       .gen_peer_delete = ath10k_wmi_op_gen_peer_delete,
+       .gen_peer_flush = ath10k_wmi_op_gen_peer_flush,
+       .gen_peer_set_param = ath10k_wmi_op_gen_peer_set_param,
+       .gen_peer_assoc = ath10k_wmi_op_gen_peer_assoc,
+       .gen_set_psmode = ath10k_wmi_op_gen_set_psmode,
+       .gen_set_sta_ps = ath10k_wmi_op_gen_set_sta_ps,
+       .gen_set_ap_ps = ath10k_wmi_op_gen_set_ap_ps,
+       .gen_scan_chan_list = ath10k_wmi_op_gen_scan_chan_list,
+       .gen_beacon_dma = ath10k_wmi_op_gen_beacon_dma,
+       .gen_pdev_set_wmm = ath10k_wmi_op_gen_pdev_set_wmm,
+       .gen_request_stats = ath10k_wmi_op_gen_request_stats,
+       .gen_force_fw_hang = ath10k_wmi_op_gen_force_fw_hang,
+       .gen_mgmt_tx = ath10k_wmi_op_gen_mgmt_tx,
+       .gen_dbglog_cfg = ath10k_wmi_op_gen_dbglog_cfg,
+       .gen_pktlog_enable = ath10k_wmi_op_gen_pktlog_enable,
+       .gen_pktlog_disable = ath10k_wmi_op_gen_pktlog_disable,
+       .gen_pdev_set_quiet_mode = ath10k_wmi_op_gen_pdev_set_quiet_mode,
+       /* .gen_pdev_get_temperature not implemented */
+};
+
+static const struct wmi_ops wmi_10_1_ops = {
+       .rx = ath10k_wmi_10_1_op_rx,
+       .map_svc = wmi_10x_svc_map,
+       .pull_svc_rdy = ath10k_wmi_10x_op_pull_svc_rdy_ev,
+       .pull_fw_stats = ath10k_wmi_10x_op_pull_fw_stats,
+       .gen_init = ath10k_wmi_10_1_op_gen_init,
+       .gen_pdev_set_rd = ath10k_wmi_10x_op_gen_pdev_set_rd,
+       .gen_start_scan = ath10k_wmi_10x_op_gen_start_scan,
+       .gen_peer_assoc = ath10k_wmi_10_1_op_gen_peer_assoc,
+       /* .gen_pdev_get_temperature not implemented */
+
+       /* shared with main branch */
+       .pull_scan = ath10k_wmi_op_pull_scan_ev,
+       .pull_mgmt_rx = ath10k_wmi_op_pull_mgmt_rx_ev,
+       .pull_ch_info = ath10k_wmi_op_pull_ch_info_ev,
+       .pull_vdev_start = ath10k_wmi_op_pull_vdev_start_ev,
+       .pull_peer_kick = ath10k_wmi_op_pull_peer_kick_ev,
+       .pull_swba = ath10k_wmi_op_pull_swba_ev,
+       .pull_phyerr = ath10k_wmi_op_pull_phyerr_ev,
+       .pull_rdy = ath10k_wmi_op_pull_rdy_ev,
+
+       .gen_pdev_suspend = ath10k_wmi_op_gen_pdev_suspend,
+       .gen_pdev_resume = ath10k_wmi_op_gen_pdev_resume,
+       .gen_pdev_set_param = ath10k_wmi_op_gen_pdev_set_param,
+       .gen_stop_scan = ath10k_wmi_op_gen_stop_scan,
+       .gen_vdev_create = ath10k_wmi_op_gen_vdev_create,
+       .gen_vdev_delete = ath10k_wmi_op_gen_vdev_delete,
+       .gen_vdev_start = ath10k_wmi_op_gen_vdev_start,
+       .gen_vdev_stop = ath10k_wmi_op_gen_vdev_stop,
+       .gen_vdev_up = ath10k_wmi_op_gen_vdev_up,
+       .gen_vdev_down = ath10k_wmi_op_gen_vdev_down,
+       .gen_vdev_set_param = ath10k_wmi_op_gen_vdev_set_param,
+       .gen_vdev_install_key = ath10k_wmi_op_gen_vdev_install_key,
+       .gen_vdev_spectral_conf = ath10k_wmi_op_gen_vdev_spectral_conf,
+       .gen_vdev_spectral_enable = ath10k_wmi_op_gen_vdev_spectral_enable,
+       .gen_peer_create = ath10k_wmi_op_gen_peer_create,
+       .gen_peer_delete = ath10k_wmi_op_gen_peer_delete,
+       .gen_peer_flush = ath10k_wmi_op_gen_peer_flush,
+       .gen_peer_set_param = ath10k_wmi_op_gen_peer_set_param,
+       .gen_set_psmode = ath10k_wmi_op_gen_set_psmode,
+       .gen_set_sta_ps = ath10k_wmi_op_gen_set_sta_ps,
+       .gen_set_ap_ps = ath10k_wmi_op_gen_set_ap_ps,
+       .gen_scan_chan_list = ath10k_wmi_op_gen_scan_chan_list,
+       .gen_beacon_dma = ath10k_wmi_op_gen_beacon_dma,
+       .gen_pdev_set_wmm = ath10k_wmi_op_gen_pdev_set_wmm,
+       .gen_request_stats = ath10k_wmi_op_gen_request_stats,
+       .gen_force_fw_hang = ath10k_wmi_op_gen_force_fw_hang,
+       .gen_mgmt_tx = ath10k_wmi_op_gen_mgmt_tx,
+       .gen_dbglog_cfg = ath10k_wmi_op_gen_dbglog_cfg,
+       .gen_pktlog_enable = ath10k_wmi_op_gen_pktlog_enable,
+       .gen_pktlog_disable = ath10k_wmi_op_gen_pktlog_disable,
+       .gen_pdev_set_quiet_mode = ath10k_wmi_op_gen_pdev_set_quiet_mode,
+};
+
+static const struct wmi_ops wmi_10_2_ops = {
+       .rx = ath10k_wmi_10_2_op_rx,
+       .gen_init = ath10k_wmi_10_2_op_gen_init,
+       .gen_peer_assoc = ath10k_wmi_10_2_op_gen_peer_assoc,
+       /* .gen_pdev_get_temperature not implemented */
+
+       /* shared with 10.1 */
+       .map_svc = wmi_10x_svc_map,
+       .pull_svc_rdy = ath10k_wmi_10x_op_pull_svc_rdy_ev,
+       .pull_fw_stats = ath10k_wmi_10x_op_pull_fw_stats,
+       .gen_pdev_set_rd = ath10k_wmi_10x_op_gen_pdev_set_rd,
+       .gen_start_scan = ath10k_wmi_10x_op_gen_start_scan,
+
+       .pull_scan = ath10k_wmi_op_pull_scan_ev,
+       .pull_mgmt_rx = ath10k_wmi_op_pull_mgmt_rx_ev,
+       .pull_ch_info = ath10k_wmi_op_pull_ch_info_ev,
+       .pull_vdev_start = ath10k_wmi_op_pull_vdev_start_ev,
+       .pull_peer_kick = ath10k_wmi_op_pull_peer_kick_ev,
+       .pull_swba = ath10k_wmi_op_pull_swba_ev,
+       .pull_phyerr = ath10k_wmi_op_pull_phyerr_ev,
+       .pull_rdy = ath10k_wmi_op_pull_rdy_ev,
+
+       .gen_pdev_suspend = ath10k_wmi_op_gen_pdev_suspend,
+       .gen_pdev_resume = ath10k_wmi_op_gen_pdev_resume,
+       .gen_pdev_set_param = ath10k_wmi_op_gen_pdev_set_param,
+       .gen_stop_scan = ath10k_wmi_op_gen_stop_scan,
+       .gen_vdev_create = ath10k_wmi_op_gen_vdev_create,
+       .gen_vdev_delete = ath10k_wmi_op_gen_vdev_delete,
+       .gen_vdev_start = ath10k_wmi_op_gen_vdev_start,
+       .gen_vdev_stop = ath10k_wmi_op_gen_vdev_stop,
+       .gen_vdev_up = ath10k_wmi_op_gen_vdev_up,
+       .gen_vdev_down = ath10k_wmi_op_gen_vdev_down,
+       .gen_vdev_set_param = ath10k_wmi_op_gen_vdev_set_param,
+       .gen_vdev_install_key = ath10k_wmi_op_gen_vdev_install_key,
+       .gen_vdev_spectral_conf = ath10k_wmi_op_gen_vdev_spectral_conf,
+       .gen_vdev_spectral_enable = ath10k_wmi_op_gen_vdev_spectral_enable,
+       .gen_peer_create = ath10k_wmi_op_gen_peer_create,
+       .gen_peer_delete = ath10k_wmi_op_gen_peer_delete,
+       .gen_peer_flush = ath10k_wmi_op_gen_peer_flush,
+       .gen_peer_set_param = ath10k_wmi_op_gen_peer_set_param,
+       .gen_set_psmode = ath10k_wmi_op_gen_set_psmode,
+       .gen_set_sta_ps = ath10k_wmi_op_gen_set_sta_ps,
+       .gen_set_ap_ps = ath10k_wmi_op_gen_set_ap_ps,
+       .gen_scan_chan_list = ath10k_wmi_op_gen_scan_chan_list,
+       .gen_beacon_dma = ath10k_wmi_op_gen_beacon_dma,
+       .gen_pdev_set_wmm = ath10k_wmi_op_gen_pdev_set_wmm,
+       .gen_request_stats = ath10k_wmi_op_gen_request_stats,
+       .gen_force_fw_hang = ath10k_wmi_op_gen_force_fw_hang,
+       .gen_mgmt_tx = ath10k_wmi_op_gen_mgmt_tx,
+       .gen_dbglog_cfg = ath10k_wmi_op_gen_dbglog_cfg,
+       .gen_pktlog_enable = ath10k_wmi_op_gen_pktlog_enable,
+       .gen_pktlog_disable = ath10k_wmi_op_gen_pktlog_disable,
+       .gen_pdev_set_quiet_mode = ath10k_wmi_op_gen_pdev_set_quiet_mode,
+};
+
+static const struct wmi_ops wmi_10_2_4_ops = {
+       .rx = ath10k_wmi_10_2_op_rx,
+       .gen_init = ath10k_wmi_10_2_op_gen_init,
+       .gen_peer_assoc = ath10k_wmi_10_2_op_gen_peer_assoc,
+       .gen_pdev_get_temperature = ath10k_wmi_10_2_op_gen_pdev_get_temperature,
+
+       /* shared with 10.1 */
+       .map_svc = wmi_10x_svc_map,
+       .pull_svc_rdy = ath10k_wmi_10x_op_pull_svc_rdy_ev,
+       .pull_fw_stats = ath10k_wmi_10x_op_pull_fw_stats,
+       .gen_pdev_set_rd = ath10k_wmi_10x_op_gen_pdev_set_rd,
+       .gen_start_scan = ath10k_wmi_10x_op_gen_start_scan,
+
+       .pull_scan = ath10k_wmi_op_pull_scan_ev,
+       .pull_mgmt_rx = ath10k_wmi_op_pull_mgmt_rx_ev,
+       .pull_ch_info = ath10k_wmi_op_pull_ch_info_ev,
+       .pull_vdev_start = ath10k_wmi_op_pull_vdev_start_ev,
+       .pull_peer_kick = ath10k_wmi_op_pull_peer_kick_ev,
+       .pull_swba = ath10k_wmi_op_pull_swba_ev,
+       .pull_phyerr = ath10k_wmi_op_pull_phyerr_ev,
+       .pull_rdy = ath10k_wmi_op_pull_rdy_ev,
+
+       .gen_pdev_suspend = ath10k_wmi_op_gen_pdev_suspend,
+       .gen_pdev_resume = ath10k_wmi_op_gen_pdev_resume,
+       .gen_pdev_set_param = ath10k_wmi_op_gen_pdev_set_param,
+       .gen_stop_scan = ath10k_wmi_op_gen_stop_scan,
+       .gen_vdev_create = ath10k_wmi_op_gen_vdev_create,
+       .gen_vdev_delete = ath10k_wmi_op_gen_vdev_delete,
+       .gen_vdev_start = ath10k_wmi_op_gen_vdev_start,
+       .gen_vdev_stop = ath10k_wmi_op_gen_vdev_stop,
+       .gen_vdev_up = ath10k_wmi_op_gen_vdev_up,
+       .gen_vdev_down = ath10k_wmi_op_gen_vdev_down,
+       .gen_vdev_set_param = ath10k_wmi_op_gen_vdev_set_param,
+       .gen_vdev_install_key = ath10k_wmi_op_gen_vdev_install_key,
+       .gen_vdev_spectral_conf = ath10k_wmi_op_gen_vdev_spectral_conf,
+       .gen_vdev_spectral_enable = ath10k_wmi_op_gen_vdev_spectral_enable,
+       .gen_peer_create = ath10k_wmi_op_gen_peer_create,
+       .gen_peer_delete = ath10k_wmi_op_gen_peer_delete,
+       .gen_peer_flush = ath10k_wmi_op_gen_peer_flush,
+       .gen_peer_set_param = ath10k_wmi_op_gen_peer_set_param,
+       .gen_set_psmode = ath10k_wmi_op_gen_set_psmode,
+       .gen_set_sta_ps = ath10k_wmi_op_gen_set_sta_ps,
+       .gen_set_ap_ps = ath10k_wmi_op_gen_set_ap_ps,
+       .gen_scan_chan_list = ath10k_wmi_op_gen_scan_chan_list,
+       .gen_beacon_dma = ath10k_wmi_op_gen_beacon_dma,
+       .gen_pdev_set_wmm = ath10k_wmi_op_gen_pdev_set_wmm,
+       .gen_request_stats = ath10k_wmi_op_gen_request_stats,
+       .gen_force_fw_hang = ath10k_wmi_op_gen_force_fw_hang,
+       .gen_mgmt_tx = ath10k_wmi_op_gen_mgmt_tx,
+       .gen_dbglog_cfg = ath10k_wmi_op_gen_dbglog_cfg,
+       .gen_pktlog_enable = ath10k_wmi_op_gen_pktlog_enable,
+       .gen_pktlog_disable = ath10k_wmi_op_gen_pktlog_disable,
+       .gen_pdev_set_quiet_mode = ath10k_wmi_op_gen_pdev_set_quiet_mode,
+};
+
 int ath10k_wmi_attach(struct ath10k *ar)
 {
-       if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {
-               if (test_bit(ATH10K_FW_FEATURE_WMI_10_2, ar->fw_features))
-                       ar->wmi.cmd = &wmi_10_2_cmd_map;
-               else
-                       ar->wmi.cmd = &wmi_10x_cmd_map;
-
+       switch (ar->wmi.op_version) {
+       case ATH10K_FW_WMI_OP_VERSION_10_2_4:
+               ar->wmi.cmd = &wmi_10_2_4_cmd_map;
+               ar->wmi.ops = &wmi_10_2_4_ops;
+               ar->wmi.vdev_param = &wmi_10_2_4_vdev_param_map;
+               ar->wmi.pdev_param = &wmi_10_2_4_pdev_param_map;
+               break;
+       case ATH10K_FW_WMI_OP_VERSION_10_2:
+               ar->wmi.cmd = &wmi_10_2_cmd_map;
+               ar->wmi.ops = &wmi_10_2_ops;
                ar->wmi.vdev_param = &wmi_10x_vdev_param_map;
                ar->wmi.pdev_param = &wmi_10x_pdev_param_map;
-       } else {
+               break;
+       case ATH10K_FW_WMI_OP_VERSION_10_1:
+               ar->wmi.cmd = &wmi_10x_cmd_map;
+               ar->wmi.ops = &wmi_10_1_ops;
+               ar->wmi.vdev_param = &wmi_10x_vdev_param_map;
+               ar->wmi.pdev_param = &wmi_10x_pdev_param_map;
+               break;
+       case ATH10K_FW_WMI_OP_VERSION_MAIN:
                ar->wmi.cmd = &wmi_cmd_map;
+               ar->wmi.ops = &wmi_ops;
                ar->wmi.vdev_param = &wmi_vdev_param_map;
                ar->wmi.pdev_param = &wmi_pdev_param_map;
+               break;
+       case ATH10K_FW_WMI_OP_VERSION_TLV:
+               ath10k_wmi_tlv_attach(ar);
+               break;
+       case ATH10K_FW_WMI_OP_VERSION_UNSET:
+       case ATH10K_FW_WMI_OP_VERSION_MAX:
+               ath10k_err(ar, "unsupported WMI op version: %d\n",
+                          ar->wmi.op_version);
+               return -EINVAL;
        }
 
        init_completion(&ar->wmi.service_ready);
index 2139192..bd7f29a 100644 (file)
@@ -109,6 +109,45 @@ enum wmi_service {
        WMI_SERVICE_BURST,
        WMI_SERVICE_SMART_ANTENNA_SW_SUPPORT,
        WMI_SERVICE_SMART_ANTENNA_HW_SUPPORT,
+       WMI_SERVICE_ROAM_SCAN_OFFLOAD,
+       WMI_SERVICE_AP_PS_DETECT_OUT_OF_SYNC,
+       WMI_SERVICE_EARLY_RX,
+       WMI_SERVICE_STA_SMPS,
+       WMI_SERVICE_FWTEST,
+       WMI_SERVICE_STA_WMMAC,
+       WMI_SERVICE_TDLS,
+       WMI_SERVICE_MCC_BCN_INTERVAL_CHANGE,
+       WMI_SERVICE_ADAPTIVE_OCS,
+       WMI_SERVICE_BA_SSN_SUPPORT,
+       WMI_SERVICE_FILTER_IPSEC_NATKEEPALIVE,
+       WMI_SERVICE_WLAN_HB,
+       WMI_SERVICE_LTE_ANT_SHARE_SUPPORT,
+       WMI_SERVICE_BATCH_SCAN,
+       WMI_SERVICE_QPOWER,
+       WMI_SERVICE_PLMREQ,
+       WMI_SERVICE_THERMAL_MGMT,
+       WMI_SERVICE_RMC,
+       WMI_SERVICE_MHF_OFFLOAD,
+       WMI_SERVICE_COEX_SAR,
+       WMI_SERVICE_BCN_TXRATE_OVERRIDE,
+       WMI_SERVICE_NAN,
+       WMI_SERVICE_L1SS_STAT,
+       WMI_SERVICE_ESTIMATE_LINKSPEED,
+       WMI_SERVICE_OBSS_SCAN,
+       WMI_SERVICE_TDLS_OFFCHAN,
+       WMI_SERVICE_TDLS_UAPSD_BUFFER_STA,
+       WMI_SERVICE_TDLS_UAPSD_SLEEP_STA,
+       WMI_SERVICE_IBSS_PWRSAVE,
+       WMI_SERVICE_LPASS,
+       WMI_SERVICE_EXTSCAN,
+       WMI_SERVICE_D0WOW,
+       WMI_SERVICE_HSOFFLOAD,
+       WMI_SERVICE_ROAM_HO_OFFLOAD,
+       WMI_SERVICE_RX_FULL_REORDER,
+       WMI_SERVICE_DHCP_OFFLOAD,
+       WMI_SERVICE_STA_RX_IPA_OFFLOAD_SUPPORT,
+       WMI_SERVICE_MDNS_OFFLOAD,
+       WMI_SERVICE_SAP_AUTH_OFFLOAD,
 
        /* keep last */
        WMI_SERVICE_MAX,
@@ -215,6 +254,45 @@ static inline char *wmi_service_name(int service_id)
        SVCSTR(WMI_SERVICE_BURST);
        SVCSTR(WMI_SERVICE_SMART_ANTENNA_SW_SUPPORT);
        SVCSTR(WMI_SERVICE_SMART_ANTENNA_HW_SUPPORT);
+       SVCSTR(WMI_SERVICE_ROAM_SCAN_OFFLOAD);
+       SVCSTR(WMI_SERVICE_AP_PS_DETECT_OUT_OF_SYNC);
+       SVCSTR(WMI_SERVICE_EARLY_RX);
+       SVCSTR(WMI_SERVICE_STA_SMPS);
+       SVCSTR(WMI_SERVICE_FWTEST);
+       SVCSTR(WMI_SERVICE_STA_WMMAC);
+       SVCSTR(WMI_SERVICE_TDLS);
+       SVCSTR(WMI_SERVICE_MCC_BCN_INTERVAL_CHANGE);
+       SVCSTR(WMI_SERVICE_ADAPTIVE_OCS);
+       SVCSTR(WMI_SERVICE_BA_SSN_SUPPORT);
+       SVCSTR(WMI_SERVICE_FILTER_IPSEC_NATKEEPALIVE);
+       SVCSTR(WMI_SERVICE_WLAN_HB);
+       SVCSTR(WMI_SERVICE_LTE_ANT_SHARE_SUPPORT);
+       SVCSTR(WMI_SERVICE_BATCH_SCAN);
+       SVCSTR(WMI_SERVICE_QPOWER);
+       SVCSTR(WMI_SERVICE_PLMREQ);
+       SVCSTR(WMI_SERVICE_THERMAL_MGMT);
+       SVCSTR(WMI_SERVICE_RMC);
+       SVCSTR(WMI_SERVICE_MHF_OFFLOAD);
+       SVCSTR(WMI_SERVICE_COEX_SAR);
+       SVCSTR(WMI_SERVICE_BCN_TXRATE_OVERRIDE);
+       SVCSTR(WMI_SERVICE_NAN);
+       SVCSTR(WMI_SERVICE_L1SS_STAT);
+       SVCSTR(WMI_SERVICE_ESTIMATE_LINKSPEED);
+       SVCSTR(WMI_SERVICE_OBSS_SCAN);
+       SVCSTR(WMI_SERVICE_TDLS_OFFCHAN);
+       SVCSTR(WMI_SERVICE_TDLS_UAPSD_BUFFER_STA);
+       SVCSTR(WMI_SERVICE_TDLS_UAPSD_SLEEP_STA);
+       SVCSTR(WMI_SERVICE_IBSS_PWRSAVE);
+       SVCSTR(WMI_SERVICE_LPASS);
+       SVCSTR(WMI_SERVICE_EXTSCAN);
+       SVCSTR(WMI_SERVICE_D0WOW);
+       SVCSTR(WMI_SERVICE_HSOFFLOAD);
+       SVCSTR(WMI_SERVICE_ROAM_HO_OFFLOAD);
+       SVCSTR(WMI_SERVICE_RX_FULL_REORDER);
+       SVCSTR(WMI_SERVICE_DHCP_OFFLOAD);
+       SVCSTR(WMI_SERVICE_STA_RX_IPA_OFFLOAD_SUPPORT);
+       SVCSTR(WMI_SERVICE_MDNS_OFFLOAD);
+       SVCSTR(WMI_SERVICE_SAP_AUTH_OFFLOAD);
        default:
                return NULL;
        }
@@ -472,6 +550,7 @@ struct wmi_cmd_map {
        u32 force_fw_hang_cmdid;
        u32 gpio_config_cmdid;
        u32 gpio_output_cmdid;
+       u32 pdev_get_temperature_cmdid;
 };
 
 /*
@@ -1076,6 +1155,11 @@ enum wmi_10_2_cmd_id {
        WMI_10_2_PDEV_SET_MIMOGAIN_TABLE_CMDID,
        WMI_10_2_PDEV_RATEPWR_TABLE_CMDID,
        WMI_10_2_PDEV_RATEPWR_CHAINMSK_TABLE_CMDID,
+       WMI_10_2_PDEV_GET_INFO,
+       WMI_10_2_VDEV_GET_INFO,
+       WMI_10_2_VDEV_ATF_REQUEST_CMDID,
+       WMI_10_2_PEER_ATF_REQUEST_CMDID,
+       WMI_10_2_PDEV_GET_TEMPERATURE_CMDID,
        WMI_10_2_PDEV_UTF_CMDID = WMI_10_2_END_CMDID - 1,
 };
 
@@ -1117,6 +1201,8 @@ enum wmi_10_2_event_id {
        WMI_10_2_MCAST_BUF_RELEASE_EVENTID,
        WMI_10_2_MCAST_LIST_AGEOUT_EVENTID,
        WMI_10_2_WDS_PEER_EVENTID,
+       WMI_10_2_PEER_STA_PS_STATECHG_EVENTID,
+       WMI_10_2_PDEV_TEMPERATURE_EVENTID,
        WMI_10_2_PDEV_UTF_EVENTID = WMI_10_2_END_EVENTID - 1,
 };
 
@@ -1862,6 +1948,11 @@ struct wmi_resource_config_10x {
        __le32 max_frag_entries;
 } __packed;
 
+enum wmi_10_2_feature_mask {
+       WMI_10_2_RX_BATCH_MODE = BIT(0),
+       WMI_10_2_ATF_CONFIG    = BIT(1),
+};
+
 struct wmi_resource_config_10_2 {
        struct wmi_resource_config_10x common;
        __le32 max_peer_ext_stats;
@@ -1870,7 +1961,7 @@ struct wmi_resource_config_10_2 {
        __le32 be_min_free;
        __le32 vi_min_free;
        __le32 vo_min_free;
-       __le32 rx_batchmode; /* 0-disable, 1-enable */
+       __le32 feature_mask;
 } __packed;
 
 #define NUM_UNITS_IS_NUM_VDEVS   0x1
@@ -2505,6 +2596,7 @@ struct wmi_pdev_param_map {
        u32 fast_channel_reset;
        u32 burst_dur;
        u32 burst_enable;
+       u32 cal_period;
 };
 
 #define WMI_PDEV_PARAM_UNSUPPORTED 0
@@ -2715,6 +2807,9 @@ enum wmi_10x_pdev_param {
        WMI_10X_PDEV_PARAM_SET_MCAST2UCAST_MODE,
        WMI_10X_PDEV_PARAM_SET_MCAST2UCAST_BUFFER,
        WMI_10X_PDEV_PARAM_REMOVE_MCAST2UCAST_BUFFER,
+       WMI_10X_PDEV_PARAM_PEER_STA_PS_STATECHG_ENABLE,
+       WMI_10X_PDEV_PARAM_RTS_FIXED_RATE,
+       WMI_10X_PDEV_PARAM_CAL_PERIOD
 };
 
 struct wmi_pdev_set_param_cmd {
@@ -2722,6 +2817,9 @@ struct wmi_pdev_set_param_cmd {
        __le32 param_value;
 } __packed;
 
+/* valid period is 1 ~ 60000ms, unit in millisecond */
+#define WMI_PDEV_PARAM_CAL_PERIOD_MAX 60000
+
 struct wmi_pdev_get_tpc_config_cmd {
        /* parameter   */
        __le32 param;
@@ -3930,6 +4028,13 @@ enum wmi_sta_ps_param_pspoll_count {
         * Values greater than 0 indicate the maximum numer of PS-Poll frames
         * FW will send before waking up.
         */
+
+       /* When u-APSD is enabled the firmware will be very reluctant to exit
+        * STA PS. This could result in very poor Rx performance with STA doing
+        * PS-Poll for each and every buffered frame. This value is a bit
+        * arbitrary.
+        */
+       WMI_STA_PS_PSPOLL_COUNT_UAPSD = 3,
 };
 
 /*
@@ -4120,7 +4225,7 @@ struct wmi_bcn_info {
 
 struct wmi_host_swba_event {
        __le32 vdev_map;
-       struct wmi_bcn_info bcn_info[1];
+       struct wmi_bcn_info bcn_info[0];
 } __packed;
 
 #define WMI_MAX_AP_VDEV 16
@@ -4567,6 +4672,58 @@ struct wmi_dbglog_cfg_cmd {
 
 #define WMI_MAX_MEM_REQS 16
 
+struct wmi_scan_ev_arg {
+       __le32 event_type; /* %WMI_SCAN_EVENT_ */
+       __le32 reason; /* %WMI_SCAN_REASON_ */
+       __le32 channel_freq; /* only valid for WMI_SCAN_EVENT_FOREIGN_CHANNEL */
+       __le32 scan_req_id;
+       __le32 scan_id;
+       __le32 vdev_id;
+};
+
+struct wmi_mgmt_rx_ev_arg {
+       __le32 channel;
+       __le32 snr;
+       __le32 rate;
+       __le32 phy_mode;
+       __le32 buf_len;
+       __le32 status; /* %WMI_RX_STATUS_ */
+};
+
+struct wmi_ch_info_ev_arg {
+       __le32 err_code;
+       __le32 freq;
+       __le32 cmd_flags;
+       __le32 noise_floor;
+       __le32 rx_clear_count;
+       __le32 cycle_count;
+};
+
+struct wmi_vdev_start_ev_arg {
+       __le32 vdev_id;
+       __le32 req_id;
+       __le32 resp_type; /* %WMI_VDEV_RESP_ */
+       __le32 status;
+};
+
+struct wmi_peer_kick_ev_arg {
+       const u8 *mac_addr;
+};
+
+struct wmi_swba_ev_arg {
+       __le32 vdev_map;
+       const struct wmi_tim_info *tim_info[WMI_MAX_AP_VDEV];
+       const struct wmi_p2p_noa_info *noa_info[WMI_MAX_AP_VDEV];
+};
+
+struct wmi_phyerr_ev_arg {
+       __le32 num_phyerrs;
+       __le32 tsf_l32;
+       __le32 tsf_u32;
+       __le32 buf_len;
+       const struct wmi_phyerr *phyerrs;
+};
+
 struct wmi_svc_rdy_ev_arg {
        __le32 min_tx_power;
        __le32 max_tx_power;
@@ -4574,6 +4731,7 @@ struct wmi_svc_rdy_ev_arg {
        __le32 vht_cap;
        __le32 sw_ver0;
        __le32 sw_ver1;
+       __le32 fw_build;
        __le32 phy_capab;
        __le32 num_rf_chains;
        __le32 eeprom_rd;
@@ -4583,83 +4741,93 @@ struct wmi_svc_rdy_ev_arg {
        const struct wlan_host_mem_req *mem_reqs[WMI_MAX_MEM_REQS];
 };
 
+struct wmi_rdy_ev_arg {
+       __le32 sw_version;
+       __le32 abi_version;
+       __le32 status;
+       const u8 *mac_addr;
+};
+
+struct wmi_pdev_temperature_event {
+       /* temperature value in Celcius degree */
+       __le32 temperature;
+} __packed;
+
 struct ath10k;
 struct ath10k_vif;
-struct ath10k_fw_stats;
+struct ath10k_fw_stats_pdev;
+struct ath10k_fw_stats_peer;
 
 int ath10k_wmi_attach(struct ath10k *ar);
 void ath10k_wmi_detach(struct ath10k *ar);
 int ath10k_wmi_wait_for_service_ready(struct ath10k *ar);
 int ath10k_wmi_wait_for_unified_ready(struct ath10k *ar);
 
+struct sk_buff *ath10k_wmi_alloc_skb(struct ath10k *ar, u32 len);
 int ath10k_wmi_connect(struct ath10k *ar);
 
 struct sk_buff *ath10k_wmi_alloc_skb(struct ath10k *ar, u32 len);
 int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id);
-
-int ath10k_wmi_pdev_suspend_target(struct ath10k *ar, u32 suspend_opt);
-int ath10k_wmi_pdev_resume_target(struct ath10k *ar);
-int ath10k_wmi_pdev_set_regdomain(struct ath10k *ar, u16 rd, u16 rd2g,
-                                 u16 rd5g, u16 ctl2g, u16 ctl5g,
-                                 enum wmi_dfs_region dfs_reg);
-int ath10k_wmi_pdev_set_param(struct ath10k *ar, u32 id, u32 value);
-int ath10k_wmi_cmd_init(struct ath10k *ar);
-int ath10k_wmi_start_scan(struct ath10k *ar, const struct wmi_start_scan_arg *);
+int ath10k_wmi_cmd_send_nowait(struct ath10k *ar, struct sk_buff *skb,
+                              u32 cmd_id);
 void ath10k_wmi_start_scan_init(struct ath10k *ar, struct wmi_start_scan_arg *);
-int ath10k_wmi_stop_scan(struct ath10k *ar,
-                        const struct wmi_stop_scan_arg *arg);
-int ath10k_wmi_vdev_create(struct ath10k *ar, u32 vdev_id,
-                          enum wmi_vdev_type type,
-                          enum wmi_vdev_subtype subtype,
-                          const u8 macaddr[ETH_ALEN]);
-int ath10k_wmi_vdev_delete(struct ath10k *ar, u32 vdev_id);
-int ath10k_wmi_vdev_start(struct ath10k *ar,
-                         const struct wmi_vdev_start_request_arg *);
-int ath10k_wmi_vdev_restart(struct ath10k *ar,
-                           const struct wmi_vdev_start_request_arg *);
-int ath10k_wmi_vdev_stop(struct ath10k *ar, u32 vdev_id);
-int ath10k_wmi_vdev_up(struct ath10k *ar, u32 vdev_id, u32 aid,
-                      const u8 *bssid);
-int ath10k_wmi_vdev_down(struct ath10k *ar, u32 vdev_id);
-int ath10k_wmi_vdev_set_param(struct ath10k *ar, u32 vdev_id,
-                             u32 param_id, u32 param_value);
-int ath10k_wmi_vdev_install_key(struct ath10k *ar,
-                               const struct wmi_vdev_install_key_arg *arg);
-int ath10k_wmi_vdev_spectral_conf(struct ath10k *ar,
-                                 const struct wmi_vdev_spectral_conf_arg *arg);
-int ath10k_wmi_vdev_spectral_enable(struct ath10k *ar, u32 vdev_id, u32 trigger,
-                                   u32 enable);
-int ath10k_wmi_peer_create(struct ath10k *ar, u32 vdev_id,
-                          const u8 peer_addr[ETH_ALEN]);
-int ath10k_wmi_peer_delete(struct ath10k *ar, u32 vdev_id,
-                          const u8 peer_addr[ETH_ALEN]);
-int ath10k_wmi_peer_flush(struct ath10k *ar, u32 vdev_id,
-                         const u8 peer_addr[ETH_ALEN], u32 tid_bitmap);
-int ath10k_wmi_peer_set_param(struct ath10k *ar, u32 vdev_id,
-                             const u8 *peer_addr,
-                             enum wmi_peer_param param_id, u32 param_value);
-int ath10k_wmi_peer_assoc(struct ath10k *ar,
-                         const struct wmi_peer_assoc_complete_arg *arg);
-int ath10k_wmi_set_psmode(struct ath10k *ar, u32 vdev_id,
-                         enum wmi_sta_ps_mode psmode);
-int ath10k_wmi_set_sta_ps_param(struct ath10k *ar, u32 vdev_id,
-                               enum wmi_sta_powersave_param param_id,
-                               u32 value);
-int ath10k_wmi_set_ap_ps_param(struct ath10k *ar, u32 vdev_id, const u8 *mac,
-                              enum wmi_ap_ps_peer_param param_id, u32 value);
-int ath10k_wmi_scan_chan_list(struct ath10k *ar,
-                             const struct wmi_scan_chan_list_arg *arg);
-int ath10k_wmi_beacon_send_ref_nowait(struct ath10k_vif *arvif);
-int ath10k_wmi_pdev_set_wmm_params(struct ath10k *ar,
-                                  const struct wmi_pdev_set_wmm_params_arg *arg);
-int ath10k_wmi_request_stats(struct ath10k *ar, enum wmi_stats_id stats_id);
-int ath10k_wmi_force_fw_hang(struct ath10k *ar,
-                            enum wmi_force_fw_hang_type type, u32 delay_ms);
-int ath10k_wmi_mgmt_tx(struct ath10k *ar, struct sk_buff *skb);
-int ath10k_wmi_dbglog_cfg(struct ath10k *ar, u32 module_enable);
-int ath10k_wmi_pull_fw_stats(struct ath10k *ar, struct sk_buff *skb,
-                            struct ath10k_fw_stats *stats);
-int ath10k_wmi_pdev_pktlog_enable(struct ath10k *ar, u32 ev_list);
-int ath10k_wmi_pdev_pktlog_disable(struct ath10k *ar);
+
+void ath10k_wmi_pull_pdev_stats(const struct wmi_pdev_stats *src,
+                               struct ath10k_fw_stats_pdev *dst);
+void ath10k_wmi_pull_peer_stats(const struct wmi_peer_stats *src,
+                               struct ath10k_fw_stats_peer *dst);
+void ath10k_wmi_put_host_mem_chunks(struct ath10k *ar,
+                                   struct wmi_host_mem_chunks *chunks);
+void ath10k_wmi_put_start_scan_common(struct wmi_start_scan_common *cmn,
+                                     const struct wmi_start_scan_arg *arg);
+void ath10k_wmi_pdev_set_wmm_param(struct wmi_wmm_params *params,
+                                  const struct wmi_wmm_params_arg *arg);
+void ath10k_wmi_put_wmi_channel(struct wmi_channel *ch,
+                               const struct wmi_channel_arg *arg);
+int ath10k_wmi_start_scan_verify(const struct wmi_start_scan_arg *arg);
+
+int ath10k_wmi_event_scan(struct ath10k *ar, struct sk_buff *skb);
+int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_chan_info(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_echo(struct ath10k *ar, struct sk_buff *skb);
+int ath10k_wmi_event_debug_mesg(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_update_stats(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_vdev_start_resp(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_vdev_stopped(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_peer_sta_kickout(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_host_swba(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_tbttoffset_update(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_dfs(struct ath10k *ar,
+                         const struct wmi_phyerr *phyerr, u64 tsf);
+void ath10k_wmi_event_spectral_scan(struct ath10k *ar,
+                                   const struct wmi_phyerr *phyerr,
+                                   u64 tsf);
+void ath10k_wmi_event_phyerr(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_roam(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_profile_match(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_debug_print(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_pdev_qvit(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_wlan_profile_data(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_rtt_measurement_report(struct ath10k *ar,
+                                            struct sk_buff *skb);
+void ath10k_wmi_event_tsf_measurement_report(struct ath10k *ar,
+                                            struct sk_buff *skb);
+void ath10k_wmi_event_rtt_error_report(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_wow_wakeup_host(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_dcs_interference(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_pdev_tpc_config(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_pdev_ftm_intg(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_gtk_offload_status(struct ath10k *ar,
+                                        struct sk_buff *skb);
+void ath10k_wmi_event_gtk_rekey_fail(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_delba_complete(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_addba_complete(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_vdev_install_key_complete(struct ath10k *ar,
+                                               struct sk_buff *skb);
+void ath10k_wmi_event_inst_rssi_stats(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_vdev_standby_req(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_vdev_resume_req(struct ath10k *ar, struct sk_buff *skb);
+void ath10k_wmi_event_service_ready(struct ath10k *ar, struct sk_buff *skb);
+int ath10k_wmi_event_ready(struct ath10k *ar, struct sk_buff *skb);
 
 #endif /* _WMI_H_ */