ath10k: change swap mail box config for UTF mode of SDIO

For SDIO chip, it does not have HTT connect step in boot phase of UTF
mode, so it does not need the swap configuration for UTF mode, otherwise
it will trigger UTF load fail. For normal mode, it is swap between HTT
and WMI, for UTF mode, it does not have HTT, so it can not swap between
HTT and WMI.

Disable swap mail box for UTF mode will let UTF mode load success.

Tested with QCA6174 SDIO with firmware
WLAN.RMH.4.4.1-00007-QCARMSWP-1.

Signed-off-by: Wen Gong <wgong@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 525a7ff87bf4d7ed55c40b6fa72fecaba7f392b9..a934e941760a5085a85b8c65a4954a7785bee1f2 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -656,7 +656,7 @@ static void ath10k_send_suspend_complete(struct ath10k *ar)
        complete(&ar->target_suspend);
 }
 
-static void ath10k_init_sdio(struct ath10k *ar)
+static void ath10k_init_sdio(struct ath10k *ar, enum ath10k_firmware_mode mode)
 {
        u32 param = 0;
 
@@ -673,7 +673,12 @@ static void ath10k_init_sdio(struct ath10k *ar)
         * not big enough for mac80211 / native wifi frames. disable it
         */
        param &= ~HI_ACS_FLAGS_ALT_DATA_CREDIT_SIZE;
-       param |= HI_ACS_FLAGS_SDIO_SWAP_MAILBOX_SET;
+
+       if (mode == ATH10K_FIRMWARE_MODE_UTF)
+               param &= ~HI_ACS_FLAGS_SDIO_SWAP_MAILBOX_SET;
+       else
+               param |= HI_ACS_FLAGS_SDIO_SWAP_MAILBOX_SET;
+
        ath10k_bmi_write32(ar, hi_acs_flags, param);
 
        /* Explicitly set fwlog prints to zero as target may turn it on
@@ -2536,7 +2541,7 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode,
                        goto err;
 
                if (ar->hif.bus == ATH10K_BUS_SDIO)
-                       ath10k_init_sdio(ar);
+                       ath10k_init_sdio(ar, mode);
        }
 
        ar->htc.htc_ops.target_send_suspend_complete =

diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c
index a2c1bad67b5b114e875bc1bfdbff9c37a779cd86..9bbd5b54b8cadefd75873f136483d5dd44c56b57 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/sdio.c
+++ b/drivers/net/wireless/ath/ath10k/sdio.c
@@ -1642,7 +1642,12 @@ static int ath10k_sdio_hif_swap_mailbox(struct ath10k *ar)
                ath10k_dbg(ar, ATH10K_DBG_SDIO,
                           "sdio mailbox swap service enabled\n");
                ar_sdio->swap_mbox = true;
+       } else {
+               ath10k_dbg(ar, ATH10K_DBG_SDIO,
+                          "sdio mailbox swap service disabled\n");
+               ar_sdio->swap_mbox = false;
        }
+
        return 0;
 }