github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-03 20:14:06 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ath11k: avoid firmware crash when reg set for QCA6390/WCN6855

Browse Source 
For the NL80211_REGDOM_SET_BY_USER hint from cfg80211, it set the new
alpha2 code to ath11k, then ath11k send WMI_SET_INIT_COUNTRY_CMDID to
firmware for all chips currently. When test with WCN6855/QCA6390 chips,
this WMI CMD leads firmware crash.

For AP based chips(ipq8074/qcn9074), WMI_SET_INIT_COUNTRY_CMDID is used
to send to firmware, for STATION based chips(WCN6855/QCA6390), it need to
use another WMI CMD WMI_SET_CURRENT_COUNTRY_CMDID.

Add flag current_cc_support in hardware parameters, it is used to
distinguish AP/STA platform. After that, the firmware will work
normal and the regulatory feature works well for QCA6390/WCN6855.

Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2

Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20220119041355.32014-1-quic_wgong@quicinc.com
This commit is contained in:
Wen Gong 2022-01-18 23:13:55 -05:00 committed by Kalle Valo
parent 1cb747192d
commit 0d6e997b76
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/ath/ath11k/core.c
View File

@ -98,6 +98,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
.wakeup_mhi = false, .wakeup_mhi = false,
.supports_rssi_stats = false, .supports_rssi_stats = false,
.fw_wmi_diag_event = false, .fw_wmi_diag_event = false,
.current_cc_support = false,
}, },
{ {
.hw_rev = ATH11K_HW_IPQ6018_HW10, .hw_rev = ATH11K_HW_IPQ6018_HW10,
@ -162,6 +163,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
.wakeup_mhi = false, .wakeup_mhi = false,
.supports_rssi_stats = false, .supports_rssi_stats = false,
.fw_wmi_diag_event = false, .fw_wmi_diag_event = false,
.current_cc_support = false,
}, },
{ {
.name = "qca6390 hw2.0", .name = "qca6390 hw2.0",
@ -225,6 +227,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
.wakeup_mhi = true, .wakeup_mhi = true,
.supports_rssi_stats = true, .supports_rssi_stats = true,
.fw_wmi_diag_event = true, .fw_wmi_diag_event = true,
.current_cc_support = true,
}, },
{ {
.name = "qcn9074 hw1.0", .name = "qcn9074 hw1.0",
@ -288,6 +291,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
.wakeup_mhi = false, .wakeup_mhi = false,
.supports_rssi_stats = false, .supports_rssi_stats = false,
.fw_wmi_diag_event = false, .fw_wmi_diag_event = false,
.current_cc_support = false,
}, },
{ {
.name = "wcn6855 hw2.0", .name = "wcn6855 hw2.0",
@ -351,6 +355,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
.wakeup_mhi = true, .wakeup_mhi = true,
.supports_rssi_stats = true, .supports_rssi_stats = true,
.fw_wmi_diag_event = true, .fw_wmi_diag_event = true,
.current_cc_support = true,
}, },
{ {
.name = "wcn6855 hw2.1", .name = "wcn6855 hw2.1",
@ -413,6 +418,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
.wakeup_mhi = true, .wakeup_mhi = true,
.supports_rssi_stats = true, .supports_rssi_stats = true,
.fw_wmi_diag_event = true, .fw_wmi_diag_event = true,
.current_cc_support = true,
}, },
}; };

1
drivers/net/wireless/ath/ath11k/hw.h
View File

@ -192,6 +192,7 @@ struct ath11k_hw_params {
bool wakeup_mhi; bool wakeup_mhi;
bool supports_rssi_stats; bool supports_rssi_stats;
bool fw_wmi_diag_event; bool fw_wmi_diag_event;
bool current_cc_support;
}; };
struct ath11k_hw_ops { struct ath11k_hw_ops {

25
drivers/net/wireless/ath/ath11k/reg.c
View File

@ -48,6 +48,7 @@ ath11k_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request)
{ {
struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy); struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
struct wmi_init_country_params init_country_param; struct wmi_init_country_params init_country_param;
struct wmi_set_current_country_params set_current_param = {};
struct ath11k *ar = hw->priv; struct ath11k *ar = hw->priv;
int ret; int ret;
@ -76,18 +77,26 @@ ath11k_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request)
return; return;
} }
/* Set the country code to the firmware and wait for /* Set the country code to the firmware and will receive
* the WMI_REG_CHAN_LIST_CC EVENT for updating the * the WMI_REG_CHAN_LIST_CC EVENT for updating the
* reg info * reg info
*/ */
init_country_param.flags = ALPHA_IS_SET; if (ar->ab->hw_params.current_cc_support) {
memcpy(&init_country_param.cc_info.alpha2, request->alpha2, 2); memcpy(&set_current_param.alpha2, request->alpha2, 2);
init_country_param.cc_info.alpha2[2] = 0; ret = ath11k_wmi_send_set_current_country_cmd(ar, &set_current_param);
if (ret)
ath11k_warn(ar->ab,
"failed set current country code: %d\n", ret);
} else {
init_country_param.flags = ALPHA_IS_SET;
memcpy(&init_country_param.cc_info.alpha2, request->alpha2, 2);
init_country_param.cc_info.alpha2[2] = 0;
ret = ath11k_wmi_send_init_country_cmd(ar, init_country_param); ret = ath11k_wmi_send_init_country_cmd(ar, init_country_param);
if (ret) if (ret)
ath11k_warn(ar->ab, ath11k_warn(ar->ab,
"INIT Country code set to fw failed : %d\n", ret); "INIT Country code set to fw failed : %d\n", ret);
}
ath11k_mac_11d_scan_stop(ar); ath11k_mac_11d_scan_stop(ar);
ar->regdom_set_by_user = true; ar->regdom_set_by_user = true;