@@ -1261,6 +1261,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,
@@ -619,6 +619,7 @@ struct ath11k {
bool regdom_set_by_user;
int hw_rate_code;
u8 twt_enabled;
+ u8 alpha2[REG_ALPHA2_LEN + 1];
};
struct ath11k_band_cap {
@@ -7917,6 +7917,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,
@@ -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,
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> --- depends on the patchset "ath11k: add feature for device recovery" https://patchwork.kernel.org/project/linux-wireless/cover/20220228064606.8981-1-quic_wgong@quicinc.com/ which already exist in master-pending branch of ath.git drivers/net/wireless/ath/ath11k/core.c | 1 + drivers/net/wireless/ath/ath11k/core.h | 1 + drivers/net/wireless/ath/ath11k/mac.c | 8 ++++++++ drivers/net/wireless/ath/ath11k/reg.c | 1 + 4 files changed, 11 insertions(+) base-commit: d845cf007bdf8b2bf41522e1ecd0eb804e553d57 prerequisite-patch-id: 8bb6c2b19d735f076e8f60a4fe10ceea3ad1b80d prerequisite-patch-id: 480ddeb9d867bda9fc673b0dd2af7e8fd0e1d184 prerequisite-patch-id: 2d69ea48692d11b6d8681447fa8f63d2753a7780 prerequisite-patch-id: bcfccd769faad1aa219c7e7d2b59def344c4a152 prerequisite-patch-id: abc29d03fdea060832fb3216c635991de46d0254