ath10k: introduce wmi ops

Since the 10.x fw branch support was introduced it
became apparent ath10k will need to be able to
deal with different fw ABIs eventually.

The patch creates an abstraction for dealing with
command and event structures across different ABIs
and mostly gets rid of the
ATH10K_FW_FEATURE_WMI_10X flag usage.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/net/wireless/ath/ath10k/testmode.c b/drivers/net/wireless/ath/ath10k/testmode.c
index 483db9cb8c96..b084f88da102 100644
--- a/drivers/net/wireless/ath/ath10k/testmode.c
+++ b/drivers/net/wireless/ath/ath10k/testmode.c
@@ -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;