Commit b2beae32 authored by Wen Gong's avatar Wen Gong Committed by Kalle Valo
Browse files

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: default avatarWen Gong <quic_wgong@quicinc.com>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20220324011856.11014-1-quic_wgong@quicinc.com
parent 673424ce

drivers/net/wireless/ath/ath11k/core.c

+1 −0
Original line number Diff line number Diff line
@@ -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,

drivers/net/wireless/ath/ath11k/core.h

+1 −0
Original line number Diff line number Diff line
@@ -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 {

drivers/net/wireless/ath/ath11k/mac.c

+8 −0
Original line number Diff line number Diff line
@@ -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,

drivers/net/wireless/ath/ath11k/reg.c

+1 −0
Original line number Diff line number Diff line
@@ -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,