wifi: ath12k: fix timeout while waiting for regulatory update during interface creation
PATCH 1/1 wifi: ath12k: fix timeout while waiting for regulatory update during interface creation
During interface creation, following print is observed on the console -
Timeout while waiting for regulatory update
This occurs due to commit 906619a00967 ("wifi: ath12k: handle regulatory hints during mac registration"), which introduced a completion mechanism to synchronize the regulatory update process. The intent behind this change is to coordinate the timing between when the firmware sends regulatory data to the driver and when the driver processes that data.
However, during interface addition, if the 6 GHz band is active, the driver invokes ath12k_regd_update() to apply the appropriate 6 GHz power mode regulatory settings. At this point, there is no interaction with the firmware, so the completion object is not reinitialized. As a result, wait_for_completion() eventually times out, leading to the observed error log message.
Hence to fix this, move all complete() on regd_update_completed to complete_all().
The complete() function signals only once, causing any subsequent waits without reinitialization to timeout. In this scenario, since waiting is unnecessary, complete_all() can be used instead, ensuring that subsequent calls to wait without reinitialization will simply bail out and not actually wait. This approach is ideal because if the firmware is not involved, there is no need to wait for the completion event. However, if the firmware is involved, it is guaranteed that the completion will be reinitialized, and thus, it would wait.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.5-01651-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/core.c | 2 +- drivers/net/wireless/ath/ath12k/mac.c | 2 +- drivers/net/wireless/ath/ath12k/wmi.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath12k/core.c +1 -1
@@ -1475,7 +1475,7 @@ static void ath12k_core_pre_reconfigure_recovery(struct ath12k_base *ab)complete (&ar->vdev_setup_done);complete (&ar->vdev_delete_done);complete (&ar->bss_survey_done); -complete (&ar->regd_update_completed); +complete_all (&ar->regd_update_completed);wake_up (&ar->dp.tx_empty_waitq); idr_for_each(&ar->txmgmt_idr,
drivers/net/wireless/ath/ath12k/mac.c +1 -1
@@ -12755,7 +12755,7 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah)* proceeding with registration. */ for_each_ar (ah, ar, i) -complete (&ar->regd_update_completed); +complete_all (&ar->regd_update_completed); ret =ieee80211_register_hw (hw);if (ret) {
drivers/net/wireless/ath/ath12k/wmi.c +1 -1
@@ -6764,7 +6764,7 @@ static int ath12k_reg_chan_list_event(struct ath12k_base *ab, struct sk_buff *sk* before registering the hardware. */ if (ar) -complete (&ar->regd_update_completed); +complete_all (&ar->regd_update_completed);return ret; }
---
base-commit: aa555da8266715e52e5dd74360f3b4c866ddcb64
change-id: 20250625-fix_timeout_during_interface_creation-ae428c7d3684
FYI this should have been tagged for -next instead of -current since the patch being fixed is only in -next
I'm in the process of picking this up now
/jeff
Jeff Johnson
AppliedQuoted 11 lines · Aditya Kumar Singh
During interface creation, following print is observed on the console -
Timeout while waiting for regulatory update
This occurs due to commit
906619a00967("wifi: ath12k: handle regulatory hints during mac registration"), which introduced a completion mechanism to synchronize the regulatory update process. The intent behind this change is to coordinate the timing between when the firmware sends regulatory data to the driver and when the driver processes that data.[...]
Applied, thanks!
[1/1] wifi: ath12k: fix timeout while waiting for regulatory update during interface creation
commit: 6e17bbb5a86e6c68d65e38dfc850699e7a0706cb
Best regards,
Signature · 1 line
Jeff Johnson <[email protected]>