From nobody Fri Oct 10 21:10:44 2025 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C91F919A2A3 for ; Thu, 12 Jun 2025 17:18:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749748731; cv=none; b=EOwRA21dS7KTmmfGv8J96VOsG3k7SGHdgBNlc/JsJKp96uD8ZCUefJhlGW7dZfiiAcV04fjgoIS9LNxfhQuq19+5NeKBjxmxNKc45hBDpqCezfdOTLdvHccxTJrMN5eBR7EWkZ5Kqi/pNud6ADDeva/QZq9ZNDG0jvJgzqEb4I4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749748731; c=relaxed/simple; bh=cn88p5R3Fk3fbeYuWcR19hLDcM8Ds/dn8XfTcbw4Hfg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=sM7kw+PHn6L5fuHjJbDHIx8kMMPM9zx7gl0hPdADyR2qKL/FGgEcfaph+O0pwMMxuM59ubIqDkHjtQKlcTrBi3+KXkj9jE8wwR11jmqI8ffqXLrr3lgaZU7coUVjYtmbp8RIMztwawm98BXazn85mmv6x3bvFA1OqhqMNxQD4xY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=nC62XfK9; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="nC62XfK9" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55CHHfHj027161 for ; Thu, 12 Jun 2025 17:18:49 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=qcppdkim1; bh=FAfd/466aJtk26pdkcE23i lUVjqGoKW+Tnh2zkx2NW4=; b=nC62XfK9UZzFHDI4g+xpU2QOqAXn6b+A7Prl/w YXxKtazHEVz3vLsP4Xars2nfNDMAVmBlYl8mCfFr4WzH8vJ+n2Jo/QhK9ubT4cDy CSsTOEjMXIn4d8npkbKCXxqxhzwomRigFgdKvCevJsmUOVaKrypvBmzSEjlvmvdd W9Fi9OJe8MQEiP9baIGvJt5umZd3AztiO5NW6dMTpov1xTr8pDVxQ03pGdWKIG6A 0eDP7jYdfNzLpfGeB/aaoUuy1khB3PBoZFNzCoHiVe12C1sbRih/XdNbo/na6rtH cvCe+iiDsV5XjtHZdgnALjA7//bwmj610dSumU89utDFw5dg== Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 474ccvh8qn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 12 Jun 2025 17:18:48 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-23592f5fcb0so16683315ad.3 for ; Thu, 12 Jun 2025 10:18:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749748727; x=1750353527; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=FAfd/466aJtk26pdkcE23ilUVjqGoKW+Tnh2zkx2NW4=; b=Elr6jkhk+tEUkCTYwW6hwuu4l1k0AF9LlHdkqRpLBp/xvu9P9+WnLl1v/zt25fDPX9 iRJzNXR3i/iIG5bO7POZVQLOATq0GMvG8I3iLpegxceG0qExn/LEgrzosg8UdOMI0zDY QC/IgbeMgF8yTTSAmexZhr1MCFT4U58gjbX+8eAih5ZSLhUFobUjH5qBb9exPNfn4yMk EqRTaSlXdb46CAEM30t6hxAFAO78+WAf0dvPuwY6bgiBk7wrrndQQoTzy9uhT/KkNcsl xPDe/wnZH2g+hIyaGYQUGR871X2R6msgdS0ehijyQCmLXIgGZuq1b6qkalTUO5CPDdco 4U7Q== X-Forwarded-Encrypted: i=1; AJvYcCUQ+rNVwGXrODj5uiCCzJfObXe+3jLQxztZbubpvOtqV07P8eJqx8o/ctZ9VYel4Ldh0DO4c04g5wxdXa4=@vger.kernel.org X-Gm-Message-State: AOJu0Yw1h4hutpsEaCzAwgkv/3OfmYe0l0zMFHEXH46Ro+ompX0AWWGQ TSr8XR0vL9DPzRbeSw2lp2OB1yCwcsF2ErBnl+6s3J2SZGkUDosyOlaHb/c0fyCVN9BBSXNCee3 7MTKgfoPcxyheZSU9rikyTdQ0Rzx9rrxzhew3QDhJnRG5vM7lqfI29x9LBZqaH2Vm7Zk= X-Gm-Gg: ASbGncuJiaNEC8V6s91PGcXQHAOgJGJ4FR9xCLT4Rkku2Q+KtlxM7P0CmvTpCtg3vAb 5H6iX0AFOUYk5AW8N08zOccmnTBTgqyvvf3o/YeHV5f9cpcop6PnJa97IU479Xl+FPVyguGuMOm 1mN5VwRHb4Z6sD488bJU/tXeLh98SRlzj9Bs8HPqmMovyytAG+ptYbpjsKDzHQm3J6PKUb0kctJ GYz1rmwjCplQ43cgUp6nphqkCCaX+sgxplVDm/rAhOZbFRJimaOvZFlGCd3OEqd+hDiaj9rCZ2c EnCurs18w2s2nYJaARX4n75Tu4kqZjB5y7PzhMBGGthzU3wn9tx2ikhz7V7Lf+2gPfeCoSkCPei IkY9voQsnxT68zPbytcTM7MmLT7pNhTBEAGPEtWGtZqCtpdk= X-Received: by 2002:a17:902:d489:b0:234:a992:96d8 with SMTP id d9443c01a7336-23641abe52fmr121980145ad.19.1749748727203; Thu, 12 Jun 2025 10:18:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEb3hmyzcuYh62ytDN+Gfk1knVYsAAA29UVORbZv5+sAlmWUmsH84jXYEFz2PZxZTBqay4zGA== X-Received: by 2002:a17:902:d489:b0:234:a992:96d8 with SMTP id d9443c01a7336-23641abe52fmr121979685ad.19.1749748726701; Thu, 12 Jun 2025 10:18:46 -0700 (PDT) Received: from hu-adisi-blr.qualcomm.com (blr-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com. [103.229.18.19]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b2fd629375fsm1411495a12.45.2025.06.12.10.18.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 10:18:46 -0700 (PDT) From: Aditya Kumar Singh Date: Thu, 12 Jun 2025 22:48:20 +0530 Subject: [PATCH ath-next] wifi: ath12k: handle regulatory hints during mac registration Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250612-handle_user_regd_update_hints_during_insmod-v1-1-576bd0f6dbe0@oss.qualcomm.com> X-B4-Tracking: v=1; b=H4sIANsLS2gC/6XPwW7DIAwA0F+pOI8qkFBIT/uPqkIoNomlBjogU acq/z6Wyy7bYdvFkm3Zz36yjIkws/PhyRKulCmGmoiXAxsmF0bkBDVnspGqUVLyWoQb2qXO2YQ j2OUOrqCdKJRsYUkURkshzxF4JwctELVvzYnVjfeEnh67dmGuTDzgo7Br7UyUS0zv+xmr2Pt/E lfBBTfOOwOq1aZ3rzHn49vibkOc52MNO7fKfxCyEh2YzjdeNdrrH4j2izgJ8Tui/fyi70HhgOB 7/w2xbdsH8kOorb0BAAA= X-Change-ID: 20250522-handle_user_regd_update_hints_during_insmod-42c71ee7f386 To: Jeff Johnson Cc: linux-wireless@vger.kernel.org, ath12k@lists.infradead.org, linux-kernel@vger.kernel.org, Aditya Kumar Singh X-Mailer: b4 0.14.2 X-Proofpoint-ORIG-GUID: CLGuVmWB1B56rllnDQ7TGG08ifG0_DA9 X-Authority-Analysis: v=2.4 cv=TsLmhCXh c=1 sm=1 tr=0 ts=684b0bf8 cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=Ou0eQOY4+eZoSc0qltEV5Q==:17 a=IkcTkHD0fZMA:10 a=6IFa9wvqVegA:10 a=EUspDBNiAAAA:8 a=cjyl3gcxlCMcS8tmzmQA:9 a=QEXdDO2ut3YA:10 a=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-GUID: CLGuVmWB1B56rllnDQ7TGG08ifG0_DA9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjEyMDEzMyBTYWx0ZWRfX+0os2WEb8I9r D/5bhynisdZ83dABlol0L7SLn5gG7jnwaOiVZdZTNNnUi7jad2pg77OSYKMSTmhisZoSVSlessp kR9zrHjUyzSxoiwCzeVqGkmq7hMlLcHtf7QUxL0tYnOrKoT54MFF4OVHuDBZhwAjlQ7FUEVnXr7 eA8DbHb6gzY5pdmWdFMz1+gZZco4QBdjma+jFb579oTX85IfLE8nihQD8hr81ciUtjQZB28QuOA j0qsL+D7gNc6MFWbz3AUPKHyL+RFeDc7ibV1qmLbnTS5AUknv2g2POkmobDiVBud551UIp+uN7G LiX9jZ7cu0puhuXea4ZKMNoDJogmBVOfBfosfmNMBKFPbqVRnZOOKQYdutumEUOdqKs8CmBtC5k 09+/meyCOMI5TZG4BFeNfGWKUdODIsZTkV52anOr9UE8pgKtr3CSSHQ2YzjJTAZ/jdjaY/yo X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-06-12_10,2025-06-12_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 spamscore=0 mlxlogscore=999 impostorscore=0 priorityscore=1501 bulkscore=0 adultscore=0 clxscore=1015 mlxscore=0 malwarescore=0 lowpriorityscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506120133 If a regulatory notification is there in the system while the hardware is being registered, it attempts to set the new regulatory country. However, ath12k currently boots with a default country derived from the BDF. If this default country differs from the one provided in the notification, a race condition can occur while updating the regulatory information back to userspace. This potentially leads to driver having the incorrect regulatory applied. For example, suppose the regulatory domain for France (FR) is already applied, and then the driver is loaded with a BDF that has the United States (US) country programmed. When the driver finishes loading, the regulatory domain shown in phyX still reflects the US regulatory settings. This is incorrect, as the driver had already received a notification for FR during hardware registration, but failed to process it properly due to the race condition. The race condition exists during driver initialization and hardware registration: - On driver load, the firmware sends BDF-based country regulatory rules, which are stored in default_regd via ath12k_reg_handle_chan_list(). - During hardware registration, a regulatory notification is triggered through: ath12k_mac_hw_register() -> ieee80211_register_hw() -> wiphy_register() -> wiphy_regulatory_register() -> reg_call_notifier() This sends a country code to the firmware, which responds with updated regulatory rules. - After registration, ath12k_mac_hw_register() calls ath12k_regd_update(), which copies default_regd and passes it to the upper layers. The race occurs between the firmware's response and the execution of ath12k_regd_update(). If the firmware's new rules are processed before the update call, the correct values are used. Otherwise, outdated boot-time country settings are exposed to userspace. To resolve this issue, introduce a completion mechanism within the hardware group (ah). Trigger this completion whenever a regulatory change is requested from the firmware. Then, in ath12k_regd_update(), wait for the firmware to complete its regulatory processing before proceeding with the update. This ensures that during driver load, the default country is processed first. However, before ath12k_regd_update() is called, the new regulatory notification will have already been received by the driver. As a result, it will wait for the firmware's regulatory processing to complete, and only the final, correct regulatory domain will be updated to userspace. Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1 Signed-off-by: Aditya Kumar Singh --- drivers/net/wireless/ath/ath12k/core.c | 4 ++++ drivers/net/wireless/ath/ath12k/core.h | 1 + drivers/net/wireless/ath/ath12k/mac.c | 15 +++++++++++++++ drivers/net/wireless/ath/ath12k/reg.c | 12 ++++++++++++ drivers/net/wireless/ath/ath12k/reg.h | 2 ++ drivers/net/wireless/ath/ath12k/wmi.c | 13 ++++++++++++- 6 files changed, 46 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath12k/core.c b/drivers/net/wireless/= ath/ath12k/core.c index ebc0560d40e3419130e4caf01c9b91bd9affb3bd..9c18a706dc3ae3b8c5b95d8575e= 778c8a9c898ba 100644 --- a/drivers/net/wireless/ath/ath12k/core.c +++ b/drivers/net/wireless/ath/ath12k/core.c @@ -1470,6 +1470,7 @@ static void ath12k_core_pre_reconfigure_recovery(stru= ct ath12k_base *ab) complete(&ar->vdev_setup_done); complete(&ar->vdev_delete_done); complete(&ar->bss_survey_done); + complete(&ar->regd_update_completed); =20 wake_up(&ar->dp.tx_empty_waitq); idr_for_each(&ar->txmgmt_idr, @@ -1509,6 +1510,9 @@ static void ath12k_update_11d(struct work_struct *wor= k) ar =3D pdev->ar; =20 memcpy(&ar->alpha2, &arg.alpha2, 2); + + reinit_completion(&ar->regd_update_completed); + ret =3D ath12k_wmi_send_set_current_country_cmd(ar, &arg); if (ret) ath12k_warn(ar->ab, diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/= ath/ath12k/core.h index 941db6e49d6eaeb03783f7714d433259d887820b..329f3e490a713b179413f73a402= 4448aedc363fd 100644 --- a/drivers/net/wireless/ath/ath12k/core.h +++ b/drivers/net/wireless/ath/ath12k/core.h @@ -804,6 +804,7 @@ struct ath12k { enum ath12k_11d_state state_11d; u8 alpha2[REG_ALPHA2_LEN]; bool regdom_set_by_user; + struct completion regd_update_completed; =20 struct completion fw_stats_complete; =20 diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/a= th/ath12k/mac.c index 88b59f3ff87af8b48cb3fafcd364fd9ced4ff197..ef2e8398cbe8723c020aff03da5= db7fa7fb2245e 100644 --- a/drivers/net/wireless/ath/ath12k/mac.c +++ b/drivers/net/wireless/ath/ath12k/mac.c @@ -10900,6 +10900,7 @@ ath12k_mac_op_reconfig_complete(struct ieee80211_hw= *hw, struct wmi_set_current_country_arg arg =3D {}; =20 memcpy(&arg.alpha2, ar->alpha2, 2); + reinit_completion(&ar->regd_update_completed); ath12k_wmi_send_set_current_country_cmd(ar, &arg); } =20 @@ -12116,6 +12117,16 @@ static int ath12k_mac_hw_register(struct ath12k_hw= *ah) goto err_cleanup_if_combs; } =20 + /* Boot-time regulatory updates have already been processed. + * Mark them as complete now, because after registration, + * cfg80211 will notify us again if there are any pending hints. + * We need to wait for those hints to be processed, so it's + * important to mark the boot-time updates as complete before + * proceeding with registration. + */ + for_each_ar(ah, ar, i) + complete(&ar->regd_update_completed); + ret =3D ieee80211_register_hw(hw); if (ret) { ath12k_err(ab, "ieee80211 registration failed: %d\n", ret); @@ -12143,6 +12154,9 @@ static int ath12k_mac_hw_register(struct ath12k_hw = *ah) =20 memcpy(¤t_cc.alpha2, ab->new_alpha2, 2); memcpy(&ar->alpha2, ab->new_alpha2, 2); + + reinit_completion(&ar->regd_update_completed); + ret =3D ath12k_wmi_send_set_current_country_cmd(ar, ¤t_cc); if (ret) ath12k_warn(ar->ab, @@ -12215,6 +12229,7 @@ static void ath12k_mac_setup(struct ath12k *ar) init_completion(&ar->scan.on_channel); init_completion(&ar->mlo_setup_done); init_completion(&ar->completed_11d_scan); + init_completion(&ar->regd_update_completed); =20 INIT_DELAYED_WORK(&ar->scan.timeout, ath12k_scan_timeout_work); wiphy_work_init(&ar->scan.vdev_clean_wk, ath12k_scan_vdev_clean_work); diff --git a/drivers/net/wireless/ath/ath12k/reg.c b/drivers/net/wireless/a= th/ath12k/reg.c index 2598b39d5d7ee9b24ad8ed5d6de1bc5bbc6554e0..079dcb6d83df4eb487fb0dbf408= 8fb8cacca8f6e 100644 --- a/drivers/net/wireless/ath/ath12k/reg.c +++ b/drivers/net/wireless/ath/ath12k/reg.c @@ -102,6 +102,8 @@ ath12k_reg_notifier(struct wiphy *wiphy, struct regulat= ory_request *request) =20 /* Send the reg change request to all the radios */ for_each_ar(ah, ar, i) { + reinit_completion(&ar->regd_update_completed); + if (ar->ab->hw_params->current_cc_support) { memcpy(¤t_arg.alpha2, request->alpha2, 2); memcpy(&ar->alpha2, ¤t_arg.alpha2, 2); @@ -272,9 +274,19 @@ int ath12k_regd_update(struct ath12k *ar, bool init) struct ieee80211_regdomain *regd, *regd_copy =3D NULL; int ret, regd_len, pdev_id; struct ath12k_base *ab; + long time_left; =20 ab =3D ar->ab; =20 + time_left =3D wait_for_completion_timeout(&ar->regd_update_completed, + ATH12K_REG_UPDATE_TIMEOUT_HZ); + if (time_left =3D=3D 0) { + ath12k_warn(ab, "Timeout while waiting for regulatory update"); + /* Even though timeout has occurred, still continue since at least boot + * time data would be there to process + */ + } + supported_bands =3D ar->pdev->cap.supported_bands; reg_cap =3D &ab->hal_reg_cap[ar->pdev_idx]; =20 diff --git a/drivers/net/wireless/ath/ath12k/reg.h b/drivers/net/wireless/a= th/ath12k/reg.h index 8af8e9ba462e90db3eb137885d0acd4b1cb2286e..fb508302c7f0f1fea2588ad4cf9= d813da574d06b 100644 --- a/drivers/net/wireless/ath/ath12k/reg.h +++ b/drivers/net/wireless/ath/ath12k/reg.h @@ -13,6 +13,8 @@ struct ath12k_base; struct ath12k; =20 +#define ATH12K_REG_UPDATE_TIMEOUT_HZ (3 * HZ) + #define ATH12K_2GHZ_MAX_FREQUENCY 2495 #define ATH12K_5GHZ_MAX_FREQUENCY 5920 =20 diff --git a/drivers/net/wireless/ath/ath12k/wmi.c b/drivers/net/wireless/a= th/ath12k/wmi.c index 60e2444fe08cefa39ae218d07eb9736d2a0c982b..047d7a0f0e7423759f7cf05dff4= aafbd3b9697d7 100644 --- a/drivers/net/wireless/ath/ath12k/wmi.c +++ b/drivers/net/wireless/ath/ath12k/wmi.c @@ -6143,6 +6143,7 @@ static void ath12k_wmi_htc_tx_complete(struct ath12k_= base *ab, static int ath12k_reg_chan_list_event(struct ath12k_base *ab, struct sk_bu= ff *skb) { struct ath12k_reg_info *reg_info; + struct ath12k *ar; u8 pdev_idx; int ret; =20 @@ -6198,7 +6199,7 @@ static int ath12k_reg_chan_list_event(struct ath12k_b= ase *ab, struct sk_buff *sk kfree(reg_info); =20 if (ret =3D=3D ATH12K_REG_STATUS_VALID) - return ret; + goto out; =20 fallback: /* Fallback to older reg (by sending previous country setting @@ -6212,6 +6213,16 @@ static int ath12k_reg_chan_list_event(struct ath12k_= base *ab, struct sk_buff *sk WARN_ON(1); =20 out: + ar =3D ab->pdevs[pdev_idx].ar; + + /* During the boot-time update, 'ar' might not be allocated, + * so the completion cannot be marked at that point. + * This boot-time update is handled in ath12k_mac_hw_register() + * before registering the hardware. + */ + if (ar) + complete(&ar->regd_update_completed); + return ret; } =20 --- base-commit: 8270f43193a0d097659eca55e701fd6818708945 change-id: 20250522-handle_user_regd_update_hints_during_insmod-42c71ee7f386