From patchwork Wed May 21 16:59:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Kumar Singh X-Patchwork-Id: 891674 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 01C5B26139A for ; Wed, 21 May 2025 16:59:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747846787; cv=none; b=nwDm4P2U0Mog8j4OFtwuzy2YEdBgkfAYzDpEMakdTNHrMpTzKUexcwD4kO/an4lmlHsQWsdRU3kjQLrDqnTQIyNCBNraXmyID5I/t3i0HyUkikj/JYCNkwuOADhHLlMvRKrfCUa6k7FGhCpHsRauu9MXVjXLe1SW/jz8dBvm6v4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747846787; c=relaxed/simple; bh=KjPiR9D4kqo90F2+qJ/NqCDy80W5xLZrMNqVy89mZ+o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gk6elo3Mjb+AeVbJ0ii+FLjPfoF8HC9/Ky1QMAndpEPQosOpm+EolvZSK3EzxCwcfRwa1MpL7D9bc8ELbz7m3gZ3UM0/ATosMRBsEcxyk2qtUAv6EqlNbIDKpb6tDTx4fJn9zNEMrgFmWajUwf1fQVtAwN2eHOOrf0jeBawCNGY= 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=CJiyUde9; arc=none smtp.client-ip=205.220.180.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="CJiyUde9" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54L9Xq0C011652 for ; Wed, 21 May 2025 16:59:45 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= WL3+vydyMIJ1To8zYn3AtbMFpeDybXOzCHGE6ghysnc=; b=CJiyUde9WmTIwT+Z VhlDJwHgGE8NcP284SxFISm4AlBD4mcS4RktaKJFd+gc0LI6FfRHwobFlG8MpLyA xsCyEqHIjL8D1dcsDGh2aU7HFWXaMmt2Q6lzrM2rGeyjW1Gu/rgV8JHCRb7mIQHW ms8IS826A3NhR+bWK/V+jwOAY+RwxFiQ4wqN7yFk8Ho3S0Ku1itEH+QGLRLlMjUU 8k3AWwBVYYZE4S/REi4yoT7SLodsD0M3+e4G/x/1KIes9I1w2F+0rgYeyGMaKQ+q NSu8452wEs1rBkWm4A+VP57LE1zMer5urgywg8k8mxSGx4UJPuKQrSFO7rvh8DU/ gHjKmQ== Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46rwfb3mb7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 21 May 2025 16:59:44 +0000 (GMT) Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-af59547f55bso4276269a12.0 for ; Wed, 21 May 2025 09:59:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747846783; x=1748451583; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WL3+vydyMIJ1To8zYn3AtbMFpeDybXOzCHGE6ghysnc=; b=w6uUTy2vZoP1toVipXgjjlNaLK/zG4MIAhRVsnByzCslTlvzN3K0R9swJ207708Bgw btB3y01KbsEzT6hg714+Qer4XYyNBMDimwpYPCWsSrUWRNNvP8Dmv9WzHDHOlpWSfZMz QXl99z2CNIkCCy1DHce+z6cG6Gn3dt+/yzAMLudQRIuJPOZwl2utgj54RNvFBYavJpES irc8Eg7XtkM/vIJwtIfwXD1JvODh3iu/xh/jM2qcknEBkv8JJLzKjlgeMMgl8bItIHDB TScO6IWMfCwmNEhMP/yp3hplI9SkezQDvWnBXlwTGe3vEhr8ldorxjhF6bIq1YaGFvi8 YwUA== X-Forwarded-Encrypted: i=1; AJvYcCXT2jvHqHwEUJhz3vbAULIYHJGYfvX/UKdUll6QsLgoF5On6QdZkxnorAl8er4prg0C42r7n6BzqU+J3jfO0g==@vger.kernel.org X-Gm-Message-State: AOJu0YyKDPE8kzSTfp9Qla2cg7DXZyUKdtsaIMM3wlWJuaT/cDk6vD5L 8rlxh7bIEeUo8KnZVdvpsnFxOFlEEAlvXsx5ZGWb50s2Eh6wpqsbNwg998fgved3wOYaOl4n3W5 rvLyBAl6jALBZeG5iN4zSJN8TkwcZfwTwI2//jq7EPU3Q3v0SHnvTVT8JIjTw/yXGr3HoKA== X-Gm-Gg: ASbGncvE7kXRNsZ5W2Ln79o7OchWL09leJkc5+PiavJpSRRPTD4hW1rn0jFyU2UR8DP DhjxHcgmqbiGhH4LBeNFG9JBrjBZZ8H7Kwnd0Vsy61fIhKzlB3E4l7OzPVQ3zBd66ePJiGo3YsG 2pYAMIJ0oFOcwCUgRiVgNWN4ernc4R+cE0eJDdsAC1o74090Mmp+j4K2jpZOMQyxEk8nWwjV8fV ZtkjkTogo7C5As9rvY47qe4TeUd7hs9NrtfOlle9r91n4OYxJJ99YXVWDWeLEH49Za0BXoJyAAa 91dqvhNKyXQnIVrPdZFzQBrx8ol+8xKQB7URROTpvTiK9Wf107hhirK5AgXwBZLy12Axg5lq6c1 XZJVzfxGD9CbOmg2M104+dxgxs2XMySrklbzM X-Received: by 2002:a17:90a:fc4f:b0:2ff:4f04:4266 with SMTP id 98e67ed59e1d1-30e83216290mr25433516a91.23.1747846783510; Wed, 21 May 2025 09:59:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEL5e8jDdzNZMMd0TV5+CNwRTfOM/yevICECgWpAkW79RdU2B9pfHaXPHxgwINBivapixqfUQ== X-Received: by 2002:a17:90a:fc4f:b0:2ff:4f04:4266 with SMTP id 98e67ed59e1d1-30e83216290mr25433481a91.23.1747846783123; Wed, 21 May 2025 09:59:43 -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 98e67ed59e1d1-30f365c4ee3sm3875055a91.18.2025.05.21.09.59.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 May 2025 09:59:42 -0700 (PDT) From: Aditya Kumar Singh Date: Wed, 21 May 2025 22:29:30 +0530 Subject: [PATCH ath-next 2/3] wifi: ath12k: fix regdomain update failure when adding interface Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250521-ath12k-fix-ah-regd_updated-v1-2-9737de5bf98e@oss.qualcomm.com> References: <20250521-ath12k-fix-ah-regd_updated-v1-0-9737de5bf98e@oss.qualcomm.com> In-Reply-To: <20250521-ath12k-fix-ah-regd_updated-v1-0-9737de5bf98e@oss.qualcomm.com> To: Jeff Johnson , Kang Yang , Wen Gong , Vasanthakumar Thiagarajan , Baochen Qiang Cc: Jeff Johnson , 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: mDmt0Uab7zKn8eIz26cXNnik_-wqRxW3 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIxMDE2NyBTYWx0ZWRfXzTNcz+pt0TIV 0pwDW8m71QG7pww8YdPq2DE6sU3w1zRoDcCSa2cjsdkEwuuGxX4bxy3AFMziums2eYHzWYNptK8 YkFOqT3TjZj7WBILQ+R2ttjB1KFWfqwiYVIeCYSv+jcy/w4Wf98rU2JPgs8VDLnnaL3LC4dBViX nMnykag2MKKyDtAm2txrJJbiOQjm9PK25Hxsih36rApHfq/dFcd6JHijTpixHCEwmQ9DwbOBvdz EXWLvbOvcrGw3FmYkzh+6NuyB05Qw7vBdqvoKeNytdepYfYAgwSOxlmXZhUIWKdNXAo383hqJ2W U9A2srdW3mktgLHB/93Vd2MiCQVAMTH7kxrnrBZ1nT4ObYczRo8TO8o+Z/WiJuSoEk0fNaBOTSL qKm1ArFsvq80fmxiqDqLjGQlxfen9JnKDKQrQ8zB1kp5kv254BaFIdtAX6Dh2u5vU0EKAfs4 X-Proofpoint-GUID: mDmt0Uab7zKn8eIz26cXNnik_-wqRxW3 X-Authority-Analysis: v=2.4 cv=dLCmmPZb c=1 sm=1 tr=0 ts=682e0680 cx=c_pps a=rz3CxIlbcmazkYymdCej/Q==:117 a=Ou0eQOY4+eZoSc0qltEV5Q==:17 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=zyJjCoAm0S0MJ9WaK7cA:9 a=QEXdDO2ut3YA:10 a=bFCP_H2QrGi7Okbo017w:22 a=TjNXssC_j7lpFel5tvFf:22 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-05-21_05,2025-05-20_03,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1015 adultscore=0 bulkscore=0 phishscore=0 suspectscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 mlxlogscore=999 spamscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505210167 From: Baochen Qiang Commit 4c546023d71a ("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: 4c546023d71a ("wifi: ath12k: update regulatory rules when interface added") Signed-off-by: Baochen Qiang Signed-off-by: Aditya Kumar Singh --- drivers/net/wireless/ath/ath12k/mac.c | 1 + drivers/net/wireless/ath/ath12k/reg.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c index 81ff32d2ce5afce582b78c17fbdf5082e4394798..755546246915cb355fc6f40fef85a87b880e2f91 100644 --- a/drivers/net/wireless/ath/ath12k/mac.c +++ b/drivers/net/wireless/ath/ath12k/mac.c @@ -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; diff --git a/drivers/net/wireless/ath/ath12k/reg.c b/drivers/net/wireless/ath/ath12k/reg.c index 2134e72e0812b2a0bdc537ace456ef7af1db0726..2598b39d5d7ee9b24ad8ed5d6de1bc5bbc6554e0 100644 --- a/drivers/net/wireless/ath/ath12k/reg.c +++ b/drivers/net/wireless/ath/ath12k/reg.c @@ -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) {