Commit 37e775a0 authored by Baochen Qiang's avatar Baochen Qiang Committed by Jeff Johnson
Browse files

wifi: ath12k: fix regdomain update failure when adding interface 



Commit 4c546023 ("wifi: ath12k: update regulatory rules when interface
added"), introduced a call to ath12k_reg_handle_chan_list() during
interface addition to update the regulatory domain based on the interface
type. While this works initially, subsequent updates (e.g., after an
interface delete/re-add cycle) fail because ah->regd_updated is never
reset.

To address this, reset ah->regd_updated before calling
ath12k_reg_handle_chan_list() to allow the update to proceed.

However, this change exposes another issue: a timeout occurs when waiting
for the 11D scan to complete, as seen in the log:
    ath12k_pci 0000:05:00.0: failed to receive 11d scan complete: timed out

This happens because during interface down, ar->state_11d is set to
ATH12K_11D_PREPARING, and during interface up, the host waits for
ar->completed_11d_scan even though the scan hasn't started yet.

Fix this by updating the wait condition to check for ATH12K_11D_RUNNING,
which is the only state where a scan complete event is expected.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c5-00284-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1

Fixes: 4c546023 ("wifi: ath12k: update regulatory rules when interface added")
Signed-off-by: default avatarBaochen Qiang <quic_bqiang@quicinc.com>
Signed-off-by: default avatarAditya Kumar Singh <aditya.kumar.singh@oss.qualcomm.com>
Link: https://patch.msgid.link/20250521-ath12k-fix-ah-regd_updated-v1-2-9737de5bf98e@oss.qualcomm.com


Signed-off-by: default avatarJeff Johnson <jeff.johnson@oss.qualcomm.com>
parent d662c14a

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

+1 −0
Original line number Diff line number Diff line
@@ -8833,6 +8833,7 @@ static int ath12k_mac_op_add_interface(struct ieee80211_hw *hw, 
		ab = ar->ab;

		reg_info = ab->reg_info[ar->pdev_idx];

		ath12k_dbg(ab, ATH12K_DBG_MAC, "interface added to change reg rules\n");

		ah->regd_updated = false;

		ath12k_reg_handle_chan_list(ab, reg_info, ahvif->vdev_type,

					    IEEE80211_REG_UNSET_AP);

		break;

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

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ int ath12k_reg_update_chan_list(struct ath12k *ar, bool wait) 
	int num_channels = 0;

	int i, ret, left;



	if (wait && ar->state_11d != ATH12K_11D_IDLE) {

	if (wait && ar->state_11d == ATH12K_11D_RUNNING) {

		left = wait_for_completion_timeout(&ar->completed_11d_scan,

						   ATH12K_SCAN_TIMEOUT_HZ);

		if (!left) {