ath10k: check power save support in STA mode through FW IE

Currently ath10k host enables power save support in station mode by
default for all firmwares but Power save for station mode still not supported
in some of the firmware versions. Which results in firmware crash while
issueing multiple scan commands.

Fix this problem by introducing new FW feature flag to check power save
support in firmware and then the firmware image can tell to ath10k that power
save mode is not supported in station mode.

Signed-off-by: Venkateswara Naralasetty <vnaralas@qti.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index a4f635820f35b69db5c0615f7f7fd2f9fd5e7ac2..7cc426c418177c6b3467ae87f506ab6d399ce23f 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -377,6 +377,7 @@ static const char *const ath10k_core_fw_feature_str[] = {
        [ATH10K_FW_FEATURE_BTCOEX_PARAM] = "btcoex-param",
        [ATH10K_FW_FEATURE_SKIP_NULL_FUNC_WAR] = "skip-null-func-war",
        [ATH10K_FW_FEATURE_ALLOWS_MESH_BCAST] = "allows-mesh-bcast",
+       [ATH10K_FW_FEATURE_NO_PS] = "no-ps",
 };
 
 static unsigned int ath10k_core_get_fw_feature_str(char *buf,

diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index 949ebb3e967bb43f34ac04b21f3938e372ad7e1a..643041ef3271cc75b7a1c964007566a606ff0bd9 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -612,6 +612,9 @@ enum ath10k_fw_features {
         */
        ATH10K_FW_FEATURE_ALLOWS_MESH_BCAST = 16,
 
+       /* Firmware does not support power save in station mode. */
+       ATH10K_FW_FEATURE_NO_PS = 17,
+
        /* keep last */
        ATH10K_FW_FEATURE_COUNT,
 };

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 5683f1a5330eedae677aad5bf2621a6232781346..10fb83784832ec5f8799798a5b7f68eb2533b327 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -8146,8 +8146,13 @@ int ath10k_mac_register(struct ath10k *ar)
                        BIT(NL80211_IFTYPE_P2P_GO);
 
        ieee80211_hw_set(ar->hw, SIGNAL_DBM);
-       ieee80211_hw_set(ar->hw, SUPPORTS_PS);
-       ieee80211_hw_set(ar->hw, SUPPORTS_DYNAMIC_PS);
+
+       if (!test_bit(ATH10K_FW_FEATURE_NO_PS,
+                     ar->running_fw->fw_file.fw_features)) {
+               ieee80211_hw_set(ar->hw, SUPPORTS_PS);
+               ieee80211_hw_set(ar->hw, SUPPORTS_DYNAMIC_PS);
+       }
+
        ieee80211_hw_set(ar->hw, MFP_CAPABLE);
        ieee80211_hw_set(ar->hw, REPORTS_TX_ACK_STATUS);
        ieee80211_hw_set(ar->hw, HAS_RATE_CONTROL);