mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-07-02 12:47:15 +08:00
71 lines
2.6 KiB
Diff
71 lines
2.6 KiB
Diff
From b2beae327e039736299f3c6559f3467323fe68c5 Mon Sep 17 00:00:00 2001
|
|
From: Wen Gong <quic_wgong@quicinc.com>
|
|
Date: Wed, 23 Mar 2022 21:18:56 -0400
|
|
Subject: [PATCH] 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
|
|
---
|
|
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(+)
|
|
|
|
--- 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 wor
|
|
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,
|
|
--- 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 {
|
|
--- 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 i
|
|
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,
|
|
--- 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,
|
|
*/
|
|
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,
|