ath11k: store and send country code to firmware after recovery

Currently ath11k does not send the country code to firmware after device
recovery, as a result the regdomain info is reported from firmware by
default. Regdomain info is important, so ath11k also need to restore
it to the value which was used before recovery.

Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3

Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20220324011856.11014-1-quic_wgong@quicinc.com

diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
index 2a867237e81791838161a80c74e01d11f6f75d8b..9395a5a271f102bc72d50c28577ee3c8d79b0a60 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/core.c
+++ b/drivers/net/wireless/ath/ath11k/core.c
@@ -1404,6 +1404,7 @@ static void ath11k_update_11d(struct work_struct *work)
                pdev = &ab->pdevs[i];
                ar = pdev->ar;
 
+               memcpy(&ar->alpha2, &set_current_param.alpha2, 2);
                ret = ath11k_wmi_send_set_current_country_cmd(ar, &set_current_param);
                if (ret)
                        ath11k_warn(ar->ab,

diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h
index 41001ec174e2b2ec2f9bd82c5edc590917b76f52..b4d58e01fffaa3d28164f352e32f9d8f0400b701 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/core.h
+++ b/drivers/net/wireless/ath/ath11k/core.h
@@ -671,6 +671,7 @@ struct ath11k {
        int hw_rate_code;
        u8 twt_enabled;
        bool nlo_enabled;
+       u8 alpha2[REG_ALPHA2_LEN + 1];
 };
 
 struct ath11k_band_cap {

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 7a7641e8e3259ac8c40c2279ddf3f6e4838317c1..9caa8b87c3139c2300184a51ef5006a0895c80ad 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -7957,6 +7957,14 @@ ath11k_mac_op_reconfig_complete(struct ieee80211_hw *hw,
                ar->state = ATH11K_STATE_ON;
                ieee80211_wake_queues(ar->hw);
 
+               if (ar->ab->hw_params.current_cc_support &&
+                   ar->alpha2[0] != 0 && ar->alpha2[1] != 0) {
+                       struct wmi_set_current_country_params set_current_param = {};
+
+                       memcpy(&set_current_param.alpha2, ar->alpha2, 2);
+                       ath11k_wmi_send_set_current_country_cmd(ar, &set_current_param);
+               }
+
                if (ab->is_reset) {
                        recovery_count = atomic_inc_return(&ab->recovery_count);
                        ath11k_dbg(ab, ATH11K_DBG_BOOT,

diff --git a/drivers/net/wireless/ath/ath11k/reg.c b/drivers/net/wireless/ath/ath11k/reg.c
index 81e11cde31d7b24c5470c94837ad88355cc30779..35eb1a0c04dcb1b3573cc01b8509bde1ed060721 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/reg.c
+++ b/drivers/net/wireless/ath/ath11k/reg.c
@@ -83,6 +83,7 @@ ath11k_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request)
         */
        if (ar->ab->hw_params.current_cc_support) {
                memcpy(&set_current_param.alpha2, request->alpha2, 2);
+               memcpy(&ar->alpha2, &set_current_param.alpha2, 2);
                ret = ath11k_wmi_send_set_current_country_cmd(ar, &set_current_param);
                if (ret)
                        ath11k_warn(ar->ab,