Skip to content

[PATCH ath-next 0/4] wifi: ath12k: fix timeout while waiting for regulatory update on bring-up #1119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hangtian Zhu (zhuhangtian) wants to merge 4 commits into
base: qcom-6.18.y
Choose a base branch
from
+35 −7
Open

[PATCH ath-next 0/4] wifi: ath12k: fix timeout while waiting for regulatory update on bring-up #1119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcb62fe
UPSTREAM: wifi: ath12k: signal regd update completion when reg event …
Jul 29, 2026
4a2f87d
UPSTREAM: wifi: ath12k: use per-radio ab in ath12k_mac_hw_register()
Jul 29, 2026
4ad02a4
UPSTREAM: wifi: ath12k: protect new_alpha2 access with base_lock
Jul 29, 2026
c277d33
UPSTREAM: wifi: ath12k: skip setting country code during registration…
Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions drivers/net/wireless/ath/ath12k/mac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15056,28 +15056,49 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah)
wiphy->interface_modes &= ~BIT(NL80211_IFTYPE_MONITOR);

for_each_ar(ah, ar, i) {
struct ath12k_base *this_ab = ar->ab;

/* Apply the regd received during initialization */
ret = ath12k_regd_update(ar, true);
if (ret) {
ath12k_err(ar->ab, "ath12k regd update failed: %d\n", ret);
ath12k_err(this_ab, "ath12k regd update failed: %d\n", ret);
goto err_unregister_hw;
}

if (ar->ab->hw_params->current_cc_support && ab->new_alpha2[0]) {
if (this_ab->hw_params->current_cc_support) {
struct wmi_set_current_country_arg current_cc = {};
struct ieee80211_regdomain *default_regd;
bool same_cc = false;

spin_lock_bh(&this_ab->base_lock);
memcpy(&current_cc.alpha2, this_ab->new_alpha2, 2);
spin_unlock_bh(&this_ab->base_lock);

if (!current_cc.alpha2[0])
goto fw_stats_init;

memcpy(&current_cc.alpha2, ab->new_alpha2, 2);
memcpy(&ar->alpha2, ab->new_alpha2, 2);
memcpy(&ar->alpha2, current_cc.alpha2, 2);

spin_lock_bh(&this_ab->base_lock);
default_regd = this_ab->default_regd[ar->pdev_idx];
if (default_regd)
same_cc = !memcmp(default_regd->alpha2,
current_cc.alpha2, 2);
spin_unlock_bh(&this_ab->base_lock);

if (same_cc)
goto fw_stats_init;

reinit_completion(&ar->regd_update_completed);

ret = ath12k_wmi_send_set_current_country_cmd(ar, &current_cc);
if (ret)
ath12k_warn(ar->ab,
ath12k_warn(this_ab,
"failed set cc code for mac register: %d\n",
ret);
}

fw_stats_init:
ath12k_fw_stats_init(ar);
ath12k_debugfs_register(ar);
}
Expand Down
11 changes: 9 additions & 2 deletions drivers/net/wireless/ath/ath12k/wmi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6964,6 +6964,14 @@ static int ath12k_reg_chan_list_event(struct ath12k_base *ab, struct sk_buff *sk
goto mem_free;
}

/*
* Set the valid pdev_idx before validating so that, even when the
* event is dropped or falls back, the completion the caller in
* ath12k_mac_hw_register() may be waiting on is still signalled at
* the end and it does not time out.
*/
pdev_idx = reg_info->phy_id;

ret = ath12k_reg_validate_reg_info(ab, reg_info);
if (ret == ATH12K_REG_STATUS_FALLBACK) {
ath12k_warn(ab, "failed to validate reg info %d\n", ret);
Expand All @@ -6980,7 +6988,6 @@ static int ath12k_reg_chan_list_event(struct ath12k_base *ab, struct sk_buff *sk
}

/* free old reg_info if it exist */
pdev_idx = reg_info->phy_id;
if (ab->reg_info[pdev_idx]) {
ath12k_reg_reset_reg_info(ab->reg_info[pdev_idx]);
kfree(ab->reg_info[pdev_idx]);
Expand Down Expand Up @@ -7019,7 +7026,7 @@ static int ath12k_reg_chan_list_event(struct ath12k_base *ab, struct sk_buff *sk

out:
/* In some error cases, even a valid pdev_idx might not be available */
if (pdev_idx != 255)
if (pdev_idx < ab->num_radios)
ar = ab->pdevs[pdev_idx].ar;

/* During the boot-time update, 'ar' might not be allocated,
Expand Down
Loading