ath10k: change swap mail box config for UTF mode of SDIO
PATCH 1/1 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.
--- drivers/net/wireless/ath/ath10k/core.c | 11 ++++++++--- drivers/net/wireless/ath/ath10k/sdio.c | 5 +++++ 2 files changed, 13 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath10k/core.c +8 -3
@@ -629,7 +629,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 ;
@@ -646,7 +646,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
@@ -2501,7 +2506,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 =
drivers/net/wireless/ath/ath10k/sdio.c +5 -0
@@ -1637,7 +1637,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 ; }
Signature · 1 line
1.9.1
Quoted 6 lines · Wen Gong
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.
Quoted 7 lines
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 <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
8cdee1affe90 ath10k: change swap mail box config for UTF mode of SDIO
Signature · 9 lines
https://patchwork.kernel.org/patch/10893131/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 6 lines · Wen Gong
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.
Quoted 7 lines
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 <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
8cdee1affe90 ath10k: change swap mail box config for UTF mode of SDIO
Signature · 3 lines
https://patchwork.kernel.org/patch/10893131/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches