9 files changed, 31 insertions, 14 deletions

diff --git a/drivers/net/wireless/ath/ath10k/ahb.c b/drivers/net/wireless/ath/ath10k/ahb.c
index 4cd69aca75e2..66b7ca9ced17 100644
--- a/drivers/net/wireless/ath/ath10k/ahb.c
+++ b/drivers/net/wireless/ath/ath10k/ahb.c
@@ -661,7 +661,8 @@ static void ath10k_ahb_hif_stop(struct ath10k *ar)
         ath10k_pci_flush(ar);
 }
 
-static int ath10k_ahb_hif_power_up(struct ath10k *ar)
+static int ath10k_ahb_hif_power_up(struct ath10k *ar,
+                                   enum ath10k_firmware_mode fw_mode)
 {
         int ret;
 
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index f64008b5da0d..ca6085076c68 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -2780,7 +2780,7 @@ static int ath10k_core_probe_fw(struct ath10k *ar)
         struct bmi_target_info target_info;
         int ret = 0;
 
-        ret = ath10k_hif_power_up(ar);
+        ret = ath10k_hif_power_up(ar, ATH10K_FIRMWARE_MODE_NORMAL);
         if (ret) {
                 ath10k_err(ar, "could not power on hif bus (%d)\n", ret);
                 return ret;
diff --git a/drivers/net/wireless/ath/ath10k/hif.h b/drivers/net/wireless/ath/ath10k/hif.h
index 5f7f1e08866f..04320d792c88 100644
--- a/drivers/net/wireless/ath/ath10k/hif.h
+++ b/drivers/net/wireless/ath/ath10k/hif.h
@@ -83,7 +83,7 @@ struct ath10k_hif_ops {
         void (*write32)(struct ath10k *ar, u32 address, u32 value);
 
         /* Power up the device and enter BMI transfer mode for FW download */
-        int (*power_up)(struct ath10k *ar);
+        int (*power_up)(struct ath10k *ar, enum ath10k_firmware_mode fw_mode);
 
         /* Power down the device and free up resources. stop() must be called
          * before this if start() was called earlier
@@ -174,9 +174,10 @@ static inline u16 ath10k_hif_get_free_queue_number(struct ath10k *ar,
         return ar->hif.ops->get_free_queue_number(ar, pipe_id);
 }
 
-static inline int ath10k_hif_power_up(struct ath10k *ar)
+static inline int ath10k_hif_power_up(struct ath10k *ar,
+                                      enum ath10k_firmware_mode fw_mode)
 {
-        return ar->hif.ops->power_up(ar);
+        return ar->hif.ops->power_up(ar, fw_mode);
 }
 
 static inline void ath10k_hif_power_down(struct ath10k *ar)
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 6c66a3435d57..c8af35ff2019 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -4705,7 +4705,7 @@ static int ath10k_start(struct ieee80211_hw *hw)
                 goto err;
         }
 
-        ret = ath10k_hif_power_up(ar);
+        ret = ath10k_hif_power_up(ar, ATH10K_FIRMWARE_MODE_NORMAL);
         if (ret) {
                 ath10k_err(ar, "Could not init hif: %d\n", ret);
                 goto err_off;
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index 600ddaad8845..71d854e2f9fc 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -2794,7 +2794,8 @@ static int ath10k_pci_chip_reset(struct ath10k *ar)
         return ar_pci->pci_hard_reset(ar);
 }
 
-static int ath10k_pci_hif_power_up(struct ath10k *ar)
+static int ath10k_pci_hif_power_up(struct ath10k *ar,
+                                   enum ath10k_firmware_mode fw_mode)
 {
         struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
         int ret;
diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c
index f3b2e148e6ce..7654536b830b 100644
--- a/drivers/net/wireless/ath/ath10k/sdio.c
+++ b/drivers/net/wireless/ath/ath10k/sdio.c
@@ -1381,7 +1381,8 @@ static int ath10k_sdio_hif_disable_intrs(struct ath10k *ar)
         return ret;
 }
 
-static int ath10k_sdio_hif_power_up(struct ath10k *ar)
+static int ath10k_sdio_hif_power_up(struct ath10k *ar,
+                                    enum ath10k_firmware_mode fw_mode)
 {
         struct ath10k_sdio *ar_sdio = ath10k_sdio_priv(ar);
         struct sdio_func *func = ar_sdio->func;
diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c
index eff19fd543c8..b81b02ae384f 100644
--- a/drivers/net/wireless/ath/ath10k/snoc.c
+++ b/drivers/net/wireless/ath/ath10k/snoc.c
@@ -957,7 +957,8 @@ static int ath10k_snoc_init_pipes(struct ath10k *ar)
         return 0;
 }
 
-static int ath10k_snoc_wlan_enable(struct ath10k *ar)
+static int ath10k_snoc_wlan_enable(struct ath10k *ar,
+                                   enum ath10k_firmware_mode fw_mode)
 {
         struct ath10k_tgt_pipe_cfg tgt_cfg[CE_COUNT_MAX];
         struct ath10k_qmi_wlan_enable_cfg cfg;
@@ -991,7 +992,17 @@ static int ath10k_snoc_wlan_enable(struct ath10k *ar)
         cfg.shadow_reg_cfg = (struct ath10k_shadow_reg_cfg *)
                 &target_shadow_reg_cfg_map;
 
-        mode = QMI_WLFW_MISSION_V01;
+        switch (fw_mode) {
+        case ATH10K_FIRMWARE_MODE_NORMAL:
+                mode = QMI_WLFW_MISSION_V01;
+                break;
+        case ATH10K_FIRMWARE_MODE_UTF:
+                mode = QMI_WLFW_FTM_V01;
+                break;
+        default:
+                ath10k_err(ar, "invalid firmware mode %d\n", fw_mode);
+                return -EINVAL;
+        }
 
         return ath10k_qmi_wlan_enable(ar, &cfg, mode,
                                        NULL);
@@ -1020,14 +1031,15 @@ static void ath10k_snoc_hif_power_down(struct ath10k *ar)
         ath10k_ce_free_rri(ar);
 }
 
-static int ath10k_snoc_hif_power_up(struct ath10k *ar)
+static int ath10k_snoc_hif_power_up(struct ath10k *ar,
+                                    enum ath10k_firmware_mode fw_mode)
 {
         int ret;
 
         ath10k_dbg(ar, ATH10K_DBG_SNOC, "%s:WCN3990 driver state = %d\n",
                    __func__, ar->state);
 
-        ret = ath10k_snoc_wlan_enable(ar);
+        ret = ath10k_snoc_wlan_enable(ar, fw_mode);
         if (ret) {
                 ath10k_err(ar, "failed to enable wcn3990: %d\n", ret);
                 return ret;
diff --git a/drivers/net/wireless/ath/ath10k/testmode.c b/drivers/net/wireless/ath/ath10k/testmode.c
index c24ee616833c..67faafecaf06 100644
--- a/drivers/net/wireless/ath/ath10k/testmode.c
+++ b/drivers/net/wireless/ath/ath10k/testmode.c
@@ -270,7 +270,7 @@ static int ath10k_tm_cmd_utf_start(struct ath10k *ar, struct nlattr *tb[])
         ath10k_dbg(ar, ATH10K_DBG_TESTMODE, "testmode wmi version %d\n",
                    ar->testmode.utf_mode_fw.fw_file.wmi_op_version);
 
-        ret = ath10k_hif_power_up(ar);
+        ret = ath10k_hif_power_up(ar, ATH10K_FIRMWARE_MODE_UTF);
         if (ret) {
                 ath10k_err(ar, "failed to power up hif (testmode): %d\n", ret);
                 ar->state = ATH10K_STATE_OFF;
diff --git a/drivers/net/wireless/ath/ath10k/usb.c b/drivers/net/wireless/ath/ath10k/usb.c
index f731d35ee76d..d3677765f96c 100644
--- a/drivers/net/wireless/ath/ath10k/usb.c
+++ b/drivers/net/wireless/ath/ath10k/usb.c
@@ -706,7 +706,8 @@ static void ath10k_usb_hif_send_complete_check(struct ath10k *ar,
 {
 }
 
-static int ath10k_usb_hif_power_up(struct ath10k *ar)
+static int ath10k_usb_hif_power_up(struct ath10k *ar,
+                                   enum ath10k_firmware_mode fw_mode)
 {
         return 0;
 }