From nobody Fri Dec 19 10:56:15 2025 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 481DA331A42 for ; Tue, 4 Nov 2025 16:26:38 +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=1762273601; cv=none; b=OwHHPK7ulj94C/+zdH2Sdm7wHw2zXegzmRJe2XzMV3rHl+yms5en6LUvaLBLYNc6NwQsjb1mNtn9UAmUEi7hz+ZDCM7jKtct7Qo1ejRpaP3Fzx+iJGzLw/wHFqiqVv3iOCfDO3CM9SvsaIepl9IjEDcFw1RmeOH1pxSlIMedQ3A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762273601; c=relaxed/simple; bh=wiIh2FzVgG/UzQYeBnUPMcMU9ThK8/B41Kq4t+3Zemg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=POJa8j8F0y4RGMUN/oFWYkuIy7EPa2/Ik/SIEVXluz5XcmlA0btOMsjUzE31/vdO7hfSrxHYe9LtvxXyM+T9bWMlGeLHmxUYzbNhWkjlL369z1tNwvVgcAXJY2HbBPDQYE8I7r9IGZLy8G4b2nfvXBwqRoF028YsXcJbN3Zz77o= 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=g5NCde0n; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=DboDbqD9; 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="g5NCde0n"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="DboDbqD9" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5A4CfuvS2056926 for ; Tue, 4 Nov 2025 16:26:38 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=ovb6MuT8KSB Al6EK5P7qSxQZN+EeYQ9gfGAa/z45rbA=; b=g5NCde0nbjNsa7u+cDkbPHD/nmB sY7GbSUZPUZAUXuXQ9gGsoQBqd/bB2yitPR+LiBb1HiEzycUBUij+g493p6EgPJV DCaebuEVhMvFXG5EhwmXMApPybUAmm2hmi3oGyVks5jnlLSv4fpsnw5rlJon/6yX UupsfiT706lM6VVrPXfrtqNDobbOhSsNIhKaKBgtXnHHUdCp/NE0ma1TK/D8mBuJ PFKAAicVaRy/poBqO23ll1W/YDLlnWt95U+hsZyS65C+Xd6DeZpt8g+CjMxrcuw0 ep2keQi3OlRJlM92PbotWyTfwaUr2u3OKeg798wVK1ZQRz1j4v5Hn4IgmkA== Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4a78eqt8nn-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 04 Nov 2025 16:26:37 +0000 (GMT) Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-29555415c09so40689875ad.0 for ; Tue, 04 Nov 2025 08:26:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1762273597; x=1762878397; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ovb6MuT8KSBAl6EK5P7qSxQZN+EeYQ9gfGAa/z45rbA=; b=DboDbqD9ovOLwHW2fH09sqiTtAFyc2PTowJu7TnczXB678jFOdoxjMTophzYXYJxIG 6Y7i5fc2bbcgsWfFBrvK1wficqPuXHcvulbH4N0tsUK5xUTgKzTZTNk2HhpHYKXfyvJh 4GKiWxhj3CPmMHoqNO198hI7uSRmjMjB8UGweSvDwDLjgL3AybYH3EbmIQ6E/gRm1+rw ZJE+j5dbL0NPKPBtDXkI+GArbcnFXubkEHnXeZN+KYch2LJgXmMyEa24hlAR2sR27dbC jtjRZZd5oBixwWvuCot3DLcnzbPzctRmlDaAMP59NARLKHmEP8H24V9/2/lNiNqJ5Qkl UMDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762273597; x=1762878397; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ovb6MuT8KSBAl6EK5P7qSxQZN+EeYQ9gfGAa/z45rbA=; b=fwLPlzhbTHLpqZL3PTzB4GldFAWeksN3plDxAnq70BG/RIQOz8ymTZ+ZCR6XEv0+ea oy3nQnrQdMd6Mdsbp7y0tnkafn+qszGmmzUpRFt3JCo1WCumValfOrbGdmuE5ANRKo41 Kh6n+1ALHkMEIyN78IrhqSFC7i5m8c4ceiSkWL32bolYfxJQCbH+I/eeoetf/xTHW7SV vYCe9MV8uLEr2iC6ZUMtftWUArWNozagp8Dg0mvsbCUXa6TUcZe+8sSkaCAOM0vuf33p 6zS+r+cQP/vcwcsrPPVyEvtWMcy3WtHZfsqi5Irj8m25riK/xRyW64PnUTk1zN5kB/qn pjSw== X-Forwarded-Encrypted: i=1; AJvYcCWY5agnouHzfwiuTGabNp5blMWsZls/M8wsa3YSGbKXDPKG+LGkLySLntHpY5y5q7sX9MIYYZpPw9C5nZY=@vger.kernel.org X-Gm-Message-State: AOJu0YzgFph0CO2z6cb+LHIXKBPITLd5Xj8kifMTgXScWOEYBccHttGc CZKp6ue6b8oRrf20HHBsjdE/bDcyFq2HE37zpQkkOI9OpuolDbHdw3gEuv5lh+UpS6MZuZ2pjvY EJsgTl4swJs7V17NvicFYVzJPkeh/1hxqvqbpgngyKJXTylI1ceS5y62wWRFZOtMdE3k= X-Gm-Gg: ASbGnctTM0SxGbbF5g12hyHLv0faaudhc70XVzvqYgMIlVh2TQzA4jb43z/zNwJCtYo WT9qVHhomOyq6IGn4BtQHBCzAyqa74ccn/ZbGsQMSbiZRwzMuv0NuPc803UMcmZDoe005G3DPKv pNBQ9ayq1Xq/8wlLz8ZYnVEE11z1t++uWFqlESeTiG064OG/JYogDM/D7XPQZoIM7dUR679qrA6 MjWYMclx6lGz3qWbaAyr5trWuEnLrM41QT8fFpVVWa/6dNBLy6L/yINly9tPCxier6j1CWvSJz5 hlQS6gi8AhTGPn2yNjIcEI+/qZUNOajN/X+2dZUACkbhfC0dxjtoJoK25jsJQfUlk9JJhup934f LKDmjUGXNAEwFiPTa2PeNwKHS16h+K/LWjRV2DCsEiWH7 X-Received: by 2002:a17:903:2f81:b0:295:987d:f7ef with SMTP id d9443c01a7336-2962adb2930mr2513845ad.10.1762273596736; Tue, 04 Nov 2025 08:26:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IEcxxgCPh/E8Qar8jvwLI6Z0EvYTem/pE6NtJidsTSPGNndzz6jfTottMm2Bs3WzCcxN0XpsA== X-Received: by 2002:a17:903:2f81:b0:295:987d:f7ef with SMTP id d9443c01a7336-2962adb2930mr2512905ad.10.1762273595718; Tue, 04 Nov 2025 08:26:35 -0800 (PST) Received: from hu-yuzha-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29601a7a8a9sm31508435ad.107.2025.11.04.08.26.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 08:26:35 -0800 (PST) From: "Yu Zhang(Yuriy)" To: jjohnson@kernel.org Cc: baochen.qiang@oss.qualcomm.com, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, Yu Zhang , Vasanthakumar Thiagarajan Subject: [PATCH ath-next v2 1/6] wifi: ath11k: Add initialization and deinitialization sequence for CFR module Date: Tue, 4 Nov 2025 08:26:28 -0800 Message-Id: <20251104162633.3007874-2-yu.zhang@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251104162633.3007874-1-yu.zhang@oss.qualcomm.com> References: <20251104162633.3007874-1-yu.zhang@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTA0MDEzNyBTYWx0ZWRfX6GTLQ7e0D+X0 9JM8xdRh3iosgqN0iIXxlQIgpQdlRerSYpXcZB0yjhqW/yiZu5cltWZRo9lAi5D7AaWexbTQuyZ pXlCw+ALyzcmdHzRHo7QY+llGgp01tf1LnJ8/jUMv4gfKymrANelZUw7QFrETKYOueJwfIPp/1B md9KJFYoPXIbTpf4qX4yPdyQ3cY+D5DfqjP3ahRpS5zW+aWvgRW+vVeYzx1J38z5vk0njESUtVZ IxbpSav7T5U+TolqODMKyI/b9+Q3soVb/VobBnLm98cmSxmURLnOeyW3Xkb0mJWoIkSWRoidmh4 pJRdVtB+CsVpH+QXh/TVDX53dAPVyRtJ0EVpgt1U3iEgPreawtIoBAqO6vg1VUV4fnsQ+MSPKrc m/mdjqvQlfWd3IeGsEIvx3E064HE/g== X-Authority-Analysis: v=2.4 cv=fofRpV4f c=1 sm=1 tr=0 ts=690a293e cx=c_pps a=MTSHoo12Qbhz2p7MsH1ifg==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=sTJiG90S0w3vqaoQ0_0A:9 a=GvdueXVYPmCkWapjIL-Q:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-ORIG-GUID: CdD0kj3xj_AfMBB_kWD2xWjq0gdBcG-u X-Proofpoint-GUID: CdD0kj3xj_AfMBB_kWD2xWjq0gdBcG-u X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-04_02,2025-11-03_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 suspectscore=0 clxscore=1015 adultscore=0 priorityscore=1501 malwarescore=0 impostorscore=0 lowpriorityscore=0 phishscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511040137 Content-Type: text/plain; charset="utf-8" From: Venkateswara Naralasetty Channel Frequency Response (CFR) module will be initialized only when the following criteria passes: * Enabled CFR support for the hardware through the hardware param 'cfr_support' * WMI service enabled for the CFR support 'WMI_TLV_SERVICE_CFR_CAPTURE_SUPPORT' Also, provide a configuration option CONFIG_ATH11K_CFR to enable CFR feature support during the compilation time. CFR module initialization includes Direct Buffer(DB) ring initialization where hardware uses the DB ring buffers to copy CFR data to host. Number of buffers and buffer size of the ring is based on the DB ring capabilities advertised by the firmware through WMI service ready. Also ring configurations are sent to firmware through ath11k_dbring_wmi_cfg_setup(). Predefine ath11k_cfr_dma_hdr, ath11k_look_up_table, and ath11k_cfr structs and fields for subsequent patches. Tested-on: IPQ8074 hw2.0 PCI IPQ8074 WLAN.HK.2.5.0.1-00991-QCAHKSWPL_SILICO= NZ-1 Tested-on: WCN6855 hw2.1 PCI WLAN.HSP.1.1-04685-QCAHSPSWPL_V1_V2_SILICONZ_I= OE-1 Signed-off-by: Venkateswara Naralasetty Co-developed-by: Yu Zhang (Yuriy) Signed-off-by: Yu Zhang (Yuriy) Reviewed-by: Vasanthakumar Thiagarajan --- drivers/net/wireless/ath/ath11k/Kconfig | 11 ++ drivers/net/wireless/ath/ath11k/Makefile | 1 + drivers/net/wireless/ath/ath11k/cfr.c | 160 +++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/cfr.h | 84 ++++++++++++ drivers/net/wireless/ath/ath11k/core.c | 41 +++++- drivers/net/wireless/ath/ath11k/core.h | 8 +- drivers/net/wireless/ath/ath11k/dbring.c | 40 ++++-- drivers/net/wireless/ath/ath11k/dbring.h | 6 +- drivers/net/wireless/ath/ath11k/hal.c | 3 +- drivers/net/wireless/ath/ath11k/hw.h | 5 +- drivers/net/wireless/ath/ath11k/wmi.h | 1 + 11 files changed, 343 insertions(+), 17 deletions(-) create mode 100644 drivers/net/wireless/ath/ath11k/cfr.c create mode 100644 drivers/net/wireless/ath/ath11k/cfr.h diff --git a/drivers/net/wireless/ath/ath11k/Kconfig b/drivers/net/wireless= /ath/ath11k/Kconfig index 659ef134ef16..47dfd39caa89 100644 --- a/drivers/net/wireless/ath/ath11k/Kconfig +++ b/drivers/net/wireless/ath/ath11k/Kconfig @@ -58,3 +58,14 @@ config ATH11K_SPECTRAL Enable ath11k spectral scan support =20 Say Y to enable access to the FFT/spectral data via debugfs. + +config ATH11K_CFR + bool "ath11k channel frequency response support" + depends on ATH11K_DEBUGFS + depends on RELAY + help + Enable ath11k channel frequency response dump support. + This option exposes debugfs nodes that will allow the user + to enable, disable, and dump data. + + Say Y to enable CFR data dump collection via debugfs. diff --git a/drivers/net/wireless/ath/ath11k/Makefile b/drivers/net/wireles= s/ath/ath11k/Makefile index d9092414b362..b1435fcf3e1b 100644 --- a/drivers/net/wireless/ath/ath11k/Makefile +++ b/drivers/net/wireless/ath/ath11k/Makefile @@ -28,6 +28,7 @@ ath11k-$(CONFIG_THERMAL) +=3D thermal.o ath11k-$(CONFIG_ATH11K_SPECTRAL) +=3D spectral.o ath11k-$(CONFIG_PM) +=3D wow.o ath11k-$(CONFIG_DEV_COREDUMP) +=3D coredump.o +ath11k-$(CONFIG_ATH11K_CFR) +=3D cfr.o =20 obj-$(CONFIG_ATH11K_AHB) +=3D ath11k_ahb.o ath11k_ahb-y +=3D ahb.o diff --git a/drivers/net/wireless/ath/ath11k/cfr.c b/drivers/net/wireless/a= th/ath11k/cfr.c new file mode 100644 index 000000000000..73ffe3510ffe --- /dev/null +++ b/drivers/net/wireless/ath/ath11k/cfr.c @@ -0,0 +1,160 @@ +// SPDX-License-Identifier: BSD-3-Clause-Clear +/* + * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved. + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. + */ + +#include +#include "core.h" +#include "debug.h" + +static int ath11k_cfr_process_data(struct ath11k *ar, + struct ath11k_dbring_data *param) +{ + return 0; +} + +void ath11k_cfr_lut_update_paddr(struct ath11k *ar, dma_addr_t paddr, + u32 buf_id) +{ + struct ath11k_cfr *cfr =3D &ar->cfr; + + if (cfr->lut) + cfr->lut[buf_id].dbr_address =3D paddr; +} + +static void ath11k_cfr_ring_free(struct ath11k *ar) +{ + struct ath11k_cfr *cfr =3D &ar->cfr; + + ath11k_dbring_buf_cleanup(ar, &cfr->rx_ring); + ath11k_dbring_srng_cleanup(ar, &cfr->rx_ring); +} + +static int ath11k_cfr_ring_alloc(struct ath11k *ar, + struct ath11k_dbring_cap *db_cap) +{ + struct ath11k_cfr *cfr =3D &ar->cfr; + int ret; + + ret =3D ath11k_dbring_srng_setup(ar, &cfr->rx_ring, + ATH11K_CFR_NUM_RING_ENTRIES, + db_cap->min_elem); + if (ret) { + ath11k_warn(ar->ab, "failed to setup db ring: %d\n", ret); + return ret; + } + + ath11k_dbring_set_cfg(ar, &cfr->rx_ring, + ATH11K_CFR_NUM_RESP_PER_EVENT, + ATH11K_CFR_EVENT_TIMEOUT_MS, + ath11k_cfr_process_data); + + ret =3D ath11k_dbring_buf_setup(ar, &cfr->rx_ring, db_cap); + if (ret) { + ath11k_warn(ar->ab, "failed to setup db ring buffer: %d\n", ret); + goto srng_cleanup; + } + + ret =3D ath11k_dbring_wmi_cfg_setup(ar, &cfr->rx_ring, WMI_DIRECT_BUF_CFR= ); + if (ret) { + ath11k_warn(ar->ab, "failed to setup db ring cfg: %d\n", ret); + goto buffer_cleanup; + } + + return 0; + +buffer_cleanup: + ath11k_dbring_buf_cleanup(ar, &cfr->rx_ring); +srng_cleanup: + ath11k_dbring_srng_cleanup(ar, &cfr->rx_ring); + return ret; +} + +void ath11k_cfr_deinit(struct ath11k_base *ab) +{ + struct ath11k_cfr *cfr; + struct ath11k *ar; + int i; + + if (!test_bit(WMI_TLV_SERVICE_CFR_CAPTURE_SUPPORT, ab->wmi_ab.svc_map) || + !ab->hw_params.cfr_support) + return; + + for (i =3D 0; i < ab->num_radios; i++) { + ar =3D ab->pdevs[i].ar; + cfr =3D &ar->cfr; + + ath11k_cfr_ring_free(ar); + + spin_lock_bh(&cfr->lut_lock); + kfree(cfr->lut); + cfr->lut =3D NULL; + spin_unlock_bh(&cfr->lut_lock); + } +} + +int ath11k_cfr_init(struct ath11k_base *ab) +{ + struct ath11k_dbring_cap db_cap; + struct ath11k_cfr *cfr; + u32 num_lut_entries; + struct ath11k *ar; + int i, ret; + + if (!test_bit(WMI_TLV_SERVICE_CFR_CAPTURE_SUPPORT, ab->wmi_ab.svc_map) || + !ab->hw_params.cfr_support) + return 0; + + for (i =3D 0; i < ab->num_radios; i++) { + ar =3D ab->pdevs[i].ar; + cfr =3D &ar->cfr; + + ret =3D ath11k_dbring_get_cap(ar->ab, ar->pdev_idx, + WMI_DIRECT_BUF_CFR, &db_cap); + if (ret) + continue; + + idr_init(&cfr->rx_ring.bufs_idr); + spin_lock_init(&cfr->rx_ring.idr_lock); + spin_lock_init(&cfr->lock); + spin_lock_init(&cfr->lut_lock); + + num_lut_entries =3D min_t(u32, CFR_MAX_LUT_ENTRIES, db_cap.min_elem); + cfr->lut =3D kcalloc(num_lut_entries, sizeof(*cfr->lut), + GFP_KERNEL); + if (!cfr->lut) { + ret =3D -ENOMEM; + goto err; + } + + ret =3D ath11k_cfr_ring_alloc(ar, &db_cap); + if (ret) { + ath11k_warn(ab, "failed to init cfr ring for pdev %d: %d\n", + i, ret); + spin_lock_bh(&cfr->lut_lock); + kfree(cfr->lut); + cfr->lut =3D NULL; + spin_unlock_bh(&cfr->lut_lock); + goto err; + } + + cfr->lut_num =3D num_lut_entries; + } + + return 0; + +err: + for (i =3D i - 1; i >=3D 0; i--) { + ar =3D ab->pdevs[i].ar; + cfr =3D &ar->cfr; + + ath11k_cfr_ring_free(ar); + + spin_lock_bh(&cfr->lut_lock); + kfree(cfr->lut); + cfr->lut =3D NULL; + spin_unlock_bh(&cfr->lut_lock); + } + return ret; +} diff --git a/drivers/net/wireless/ath/ath11k/cfr.h b/drivers/net/wireless/a= th/ath11k/cfr.h new file mode 100644 index 000000000000..65b87d759329 --- /dev/null +++ b/drivers/net/wireless/ath/ath11k/cfr.h @@ -0,0 +1,84 @@ +/* SPDX-License-Identifier: BSD-3-Clause-Clear */ +/* + * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved. + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. + */ + +#ifndef ATH11K_CFR_H +#define ATH11K_CFR_H + +#include "dbring.h" +#include "wmi.h" + +#define ATH11K_CFR_NUM_RESP_PER_EVENT 1 +#define ATH11K_CFR_EVENT_TIMEOUT_MS 1 +#define ATH11K_CFR_NUM_RING_ENTRIES 1 + +#define CFR_MAX_LUT_ENTRIES 136 + +#define HOST_MAX_CHAINS 8 + +struct ath11k_cfr_dma_hdr { + u16 info0; + u16 info1; + u16 sw_peer_id; + u16 phy_ppdu_id; +}; + +struct ath11k_look_up_table { + bool dbr_recv; + bool tx_recv; + u8 *data; + u32 data_len; + u16 dbr_ppdu_id; + u16 tx_ppdu_id; + dma_addr_t dbr_address; + struct ath11k_cfr_dma_hdr hdr; + u64 txrx_tstamp; + u64 dbr_tstamp; + u32 header_length; + u32 payload_length; + struct ath11k_dbring_element *buff; +}; + +struct ath11k_cfr { + struct ath11k_dbring rx_ring; + /* Protects cfr data */ + spinlock_t lock; + /* Protect for lut entries */ + spinlock_t lut_lock; + struct ath11k_look_up_table *lut; + u32 lut_num; + u64 tx_evt_cnt; + u64 dbr_evt_cnt; + u64 release_cnt; + u64 tx_peer_status_cfr_fail; + u64 tx_evt_status_cfr_fail; + u64 tx_dbr_lookup_fail; + u64 last_success_tstamp; + u64 flush_dbr_cnt; + u64 clear_txrx_event; + u64 cfr_dma_aborts; +}; + +#ifdef CONFIG_ATH11K_CFR +int ath11k_cfr_init(struct ath11k_base *ab); +void ath11k_cfr_deinit(struct ath11k_base *ab); +void ath11k_cfr_lut_update_paddr(struct ath11k *ar, dma_addr_t paddr, + u32 buf_id); +#else +static inline int ath11k_cfr_init(struct ath11k_base *ab) +{ + return 0; +} + +static inline void ath11k_cfr_deinit(struct ath11k_base *ab) +{ +} + +static inline void ath11k_cfr_lut_update_paddr(struct ath11k *ar, + dma_addr_t paddr, u32 buf_id) +{ +} +#endif /* CONFIG_ATH11K_CFR */ +#endif /* ATH11K_CFR_H */ diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/= ath/ath11k/core.c index 2810752260f2..71926a774f57 100644 --- a/drivers/net/wireless/ath/ath11k/core.c +++ b/drivers/net/wireless/ath/ath11k/core.c @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights res= erved. * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ =20 @@ -126,6 +125,9 @@ static const struct ath11k_hw_params ath11k_hw_params[]= =3D { .smp2p_wow_exit =3D false, .support_dual_stations =3D false, .pdev_suspend =3D false, + .cfr_support =3D true, + .cfr_num_stream_bufs =3D 255, + .cfr_stream_buf_size =3D 8200, }, { .hw_rev =3D ATH11K_HW_IPQ6018_HW10, @@ -211,6 +213,9 @@ static const struct ath11k_hw_params ath11k_hw_params[]= =3D { .support_fw_mac_sequence =3D false, .support_dual_stations =3D false, .pdev_suspend =3D false, + .cfr_support =3D false, + .cfr_num_stream_bufs =3D 0, + .cfr_stream_buf_size =3D 0, }, { .name =3D "qca6390 hw2.0", @@ -301,6 +306,9 @@ static const struct ath11k_hw_params ath11k_hw_params[]= =3D { .support_fw_mac_sequence =3D true, .support_dual_stations =3D true, .pdev_suspend =3D false, + .cfr_support =3D false, + .cfr_num_stream_bufs =3D 0, + .cfr_stream_buf_size =3D 0, }, { .name =3D "qcn9074 hw1.0", @@ -385,6 +393,9 @@ static const struct ath11k_hw_params ath11k_hw_params[]= =3D { .support_fw_mac_sequence =3D false, .support_dual_stations =3D false, .pdev_suspend =3D false, + .cfr_support =3D false, + .cfr_num_stream_bufs =3D 0, + .cfr_stream_buf_size =3D 0, }, { .name =3D "wcn6855 hw2.0", @@ -475,6 +486,9 @@ static const struct ath11k_hw_params ath11k_hw_params[]= =3D { .support_fw_mac_sequence =3D true, .support_dual_stations =3D true, .pdev_suspend =3D false, + .cfr_support =3D false, + .cfr_num_stream_bufs =3D 0, + .cfr_stream_buf_size =3D 0, }, { .name =3D "wcn6855 hw2.1", @@ -563,6 +577,9 @@ static const struct ath11k_hw_params ath11k_hw_params[]= =3D { .support_fw_mac_sequence =3D true, .support_dual_stations =3D true, .pdev_suspend =3D false, + .cfr_support =3D true, + .cfr_num_stream_bufs =3D 255, + .cfr_stream_buf_size =3D 8200, }, { .name =3D "wcn6750 hw1.0", @@ -646,6 +663,9 @@ static const struct ath11k_hw_params ath11k_hw_params[]= =3D { .support_fw_mac_sequence =3D true, .support_dual_stations =3D false, .pdev_suspend =3D true, + .cfr_support =3D false, + .cfr_num_stream_bufs =3D 0, + .cfr_stream_buf_size =3D 0, }, { .hw_rev =3D ATH11K_HW_IPQ5018_HW10, @@ -729,6 +749,9 @@ static const struct ath11k_hw_params ath11k_hw_params[]= =3D { .support_fw_mac_sequence =3D false, .support_dual_stations =3D false, .pdev_suspend =3D false, + .cfr_support =3D false, + .cfr_num_stream_bufs =3D 0, + .cfr_stream_buf_size =3D 0, }, { .name =3D "qca2066 hw2.1", @@ -818,6 +841,9 @@ static const struct ath11k_hw_params ath11k_hw_params[]= =3D { .smp2p_wow_exit =3D false, .support_fw_mac_sequence =3D true, .support_dual_stations =3D true, + .cfr_support =3D false, + .cfr_num_stream_bufs =3D 0, + .cfr_stream_buf_size =3D 0, }, { .name =3D "qca6698aq hw2.1", @@ -906,6 +932,9 @@ static const struct ath11k_hw_params ath11k_hw_params[]= =3D { .support_fw_mac_sequence =3D true, .support_dual_stations =3D true, .pdev_suspend =3D false, + .cfr_support =3D true, + .cfr_num_stream_bufs =3D 255, + .cfr_stream_buf_size =3D 8200, }, }; =20 @@ -1945,8 +1974,16 @@ static int ath11k_core_pdev_create(struct ath11k_bas= e *ab) goto err_thermal_unregister; } =20 + ret =3D ath11k_cfr_init(ab); + if (ret) { + ath11k_err(ab, "failed to init cfr %d\n", ret); + goto err_spectral_unregister; + } + return 0; =20 +err_spectral_unregister: + ath11k_spectral_deinit(ab); err_thermal_unregister: ath11k_thermal_unregister(ab); err_mac_unregister: @@ -1996,6 +2033,7 @@ static void ath11k_core_pdev_suspend_target(struct at= h11k_base *ab) =20 static void ath11k_core_pdev_destroy(struct ath11k_base *ab) { + ath11k_cfr_deinit(ab); ath11k_spectral_deinit(ab); ath11k_thermal_unregister(ab); ath11k_mac_unregister(ab); @@ -2208,6 +2246,7 @@ static int ath11k_core_reconfigure_on_crash(struct at= h11k_base *ab) mutex_lock(&ab->core_lock); ath11k_thermal_unregister(ab); ath11k_dp_pdev_free(ab); + ath11k_cfr_deinit(ab); ath11k_spectral_deinit(ab); ath11k_ce_cleanup_pipes(ab); ath11k_wmi_detach(ab); diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/= ath/ath11k/core.h index e8780b05ce11..40fb7cee3e43 100644 --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights res= erved. + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ =20 #ifndef ATH11K_CORE_H @@ -35,6 +35,7 @@ #include "wow.h" #include "fw.h" #include "coredump.h" +#include "cfr.h" =20 #define SM(_v, _f) (((_v) << _f##_LSB) & _f##_MASK) =20 @@ -795,6 +796,11 @@ struct ath11k { bool ps_state_enable; bool ps_timekeeper_enable; s8 max_allowed_tx_power; + +#ifdef CONFIG_ATH11K_CFR + struct ath11k_cfr cfr; +#endif + bool cfr_enabled; }; =20 struct ath11k_band_cap { diff --git a/drivers/net/wireless/ath/ath11k/dbring.c b/drivers/net/wireles= s/ath/ath11k/dbring.c index 520d8b8662a2..ed2b781a6bab 100644 --- a/drivers/net/wireless/ath/ath11k/dbring.c +++ b/drivers/net/wireless/ath/ath11k/dbring.c @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights res= erved. * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ =20 @@ -37,10 +36,10 @@ static void ath11k_dbring_fill_magic_value(struct ath11= k *ar, memset32(buffer, ATH11K_DB_MAGIC_VALUE, size); } =20 -static int ath11k_dbring_bufs_replenish(struct ath11k *ar, - struct ath11k_dbring *ring, - struct ath11k_dbring_element *buff, - enum wmi_direct_buffer_module id) +int ath11k_dbring_bufs_replenish(struct ath11k *ar, + struct ath11k_dbring *ring, + struct ath11k_dbring_element *buff, + enum wmi_direct_buffer_module id) { struct ath11k_base *ab =3D ar->ab; struct hal_srng *srng; @@ -80,6 +79,9 @@ static int ath11k_dbring_bufs_replenish(struct ath11k *ar, goto err_idr_remove; } =20 + if (id =3D=3D WMI_DIRECT_BUF_CFR) + ath11k_cfr_lut_update_paddr(ar, paddr, buf_id); + buff->paddr =3D paddr; =20 cookie =3D FIELD_PREP(DP_RXDMA_BUF_COOKIE_PDEV_ID, ar->pdev_idx) | @@ -155,12 +157,11 @@ int ath11k_dbring_wmi_cfg_setup(struct ath11k *ar, enum wmi_direct_buffer_module id) { struct ath11k_wmi_pdev_dma_ring_cfg_req_cmd param =3D {}; - int ret; + int ret, i; =20 if (id >=3D WMI_DIRECT_BUF_MAX) return -EINVAL; =20 - param.pdev_id =3D DP_SW2HW_MACID(ring->pdev_id); param.module_id =3D id; param.base_paddr_lo =3D lower_32_bits(ring->refill_srng.paddr); param.base_paddr_hi =3D upper_32_bits(ring->refill_srng.paddr); @@ -173,10 +174,23 @@ int ath11k_dbring_wmi_cfg_setup(struct ath11k *ar, param.num_resp_per_event =3D ring->num_resp_per_event; param.event_timeout_ms =3D ring->event_timeout_ms; =20 - ret =3D ath11k_wmi_pdev_dma_ring_cfg(ar, ¶m); - if (ret) { - ath11k_warn(ar->ab, "failed to setup db ring cfg\n"); - return ret; + /* For single pdev, 2GHz and 5GHz use one DBR. */ + if (ar->ab->hw_params.single_pdev_only) { + for (i =3D 0; i < ar->ab->target_pdev_count; i++) { + param.pdev_id =3D ar->ab->target_pdev_ids[i].pdev_id; + ret =3D ath11k_wmi_pdev_dma_ring_cfg(ar, ¶m); + if (ret) { + ath11k_warn(ar->ab, "failed to setup db ring cfg\n"); + return ret; + } + } + } else { + param.pdev_id =3D DP_SW2HW_MACID(ring->pdev_id); + ret =3D ath11k_wmi_pdev_dma_ring_cfg(ar, ¶m); + if (ret) { + ath11k_warn(ar->ab, "failed to setup db ring cfg\n"); + return ret; + } } =20 return 0; @@ -285,6 +299,10 @@ int ath11k_dbring_buffer_release_event(struct ath11k_b= ase *ab, pdev_idx =3D ev->fixed.pdev_id; module_id =3D ev->fixed.module_id; =20 + if (ab->hw_params.single_pdev_only && + pdev_idx < ab->target_pdev_count) + pdev_idx =3D 0; + if (pdev_idx >=3D ab->num_radios) { ath11k_warn(ab, "Invalid pdev id %d\n", pdev_idx); return -EINVAL; diff --git a/drivers/net/wireless/ath/ath11k/dbring.h b/drivers/net/wireles= s/ath/ath11k/dbring.h index 2f93b78a50df..0a380120f7a0 100644 --- a/drivers/net/wireless/ath/ath11k/dbring.h +++ b/drivers/net/wireless/ath/ath11k/dbring.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ =20 #ifndef ATH11K_DBRING_H @@ -61,6 +61,10 @@ int ath11k_dbring_set_cfg(struct ath11k *ar, u32 event_timeout_ms, int (*handler)(struct ath11k *, struct ath11k_dbring_data *)); +int ath11k_dbring_bufs_replenish(struct ath11k *ar, + struct ath11k_dbring *ring, + struct ath11k_dbring_element *buff, + enum wmi_direct_buffer_module id); int ath11k_dbring_wmi_cfg_setup(struct ath11k *ar, struct ath11k_dbring *ring, enum wmi_direct_buffer_module id); diff --git a/drivers/net/wireless/ath/ath11k/hal.c b/drivers/net/wireless/a= th/ath11k/hal.c index 0c797b8d0a27..e821e5a62c1c 100644 --- a/drivers/net/wireless/ath/ath11k/hal.c +++ b/drivers/net/wireless/ath/ath11k/hal.c @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights res= erved. * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ #include @@ -184,7 +183,7 @@ static const struct hal_srng_config hw_srng_config_temp= late[] =3D { }, { /* RXDMA DIR BUF */ .start_ring_id =3D HAL_SRNG_RING_ID_RXDMA_DIR_BUF, - .max_rings =3D 1, + .max_rings =3D 2, .entry_size =3D 8 >> 2, /* TODO: Define the struct */ .lmac_ring =3D true, .ring_dir =3D HAL_SRNG_DIR_SRC, diff --git a/drivers/net/wireless/ath/ath11k/hw.h b/drivers/net/wireless/at= h/ath11k/hw.h index 52d9f4c13b13..e13ca02a9d05 100644 --- a/drivers/net/wireless/ath/ath11k/hw.h +++ b/drivers/net/wireless/ath/ath11k/hw.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights res= erved. + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ =20 #ifndef ATH11K_HW_H @@ -228,6 +228,9 @@ struct ath11k_hw_params { bool support_fw_mac_sequence; bool support_dual_stations; bool pdev_suspend; + bool cfr_support; + u32 cfr_num_stream_bufs; + u32 cfr_stream_buf_size; }; =20 struct ath11k_hw_ops { diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/a= th/ath11k/wmi.h index 0f0de24a3840..7a55fe0879c0 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.h +++ b/drivers/net/wireless/ath/ath11k/wmi.h @@ -981,6 +981,7 @@ enum wmi_tlv_pdev_param { WMI_PDEV_PARAM_RADIO_CHAN_STATS_ENABLE, WMI_PDEV_PARAM_RADIO_DIAGNOSIS_ENABLE, WMI_PDEV_PARAM_MESH_MCAST_ENABLE, + WMI_PDEV_PARAM_PER_PEER_CFR_ENABLE =3D 0xa8, WMI_PDEV_PARAM_SET_CMD_OBSS_PD_THRESHOLD =3D 0xbc, WMI_PDEV_PARAM_SET_CMD_OBSS_PD_PER_AC =3D 0xbe, WMI_PDEV_PARAM_ENABLE_SR_PROHIBIT =3D 0xc6, --=20 2.34.1 From nobody Fri Dec 19 10:56:15 2025 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 3B9B93314CC for ; Tue, 4 Nov 2025 16:26:39 +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=1762273602; cv=none; b=MBgOfjBmUL798J3YahWDjISInzfu7c9P3zxEibAGkqi6nIEDxoFqt4kb6EhLsR0sizfDMrrCvPso31VntLYTcSkNxdShOEPGtFEe7QsqYKQgH5ijl2wPBiVSFkv2YS8ywUy0mZT+AshARmLYt4dVnngbfTJ1Svr/k5iGGUfiWyU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762273602; c=relaxed/simple; bh=f2htvx12bw7SMDZ3aiHnRioMCGgqy+3MUAmu4uzS49s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iUpK5t8d+7YvNGWRgZ374s/GlFeflOzATEwxpXc8yv9O0y2Vc3TnXGVZZtqhmQM6mdUwfmmIT8HrqOGg4j6S85ivtVb5LJCbIQpxWPVsSCr9KvFVMDwD0q2Mhz8qgiyFVXcyjXFqKGNLG7XwbCN6rgkWzdzz6g86mT6z26EpOaw= 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=KBAwVRXD; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=QKajZkyv; 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="KBAwVRXD"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="QKajZkyv" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5A4Cfuga2056906 for ; Tue, 4 Nov 2025 16:26:39 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=JIURF+d3FTA 1RHybdKd5zcpig3gEVPwtAKcIXddrJkM=; b=KBAwVRXDYGhfixJGmYh29QKuq+K IlWBDnDdFaOKtbj+uoaqhcZXLVwH4ohzqXuwQJR/mZAmtfrFD8wjmUXk98i+ygCx av71WpyXicu0cCkyreG56t8tLJp6p3IWrOSaf1xncEL+XcVSMQn2rw3r2cVaTnqq w3Fzuu3oyXlwivrL6KvfPA6SaL3uMCle/1puP5jNYOSJoDLW79I86xGCXRyfT6bz g6+L/R8ldrP4nKnFddC32Gbkjd4IngbXOjXh0zWxnZ4Fxth+p6kTDqyvJfSDUK5s /y9r21WCLEG+GxzIEbPk5vxB4Q+FJd4LhlI5JVrtKMWrP7J25OOxCXk4jqQ== 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 4a78eqt8ns-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 04 Nov 2025 16:26:39 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-295093f614cso68631985ad.0 for ; Tue, 04 Nov 2025 08:26:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1762273598; x=1762878398; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JIURF+d3FTA1RHybdKd5zcpig3gEVPwtAKcIXddrJkM=; b=QKajZkyv8VM33CCDTeaFQ+uqLWVFwFCZZXaN+VjylUzAPrJGx0ZN4DLt3Vm+adRzpF nmGR2OoBcr06b29KlbU+qMXs1Nsrqhx8mSJ+P4ZByg3hPFAdBZPU3RF+PnjM9y39Zq9c Y1HnRt91i0kZ0f2y3t5Awla1+jxO6WXHUUc6gMbq8g+NJ15rZtYIYLw0RkMXTmaHhXld d+u/QF8SeyuPQXvin8FG3QFXZwtPWp2t+k1b7XoJqhqvifobj+n4+c1cGb6AQZNcLMz8 Lu5HRPiy3IhmmtMUwIrdO67/RtJQKS5piKCtl5aLfUw1UrWEgPJuoJpBZnfX2Smlr2lW cTwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762273598; x=1762878398; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JIURF+d3FTA1RHybdKd5zcpig3gEVPwtAKcIXddrJkM=; b=djOsMmTGTlNCMWZeFFMdeGO4qQfKoOi4rE+DqsXinqco40+eCTNDbHFhHGFUgEoG2F XK/2Uzzrdp3KfOuADyUjjSV4K4YEcMwrwQojN8ShKd/L5zWVVol3TB33WIrDveXQm0Z3 ECm6nZMNvO4dvc0Q2aUZJtL2BwD0FLs1jknEtBA6IIse9FLUIJnvrJ4jwBemN6PcIaMy YAbTdHpjcJ5RNUcoxi7h7QiIO37DvGvGdUPnGNiIpToegcJycTHKvPi/CZYOZg4ZzRxw 2bbn10Tu8Wq2LYNBMrxfhyrcc4CHJcbbSaZke5RHJomhvI8hYA/B/XJ4tpmDSeuVOdt2 nuzg== X-Forwarded-Encrypted: i=1; AJvYcCUH80i/dBSodbulCRN9c87qNjR/RCwcb03E0C+C6ixwIjPcsEHju2siz3oh6AfM0aWVl6SaF3XwVfl1bd0=@vger.kernel.org X-Gm-Message-State: AOJu0YxxLtDLluHZ8v66fx5ys9tpkEHCQRGI8cYdt3Og24ntgmPvCXPe hpCE/gZAqVJAuOa02z53uXlrEWTnG5TFH43+ht4gFe9ekZM8svuunYCrYav2mRt3S0A3zVKrU2Q IUS5gtvZwkdLbLbf1ONZdIl/YmdXSSh+GngfEoVabJ2thzBmf6ZvFhpMMKsxlnZ/cREM= X-Gm-Gg: ASbGncslY6N2DIOACrEIabtUp/qt+cmR0oKr3B6dZTGp0FJhD2Tovl0YW8pczUj0Dsv muo+xLcCVoJWGc5BhZfonioc/659qI8Lui3PaL4cLCX+2276hcd6dx4uRdG4o5ZJWd/6XGTrAGh 5Vsk016CJooHSYG3uRQECuN0szOEgL4EF4T1kqm55OA+F5EbzvfEfAUGk4lp0ApLBSU+G4WhQLF xKAUZbuXZweJIRVQLhSGCB0iTExuZpq+WbbkRUjxsGt8qZdNnzb1aapJIXZZT7e1fclc+gdncgn 8RFuluM/IYlbCf29VCYJ1re1Cf3tP9RP7CN2yZEfRqmH3xtH9Hg9LeQ6P6SsEwpSKTOoBwKJKR6 JjrYSuvI2VPRhMBbwWnwnmvKGQWFJLZcLok67iRPBnD0+ X-Received: by 2002:a17:903:1a0b:b0:294:fc77:f041 with SMTP id d9443c01a7336-2962addfa05mr2003405ad.25.1762273597648; Tue, 04 Nov 2025 08:26:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IHbdiDnsXgvZTVNG6+LON5+jxK58b43NI5g7Z4kf30StwJ7aLWWyCSfl02b3WA7qBy6rR4K7w== X-Received: by 2002:a17:903:1a0b:b0:294:fc77:f041 with SMTP id d9443c01a7336-2962addfa05mr2002945ad.25.1762273596980; Tue, 04 Nov 2025 08:26:36 -0800 (PST) Received: from hu-yuzha-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29601a7a8a9sm31508435ad.107.2025.11.04.08.26.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 08:26:36 -0800 (PST) From: "Yu Zhang(Yuriy)" To: jjohnson@kernel.org Cc: baochen.qiang@oss.qualcomm.com, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, Yu Zhang , Vasanthakumar Thiagarajan Subject: [PATCH ath-next v2 2/6] wifi: ath11k: Register debugfs for CFR configuration Date: Tue, 4 Nov 2025 08:26:29 -0800 Message-Id: <20251104162633.3007874-3-yu.zhang@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251104162633.3007874-1-yu.zhang@oss.qualcomm.com> References: <20251104162633.3007874-1-yu.zhang@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTA0MDEzNyBTYWx0ZWRfX3nZ5M2aKJdvr u+vRvfzdBk/vGSuwJxZDFwNpfgIEP6OxVA8BJh932tCt6TTdVCGgpgsOzaLry8mnzpibtdEWBr0 PA6u15QehYVMpFY/u9PntsU6+HB5s4JC09p4d9yolmgYbtrni7B/eJnrz5H0OdXjCz/hjwTills pUnVK4VGmM3DjBoi8OIlSChrxWMvHEuQYvNOJEUoAFoBbCv0YzlsPw9oKwdqbPcqTvXxqabB0xK DOLWhmyog8QQRG7fX5zWEe7x4w60miudyfnEJ2Xkrouf80av5VJWFwyEsteOWBgksIBkBA6pufV O2O/aoUfJ/K8SGkosT1UA1CFi3lnizM4ymDH1bx4xc33kYrmZI0pvDBhN8luaMGshmY/a+U1tl5 NCNQ+e0RzHloGfereL5QtMX/rm13bA== X-Authority-Analysis: v=2.4 cv=fofRpV4f c=1 sm=1 tr=0 ts=690a293f cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=dJ9JZWBW9j4LC2dvM44A:9 a=324X-CrmTo6CU4MGRt3R:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-ORIG-GUID: Blr50rU33_2rvFIK1PGPdvUohGnBUD-m X-Proofpoint-GUID: Blr50rU33_2rvFIK1PGPdvUohGnBUD-m X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-04_02,2025-11-03_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 suspectscore=0 clxscore=1015 adultscore=0 priorityscore=1501 malwarescore=0 impostorscore=0 lowpriorityscore=0 phishscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511040137 Content-Type: text/plain; charset="utf-8" From: Venkateswara Naralasetty Provide debugfs interfaces support to config CFR from the user space. To enable/disable cfr feature use command, echo > /sys/kernel/debug/ieee80211/phyX/ath11k/enable_cfr where, val: 0 to disable CFR and 1 to enable CFR. To enable CFR capture for associated peers, echo " " > /sys/kernel/debug/ieee80211/phyX/netdev\:wlanx/stations//cfr_capture val: 0 - stop CFR capture 1 - start CFR capture bw: CFR capture bandwidth 0 - 20MHZ 1 - 40MHZ 2 - 80MHZ Periodicity: Periodicity at which hardware is expected to collect CFR dump. 0 - single shot capture. non zero - for Periodic captures (value must be multiple of 10 ms) method: Method used by hardware to collect the CFR dump. 0 - from the ACKs of QOS NULL packets. Also, send the required WMI commands to the firmware based on the CFR configurations. Tested-on: IPQ8074 hw2.0 PCI IPQ8074 WLAN.HK.2.5.0.1-00991-QCAHKSWPL_SILICO= NZ-1 Tested-on: WCN6855 hw2.1 PCI WLAN.HSP.1.1-04685-QCAHSPSWPL_V1_V2_SILICONZ_I= OE-1 Signed-off-by: Venkateswara Naralasetty Co-developed-by: Yu Zhang (Yuriy) Signed-off-by: Yu Zhang (Yuriy) Reviewed-by: Vasanthakumar Thiagarajan --- drivers/net/wireless/ath/ath11k/cfr.c | 191 ++++++++++++++++++ drivers/net/wireless/ath/ath11k/cfr.h | 41 ++++ drivers/net/wireless/ath/ath11k/core.h | 11 + drivers/net/wireless/ath/ath11k/debugfs_sta.c | 143 ++++++++++++- drivers/net/wireless/ath/ath11k/mac.c | 2 + drivers/net/wireless/ath/ath11k/wmi.c | 41 ++++ drivers/net/wireless/ath/ath11k/wmi.h | 50 ++++- 7 files changed, 476 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/cfr.c b/drivers/net/wireless/a= th/ath11k/cfr.c index 73ffe3510ffe..5d634d1ef5f5 100644 --- a/drivers/net/wireless/ath/ath11k/cfr.c +++ b/drivers/net/wireless/ath/ath11k/cfr.c @@ -14,6 +14,193 @@ static int ath11k_cfr_process_data(struct ath11k *ar, return 0; } =20 +void ath11k_cfr_decrement_peer_count(struct ath11k *ar, + struct ath11k_sta *arsta) +{ + struct ath11k_cfr *cfr =3D &ar->cfr; + + spin_lock_bh(&cfr->lock); + + if (arsta->cfr_capture.cfr_enable) + cfr->cfr_enabled_peer_cnt--; + + spin_unlock_bh(&cfr->lock); +} + +static enum ath11k_wmi_cfr_capture_bw +ath11k_cfr_bw_to_fw_cfr_bw(enum ath11k_cfr_capture_bw bw) +{ + switch (bw) { + case ATH11K_CFR_CAPTURE_BW_20: + return WMI_PEER_CFR_CAPTURE_BW_20; + case ATH11K_CFR_CAPTURE_BW_40: + return WMI_PEER_CFR_CAPTURE_BW_40; + case ATH11K_CFR_CAPTURE_BW_80: + return WMI_PEER_CFR_CAPTURE_BW_80; + default: + return WMI_PEER_CFR_CAPTURE_BW_MAX; + } +} + +static enum ath11k_wmi_cfr_capture_method +ath11k_cfr_method_to_fw_cfr_method(enum ath11k_cfr_capture_method method) +{ + switch (method) { + case ATH11K_CFR_CAPTURE_METHOD_NULL_FRAME: + return WMI_CFR_CAPTURE_METHOD_NULL_FRAME; + case ATH11K_CFR_CAPTURE_METHOD_NULL_FRAME_WITH_PHASE: + return WMI_CFR_CAPTURE_METHOD_NULL_FRAME_WITH_PHASE; + case ATH11K_CFR_CAPTURE_METHOD_PROBE_RESP: + return WMI_CFR_CAPTURE_METHOD_PROBE_RESP; + default: + return WMI_CFR_CAPTURE_METHOD_MAX; + } +} + +int ath11k_cfr_send_peer_cfr_capture_cmd(struct ath11k *ar, + struct ath11k_sta *arsta, + struct ath11k_per_peer_cfr_capture *params, + const u8 *peer_mac) +{ + struct ath11k_cfr *cfr =3D &ar->cfr; + struct wmi_peer_cfr_capture_conf_arg arg; + enum ath11k_wmi_cfr_capture_bw bw; + enum ath11k_wmi_cfr_capture_method method; + int ret =3D 0; + + if (cfr->cfr_enabled_peer_cnt >=3D ATH11K_MAX_CFR_ENABLED_CLIENTS && + !arsta->cfr_capture.cfr_enable) { + ath11k_err(ar->ab, "CFR enable peer threshold reached %u\n", + cfr->cfr_enabled_peer_cnt); + return -ENOSPC; + } + + if (params->cfr_enable =3D=3D arsta->cfr_capture.cfr_enable && + params->cfr_period =3D=3D arsta->cfr_capture.cfr_period && + params->cfr_method =3D=3D arsta->cfr_capture.cfr_method && + params->cfr_bw =3D=3D arsta->cfr_capture.cfr_bw) + return ret; + + if (!params->cfr_enable && !arsta->cfr_capture.cfr_enable) + return ret; + + bw =3D ath11k_cfr_bw_to_fw_cfr_bw(params->cfr_bw); + if (bw >=3D WMI_PEER_CFR_CAPTURE_BW_MAX) { + ath11k_warn(ar->ab, "FW doesn't support configured bw %d\n", + params->cfr_bw); + return -EINVAL; + } + + method =3D ath11k_cfr_method_to_fw_cfr_method(params->cfr_method); + if (method >=3D WMI_CFR_CAPTURE_METHOD_MAX) { + ath11k_warn(ar->ab, "FW doesn't support configured method %d\n", + params->cfr_method); + return -EINVAL; + } + + arg.request =3D params->cfr_enable; + arg.periodicity =3D params->cfr_period; + arg.bw =3D bw; + arg.method =3D method; + + ret =3D ath11k_wmi_peer_set_cfr_capture_conf(ar, arsta->arvif->vdev_id, + peer_mac, &arg); + if (ret) { + ath11k_warn(ar->ab, + "failed to send cfr capture info: vdev_id %u peer %pM: %d\n", + arsta->arvif->vdev_id, peer_mac, ret); + return ret; + } + + spin_lock_bh(&cfr->lock); + + if (params->cfr_enable && + params->cfr_enable !=3D arsta->cfr_capture.cfr_enable) + cfr->cfr_enabled_peer_cnt++; + else if (!params->cfr_enable) + cfr->cfr_enabled_peer_cnt--; + + spin_unlock_bh(&cfr->lock); + + arsta->cfr_capture.cfr_enable =3D params->cfr_enable; + arsta->cfr_capture.cfr_period =3D params->cfr_period; + arsta->cfr_capture.cfr_method =3D params->cfr_method; + arsta->cfr_capture.cfr_bw =3D params->cfr_bw; + + return ret; +} + +static ssize_t ath11k_read_file_enable_cfr(struct file *file, + char __user *user_buf, + size_t count, loff_t *ppos) +{ + struct ath11k *ar =3D file->private_data; + char buf[32] =3D {}; + size_t len; + + mutex_lock(&ar->conf_mutex); + len =3D scnprintf(buf, sizeof(buf), "%d\n", ar->cfr_enabled); + mutex_unlock(&ar->conf_mutex); + + return simple_read_from_buffer(user_buf, count, ppos, buf, len); +} + +static ssize_t ath11k_write_file_enable_cfr(struct file *file, + const char __user *ubuf, + size_t count, loff_t *ppos) +{ + struct ath11k *ar =3D file->private_data; + u32 enable_cfr; + int ret; + + if (kstrtouint_from_user(ubuf, count, 0, &enable_cfr)) + return -EINVAL; + + guard(mutex)(&ar->conf_mutex); + + if (ar->state !=3D ATH11K_STATE_ON) + return -ENETDOWN; + + if (enable_cfr > 1) + return -EINVAL; + + if (ar->cfr_enabled =3D=3D enable_cfr) + return count; + + ret =3D ath11k_wmi_pdev_set_param(ar, WMI_PDEV_PARAM_PER_PEER_CFR_ENABLE, + enable_cfr, ar->pdev->pdev_id); + if (ret) { + ath11k_warn(ar->ab, + "Failed to enable/disable per peer cfr %d\n", ret); + return ret; + } + + ar->cfr_enabled =3D enable_cfr; + + return count; +} + +static const struct file_operations fops_enable_cfr =3D { + .read =3D ath11k_read_file_enable_cfr, + .write =3D ath11k_write_file_enable_cfr, + .open =3D simple_open, + .owner =3D THIS_MODULE, + .llseek =3D default_llseek, +}; + +static void ath11k_cfr_debug_unregister(struct ath11k *ar) +{ + debugfs_remove(ar->cfr.enable_cfr); + ar->cfr.enable_cfr =3D NULL; +} + +static void ath11k_cfr_debug_register(struct ath11k *ar) +{ + ar->cfr.enable_cfr =3D debugfs_create_file("enable_cfr", 0600, + ar->debug.debugfs_pdev, ar, + &fops_enable_cfr); +} + void ath11k_cfr_lut_update_paddr(struct ath11k *ar, dma_addr_t paddr, u32 buf_id) { @@ -85,6 +272,7 @@ void ath11k_cfr_deinit(struct ath11k_base *ab) ar =3D ab->pdevs[i].ar; cfr =3D &ar->cfr; =20 + ath11k_cfr_debug_unregister(ar); ath11k_cfr_ring_free(ar); =20 spin_lock_bh(&cfr->lut_lock); @@ -140,6 +328,8 @@ int ath11k_cfr_init(struct ath11k_base *ab) } =20 cfr->lut_num =3D num_lut_entries; + + ath11k_cfr_debug_register(ar); } =20 return 0; @@ -149,6 +339,7 @@ int ath11k_cfr_init(struct ath11k_base *ab) ar =3D ab->pdevs[i].ar; cfr =3D &ar->cfr; =20 + ath11k_cfr_debug_unregister(ar); ath11k_cfr_ring_free(ar); =20 spin_lock_bh(&cfr->lut_lock); diff --git a/drivers/net/wireless/ath/ath11k/cfr.h b/drivers/net/wireless/a= th/ath11k/cfr.h index 65b87d759329..054962f6cfb3 100644 --- a/drivers/net/wireless/ath/ath11k/cfr.h +++ b/drivers/net/wireless/ath/ath11k/cfr.h @@ -14,10 +14,14 @@ #define ATH11K_CFR_EVENT_TIMEOUT_MS 1 #define ATH11K_CFR_NUM_RING_ENTRIES 1 =20 +#define ATH11K_MAX_CFR_ENABLED_CLIENTS 10 #define CFR_MAX_LUT_ENTRIES 136 =20 #define HOST_MAX_CHAINS 8 =20 +struct ath11k_sta; +struct ath11k_per_peer_cfr_capture; + struct ath11k_cfr_dma_hdr { u16 info0; u16 info1; @@ -48,6 +52,8 @@ struct ath11k_cfr { /* Protect for lut entries */ spinlock_t lut_lock; struct ath11k_look_up_table *lut; + struct dentry *enable_cfr; + u8 cfr_enabled_peer_cnt; u32 lut_num; u64 tx_evt_cnt; u64 dbr_evt_cnt; @@ -61,11 +67,32 @@ struct ath11k_cfr { u64 cfr_dma_aborts; }; =20 +enum ath11k_cfr_capture_method { + ATH11K_CFR_CAPTURE_METHOD_NULL_FRAME, + ATH11K_CFR_CAPTURE_METHOD_NULL_FRAME_WITH_PHASE, + ATH11K_CFR_CAPTURE_METHOD_PROBE_RESP, + ATH11K_CFR_CAPTURE_METHOD_MAX, +}; + +enum ath11k_cfr_capture_bw { + ATH11K_CFR_CAPTURE_BW_20, + ATH11K_CFR_CAPTURE_BW_40, + ATH11K_CFR_CAPTURE_BW_80, + ATH11K_CFR_CAPTURE_BW_MAX, +}; + #ifdef CONFIG_ATH11K_CFR int ath11k_cfr_init(struct ath11k_base *ab); void ath11k_cfr_deinit(struct ath11k_base *ab); void ath11k_cfr_lut_update_paddr(struct ath11k *ar, dma_addr_t paddr, u32 buf_id); +void ath11k_cfr_decrement_peer_count(struct ath11k *ar, + struct ath11k_sta *arsta); +int ath11k_cfr_send_peer_cfr_capture_cmd(struct ath11k *ar, + struct ath11k_sta *arsta, + struct ath11k_per_peer_cfr_capture *params, + const u8 *peer_mac); + #else static inline int ath11k_cfr_init(struct ath11k_base *ab) { @@ -80,5 +107,19 @@ static inline void ath11k_cfr_lut_update_paddr(struct a= th11k *ar, dma_addr_t paddr, u32 buf_id) { } + +static inline void ath11k_cfr_decrement_peer_count(struct ath11k *ar, + struct ath11k_sta *arsta) +{ +} + +static inline int +ath11k_cfr_send_peer_cfr_capture_cmd(struct ath11k *ar, + struct ath11k_sta *arsta, + struct ath11k_per_peer_cfr_capture *params, + const u8 *peer_mac) +{ + return 0; +} #endif /* CONFIG_ATH11K_CFR */ #endif /* ATH11K_CFR_H */ diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/= ath/ath11k/core.h index 40fb7cee3e43..3f41e6569a78 100644 --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h @@ -532,6 +532,13 @@ struct ath11k_per_ppdu_tx_stats { =20 DECLARE_EWMA(avg_rssi, 10, 8) =20 +struct ath11k_per_peer_cfr_capture { + enum ath11k_cfr_capture_method cfr_method; + enum ath11k_cfr_capture_bw cfr_bw; + u32 cfr_enable; + u32 cfr_period; +}; + struct ath11k_sta { struct ath11k_vif *arvif; =20 @@ -572,6 +579,10 @@ struct ath11k_sta { bool peer_current_ps_valid; =20 u32 bw_prev; + +#ifdef CONFIG_ATH11K_CFR + struct ath11k_per_peer_cfr_capture cfr_capture; +#endif }; =20 #define ATH11K_MIN_5G_FREQ 4150 diff --git a/drivers/net/wireless/ath/ath11k/debugfs_sta.c b/drivers/net/wi= reless/ath/ath11k/debugfs_sta.c index d89d0f28d890..dfb9d877d28a 100644 --- a/drivers/net/wireless/ath/ath11k/debugfs_sta.c +++ b/drivers/net/wireless/ath/ath11k/debugfs_sta.c @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights res= erved. * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ =20 @@ -240,6 +239,141 @@ static const struct file_operations fops_tx_stats =3D= { .llseek =3D default_llseek, }; =20 +#ifdef CONFIG_ATH11K_CFR +static ssize_t ath11k_dbg_sta_write_cfr_capture(struct file *file, + const char __user *user_buf, + size_t count, loff_t *ppos) +{ + struct ieee80211_sta *sta =3D file->private_data; + struct ath11k_sta *arsta =3D ath11k_sta_to_arsta(sta); + struct ath11k *ar =3D arsta->arvif->ar; + struct ath11k_cfr *cfr =3D &ar->cfr; + struct wmi_peer_cfr_capture_conf_arg arg; + u32 cfr_capture_enable =3D 0, cfr_capture_bw =3D 0; + u32 cfr_capture_method =3D 0, cfr_capture_period =3D 0; + char buf[64] =3D {}; + int ret; + + simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count); + + guard(mutex)(&ar->conf_mutex); + + if (ar->state !=3D ATH11K_STATE_ON) + return -ENETDOWN; + + if (!ar->cfr_enabled) + return -EINVAL; + + ret =3D sscanf(buf, "%u %u %u %u", &cfr_capture_enable, &cfr_capture_bw, + &cfr_capture_period, &cfr_capture_method); + + if (ret < 1 || (cfr_capture_enable && ret !=3D 4)) + return -EINVAL; + + if (cfr_capture_enable =3D=3D arsta->cfr_capture.cfr_enable && + (cfr_capture_period && + cfr_capture_period =3D=3D arsta->cfr_capture.cfr_period) && + cfr_capture_bw =3D=3D arsta->cfr_capture.cfr_bw && + cfr_capture_method =3D=3D arsta->cfr_capture.cfr_method) + return count; + + if (!cfr_capture_enable && + cfr_capture_enable =3D=3D arsta->cfr_capture.cfr_enable) + return count; + + if (cfr_capture_enable > WMI_PEER_CFR_CAPTURE_ENABLE || + cfr_capture_bw > arsta->bw || + cfr_capture_bw > WMI_PEER_CFR_CAPTURE_BW_80 || + cfr_capture_method > ATH11K_CFR_CAPTURE_METHOD_NULL_FRAME_WITH_PHASE = || + cfr_capture_period > WMI_PEER_CFR_PERIODICITY_MAX) + return -EINVAL; + + /* Target expects cfr period in multiple of 10 */ + if (cfr_capture_period % 10) { + ath11k_err(ar->ab, "periodicity should be 10x\n"); + return -EINVAL; + } + + if (ar->cfr.cfr_enabled_peer_cnt >=3D ATH11K_MAX_CFR_ENABLED_CLIENTS && + !arsta->cfr_capture.cfr_enable) { + ath11k_err(ar->ab, "CFR enable peer threshold reached %u\n", + ar->cfr.cfr_enabled_peer_cnt); + return -EINVAL; + } + + if (!cfr_capture_enable) { + cfr_capture_bw =3D arsta->cfr_capture.cfr_bw; + cfr_capture_period =3D arsta->cfr_capture.cfr_period; + cfr_capture_method =3D arsta->cfr_capture.cfr_method; + } + + arg.request =3D cfr_capture_enable; + arg.periodicity =3D cfr_capture_period; + arg.bw =3D cfr_capture_bw; + arg.method =3D cfr_capture_method; + + ret =3D ath11k_wmi_peer_set_cfr_capture_conf(ar, arsta->arvif->vdev_id, + sta->addr, &arg); + if (ret) { + ath11k_warn(ar->ab, + "failed to send cfr capture info: vdev_id %u peer %pM: %d\n", + arsta->arvif->vdev_id, sta->addr, ret); + return ret; + } + + spin_lock_bh(&ar->cfr.lock); + + if (cfr_capture_enable && + cfr_capture_enable !=3D arsta->cfr_capture.cfr_enable) + cfr->cfr_enabled_peer_cnt++; + else if (!cfr_capture_enable) + cfr->cfr_enabled_peer_cnt--; + + spin_unlock_bh(&ar->cfr.lock); + + arsta->cfr_capture.cfr_enable =3D cfr_capture_enable; + arsta->cfr_capture.cfr_period =3D cfr_capture_period; + arsta->cfr_capture.cfr_bw =3D cfr_capture_bw; + arsta->cfr_capture.cfr_method =3D cfr_capture_method; + + return count; +} + +static ssize_t ath11k_dbg_sta_read_cfr_capture(struct file *file, + char __user *user_buf, + size_t count, loff_t *ppos) +{ + struct ieee80211_sta *sta =3D file->private_data; + struct ath11k_sta *arsta =3D ath11k_sta_to_arsta(sta); + struct ath11k *ar =3D arsta->arvif->ar; + char buf[512] =3D {}; + int len =3D 0; + + mutex_lock(&ar->conf_mutex); + + len +=3D scnprintf(buf + len, sizeof(buf) - len, "cfr_enabled =3D %d\n", + arsta->cfr_capture.cfr_enable); + len +=3D scnprintf(buf + len, sizeof(buf) - len, "bandwidth =3D %d\n", + arsta->cfr_capture.cfr_bw); + len +=3D scnprintf(buf + len, sizeof(buf) - len, "period =3D %d\n", + arsta->cfr_capture.cfr_period); + len +=3D scnprintf(buf + len, sizeof(buf) - len, "cfr_method =3D %d\n", + arsta->cfr_capture.cfr_method); + + mutex_unlock(&ar->conf_mutex); + + return simple_read_from_buffer(user_buf, count, ppos, buf, len); +} + +static const struct file_operations fops_peer_cfr_capture =3D { + .write =3D ath11k_dbg_sta_write_cfr_capture, + .read =3D ath11k_dbg_sta_read_cfr_capture, + .open =3D simple_open, + .owner =3D THIS_MODULE, + .llseek =3D default_llseek, +}; +#endif /* CONFIG_ATH11K_CFR */ + static ssize_t ath11k_dbg_sta_dump_rx_stats(struct file *file, char __user *user_buf, size_t count, loff_t *ppos) @@ -877,6 +1011,13 @@ void ath11k_debugfs_sta_op_add(struct ieee80211_hw *h= w, struct ieee80211_vif *vi debugfs_create_file("htt_peer_stats_reset", 0600, dir, sta, &fops_htt_peer_stats_reset); =20 +#ifdef CONFIG_ATH11K_CFR + if (test_bit(WMI_TLV_SERVICE_CFR_CAPTURE_SUPPORT, + ar->ab->wmi_ab.svc_map)) + debugfs_create_file("cfr_capture", 0600, dir, sta, + &fops_peer_cfr_capture); +#endif/* CONFIG_ATH11K_CFR */ + debugfs_create_file("peer_ps_state", 0400, dir, sta, &fops_peer_ps_state); =20 diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/a= th/ath11k/mac.c index c6360d6a72bd..965c377cd8dc 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c @@ -9979,6 +9979,8 @@ static int ath11k_mac_op_sta_state(struct ieee80211_h= w *hw, } spin_unlock_bh(&ar->ab->base_lock); mutex_unlock(&ar->ab->tbl_mtx_lock); + + ath11k_cfr_decrement_peer_count(ar, arsta); } else if (old_state =3D=3D IEEE80211_STA_AUTH && new_state =3D=3D IEEE80211_STA_ASSOC && (vif->type =3D=3D NL80211_IFTYPE_AP || diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/a= th/ath11k/wmi.c index edff6fb61344..846c9946a084 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c @@ -3941,6 +3941,47 @@ int ath11k_wmi_fils_discovery_tmpl(struct ath11k *ar= , u32 vdev_id, return 0; } =20 +int ath11k_wmi_peer_set_cfr_capture_conf(struct ath11k *ar, + u32 vdev_id, const u8 *mac_addr, + struct wmi_peer_cfr_capture_conf_arg *arg) +{ + struct ath11k_pdev_wmi *wmi =3D ar->wmi; + struct wmi_peer_cfr_capture_cmd_fixed_param *cmd; + struct sk_buff *skb; + int ret; + + skb =3D ath11k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd)); + if (!skb) + return -ENOMEM; + + cmd =3D (struct wmi_peer_cfr_capture_cmd_fixed_param *)skb->data; + cmd->tlv_header =3D FIELD_PREP(WMI_TLV_TAG, + WMI_TAG_PEER_CFR_CAPTURE_CMD) | + FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + + memcpy(&cmd->mac_addr, mac_addr, ETH_ALEN); + cmd->request =3D arg->request; + cmd->vdev_id =3D vdev_id; + cmd->periodicity =3D arg->periodicity; + cmd->bandwidth =3D arg->bw; + cmd->capture_method =3D arg->method; + + ret =3D ath11k_wmi_cmd_send(ar->wmi, skb, WMI_PEER_CFR_CAPTURE_CMDID); + if (ret) { + ath11k_warn(ar->ab, + "WMI vdev %d failed to send peer cfr capture cmd: %d\n", + vdev_id, ret); + dev_kfree_skb(skb); + } + + ath11k_dbg(ar->ab, ATH11K_DBG_WMI, + "WMI peer CFR capture cmd req %u id %u period %u bw %u mode %u\n", + arg->request, vdev_id, arg->periodicity, + arg->bw, arg->method); + + return ret; +} + int ath11k_wmi_probe_resp_tmpl(struct ath11k *ar, u32 vdev_id, struct sk_buff *tmpl) { diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/a= th/ath11k/wmi.h index 7a55fe0879c0..1562d169ba9a 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.h +++ b/drivers/net/wireless/ath/ath11k/wmi.h @@ -362,6 +362,10 @@ enum wmi_tlv_cmd_id { WMI_PEER_REORDER_QUEUE_REMOVE_CMDID, WMI_PEER_SET_RX_BLOCKSIZE_CMDID, WMI_PEER_ANTDIV_INFO_REQ_CMDID, + WMI_PEER_RESERVED0_CMDID, + WMI_PEER_TID_MSDUQ_QDEPTH_THRESH_UPDATE_CMDID, + WMI_PEER_TID_CONFIGURATIONS_CMDID, + WMI_PEER_CFR_CAPTURE_CMDID, WMI_BCN_TX_CMDID =3D WMI_TLV_CMD(WMI_GRP_MGMT), WMI_PDEV_SEND_BCN_CMDID, WMI_BCN_TMPL_CMDID, @@ -3833,7 +3837,8 @@ struct wmi_scan_prob_req_oui_cmd { #define WMI_TX_PARAMS_DWORD1_BW_MASK GENMASK(14, 8) #define WMI_TX_PARAMS_DWORD1_PREAMBLE_TYPE GENMASK(19, 15) #define WMI_TX_PARAMS_DWORD1_FRAME_TYPE BIT(20) -#define WMI_TX_PARAMS_DWORD1_RSVD GENMASK(31, 21) +#define WMI_TX_PARAMS_DWORD1_CFR_CAPTURE BIT(21) +#define WMI_TX_PARAMS_DWORD1_RSVD GENMASK(31, 22) =20 struct wmi_mgmt_send_params { u32 tlv_header; @@ -4218,6 +4223,45 @@ enum cc_setting_code { */ }; =20 +enum ath11k_wmi_cfr_capture_bw { + WMI_PEER_CFR_CAPTURE_BW_20, + WMI_PEER_CFR_CAPTURE_BW_40, + WMI_PEER_CFR_CAPTURE_BW_80, + WMI_PEER_CFR_CAPTURE_BW_MAX, +}; + +enum ath11k_wmi_cfr_capture_method { + WMI_CFR_CAPTURE_METHOD_NULL_FRAME, + WMI_CFR_CAPTURE_METHOD_NULL_FRAME_WITH_PHASE, + WMI_CFR_CAPTURE_METHOD_PROBE_RESP, + WMI_CFR_CAPTURE_METHOD_MAX, +}; + +struct wmi_peer_cfr_capture_conf_arg { + enum ath11k_wmi_cfr_capture_bw bw; + enum ath11k_wmi_cfr_capture_method method; + u32 request; + u32 periodicity; +}; + +struct wmi_peer_cfr_capture_cmd_fixed_param { + u32 tlv_header; + u32 request; + struct wmi_mac_addr mac_addr; + u32 vdev_id; + u32 periodicity; + /* BW of measurement - of type enum ath11k_wmi_cfr_capture_bw */ + u32 bandwidth; + /* Method used to capture CFR - of type enum ath11k_wmi_cfr_capture_metho= d */ + u32 capture_method; +} __packed; + +#define WMI_PEER_CFR_CAPTURE_ENABLE 1 +#define WMI_PEER_CFR_CAPTURE_DISABLE 0 + +/*periodicity in ms */ +#define WMI_PEER_CFR_PERIODICITY_MAX 600000 + static inline enum cc_setting_code ath11k_wmi_cc_setting_code_to_reg(enum wmi_reg_cc_setting_code status_code) { @@ -6532,5 +6576,7 @@ bool ath11k_wmi_supports_6ghz_cc_ext(struct ath11k *a= r); int ath11k_wmi_send_vdev_set_tpc_power(struct ath11k *ar, u32 vdev_id, struct ath11k_reg_tpc_power_info *param); - +int ath11k_wmi_peer_set_cfr_capture_conf(struct ath11k *ar, + u32 vdev_id, const u8 *mac, + struct wmi_peer_cfr_capture_conf_arg *arg); #endif --=20 2.34.1 From nobody Fri Dec 19 10:56:15 2025 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 360FD3328E0 for ; Tue, 4 Nov 2025 16:26:40 +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=1762273603; cv=none; b=RuIMHfVkEMl5EnCN37uVe9ap65nPp15yHprbIzo7X/5/qZ9LZCBPoL/ktDw3s5mn/xk1pxuzFQex0WN65w8aQ9Ml9jrzBukGrGN3ABvLufAbUI0yqSVVCqjZu/ploilrcN+O0M5b542BlCN/y3WNHyxy1sihl3hEg8Cf9pa98+o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762273603; c=relaxed/simple; bh=O0SBU6X8ZNXAhp0bLg8v3zUNUfHYsDrMu8k/vt+hBzI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=rx1Nsxk02ce0wbNdm7Y0jas9YCZ86ffrddElPUi5OhQb/IKh5B2mweWWJ9a0img6G+DODCLaFWv6EfkO1bph6fRCOYVNTMogH5Ra017SgPIv/X9koloG3dul/M2T9tm+B8YGlrFmLgeqYH1hFonmD8TmMyuWYcjdiwmRvSrrb0o= 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=W+CBeVL9; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=ZZfLYlL6; 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="W+CBeVL9"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="ZZfLYlL6" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5A4CfveE2049347 for ; Tue, 4 Nov 2025 16:26:40 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= LFrtG1KFdR/sQfiwZyV2ZsLgdioWBtQF2cBCrfJ2vFU=; b=W+CBeVL9IqbQuYWq XqWzy9O539/4gDgPHeTfR5abk+fP545qDaC9q1j7ajq77t9rKLglbII1hlpYrm74 GfT9cV11yu9mzcgrdWJJ82LwbO4VCrF5mn0L8ZJP0cVdfBKSkY2HT7FhF6cJiCKs 4fnuTBcfg18b9GjysVeKl6dzkl2X2v9OdlIVhVkLsNZ6rz94RxtbX7m9NmApPCeu NS8H4bj3rgfWVBoSfH0du+k6jBgv7vL/r4tLelEF23m0VQWKxJm7FqErHXhcGtJJ stWTLve4fx9ECh2AphKg9ilpYo38TyhaCWPBgMC9Qn+EivTQ0Mz4xXkc2E4e7Cno g1CDLw== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4a7f25131j-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 04 Nov 2025 16:26:39 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2956510d04cso36937505ad.3 for ; Tue, 04 Nov 2025 08:26:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1762273599; x=1762878399; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LFrtG1KFdR/sQfiwZyV2ZsLgdioWBtQF2cBCrfJ2vFU=; b=ZZfLYlL6FH2v1SakmZp6Lqqh0VXKaZZmQBMcukz590YCEhSYQynYNmVaOsqudqEDfW BL1jwSDflVqC8/i03fTvy9aHkxczWq64PW9WeUpFvrX6vp5imF7AZ4vDdU8wvsh/00D6 CdHSPVTQMfcnbgfznLTmoWo7nxIC0QQLnmPYMqqa1F9bVPTfkTg2kbzOtGkemaJULuJ8 TuJMytNXoR24TnEJmZ0T+px1R1fy2TaPZ3JO2+YQNCAt6XaffomrgYmQFbGuSjBDlkUl 2rIlEnCc5YphrG3zrwKzawo3kdGVSW+fofOZScPLNlydjyT0t7c23edWb/5BijXDcbAP N9+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762273599; x=1762878399; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LFrtG1KFdR/sQfiwZyV2ZsLgdioWBtQF2cBCrfJ2vFU=; b=r6OuYg2WAkiX2UY2xLy47KsKnutow0Tg4HcXEk1jJmcNJTaWwtYOp0QihxQ8FZxfO0 1Q8tinHP847v+liVPUjAI3Nl3iIX6mOPig//yGXRiNQYa+tlqCQ64lO/JDDITgqU4ubg u+1v99uzzG6T8IcOYGJ8mKWnDMtJE4wo3Dtmu1/VuFmq6m3JFx26Yxd9Zw5CqZ1UasYW zXdMzXtCYDczagy9gGO5Nn4Gm7/G70S/yW0IR0EVWqg+nDhwdCb52mWRrNni+sHmR8lX JmehIX/zfrhS1NgT9PU+0p1Uk+uxJwMRkPmu4KX0hcb+gHR1StFsiiyXs6utgGkJD/nu 4bSw== X-Forwarded-Encrypted: i=1; AJvYcCXERU0leEnFiTaxuoQSGdhjN2n05Z/MPYpUsnnZEi3O+o30NLiF39PHfm+bhnzrBMLyxTgmjB9HKaympOk=@vger.kernel.org X-Gm-Message-State: AOJu0YwxEfZjB4P+hKmODbayI3pC4CJaPlbbclzHhO31vQXx1FokV236 fdd0iSI8ob6JHQl9b4zLaJ4FvAmFd2TCZHJwP247hK+F3CWUemLWhFmI+uy0U+W7QYmvojf1CFq NZhyZj7rSMhFwg2j6Y2JJJ5fgKuzDdJ34ATd9e+WEFgED7FfDzoz1DSJwXbtWy1fZiQI= X-Gm-Gg: ASbGnct6BkroQk0i68mTlVcMupJCd4zTHPm+Gl0HeleYXhzsY0umnQLrVZYfK8HbCyp ouUSV9L5eUxro7olngEaUTafTnOy5y2JCV6Nxyk2WGgqnjmDtzQhhiHAeP2POBv/7nkB5B5w1cQ vqENLkksKv5F9/Ra5S+LpGZyJ6EzG+qu9qRbPmAcu9BIhk788YGji8nIY9pwpVSB7kWmIazoPVE M42AFqD9O3gxJ0SDjkJtHt+hoJSbl/a1Q2akU/o8Mao4apCYvbe7nMWGlLiZ105l2jKNOb1zfhI D8YT8Pm9w0im12SOwFUmhHsE0EaDT11Lhjt+BJ6iCEfBsKtGK9B7XEl9VTR2K5H1ieyfE3uzd0r P9h1sbliLO0r2rIpA/Gw0muSAmuGOnQ5/DwW78xlKeh/S X-Received: by 2002:a17:903:2f81:b0:28d:18fb:bb93 with SMTP id d9443c01a7336-2962adb409amr2300525ad.7.1762273598739; Tue, 04 Nov 2025 08:26:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IEkpY6qFCLWV8sp54qIOAW7lPlFtTaPOBdgjs5le3oz92PclTleyWaIa7yqI7/ktCot3RePSQ== X-Received: by 2002:a17:903:2f81:b0:28d:18fb:bb93 with SMTP id d9443c01a7336-2962adb409amr2300035ad.7.1762273598152; Tue, 04 Nov 2025 08:26:38 -0800 (PST) Received: from hu-yuzha-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29601a7a8a9sm31508435ad.107.2025.11.04.08.26.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 08:26:37 -0800 (PST) From: "Yu Zhang(Yuriy)" To: jjohnson@kernel.org Cc: baochen.qiang@oss.qualcomm.com, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, Yu Zhang , Vasanthakumar Thiagarajan Subject: [PATCH ath-next v2 3/6] wifi: ath11k: Add support unassociated client CFR Date: Tue, 4 Nov 2025 08:26:30 -0800 Message-Id: <20251104162633.3007874-4-yu.zhang@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251104162633.3007874-1-yu.zhang@oss.qualcomm.com> References: <20251104162633.3007874-1-yu.zhang@oss.qualcomm.com> 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 X-Authority-Analysis: v=2.4 cv=dNyrWeZb c=1 sm=1 tr=0 ts=690a293f cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=J6nKnfFvHuu1lZMax6MA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=uG9DUKGECoFWVXl0Dc02:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-GUID: aGjQv5_Wn5zCPelIR1zf9AeBsd8l9Xhz X-Proofpoint-ORIG-GUID: aGjQv5_Wn5zCPelIR1zf9AeBsd8l9Xhz X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTA0MDEzNyBTYWx0ZWRfXwU0WHJosnc2Y fXVidX4w8GALBcVDyx5l6XVBp9QNGeYAmVKG28sNIaNcHHv6iUKnhdti9g4qnlodrsW0WQBGhD7 OuLVkuFWAcraX6yEwi+OUjxBm5F4kdDirZZ0yDZdjvGdATXjhlioYPNG6iFzYj2mG2Y8tTAC2rZ BrEPfSq1h2QmrEssuctWJT8f+Hd4M3Ohzm/BECdWsntS+/z1h41b3Jn2bwAg9wYeCiTPhUfItUr nxJe822Xz9V+XOW0m99O64hANkbE2je4s2ysaSHjka/d+HhiMOWB8QquAiMJuY9ivxjxz7Rzovu yoKBQ3O4H5zt3ZuSDPAt4nLCOXRzUg8TSXygirNpHKnmOe88a8i/grDdbk+WDjjJKnEpS+srp5s jZjKCIZWVgFG9pj3k4vvPRlCPJz++g== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-04_02,2025-11-03_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 malwarescore=0 spamscore=0 lowpriorityscore=0 suspectscore=0 impostorscore=0 adultscore=0 priorityscore=1501 phishscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511040137 From: Venkateswara Naralasetty Provide debugfs interfaces support to config unassociated client CFR from the user space. To enable CFR capture for unassociated clients, echo =E2=80=9C =E2=80=9D > /sys/kernel/debug/ieee80211/phyX/ath11k/cfr_unassoc Mac address: mac address of the client. Val: 0 - start CFR capture 1 =E2=80=93 stop CFR capture Periodicity: Periodicity at which hardware is expected to collect CFR dump. 0 - single shot capture. non zero - for Periodic captures (value must be multiple of 10 ms) Tested-on: IPQ8074 hw2.0 PCI IPQ8074 WLAN.HK.2.5.0.1-00991-QCAHKSWPL_SILICO= NZ-1 Tested-on: WCN6855 hw2.1 PCI WLAN.HSP.1.1-04685-QCAHSPSWPL_V1_V2_SILICONZ_I= OE-1 Signed-off-by: Venkateswara Naralasetty Co-developed-by: Yu Zhang (Yuriy) Signed-off-by: Yu Zhang (Yuriy) Reviewed-by: Vasanthakumar Thiagarajan --- drivers/net/wireless/ath/ath11k/cfr.c | 228 ++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/cfr.h | 33 ++++ drivers/net/wireless/ath/ath11k/mac.c | 15 +- drivers/net/wireless/ath/ath11k/wmi.c | 16 +- drivers/net/wireless/ath/ath11k/wmi.h | 2 +- 5 files changed, 290 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/cfr.c b/drivers/net/wireless/a= th/ath11k/cfr.c index 5d634d1ef5f5..0fa81c939860 100644 --- a/drivers/net/wireless/ath/ath11k/cfr.c +++ b/drivers/net/wireless/ath/ath11k/cfr.c @@ -14,6 +14,60 @@ static int ath11k_cfr_process_data(struct ath11k *ar, return 0; } =20 +/* Helper function to check whether the given peer mac address + * is in unassociated peer pool or not. + */ +bool ath11k_cfr_peer_is_in_cfr_unassoc_pool(struct ath11k *ar, const u8 *p= eer_mac) +{ + struct ath11k_cfr *cfr =3D &ar->cfr; + struct cfr_unassoc_pool_entry *entry; + int i; + + if (!ar->cfr_enabled) + return false; + + spin_lock_bh(&cfr->lock); + for (i =3D 0; i < ATH11K_MAX_CFR_ENABLED_CLIENTS; i++) { + entry =3D &cfr->unassoc_pool[i]; + if (!entry->is_valid) + continue; + + if (ether_addr_equal(peer_mac, entry->peer_mac)) { + spin_unlock_bh(&cfr->lock); + return true; + } + } + + spin_unlock_bh(&cfr->lock); + + return false; +} + +void ath11k_cfr_update_unassoc_pool_entry(struct ath11k *ar, + const u8 *peer_mac) +{ + struct ath11k_cfr *cfr =3D &ar->cfr; + struct cfr_unassoc_pool_entry *entry; + int i; + + spin_lock_bh(&cfr->lock); + for (i =3D 0; i < ATH11K_MAX_CFR_ENABLED_CLIENTS; i++) { + entry =3D &cfr->unassoc_pool[i]; + if (!entry->is_valid) + continue; + + if (ether_addr_equal(peer_mac, entry->peer_mac) && + entry->period =3D=3D 0) { + memset(entry->peer_mac, 0, ETH_ALEN); + entry->is_valid =3D false; + cfr->cfr_enabled_peer_cnt--; + break; + } + } + + spin_unlock_bh(&cfr->lock); +} + void ath11k_cfr_decrement_peer_count(struct ath11k *ar, struct ath11k_sta *arsta) { @@ -130,6 +184,59 @@ int ath11k_cfr_send_peer_cfr_capture_cmd(struct ath11k= *ar, return ret; } =20 +void ath11k_cfr_update_unassoc_pool(struct ath11k *ar, + struct ath11k_per_peer_cfr_capture *params, + u8 *peer_mac) +{ + struct ath11k_cfr *cfr =3D &ar->cfr; + struct cfr_unassoc_pool_entry *entry; + int available_idx =3D -1; + int i; + + guard(spinlock_bh)(&cfr->lock); + + if (!params->cfr_enable) { + for (i =3D 0; i < ATH11K_MAX_CFR_ENABLED_CLIENTS; i++) { + entry =3D &cfr->unassoc_pool[i]; + if (ether_addr_equal(peer_mac, entry->peer_mac)) { + memset(entry->peer_mac, 0, ETH_ALEN); + entry->is_valid =3D false; + cfr->cfr_enabled_peer_cnt--; + break; + } + } + return; + } + + if (cfr->cfr_enabled_peer_cnt >=3D ATH11K_MAX_CFR_ENABLED_CLIENTS) { + ath11k_info(ar->ab, "Max cfr peer threshold reached\n"); + return; + } + + for (i =3D 0; i < ATH11K_MAX_CFR_ENABLED_CLIENTS; i++) { + entry =3D &cfr->unassoc_pool[i]; + + if (ether_addr_equal(peer_mac, entry->peer_mac)) { + ath11k_info(ar->ab, + "peer entry already present updating params\n"); + entry->period =3D params->cfr_period; + available_idx =3D -1; + break; + } + + if (available_idx < 0 && !entry->is_valid) + available_idx =3D i; + } + + if (available_idx >=3D 0) { + entry =3D &cfr->unassoc_pool[available_idx]; + ether_addr_copy(entry->peer_mac, peer_mac); + entry->period =3D params->cfr_period; + entry->is_valid =3D true; + cfr->cfr_enabled_peer_cnt++; + } +} + static ssize_t ath11k_read_file_enable_cfr(struct file *file, char __user *user_buf, size_t count, loff_t *ppos) @@ -188,10 +295,127 @@ static const struct file_operations fops_enable_cfr = =3D { .llseek =3D default_llseek, }; =20 +static ssize_t ath11k_write_file_cfr_unassoc(struct file *file, + const char __user *ubuf, + size_t count, loff_t *ppos) +{ + struct ath11k *ar =3D file->private_data; + struct ath11k_cfr *cfr =3D &ar->cfr; + struct cfr_unassoc_pool_entry *entry; + char buf[64] =3D {}; + u8 peer_mac[6]; + u32 cfr_capture_enable; + u32 cfr_capture_period; + int available_idx =3D -1; + int ret, i; + + simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, ubuf, count); + + guard(mutex)(&ar->conf_mutex); + guard(spinlock_bh)(&cfr->lock); + + if (ar->state !=3D ATH11K_STATE_ON) + return -ENETDOWN; + + if (!ar->cfr_enabled) { + ath11k_err(ar->ab, "CFR is not enabled on this pdev %d\n", + ar->pdev_idx); + return -EINVAL; + } + + ret =3D sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx %u %u", + &peer_mac[0], &peer_mac[1], &peer_mac[2], &peer_mac[3], + &peer_mac[4], &peer_mac[5], &cfr_capture_enable, + &cfr_capture_period); + + if (ret < 1) + return -EINVAL; + + if (cfr_capture_enable && ret !=3D 8) + return -EINVAL; + + if (!cfr_capture_enable) { + for (i =3D 0; i < ATH11K_MAX_CFR_ENABLED_CLIENTS; i++) { + entry =3D &cfr->unassoc_pool[i]; + if (ether_addr_equal(peer_mac, entry->peer_mac)) { + memset(entry->peer_mac, 0, ETH_ALEN); + entry->is_valid =3D false; + cfr->cfr_enabled_peer_cnt--; + } + } + + return count; + } + + if (cfr->cfr_enabled_peer_cnt >=3D ATH11K_MAX_CFR_ENABLED_CLIENTS) { + ath11k_info(ar->ab, "Max cfr peer threshold reached\n"); + return count; + } + + for (i =3D 0; i < ATH11K_MAX_CFR_ENABLED_CLIENTS; i++) { + entry =3D &cfr->unassoc_pool[i]; + + if (available_idx < 0 && !entry->is_valid) + available_idx =3D i; + + if (ether_addr_equal(peer_mac, entry->peer_mac)) { + ath11k_info(ar->ab, + "peer entry already present updating params\n"); + entry->period =3D cfr_capture_period; + return count; + } + } + + if (available_idx >=3D 0) { + entry =3D &cfr->unassoc_pool[available_idx]; + ether_addr_copy(entry->peer_mac, peer_mac); + entry->period =3D cfr_capture_period; + entry->is_valid =3D true; + cfr->cfr_enabled_peer_cnt++; + } + + return count; +} + +static ssize_t ath11k_read_file_cfr_unassoc(struct file *file, + char __user *ubuf, + size_t count, loff_t *ppos) +{ + struct ath11k *ar =3D file->private_data; + struct ath11k_cfr *cfr =3D &ar->cfr; + struct cfr_unassoc_pool_entry *entry; + char buf[512] =3D {}; + int len =3D 0, i; + + spin_lock_bh(&cfr->lock); + + for (i =3D 0; i < ATH11K_MAX_CFR_ENABLED_CLIENTS; i++) { + entry =3D &cfr->unassoc_pool[i]; + if (entry->is_valid) + len +=3D scnprintf(buf + len, sizeof(buf) - len, + "peer: %pM period: %u\n", + entry->peer_mac, entry->period); + } + + spin_unlock_bh(&cfr->lock); + + return simple_read_from_buffer(ubuf, count, ppos, buf, len); +} + +static const struct file_operations fops_configure_cfr_unassoc =3D { + .write =3D ath11k_write_file_cfr_unassoc, + .read =3D ath11k_read_file_cfr_unassoc, + .open =3D simple_open, + .owner =3D THIS_MODULE, + .llseek =3D default_llseek, +}; + static void ath11k_cfr_debug_unregister(struct ath11k *ar) { debugfs_remove(ar->cfr.enable_cfr); ar->cfr.enable_cfr =3D NULL; + debugfs_remove(ar->cfr.cfr_unassoc); + ar->cfr.cfr_unassoc =3D NULL; } =20 static void ath11k_cfr_debug_register(struct ath11k *ar) @@ -199,6 +423,10 @@ static void ath11k_cfr_debug_register(struct ath11k *a= r) ar->cfr.enable_cfr =3D debugfs_create_file("enable_cfr", 0600, ar->debug.debugfs_pdev, ar, &fops_enable_cfr); + + ar->cfr.cfr_unassoc =3D debugfs_create_file("cfr_unassoc", 0600, + ar->debug.debugfs_pdev, ar, + &fops_configure_cfr_unassoc); } =20 void ath11k_cfr_lut_update_paddr(struct ath11k *ar, dma_addr_t paddr, diff --git a/drivers/net/wireless/ath/ath11k/cfr.h b/drivers/net/wireless/a= th/ath11k/cfr.h index 054962f6cfb3..fa9d98cc72b7 100644 --- a/drivers/net/wireless/ath/ath11k/cfr.h +++ b/drivers/net/wireless/ath/ath11k/cfr.h @@ -45,6 +45,12 @@ struct ath11k_look_up_table { struct ath11k_dbring_element *buff; }; =20 +struct cfr_unassoc_pool_entry { + u8 peer_mac[ETH_ALEN]; + u32 period; + bool is_valid; +}; + struct ath11k_cfr { struct ath11k_dbring rx_ring; /* Protects cfr data */ @@ -53,6 +59,7 @@ struct ath11k_cfr { spinlock_t lut_lock; struct ath11k_look_up_table *lut; struct dentry *enable_cfr; + struct dentry *cfr_unassoc; u8 cfr_enabled_peer_cnt; u32 lut_num; u64 tx_evt_cnt; @@ -65,6 +72,7 @@ struct ath11k_cfr { u64 flush_dbr_cnt; u64 clear_txrx_event; u64 cfr_dma_aborts; + struct cfr_unassoc_pool_entry unassoc_pool[ATH11K_MAX_CFR_ENABLED_CLIENTS= ]; }; =20 enum ath11k_cfr_capture_method { @@ -88,6 +96,13 @@ void ath11k_cfr_lut_update_paddr(struct ath11k *ar, dma_= addr_t paddr, u32 buf_id); void ath11k_cfr_decrement_peer_count(struct ath11k *ar, struct ath11k_sta *arsta); +void ath11k_cfr_update_unassoc_pool_entry(struct ath11k *ar, + const u8 *peer_mac); +bool ath11k_cfr_peer_is_in_cfr_unassoc_pool(struct ath11k *ar, + const u8 *peer_mac); +void ath11k_cfr_update_unassoc_pool(struct ath11k *ar, + struct ath11k_per_peer_cfr_capture *params, + u8 *peer_mac); int ath11k_cfr_send_peer_cfr_capture_cmd(struct ath11k *ar, struct ath11k_sta *arsta, struct ath11k_per_peer_cfr_capture *params, @@ -113,6 +128,24 @@ static inline void ath11k_cfr_decrement_peer_count(str= uct ath11k *ar, { } =20 +static inline void ath11k_cfr_update_unassoc_pool_entry(struct ath11k *ar, + const u8 *peer_mac) +{ +} + +static inline bool +ath11k_cfr_peer_is_in_cfr_unassoc_pool(struct ath11k *ar, const u8 *peer_m= ac) +{ + return false; +} + +static inline void +ath11k_cfr_update_unassoc_pool(struct ath11k *ar, + struct ath11k_per_peer_cfr_capture *params, + u8 *peer_mac) +{ +} + static inline int ath11k_cfr_send_peer_cfr_capture_cmd(struct ath11k *ar, struct ath11k_sta *arsta, diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/a= th/ath11k/mac.c index 965c377cd8dc..2fbd64d78338 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c @@ -6186,6 +6186,8 @@ static int ath11k_mac_mgmt_tx_wmi(struct ath11k *ar, = struct ath11k_vif *arvif, dma_addr_t paddr; int buf_id; int ret; + bool tx_params_valid =3D false; + bool peer_in_unassoc_pool; =20 ATH11K_SKB_CB(skb)->ar =3D ar; =20 @@ -6224,7 +6226,18 @@ static int ath11k_mac_mgmt_tx_wmi(struct ath11k *ar,= struct ath11k_vif *arvif, =20 ATH11K_SKB_CB(skb)->paddr =3D paddr; =20 - ret =3D ath11k_wmi_mgmt_send(ar, arvif->vdev_id, buf_id, skb); + peer_in_unassoc_pool =3D ath11k_cfr_peer_is_in_cfr_unassoc_pool(ar, hdr->= addr1); + + if (ar->cfr_enabled && + ieee80211_is_probe_resp(hdr->frame_control) && + peer_in_unassoc_pool) + tx_params_valid =3D true; + + if (peer_in_unassoc_pool) + ath11k_cfr_update_unassoc_pool_entry(ar, hdr->addr1); + + ret =3D ath11k_wmi_mgmt_send(ar, arvif->vdev_id, buf_id, skb, + tx_params_valid); if (ret) { ath11k_warn(ar->ab, "failed to send mgmt frame: %d\n", ret); goto err_unmap_buf; diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/a= th/ath11k/wmi.c index 846c9946a084..0b4cc943c290 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c @@ -651,11 +651,12 @@ static u32 ath11k_wmi_mgmt_get_freq(struct ath11k *ar, } =20 int ath11k_wmi_mgmt_send(struct ath11k *ar, u32 vdev_id, u32 buf_id, - struct sk_buff *frame) + struct sk_buff *frame, bool tx_params_valid) { struct ath11k_pdev_wmi *wmi =3D ar->wmi; struct ieee80211_tx_info *info =3D IEEE80211_SKB_CB(frame); struct wmi_mgmt_send_cmd *cmd; + struct wmi_mgmt_send_params *params; struct wmi_tlv *frame_tlv; struct sk_buff *skb; u32 buf_len; @@ -665,6 +666,8 @@ int ath11k_wmi_mgmt_send(struct ath11k *ar, u32 vdev_id= , u32 buf_id, frame->len : WMI_MGMT_SEND_DOWNLD_LEN; =20 len =3D sizeof(*cmd) + sizeof(*frame_tlv) + roundup(buf_len, 4); + if (tx_params_valid) + len +=3D sizeof(*params); =20 skb =3D ath11k_wmi_alloc_skb(wmi->wmi_ab, len); if (!skb) @@ -680,7 +683,7 @@ int ath11k_wmi_mgmt_send(struct ath11k *ar, u32 vdev_id= , u32 buf_id, cmd->paddr_hi =3D upper_32_bits(ATH11K_SKB_CB(frame)->paddr); cmd->frame_len =3D frame->len; cmd->buf_len =3D buf_len; - cmd->tx_params_valid =3D 0; + cmd->tx_params_valid =3D !!tx_params_valid; =20 frame_tlv =3D (struct wmi_tlv *)(skb->data + sizeof(*cmd)); frame_tlv->header =3D FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) | @@ -690,6 +693,15 @@ int ath11k_wmi_mgmt_send(struct ath11k *ar, u32 vdev_i= d, u32 buf_id, =20 ath11k_ce_byte_swap(frame_tlv->value, buf_len); =20 + if (tx_params_valid) { + params =3D + (struct wmi_mgmt_send_params *)(skb->data + (len - sizeof(*params))); + params->tlv_header =3D FIELD_PREP(WMI_TLV_TAG, WMI_TAG_TX_SEND_PARAMS) | + FIELD_PREP(WMI_TLV_LEN, + sizeof(*params) - TLV_HDR_SIZE); + params->tx_params_dword1 |=3D WMI_TX_PARAMS_DWORD1_CFR_CAPTURE; + } + ret =3D ath11k_wmi_cmd_send(wmi, skb, WMI_MGMT_TX_SEND_CMDID); if (ret) { ath11k_warn(ar->ab, diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/a= th/ath11k/wmi.h index 1562d169ba9a..afc78fa4389b 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.h +++ b/drivers/net/wireless/ath/ath11k/wmi.h @@ -6391,7 +6391,7 @@ int ath11k_wmi_cmd_send(struct ath11k_pdev_wmi *wmi, = struct sk_buff *skb, u32 cmd_id); struct sk_buff *ath11k_wmi_alloc_skb(struct ath11k_wmi_base *wmi_sc, u32 l= en); int ath11k_wmi_mgmt_send(struct ath11k *ar, u32 vdev_id, u32 buf_id, - struct sk_buff *frame); + struct sk_buff *frame, bool tx_params_valid); int ath11k_wmi_p2p_go_bcn_ie(struct ath11k *ar, u32 vdev_id, const u8 *p2p_ie); int ath11k_wmi_bcn_tmpl(struct ath11k *ar, u32 vdev_id, --=20 2.34.1 From nobody Fri Dec 19 10:56:15 2025 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 CE4DF3328FC for ; Tue, 4 Nov 2025 16:26:41 +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=1762273603; cv=none; b=p26Mtl90amkfQrwn7oci9gUIpxVVsalpKyxdNXQiUAbYcJy61+DY9gbdq+h6gVkoeouSd5E/ohQrE1XxqIO6L6/rTvERDRVZmV7NU847ONomL4PG0DOWeoKHRo3mjyOCkyEsEkU3hMgBuvud3PP6L6s/fWKAEhFiziaybIYwP7Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762273603; c=relaxed/simple; bh=Zfq0tRzBMK/stIqYR/fNd49x0GpwLSnbF3DD/tpTY64=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jHS2Z4aTSpE0dCTmRLj8D4vxB4aMKF+2NOGpsZAANM6x0DYS/Iky/xjrClVFqb9tNB5TUcgIW15czUXRcK9/Bk5b0l4WyAR8paESl7YpPHuZroCSk/plNm6RNN49jqElCNU89mmoh05b29LCtDieECOZknWNc8k8slTtaC28wy4= 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=gse0mVpQ; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=atu45Jun; 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="gse0mVpQ"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="atu45Jun" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5A4Cfg5K2098840 for ; Tue, 4 Nov 2025 16:26:40 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=5Vssr73RyQ+ FszqtmkVaSpa6VDKHA4NdGYdJks1BQS4=; b=gse0mVpQzJ7H9T+CYYVtnNuCqZ3 lL0KaN3MNnmA7TZnXUucjxWbFtZcRzO2725b25NEQTSTcoAoXxvvQMXDZitcQgrW Z715FtQ2U0xCeaHGApns8WfjhWC++EnSbkeu9sFq5SXmbq6L0E0QyCOWs0ltNaRw fLvhAKcQicU6oPQrR0o6aRqOZsGOeyW//jVAtEKyGSWl0F3i895EaNx2zr0U9Jbm ktUpjiqXKnHYiGmG2jVgUyn4NC8neApJm2BDQ4EbSpprkqN9DIJL0TST7ie6zGK/ TTzM5dudvkuhpu5DfhL5jPa2pcm/iBtwUifRTqED1HpuFFdW8x0zQZOkyiA== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4a79jjt2xw-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 04 Nov 2025 16:26:40 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-295952a4dd6so31846355ad.1 for ; Tue, 04 Nov 2025 08:26:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1762273600; x=1762878400; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5Vssr73RyQ+FszqtmkVaSpa6VDKHA4NdGYdJks1BQS4=; b=atu45Jun46I/xJSNSmcSYMjD5xewq+qpT15HpEIcpRpbHnlkz1FJnVkD6ONFS5+SiV YC7dJIJbSWy8Q285VULRi2DtuAqSKfexYBPDzhckx0IjUHg4rspxT7QPTYt/CXjiAZO5 iqM1XaLZNRLzdhaZwRLFiV6ST4xZy2QOzUq9s7HrMcWLAmdH/kPmkWwVM4U/ybTqUPVz /QvyVj49LmTl+14pzMnDrY2VUmbFyXVLKeh34qDRc7uVByZOwfC6h2HqjDhXVuJC4c3C yYscJCXBacOJZwpIut8bIv6BxBLWHxiJfwK233xfFDpnNwdEWNmiLGa4Xln318zqqM2E 614Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762273600; x=1762878400; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5Vssr73RyQ+FszqtmkVaSpa6VDKHA4NdGYdJks1BQS4=; b=D5u3mWpBxh6Feqrpd4C6I5OsKc9b9XSLOt4KjabIdN7Kwu3YGqMg982mYCjKYGWJSl 19WHGpnGa+EUXBZuj9MFUQOtEbdr0xx6IxfpFa6OjVTO0GMCnmxsSbSss/OOiwL4DAUX HOSiQqctzJJUMvwriHY/emWiIfb+V8GNDgbgGXvwBS1ohOLrA+Xu/G8K8S5OknbpI3rw 1zM8MdMOntLLP76oSkbvrW8G1bZkJUZ1xQsHiu/87H4YbkDK2PZEaihBOdMaWFokjOpP JiDAcM6+6+gRfYZw4xCkgotL4NBmeFSQZGZG8qkXURW0sL+pkC6XPX2APomESI6l1Znj MTwQ== X-Forwarded-Encrypted: i=1; AJvYcCUxeWeto0DrkxuzXC/YC3oU3qreSxfEu979ov2c1E6nPrwyY5h6qhRddyqjSPE9UJdYkH8W88qpP8xkf94=@vger.kernel.org X-Gm-Message-State: AOJu0YwOjqsaNJasYXYNi17AYC3JzAUH80uV59hCmpLL+uPTm7bC60su UHQ07YPMzudkSayRLXKxswujgHYjgrDm0Fg5RWqpdaFX7mgyZz2aYBDia7b345fPdM67np+krgc nRxONrajjQD77UaH70ouNKVNm3ymCgeiw5+QEZJ8ErqQYXfa/wOT7/EAvoL8Tw8gQbpZZFsewhh QxPMEq X-Gm-Gg: ASbGnctbPzYhMUlfMHGzy04H3MluYuyq2gMau5DM0BhoepuWZZ7GfsBD9qNoW5jwjP/ q09J9gIrjdF9N2nYhM6Ebz4QpqujDatbjZ6PjM9x3Gj4k+2c605ZyKNZqvG2mh1JyvCSSnso8xz hF8PTSxlGUmcgD5OW47qAdA9B1ZLzvg2NEDSTUSAbQcjammDqO/VLZF2bI885esD9OvsnCQr3El sE/5pFW3cm8hzixPtMiIwd049ETunVSTspVTrYiGBrGZPcWf70WI+6x9na838+/S7/ggaU3usHE lUmOlH0Lb/WtbPDjFllPdeOtiO4V2fGYmI2qwr4v/NBwbFYTBBnRWZ0RP1C9yhYKyXd+8Cpahmi 0qiGfmB6e1qQXOSBJEBakcPS9yx8RbsUiaEU0tmi5NRTN X-Received: by 2002:a17:902:db08:b0:294:fc13:7e8c with SMTP id d9443c01a7336-2962ad41aa1mr3110045ad.13.1762273599583; Tue, 04 Nov 2025 08:26:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IFNZs7Qx9rkasOM8xWADo/sxz4Q2imfM3mJR8YCwuWSazJuiOsuh4+13f7zKN4iISctrbrl1g== X-Received: by 2002:a17:902:db08:b0:294:fc13:7e8c with SMTP id d9443c01a7336-2962ad41aa1mr3109615ad.13.1762273599075; Tue, 04 Nov 2025 08:26:39 -0800 (PST) Received: from hu-yuzha-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29601a7a8a9sm31508435ad.107.2025.11.04.08.26.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 08:26:38 -0800 (PST) From: "Yu Zhang(Yuriy)" To: jjohnson@kernel.org Cc: baochen.qiang@oss.qualcomm.com, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, Yu Zhang , Vasanthakumar Thiagarajan Subject: [PATCH ath-next v2 4/6] wifi: ath11k: Register relayfs entries for CFR dump Date: Tue, 4 Nov 2025 08:26:31 -0800 Message-Id: <20251104162633.3007874-5-yu.zhang@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251104162633.3007874-1-yu.zhang@oss.qualcomm.com> References: <20251104162633.3007874-1-yu.zhang@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: _qkmhQvONV4hbTCXNmSr4ZS6wfvhwd9a X-Proofpoint-ORIG-GUID: _qkmhQvONV4hbTCXNmSr4ZS6wfvhwd9a X-Authority-Analysis: v=2.4 cv=TuPrRTXh c=1 sm=1 tr=0 ts=690a2940 cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=6mQ44K8ZfP1dJrZg0vYA:9 a=1OuFwYUASf3TG4hYMiVC:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTA0MDEzNyBTYWx0ZWRfX6dgZCC9SjioT xgGGUH0u/ZUxKlQKDXAwW9ewBfkmnTWgddWXWM1qzDnlabyi07UoOwanCrkM/W3m1ZGvWH7jVUP cM50741lYHZ3mRH92VplLdjM6aeUxcOFw/Cxr4KZ0933wsC11aUGn/ASwGbaDcW5TNmbEm0E3da 3BlEd494r6deC5bfJgSH453jNZrbxO+gBg7VbrjnK4FgT636eZhgU3FqTSho4DgsvZPOeFVQwxh w+VQMs0ZisczJkWbKyE20mUPzqS1QNyi3+DDthtFiki1WK9fhUTUYvpBl6YaxunU1hyWJcA805K F0xOol8aRjh+JYsSMVK1WSPOLqQGNVjKuIWJmn/sgZ90qXTG9NZVsH8e3QO65mdinxT4NCXw/Uq EIyfTd3lnjOcbd46PmvwBukzNkffHw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-04_02,2025-11-03_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 adultscore=0 priorityscore=1501 phishscore=0 spamscore=0 clxscore=1015 malwarescore=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511040137 Content-Type: text/plain; charset="utf-8" From: Venkateswara Naralasetty Provide a relayfs interface to collect the CFR dump from the user space. '/sys/kernel/debug/ieee80211/phyX/ath11k/cfr_capture' is exposed to user space to get CFR data. CFR format to user space: ___________________________________________ | CFR header | CFR payload | CFR tail data | |____________|_____________|_______________| CFR header contains the following fields, * Start magic number 0xDEADBEAF - 4 bytes * vendor id - 4 bytes * cfr metadata version - 1 byte * cfr data version - 1 byte * device type - 1 byte * platform type - 1 byte * CFR metadata length - 4 bytes * metadata - 92 bytes peer mac - 6 bytes capture status - 1 byte (1 for success 0 for failure) capture_bw - 1 byte channel_bw - 1 byte phy_mode - 1 byte prim20_chan - 2 bytes center_freq1 - 2 bytes center_freq2 - 2 bytes capture_mode - 1 byte capture_type - 1 byte sts_count - 1 byte num_rx_chain - 1 byte timestamp - 4 bytes length - 4 bytes chain_rssi - 32 bytes (4 bytes for each chain) chain_phase - 16 bytes (2 bytes for each chain) cfo_measurement - 4 bytes agc_gain - 8 bytes (1 bytes for each chain) rx_start_ts - 4 bytes CFR payload: CFR payload contains 8bytes of ucode header followed by the tone information. Tone order is positive tones, followed by PHY memory garbage, followed by negative tones. Dummy tones are uploaded to make number of tones always integer number of 64. Number of tones is not preamble type dependent. Each CFR tone has 14-bit I component and 14-bit Q component and is sign extended to 16-bit I/Q. Two tones are packed into one 64-bit unit as: [63:0] =3D [Tone1_Q(63:48) Tone1_I(47:32) Tone0_Q(31:16) Tone0_I(15:0)] CFR tail: end magic number 0xBEAFDEAD Tested-on: IPQ8074 hw2.0 PCI IPQ8074 WLAN.HK.2.5.0.1-00991-QCAHKSWPL_SILICO= NZ-1 Tested-on: WCN6855 hw2.1 PCI WLAN.HSP.1.1-04685-QCAHSPSWPL_V1_V2_SILICONZ_I= OE-1 Signed-off-by: Venkateswara Naralasetty Co-developed-by: Yu Zhang (Yuriy) Signed-off-by: Yu Zhang (Yuriy) Reviewed-by: Vasanthakumar Thiagarajan --- drivers/net/wireless/ath/ath11k/cfr.c | 35 +++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/cfr.h | 1 + 2 files changed, 36 insertions(+) diff --git a/drivers/net/wireless/ath/ath11k/cfr.c b/drivers/net/wireless/a= th/ath11k/cfr.c index 0fa81c939860..861e457ec5bf 100644 --- a/drivers/net/wireless/ath/ath11k/cfr.c +++ b/drivers/net/wireless/ath/ath11k/cfr.c @@ -416,10 +416,45 @@ static void ath11k_cfr_debug_unregister(struct ath11k= *ar) ar->cfr.enable_cfr =3D NULL; debugfs_remove(ar->cfr.cfr_unassoc); ar->cfr.cfr_unassoc =3D NULL; + + relay_close(ar->cfr.rfs_cfr_capture); + ar->cfr.rfs_cfr_capture =3D NULL; } =20 +static struct dentry *ath11k_cfr_create_buf_file_handler(const char *filen= ame, + struct dentry *parent, + umode_t mode, + struct rchan_buf *buf, + int *is_global) +{ + struct dentry *buf_file; + + buf_file =3D debugfs_create_file(filename, mode, parent, buf, + &relay_file_operations); + *is_global =3D 1; + return buf_file; +} + +static int ath11k_cfr_remove_buf_file_handler(struct dentry *dentry) +{ + debugfs_remove(dentry); + + return 0; +} + +static const struct rchan_callbacks rfs_cfr_capture_cb =3D { + .create_buf_file =3D ath11k_cfr_create_buf_file_handler, + .remove_buf_file =3D ath11k_cfr_remove_buf_file_handler, +}; + static void ath11k_cfr_debug_register(struct ath11k *ar) { + ar->cfr.rfs_cfr_capture =3D relay_open("cfr_capture", + ar->debug.debugfs_pdev, + ar->ab->hw_params.cfr_stream_buf_size, + ar->ab->hw_params.cfr_num_stream_bufs, + &rfs_cfr_capture_cb, NULL); + ar->cfr.enable_cfr =3D debugfs_create_file("enable_cfr", 0600, ar->debug.debugfs_pdev, ar, &fops_enable_cfr); diff --git a/drivers/net/wireless/ath/ath11k/cfr.h b/drivers/net/wireless/a= th/ath11k/cfr.h index fa9d98cc72b7..4653b04c30de 100644 --- a/drivers/net/wireless/ath/ath11k/cfr.h +++ b/drivers/net/wireless/ath/ath11k/cfr.h @@ -60,6 +60,7 @@ struct ath11k_cfr { struct ath11k_look_up_table *lut; struct dentry *enable_cfr; struct dentry *cfr_unassoc; + struct rchan *rfs_cfr_capture; u8 cfr_enabled_peer_cnt; u32 lut_num; u64 tx_evt_cnt; --=20 2.34.1 From nobody Fri Dec 19 10:56:15 2025 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 80364332EDA for ; Tue, 4 Nov 2025 16:26:43 +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=1762273606; cv=none; b=FQFbJPM2/Zo7XmrwHQ4R5D3f9x+QffEO9m8yQInXVONfsBm3DjxU1ZPZAP/WSIStlIOQCscb//vrqQDSxVWl6QjSraIC3ifHYYjK2Ji5642HVDClsBrx7a36rGx0q3UV9WnLwCcbh5YQkxpl+7HObJ99o6ChXP1fd2oUmAINR+A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762273606; c=relaxed/simple; bh=LYfRcr/YcVGmrMsOrftFPt37JHfUfx4lUjwwIWQxR8A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=i5X3CfEySL8jBoiuvjl6xetUaJxwkjac5g6MELZZnypWeIwVS6NQ+He2Vfd1+tZFcKFiCv4lJ5LQOU62NNBuribvxmJGRELFL3yVLKFHWHFule18FZc+a6VH080qrL9tnWpl86EhCYpaUVmhxy0hgUrvEBq7q7AsqW3XcixF5eA= 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=j/f4RMfU; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=JpN7ZEkg; 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="j/f4RMfU"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="JpN7ZEkg" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5A4Edf072421778 for ; Tue, 4 Nov 2025 16:26:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=gIJHEB0J1uf Lo8oTCs57AXFLe88vj/6voialLkZ8dsw=; b=j/f4RMfUQYr4OwDsl0iOfCxIFr7 +lN5xeZIe0pqqOok6mXD1E1YzNWnTGft8tyZ4Mpr91OIDeaY720EmJ6n5/8RoGq1 r5F9iwWyBjS44kZ9rQruTzR4p69Rta8pYiZHHzdKnfWJVfd+/8fg9fzCYqN5MXEF UNUlmlshT6Hi+EWsM7qq72QZ8xKw89U7YykcqLeRJnKekxDDFw5/IcpqSJ9d0WBI Zb6nJmlrvEaXM03/PMPG+ZjQyso8q3XdtMfdip0LUhLAXvc9S2RnB6MwkryEcKBf UfpqVARUt2+5i2Qwbhb2pwisDBJRXu28abuEj1zaWgl0caVqHSuFjLbl79w== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4a7ketgay3-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 04 Nov 2025 16:26:42 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2952cb6f51bso110643775ad.2 for ; Tue, 04 Nov 2025 08:26:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1762273601; x=1762878401; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gIJHEB0J1ufLo8oTCs57AXFLe88vj/6voialLkZ8dsw=; b=JpN7ZEkgHJIKXPYFgCKVk2Y8SpSUCdq9gfRTq/BuPEy7jCF1b83GYeSZYUJzdBReyE GwcvxkNmtkfGfEyE0f3nxF0/9Jfx/PQ8DaufmdBv4i0Fx16ezFakJ3coGiiQXkHswNFa 0n1Qzxz7xsdFUgxcqry5b6Cvadomanl4D6knoSO0Z5Qx0VwZ99woK2HhC3ji9kY+iP1H 6FMT/shcmPxr++BOa8M8up6vymN+DnPweHE0MmOvKaBvcUfS22Yt6VOvamV1k85a2TEy vD66Bel86PdqhQ4wWBLtBaZoIrSDlAXutor6g1TPwNVaCEk+fCXUpMJ8I9CY8PVcdH6d ck0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762273601; x=1762878401; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gIJHEB0J1ufLo8oTCs57AXFLe88vj/6voialLkZ8dsw=; b=kYrJ/A9tFlPcYdL5/Ra7738rNa4nnC/YzgV3OM5MMKoklqm1jEV73qUVdSoZPcmya7 xAJ2jK/0CoE917PRMkX1HCicQrem+64AZMvnRW1m64/X4Q1AfutmysbqKjiuPCeoozMa uWDED53rmCJIxLc8LUXz17nf0ugHyc/qQpZRBJQJ8nt1McOuCgTjsHt+1EKgHTRR1357 kmOu5WNvHssMoqrd+x0luURyl3uySYzuy6p0Fkp4ITiibsyimkcWqz2ZMgiqEaMz2ydQ 9s6RTlhhdMhY2hj5NFwiOLqRuWLdnob7WJ0OiotwSKVptKCzH+uvvp0tWs0e2MvPZwGm HRSg== X-Forwarded-Encrypted: i=1; AJvYcCUVJe0RwXT+45PF3tlr1sEaJEDGky8y9e/wqysICXiMXzsoqxbuQdqovTA7lqH5yukGWixgR5/DTpIVOdg=@vger.kernel.org X-Gm-Message-State: AOJu0YyfOpevpS8AS3MHnZMk/7thKMSi5UL7EuHWLoZ6egWOJlqM6s2i Jb4J6dc3aXMgWld49iIWSS3F6fybLbMEREkZ2GfXpcshrvqYn0DFqA5tUT7OwxWfkp5e2qVwIW6 pb3Z0U7ICbf4pcpf2HryyzS80l7wVr+nvC2e87z3Cg06z73RPuaqX8bxicUFWr66fXx8heeJ6Wn hH5IJG X-Gm-Gg: ASbGncv3rYih8MoWIqZ8QkOEo69qrA5xL3z6jaMORwe5vd+H0XC+HdeywG6Ea1ZqwMf 23tFUKddohvZmlN0hEYZpTxHKXSHBHnSGQTPxqmvDW33EV7IHVjFyedTxwMK51uW3t7o2Zq9ftv g+rjdStXFdjLHiSeABOQY5hkQ0Vgc33Fn4khogIlOhraqit9rI9KxS7PY4mMvoMdt8Ypd5UDax7 KvqmFIQXZa9AunYhMjIziyKIblHIsM9wJMZxDpYBCb+hvyTrTsdf2kusZv8iU1Nj4JnE6Y8pov/ tQ/RQO/jGFNN8qfs9WnI/75EIC6BWsqCuudGofYKQZtw7qdCRx843pp/J3QjfK8uLQSslobRPG2 WYqFsdIOTEXfrWLpfXwRu3n3AVyDenPKrkaGVZHYy0z7U X-Received: by 2002:a17:902:e84c:b0:295:49ab:3593 with SMTP id d9443c01a7336-2962ae0f938mr2141145ad.29.1762273600707; Tue, 04 Nov 2025 08:26:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IF7wMJV5s5k2TCqgQV1CWbY+2ruzChTeKd68mVLj3ZIXarbatmuIEJe+FhHQgwmGmnx+TMU8w== X-Received: by 2002:a17:902:e84c:b0:295:49ab:3593 with SMTP id d9443c01a7336-2962ae0f938mr2140715ad.29.1762273600029; Tue, 04 Nov 2025 08:26:40 -0800 (PST) Received: from hu-yuzha-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29601a7a8a9sm31508435ad.107.2025.11.04.08.26.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 08:26:39 -0800 (PST) From: "Yu Zhang(Yuriy)" To: jjohnson@kernel.org Cc: baochen.qiang@oss.qualcomm.com, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, Yu Zhang , Vasanthakumar Thiagarajan Subject: [PATCH ath-next v2 5/6] wifi: ath11k: Register DBR event handler for CFR data Date: Tue, 4 Nov 2025 08:26:32 -0800 Message-Id: <20251104162633.3007874-6-yu.zhang@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251104162633.3007874-1-yu.zhang@oss.qualcomm.com> References: <20251104162633.3007874-1-yu.zhang@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTA0MDEzNyBTYWx0ZWRfXzu97fCS4tzq8 5vsNeX9x87BEwVlgtpMfIM1bWVFZrTMwvomnJqhKDfowvE5xb4tfU6K/fCkzO2rh4gKtJCc9ZOf d847LDXr1XDKQmDoFnPh+OX4NIbktXhlykIl/ZLYbvaEqq+5mQgMDLzkrNsqycY+PkJiRB3z0r3 sN4LtCGWJgiQylmKCR5XJrJALfZazXbwa6jdVoyvtBhoj/WewOtL5EZJYn3YI3bPaSHLasNtnqC Sw+17pzOYh+NbkWszeKl4u/iZo8O142uJ+/u6siDVRh6Th+z8L2oqJxDJ6V0fD8VDV5ek0ctWkt 1K9ZJuQyAa+o+NDnB2YzbBuewu3f0QBZ2JUrlkqHanI2iHB107LXEeQvIXeNA+2IR6rmaLvpNCE VQXZexmHgDyzDxuvJWBJUnQLd0sREA== X-Proofpoint-GUID: XDokGY03_ql0PEjQeVZMoFKaiWESCrEc X-Authority-Analysis: v=2.4 cv=IdSKmGqa c=1 sm=1 tr=0 ts=690a2942 cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=X6MYPc9AQ2pAf6QSHKQA:9 a=uG9DUKGECoFWVXl0Dc02:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-ORIG-GUID: XDokGY03_ql0PEjQeVZMoFKaiWESCrEc X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-04_02,2025-11-03_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 phishscore=0 clxscore=1015 adultscore=0 priorityscore=1501 lowpriorityscore=0 bulkscore=0 impostorscore=0 suspectscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511040137 Content-Type: text/plain; charset="utf-8" From: Venkateswara Naralasetty Add handler for WMI_PDEV_DMA_RING_BUF_RELEASE_EVENT which indicates CFR data availability in the DB ring. Add CFR data processing from DB ring buffers. Use correlate_and_relay API to match CFR data with metadata from WMI_PEER_CFR_CAPTURE_EVENT. Release buffer to userspace through relayfs on successful correlation, otherwise hold buffer waiting for matching WMI event from firmware. Add new debug masks: - ATH11K_DBG_CFR: Enables CFR-related debug logs. - ATH11K_DBG_CFR_DUMP: Enables detailed CFR data dump for analysis. Tested-on: IPQ8074 hw2.0 PCI IPQ8074 WLAN.HK.2.5.0.1-00991-QCAHKSWPL_SILICO= NZ-1 Tested-on: WCN6855 hw2.1 PCI WLAN.HSP.1.1-04685-QCAHSPSWPL_V1_V2_SILICONZ_I= OE-1 Signed-off-by: Venkateswara Naralasetty Co-developed-by: Yu Zhang (Yuriy) Signed-off-by: Yu Zhang (Yuriy) Reviewed-by: Vasanthakumar Thiagarajan --- drivers/net/wireless/ath/ath11k/cfr.c | 238 ++++++++++++++++++++++- drivers/net/wireless/ath/ath11k/cfr.h | 82 ++++++++ drivers/net/wireless/ath/ath11k/dbring.c | 10 +- drivers/net/wireless/ath/ath11k/dbring.h | 2 + drivers/net/wireless/ath/ath11k/debug.h | 8 +- 5 files changed, 337 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/cfr.c b/drivers/net/wireless/a= th/ath11k/cfr.c index 861e457ec5bf..0b02c038693e 100644 --- a/drivers/net/wireless/ath/ath11k/cfr.c +++ b/drivers/net/wireless/ath/ath11k/cfr.c @@ -8,10 +8,246 @@ #include "core.h" #include "debug.h" =20 +struct ath11k_dbring *ath11k_cfr_get_dbring(struct ath11k *ar) +{ + if (ar->cfr_enabled) + return &ar->cfr.rx_ring; + + return NULL; +} + +static int ath11k_cfr_calculate_tones_from_dma_hdr(struct ath11k_cfr_dma_h= dr *hdr) +{ + u8 bw =3D FIELD_GET(CFIR_DMA_HDR_INFO1_UPLOAD_PKT_BW, hdr->info1); + u8 preamble =3D FIELD_GET(CFIR_DMA_HDR_INFO1_PREAMBLE_TYPE, hdr->info1); + + switch (preamble) { + case ATH11K_CFR_PREAMBLE_TYPE_LEGACY: + fallthrough; + case ATH11K_CFR_PREAMBLE_TYPE_VHT: + switch (bw) { + case 0: + return TONES_IN_20MHZ; + case 1: /* DUP40/VHT40 */ + return TONES_IN_40MHZ; + case 2: /* DUP80/VHT80 */ + return TONES_IN_80MHZ; + case 3: /* DUP160/VHT160 */ + return TONES_IN_160MHZ; + default: + return TONES_INVALID; + } + case ATH11K_CFR_PREAMBLE_TYPE_HT: + switch (bw) { + case 0: + return TONES_IN_20MHZ; + case 1: + return TONES_IN_40MHZ; + default: + return TONES_INVALID; + } + default: + return TONES_INVALID; + } +} + +void ath11k_cfr_release_lut_entry(struct ath11k_look_up_table *lut) +{ + memset(lut, 0, sizeof(*lut)); +} + +static void ath11k_cfr_rfs_write(struct ath11k *ar, const void *head, + u32 head_len, const void *data, u32 data_len, + const void *tail, int tail_data) +{ + struct ath11k_cfr *cfr =3D &ar->cfr; + + if (!cfr->rfs_cfr_capture) + return; + + relay_write(cfr->rfs_cfr_capture, head, head_len); + relay_write(cfr->rfs_cfr_capture, data, data_len); + relay_write(cfr->rfs_cfr_capture, tail, tail_data); + relay_flush(cfr->rfs_cfr_capture); +} + +static void ath11k_cfr_free_pending_dbr_events(struct ath11k *ar) +{ + struct ath11k_cfr *cfr =3D &ar->cfr; + struct ath11k_look_up_table *lut; + int i; + + if (!cfr->lut) + return; + + for (i =3D 0; i < cfr->lut_num; i++) { + lut =3D &cfr->lut[i]; + if (lut->dbr_recv && !lut->tx_recv && + lut->dbr_tstamp < cfr->last_success_tstamp) { + ath11k_dbring_bufs_replenish(ar, &cfr->rx_ring, lut->buff, + WMI_DIRECT_BUF_CFR); + ath11k_cfr_release_lut_entry(lut); + cfr->flush_dbr_cnt++; + } + } +} + +/** + * ath11k_cfr_correlate_and_relay() - Correlate and relay CFR events + * @ar: Pointer to ath11k structure + * @lut: Lookup table for correlation + * @event_type: Type of event received (TX or DBR) + * + * Correlates WMI_PDEV_DMA_RING_BUF_RELEASE_EVENT (DBR) and + * WMI_PEER_CFR_CAPTURE_EVENT (TX capture) by PPDU ID. If both events + * are present and the PPDU IDs match, returns CORRELATE_STATUS_RELEASE + * to relay thecorrelated data to userspace. Otherwise returns + * CORRELATE_STATUS_HOLD to wait for the other event. + * + * Also checks pending DBR events and clears them when no corresponding TX + * capture event is received for the PPDU. + * + * Return: CORRELATE_STATUS_RELEASE or CORRELATE_STATUS_HOLD + */ + +static enum ath11k_cfr_correlate_status +ath11k_cfr_correlate_and_relay(struct ath11k *ar, + struct ath11k_look_up_table *lut, + u8 event_type) +{ + enum ath11k_cfr_correlate_status status; + struct ath11k_cfr *cfr =3D &ar->cfr; + u64 diff; + + if (event_type =3D=3D ATH11K_CORRELATE_TX_EVENT) { + if (lut->tx_recv) + cfr->cfr_dma_aborts++; + cfr->tx_evt_cnt++; + lut->tx_recv =3D true; + } else if (event_type =3D=3D ATH11K_CORRELATE_DBR_EVENT) { + cfr->dbr_evt_cnt++; + lut->dbr_recv =3D true; + } + + if (lut->dbr_recv && lut->tx_recv) { + if (lut->dbr_ppdu_id =3D=3D lut->tx_ppdu_id) { + /* 64-bit counters make wraparound highly improbable, + * wraparound handling is omitted. + */ + cfr->last_success_tstamp =3D lut->dbr_tstamp; + if (lut->dbr_tstamp > lut->txrx_tstamp) { + diff =3D lut->dbr_tstamp - lut->txrx_tstamp; + ath11k_dbg(ar->ab, ATH11K_DBG_CFR, + "txrx event -> dbr event delay =3D %u ms", + jiffies_to_msecs(diff)); + } else if (lut->txrx_tstamp > lut->dbr_tstamp) { + diff =3D lut->txrx_tstamp - lut->dbr_tstamp; + ath11k_dbg(ar->ab, ATH11K_DBG_CFR, + "dbr event -> txrx event delay =3D %u ms", + jiffies_to_msecs(diff)); + } + + ath11k_cfr_free_pending_dbr_events(ar); + + cfr->release_cnt++; + status =3D ATH11K_CORRELATE_STATUS_RELEASE; + } else { + /* Discard TXRX event on PPDU ID mismatch because multiple PPDUs + * may share the same DMA address due to ucode aborts. + */ + + ath11k_dbg(ar->ab, ATH11K_DBG_CFR, + "Received dbr event twice for the same lut entry"); + lut->tx_recv =3D false; + lut->tx_ppdu_id =3D 0; + cfr->clear_txrx_event++; + cfr->cfr_dma_aborts++; + status =3D ATH11K_CORRELATE_STATUS_HOLD; + } + } else { + status =3D ATH11K_CORRELATE_STATUS_HOLD; + } + + return status; +} + static int ath11k_cfr_process_data(struct ath11k *ar, struct ath11k_dbring_data *param) { - return 0; + u32 end_magic =3D ATH11K_CFR_END_MAGIC; + struct ath11k_csi_cfr_header *header; + struct ath11k_cfr_dma_hdr *dma_hdr; + struct ath11k_cfr *cfr =3D &ar->cfr; + struct ath11k_look_up_table *lut; + struct ath11k_base *ab =3D ar->ab; + u32 buf_id, tones, length; + u8 num_chains; + int status; + u8 *data; + + data =3D param->data; + buf_id =3D param->buf_id; + + if (param->data_sz < sizeof(*dma_hdr)) + return -EINVAL; + + dma_hdr =3D (struct ath11k_cfr_dma_hdr *)data; + + tones =3D ath11k_cfr_calculate_tones_from_dma_hdr(dma_hdr); + if (tones =3D=3D TONES_INVALID) { + ath11k_warn(ar->ab, "Number of tones received is invalid\n"); + return -EINVAL; + } + + num_chains =3D FIELD_GET(CFIR_DMA_HDR_INFO1_NUM_CHAINS, + dma_hdr->info1); + + length =3D sizeof(*dma_hdr); + length +=3D tones * (num_chains + 1); + + spin_lock_bh(&cfr->lut_lock); + + if (!cfr->lut) { + spin_unlock_bh(&cfr->lut_lock); + return -EINVAL; + } + + lut =3D &cfr->lut[buf_id]; + + ath11k_dbg_dump(ab, ATH11K_DBG_CFR_DUMP, "data_from_buf_rel:", "", + data, length); + + lut->buff =3D param->buff; + lut->data =3D data; + lut->data_len =3D length; + lut->dbr_ppdu_id =3D dma_hdr->phy_ppdu_id; + lut->dbr_tstamp =3D jiffies; + + memcpy(&lut->hdr, dma_hdr, sizeof(*dma_hdr)); + + header =3D &lut->header; + header->meta_data.channel_bw =3D FIELD_GET(CFIR_DMA_HDR_INFO1_UPLOAD_PKT_= BW, + dma_hdr->info1); + header->meta_data.length =3D length; + + status =3D ath11k_cfr_correlate_and_relay(ar, lut, + ATH11K_CORRELATE_DBR_EVENT); + if (status =3D=3D ATH11K_CORRELATE_STATUS_RELEASE) { + ath11k_dbg(ab, ATH11K_DBG_CFR, + "releasing CFR data to user space"); + ath11k_cfr_rfs_write(ar, &lut->header, + sizeof(struct ath11k_csi_cfr_header), + lut->data, lut->data_len, + &end_magic, sizeof(u32)); + ath11k_cfr_release_lut_entry(lut); + } else if (status =3D=3D ATH11K_CORRELATE_STATUS_HOLD) { + ath11k_dbg(ab, ATH11K_DBG_CFR, + "tx event is not yet received holding the buf"); + } + + spin_unlock_bh(&cfr->lut_lock); + + return status; } =20 /* Helper function to check whether the given peer mac address diff --git a/drivers/net/wireless/ath/ath11k/cfr.h b/drivers/net/wireless/a= th/ath11k/cfr.h index 4653b04c30de..e8b5c23b15cc 100644 --- a/drivers/net/wireless/ath/ath11k/cfr.h +++ b/drivers/net/wireless/ath/ath11k/cfr.h @@ -19,9 +19,78 @@ =20 #define HOST_MAX_CHAINS 8 =20 +enum ath11k_cfr_correlate_event_type { + ATH11K_CORRELATE_DBR_EVENT, + ATH11K_CORRELATE_TX_EVENT, +}; + struct ath11k_sta; struct ath11k_per_peer_cfr_capture; =20 +#define ATH11K_CFR_END_MAGIC 0xBEAFDEAD + +enum ath11k_cfr_correlate_status { + ATH11K_CORRELATE_STATUS_RELEASE, + ATH11K_CORRELATE_STATUS_HOLD, + ATH11K_CORRELATE_STATUS_ERR, +}; + +enum ath11k_cfr_preamble_type { + ATH11K_CFR_PREAMBLE_TYPE_LEGACY, + ATH11K_CFR_PREAMBLE_TYPE_HT, + ATH11K_CFR_PREAMBLE_TYPE_VHT, +}; + +struct cfr_metadata { + u8 peer_addr[ETH_ALEN]; + u8 status; + u8 capture_bw; + u8 channel_bw; + u8 phy_mode; + u16 prim20_chan; + u16 center_freq1; + u16 center_freq2; + u8 capture_mode; + u8 capture_type; + u8 sts_count; + u8 num_rx_chain; + u32 timestamp; + u32 length; + u32 chain_rssi[HOST_MAX_CHAINS]; + u16 chain_phase[HOST_MAX_CHAINS]; + u32 cfo_measurement; + u8 agc_gain[HOST_MAX_CHAINS]; + u32 rx_start_ts; +} __packed; + +struct ath11k_csi_cfr_header { + u32 start_magic_num; + u32 vendorid; + u8 cfr_metadata_version; + u8 cfr_data_version; + u8 chip_type; + u8 platform_type; + u32 reserved; + struct cfr_metadata meta_data; +} __packed; + +#define TONES_IN_20MHZ 256 +#define TONES_IN_40MHZ 512 +#define TONES_IN_80MHZ 1024 +#define TONES_IN_160MHZ 2048 /* 160 MHz isn't supported yet */ +#define TONES_INVALID 0 + +#define CFIR_DMA_HDR_INFO0_TAG GENMASK(7, 0) +#define CFIR_DMA_HDR_INFO0_LEN GENMASK(13, 8) + +#define CFIR_DMA_HDR_INFO1_UPLOAD_DONE GENMASK(0, 0) +#define CFIR_DMA_HDR_INFO1_CAPTURE_TYPE GENMASK(3, 1) +#define CFIR_DMA_HDR_INFO1_PREAMBLE_TYPE GENMASK(5, 4) +#define CFIR_DMA_HDR_INFO1_NSS GENMASK(8, 6) +#define CFIR_DMA_HDR_INFO1_NUM_CHAINS GENMASK(11, 9) +#define CFIR_DMA_HDR_INFO1_UPLOAD_PKT_BW GENMASK(14, 12) +#define CFIR_DMA_HDR_INFO1_SW_PEER_ID_VALID GENMASK(15, 15) + struct ath11k_cfr_dma_hdr { u16 info0; u16 info1; @@ -37,6 +106,7 @@ struct ath11k_look_up_table { u16 dbr_ppdu_id; u16 tx_ppdu_id; dma_addr_t dbr_address; + struct ath11k_csi_cfr_header header; struct ath11k_cfr_dma_hdr hdr; u64 txrx_tstamp; u64 dbr_tstamp; @@ -108,6 +178,8 @@ int ath11k_cfr_send_peer_cfr_capture_cmd(struct ath11k = *ar, struct ath11k_sta *arsta, struct ath11k_per_peer_cfr_capture *params, const u8 *peer_mac); +struct ath11k_dbring *ath11k_cfr_get_dbring(struct ath11k *ar); +void ath11k_cfr_release_lut_entry(struct ath11k_look_up_table *lut); =20 #else static inline int ath11k_cfr_init(struct ath11k_base *ab) @@ -155,5 +227,15 @@ ath11k_cfr_send_peer_cfr_capture_cmd(struct ath11k *ar, { return 0; } + +static inline void ath11k_cfr_release_lut_entry(struct ath11k_look_up_tabl= e *lut) +{ +} + +static inline +struct ath11k_dbring *ath11k_cfr_get_dbring(struct ath11k *ar) +{ + return NULL; +} #endif /* CONFIG_ATH11K_CFR */ #endif /* ATH11K_CFR_H */ diff --git a/drivers/net/wireless/ath/ath11k/dbring.c b/drivers/net/wireles= s/ath/ath11k/dbring.c index ed2b781a6bab..d6994ce6ebff 100644 --- a/drivers/net/wireless/ath/ath11k/dbring.c +++ b/drivers/net/wireless/ath/ath11k/dbring.c @@ -295,6 +295,7 @@ int ath11k_dbring_buffer_release_event(struct ath11k_ba= se *ab, int size; dma_addr_t paddr; int ret =3D 0; + int status; =20 pdev_idx =3D ev->fixed.pdev_id; module_id =3D ev->fixed.module_id; @@ -328,6 +329,9 @@ int ath11k_dbring_buffer_release_event(struct ath11k_ba= se *ab, case WMI_DIRECT_BUF_SPECTRAL: ring =3D ath11k_spectral_get_dbring(ar); break; + case WMI_DIRECT_BUF_CFR: + ring =3D ath11k_cfr_get_dbring(ar); + break; default: ring =3D NULL; ath11k_warn(ab, "Recv dma buffer release ev on unsupp module %d\n", @@ -378,8 +382,12 @@ int ath11k_dbring_buffer_release_event(struct ath11k_b= ase *ab, handler_data.data =3D PTR_ALIGN(vaddr_unalign, ring->buf_align); handler_data.data_sz =3D ring->buf_sz; + handler_data.buff =3D buff; + handler_data.buf_id =3D buf_id; =20 - ring->handler(ar, &handler_data); + status =3D ring->handler(ar, &handler_data); + if (status =3D=3D ATH11K_CORRELATE_STATUS_HOLD) + continue; } =20 buff->paddr =3D 0; diff --git a/drivers/net/wireless/ath/ath11k/dbring.h b/drivers/net/wireles= s/ath/ath11k/dbring.h index 0a380120f7a0..e5f244dfa963 100644 --- a/drivers/net/wireless/ath/ath11k/dbring.h +++ b/drivers/net/wireless/ath/ath11k/dbring.h @@ -21,6 +21,8 @@ struct ath11k_dbring_data { void *data; u32 data_sz; struct wmi_dma_buf_release_meta_data meta; + struct ath11k_dbring_element *buff; + u32 buf_id; }; =20 struct ath11k_dbring_buf_release_event { diff --git a/drivers/net/wireless/ath/ath11k/debug.h b/drivers/net/wireless= /ath/ath11k/debug.h index cc8934d15697..aaa0034527a5 100644 --- a/drivers/net/wireless/ath/ath11k/debug.h +++ b/drivers/net/wireless/ath/ath11k/debug.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. - * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights res= erved. + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ =20 #ifndef _ATH11K_DEBUG_H_ @@ -27,6 +27,8 @@ enum ath11k_debug_mask { ATH11K_DBG_DP_TX =3D 0x00002000, ATH11K_DBG_DP_RX =3D 0x00004000, ATH11K_DBG_CE =3D 0x00008000, + ATH11K_DBG_CFR =3D 0x00010000, + ATH11K_DBG_CFR_DUMP =3D 0x00020000, }; =20 static inline const char *ath11k_dbg_str(enum ath11k_debug_mask mask) @@ -64,6 +66,10 @@ static inline const char *ath11k_dbg_str(enum ath11k_deb= ug_mask mask) return "dp_rx"; case ATH11K_DBG_CE: return "ce"; + case ATH11K_DBG_CFR: + return "cfr"; + case ATH11K_DBG_CFR_DUMP: + return "cfr_dump"; =20 /* no default handler to allow compiler to check that the * enum is fully handled --=20 2.34.1 From nobody Fri Dec 19 10:56:15 2025 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 59283333448 for ; Tue, 4 Nov 2025 16:26:44 +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=1762273607; cv=none; b=KJ2ZQFq5j9sDt+U+44FRTdP134o+XMnwuyXybwHnXoGDaIa6qAV+xg1KI6cRRdGek5vj8oQ/SxHRD8awJCe5ROXrGZAU5TgLZE05uQomVuMtyCV75EhQLkJTGVHO+hiXWzC/810hQ4TpKq+dx6yWGQ0EvA81C33OPfu9eTd41l0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762273607; c=relaxed/simple; bh=cMbZuL7E5IbyDPw4vjDAVYjJKdWpoaXbUM+e8+y8/Qk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oi/HnCmiVsmy1c24QM95P11xnuga8ObmsuowJaGL+zcDJj1LSRPI+/cOVx5WT8jCO8MtsUerp6Hq/jGe3EJnkkMnwoZ5HRJSfh/BCiypEaSatLvmtWSdl++VxWZCcN7JiyD4uQVU4nO2Q1RBMsKMGRF4YdBzwNhPJ0CkYA+bN1A= 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=nKKdvBR7; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=E8ajqU2W; 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="nKKdvBR7"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="E8ajqU2W" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5A4CfWB62042590 for ; Tue, 4 Nov 2025 16:26:43 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=LfxL8k9s1Pt DxiBzoMjCu5lz16zmZriUmUqyLCu3JYM=; b=nKKdvBR7UMsVngXDD75IDigx477 a4XeODVIYzJo4AYz/lvyRvez9o6bH9KXxeunIhZpJDhaGQZs3m+14s9ogYC4yPsw nnobY/TTPL5cveywOyxextbAhvStXlgAFKl9zqtRN7ZMLHnMLUrkb4vssyH2BRnf 3taf7GUx8KZXDXUrpYkBMENeu/IA+eB1pFG4FXOPlLVCi4JDlAYDm66yNYwC5wlC 1VRZq1WCn0j1Z9+6KfDwdmUZh8ftYcccvwsAL5I4wa1RHBY8mG8HjfX0HaYxYBOT /SXqcgpKesPrrRR0LOpRh/CSSdQwT5+RXqxoZlCnzHyTXtpBepXgRc9sZzw== 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 4a7fgrh0nk-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 04 Nov 2025 16:26:42 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-295b713530cso30457825ad.1 for ; Tue, 04 Nov 2025 08:26:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1762273602; x=1762878402; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LfxL8k9s1PtDxiBzoMjCu5lz16zmZriUmUqyLCu3JYM=; b=E8ajqU2WvWNAJbA9MJ1Tq286JbJTBiYE/RwaaAjX5iKooZ6zqghgt1jw5ZYvaM6LbF hXYfLIVZ+LmDy4Qu9xASA1l7EElE7H3b75I2ZHQHZK+gQs0MbWgfO6usG51qD4UqjkQz 79Itt8R15f5y07zdS7z2tNSkJFIHSCndNxkZi5AdaNkVKBZBstl19lACSj88ckOqB2ky D8FukYIfQl+RQp1g8JRFodLYPdnJf6RZZhkA+Dmf1k66uKA5hXEFZzcrA9WByQLRHwpf tq29oMNH6YYpbLCXPB3lZVBRYlxpDK0U96coc6mDK6wwhR5MozZw6SVr9Ad9P3LXGzPQ NY7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762273602; x=1762878402; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LfxL8k9s1PtDxiBzoMjCu5lz16zmZriUmUqyLCu3JYM=; b=LoHZSJ09c88pJ8ndHCmkT8MoKnqDkaSD2/8Z7LpSBAs5ZrRQHzOregXYCf7np97hF8 2E6Y7Q/HQnYFmHeqyFFLeK9Dkvqt8wXJmkHX0hJL6WDLQ+z+wDD4/C/IZRAqqTbgoaeg bCwXwO8bk9myQq8P4Q1F3GzgZI8RgajEHCO9XjqknwyTf6foIYFm3InShwNOarNS3HXL VUonPHy3JXFW4OBMu7xooeEziNSmnfKJRTFTPEOAsAk5Gbiruz7g0KCB05hLdpuBMMBN sx2Ko1oMGR4qw4FymTMZVjMvV4chL11iQKYvKeRHnehhwzL7+CUWeQooEgbGoOyohbDV jPJg== X-Forwarded-Encrypted: i=1; AJvYcCVpTK6czug/EoXKzmYhim1d5vR+0dzwhBvSsvQWseoY1Qzod74+74TU4XqpCc1SSoue791bW7FNOwkUQTQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzocZfnrWVluTlF9CdnSElNlQJ1fGMqvo6fqzjdNZuN0nA1GMUW OyITljjIMwWjxcd/hpoYa9MjYOY41yhOzZg38Fx/LasDDlooyAEPigqUSiPYoEF6ttUTQXzDWB1 m/7G27Ih9zrhV+Tt7tmBAqGSPH9QqasMCpsCnQ2uB5k56QSDkGU8PWR8W3lmT+gpnzxk= X-Gm-Gg: ASbGncsMVKFl1ZE/5WrHumVmJ2zA5Aj5OeVW2QOhU0aQn41idWvpkbRgPBaoCjntcuK y1RqMRg+uhKBwmPiyExjQmC6Z4O6SZtfP3in8G3EqlkgxgdXXbHQM+L0MbxuKTvtIF3j0bOR/Cc OgUMTMBbUjxCyYn80DujN4IFDMTO+lwk/Y4AiJ6Gqvtvfv2KOsyg0vH+KqFlrp2vOrjUbhmqMDI DUsIgMnE8CWr+hulsKYPhH6SSfpcE2NCZKCmjZo0lM6rKrHWhTSvVVmhtkwkWBg9jUCiNPkUtos svRD3eh5iDEdZ/6iti4agApqnzPtZYzJ5BMwMLlxf9d39grYEL8LI5FdPgU2rTRXIfCMKYrOArk KhKsdeJuQsA++qZrKlq1mfvgt7iDKDZGzPdapCGBgY8Wg X-Received: by 2002:a17:903:2341:b0:295:82b5:73e9 with SMTP id d9443c01a7336-2962ada6b0fmr2405175ad.35.1762273601631; Tue, 04 Nov 2025 08:26:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IGHh5Hs+0YNeqZvomTfGtPezONLdo2oRuuKYVYUrY7Wc+ewG7N762IAr4o8MrLtCWNtdVMOdw== X-Received: by 2002:a17:903:2341:b0:295:82b5:73e9 with SMTP id d9443c01a7336-2962ada6b0fmr2404905ad.35.1762273601086; Tue, 04 Nov 2025 08:26:41 -0800 (PST) Received: from hu-yuzha-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29601a7a8a9sm31508435ad.107.2025.11.04.08.26.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 08:26:40 -0800 (PST) From: "Yu Zhang(Yuriy)" To: jjohnson@kernel.org Cc: baochen.qiang@oss.qualcomm.com, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, Yu Zhang , Vasanthakumar Thiagarajan Subject: [PATCH ath-next v2 6/6] wifi: ath11k: Register handler for CFR capture event Date: Tue, 4 Nov 2025 08:26:33 -0800 Message-Id: <20251104162633.3007874-7-yu.zhang@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251104162633.3007874-1-yu.zhang@oss.qualcomm.com> References: <20251104162633.3007874-1-yu.zhang@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: 8jfSmb48JWy2Uxd06pUG3eFx2KW0RKhH X-Proofpoint-GUID: 8jfSmb48JWy2Uxd06pUG3eFx2KW0RKhH X-Authority-Analysis: v=2.4 cv=b7O/I9Gx c=1 sm=1 tr=0 ts=690a2942 cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=RXpQw9b9vDifZkLeuRoA:9 a=324X-CrmTo6CU4MGRt3R:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTA0MDEzNyBTYWx0ZWRfX9+Z4q2xyzIR9 UZN9tKM2NuyHwZ7QJvvUyNhlAxHq4ikBhTfHF30wYT+fYZOEfLzIhWOxYtUIdFdmkS1bQn3Wfb1 BZ8ZRQkPj/sVIsLncnKUCbbnrStdMmnSAH/Xj9IHV3AgCVAl+feOh8A7theGAcuGAJGfgDkXC66 2uZgpurIet84HjhBtYU+rskzuaKc5nyn9VHvVRGBdJS1H8mllIhCE1BedisampclY53ch1mS1aL AJ0qDO1Xb5yQLngDObUU+jthVCuh9WvPipvOZpz0+hj/JOc32ZkUVAWIgU4pOOxXnGeL9bXoG9J FHcUVnnZlV8p8OZ/wRgbtERrcfqgPpAEIHTOwGi6jrxjFNtxPVe1WXTVSrDlldgazlQQgUbV8sD BwEv0N9ZiSNOwn25aB9J06XxVmWf9Q== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-04_02,2025-11-03_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 adultscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 phishscore=0 spamscore=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511040137 Content-Type: text/plain; charset="utf-8" From: Venkateswara Naralasetty Firmware sends CFR meta data through the WMI event WMI_PEER_CFR_CAPTURE_EVENT. Parse the meta data coming from the firmware and invoke correlate_and_relay function to correlate the CFR meta data with the CFR payload coming from the other WMI event WMI_PDEV_DMA_RING_BUF_RELEASE_EVENT. Release the buffer to user space once correlate and relay return success. Tested-on: IPQ8074 hw2.0 PCI IPQ8074 WLAN.HK.2.5.0.1-00991-QCAHKSWPL_SILICO= NZ-1 Tested-on: WCN6855 hw2.1 PCI WLAN.HSP.1.1-04685-QCAHSPSWPL_V1_V2_SILICONZ_I= OE-1 Signed-off-by: Venkateswara Naralasetty Co-developed-by: Yu Zhang (Yuriy) Signed-off-by: Yu Zhang (Yuriy) Reviewed-by: Vasanthakumar Thiagarajan --- drivers/net/wireless/ath/ath11k/cfr.c | 144 ++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/cfr.h | 62 ++++++++++- drivers/net/wireless/ath/ath11k/wmi.c | 90 ++++++++++++++++ drivers/net/wireless/ath/ath11k/wmi.h | 44 ++++++++ 4 files changed, 339 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath11k/cfr.c b/drivers/net/wireless/a= th/ath11k/cfr.c index 0b02c038693e..b26d336533ae 100644 --- a/drivers/net/wireless/ath/ath11k/cfr.c +++ b/drivers/net/wireless/ath/ath11k/cfr.c @@ -250,6 +250,150 @@ static int ath11k_cfr_process_data(struct ath11k *ar, return status; } =20 +static void ath11k_cfr_fill_hdr_info(struct ath11k *ar, + struct ath11k_csi_cfr_header *header, + struct ath11k_cfr_peer_tx_param *params) +{ + header->cfr_metadata_version =3D ATH11K_CFR_META_VERSION_4; + header->cfr_data_version =3D ATH11K_CFR_DATA_VERSION_1; + header->cfr_metadata_len =3D sizeof(struct cfr_metadata); + header->chip_type =3D ar->ab->hw_rev; + header->meta_data.status =3D FIELD_GET(WMI_CFR_PEER_CAPTURE_STATUS, + params->status); + header->meta_data.capture_bw =3D params->bandwidth; + header->meta_data.phy_mode =3D params->phy_mode; + header->meta_data.prim20_chan =3D params->primary_20mhz_chan; + header->meta_data.center_freq1 =3D params->band_center_freq1; + header->meta_data.center_freq2 =3D params->band_center_freq2; + + /* CFR capture is triggered by the ACK of a QoS Null frame: + * - 20 MHz: Legacy ACK + * - 40/80/160 MHz: DUP Legacy ACK + */ + header->meta_data.capture_mode =3D params->bandwidth ? + ATH11K_CFR_CAPTURE_DUP_LEGACY_ACK : ATH11K_CFR_CAPTURE_LEGACY_ACK; + header->meta_data.capture_type =3D params->capture_method; + header->meta_data.num_rx_chain =3D ar->num_rx_chains; + header->meta_data.sts_count =3D params->spatial_streams; + header->meta_data.timestamp =3D params->timestamp_us; + ether_addr_copy(header->meta_data.peer_addr, params->peer_mac_addr); + memcpy(header->meta_data.chain_rssi, params->chain_rssi, + sizeof(params->chain_rssi)); + memcpy(header->meta_data.chain_phase, params->chain_phase, + sizeof(params->chain_phase)); + memcpy(header->meta_data.agc_gain, params->agc_gain, + sizeof(params->agc_gain)); +} + +int ath11k_process_cfr_capture_event(struct ath11k_base *ab, + struct ath11k_cfr_peer_tx_param *params) +{ + struct ath11k_look_up_table *lut =3D NULL; + u32 end_magic =3D ATH11K_CFR_END_MAGIC; + struct ath11k_csi_cfr_header *header; + struct ath11k_dbring_element *buff; + struct ath11k_cfr *cfr; + dma_addr_t buf_addr; + struct ath11k *ar; + u8 tx_status; + int status; + int i; + + rcu_read_lock(); + ar =3D ath11k_mac_get_ar_by_vdev_id(ab, params->vdev_id); + if (!ar) { + rcu_read_unlock(); + ath11k_warn(ab, "Failed to get ar for vdev id %d\n", + params->vdev_id); + return -ENOENT; + } + + cfr =3D &ar->cfr; + rcu_read_unlock(); + + if (WMI_CFR_CAPTURE_STATUS_PEER_PS & params->status) { + ath11k_warn(ab, "CFR capture failed as peer %pM is in powersave", + params->peer_mac_addr); + return -EINVAL; + } + + if (!(WMI_CFR_PEER_CAPTURE_STATUS & params->status)) { + ath11k_warn(ab, "CFR capture failed for the peer : %pM", + params->peer_mac_addr); + cfr->tx_peer_status_cfr_fail++; + return -EINVAL; + } + + tx_status =3D FIELD_GET(WMI_CFR_FRAME_TX_STATUS, params->status); + if (tx_status !=3D WMI_FRAME_TX_STATUS_OK) { + ath11k_warn(ab, "WMI tx status %d for the peer %pM", + tx_status, params->peer_mac_addr); + cfr->tx_evt_status_cfr_fail++; + return -EINVAL; + } + + buf_addr =3D (((u64)FIELD_GET(WMI_CFR_CORRELATION_INFO2_BUF_ADDR_HIGH, + params->correlation_info_2)) << 32) | + params->correlation_info_1; + + spin_lock_bh(&cfr->lut_lock); + + if (!cfr->lut) { + spin_unlock_bh(&cfr->lut_lock); + return -EINVAL; + } + + for (i =3D 0; i < cfr->lut_num; i++) { + struct ath11k_look_up_table *temp =3D &cfr->lut[i]; + + if (temp->dbr_address =3D=3D buf_addr) { + lut =3D &cfr->lut[i]; + break; + } + } + + if (!lut) { + spin_unlock_bh(&cfr->lut_lock); + ath11k_warn(ab, "lut failure to process tx event\n"); + cfr->tx_dbr_lookup_fail++; + return -EINVAL; + } + + lut->tx_ppdu_id =3D FIELD_GET(WMI_CFR_CORRELATION_INFO2_PPDU_ID, + params->correlation_info_2); + lut->txrx_tstamp =3D jiffies; + + header =3D &lut->header; + header->start_magic_num =3D ATH11K_CFR_START_MAGIC; + header->vendorid =3D VENDOR_QCA; + header->platform_type =3D PLATFORM_TYPE_ARM; + + ath11k_cfr_fill_hdr_info(ar, header, params); + + status =3D ath11k_cfr_correlate_and_relay(ar, lut, + ATH11K_CORRELATE_TX_EVENT); + if (status =3D=3D ATH11K_CORRELATE_STATUS_RELEASE) { + ath11k_dbg(ab, ATH11K_DBG_CFR, + "Releasing CFR data to user space"); + ath11k_cfr_rfs_write(ar, &lut->header, + sizeof(struct ath11k_csi_cfr_header), + lut->data, lut->data_len, + &end_magic, sizeof(u32)); + buff =3D lut->buff; + ath11k_cfr_release_lut_entry(lut); + + ath11k_dbring_bufs_replenish(ar, &cfr->rx_ring, buff, + WMI_DIRECT_BUF_CFR); + } else if (status =3D=3D ATH11K_CORRELATE_STATUS_HOLD) { + ath11k_dbg(ab, ATH11K_DBG_CFR, + "dbr event is not yet received holding buf\n"); + } + + spin_unlock_bh(&cfr->lut_lock); + + return 0; +} + /* Helper function to check whether the given peer mac address * is in unassociated peer pool or not. */ diff --git a/drivers/net/wireless/ath/ath11k/cfr.h b/drivers/net/wireless/a= th/ath11k/cfr.h index e8b5c23b15cc..0129f9a924e2 100644 --- a/drivers/net/wireless/ath/ath11k/cfr.h +++ b/drivers/net/wireless/ath/ath11k/cfr.h @@ -27,8 +27,37 @@ enum ath11k_cfr_correlate_event_type { struct ath11k_sta; struct ath11k_per_peer_cfr_capture; =20 +#define ATH11K_CFR_START_MAGIC 0xDEADBEAF #define ATH11K_CFR_END_MAGIC 0xBEAFDEAD =20 +#define VENDOR_QCA 0x8cfdf0 +#define PLATFORM_TYPE_ARM 2 + +enum ath11k_cfr_meta_version { + ATH11K_CFR_META_VERSION_NONE, + ATH11K_CFR_META_VERSION_1, + ATH11K_CFR_META_VERSION_2, + ATH11K_CFR_META_VERSION_3, + ATH11K_CFR_META_VERSION_4, + ATH11K_CFR_META_VERSION_MAX =3D 0xFF, +}; + +enum ath11k_cfr_data_version { + ATH11K_CFR_DATA_VERSION_NONE, + ATH11K_CFR_DATA_VERSION_1, + ATH11K_CFR_DATA_VERSION_MAX =3D 0xFF, +}; + +enum ath11k_cfr_capture_ack_mode { + ATH11K_CFR_CAPTURE_LEGACY_ACK, + ATH11K_CFR_CAPTURE_DUP_LEGACY_ACK, + ATH11K_CFR_CAPTURE_HT_ACK, + ATH11K_CFR_CAPTURE_VHT_ACK, + + /*Always keep this at last*/ + ATH11K_CFR_CAPTURE_INVALID_ACK +}; + enum ath11k_cfr_correlate_status { ATH11K_CORRELATE_STATUS_RELEASE, ATH11K_CORRELATE_STATUS_HOLD, @@ -41,6 +70,28 @@ enum ath11k_cfr_preamble_type { ATH11K_CFR_PREAMBLE_TYPE_VHT, }; =20 +struct ath11k_cfr_peer_tx_param { + u32 capture_method; + u32 vdev_id; + u8 peer_mac_addr[ETH_ALEN]; + u32 primary_20mhz_chan; + u32 bandwidth; + u32 phy_mode; + u32 band_center_freq1; + u32 band_center_freq2; + u32 spatial_streams; + u32 correlation_info_1; + u32 correlation_info_2; + u32 status; + u32 timestamp_us; + u32 counter; + u32 chain_rssi[WMI_MAX_CHAINS]; + u16 chain_phase[WMI_MAX_CHAINS]; + u32 cfo_measurement; + u8 agc_gain[HOST_MAX_CHAINS]; + u32 rx_start_ts; +}; + struct cfr_metadata { u8 peer_addr[ETH_ALEN]; u8 status; @@ -70,7 +121,7 @@ struct ath11k_csi_cfr_header { u8 cfr_data_version; u8 chip_type; u8 platform_type; - u32 reserved; + u32 cfr_metadata_len; struct cfr_metadata meta_data; } __packed; =20 @@ -180,6 +231,8 @@ int ath11k_cfr_send_peer_cfr_capture_cmd(struct ath11k = *ar, const u8 *peer_mac); struct ath11k_dbring *ath11k_cfr_get_dbring(struct ath11k *ar); void ath11k_cfr_release_lut_entry(struct ath11k_look_up_table *lut); +int ath11k_process_cfr_capture_event(struct ath11k_base *ab, + struct ath11k_cfr_peer_tx_param *params); =20 #else static inline int ath11k_cfr_init(struct ath11k_base *ab) @@ -237,5 +290,12 @@ struct ath11k_dbring *ath11k_cfr_get_dbring(struct ath= 11k *ar) { return NULL; } + +static inline +int ath11k_process_cfr_capture_event(struct ath11k_base *ab, + struct ath11k_cfr_peer_tx_param *params) +{ + return 0; +} #endif /* CONFIG_ATH11K_CFR */ #endif /* ATH11K_CFR_H */ diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/a= th/ath11k/wmi.c index 0b4cc943c290..65f084524855 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c @@ -8802,6 +8802,93 @@ static void ath11k_wmi_p2p_noa_event(struct ath11k_b= ase *ab, kfree(tb); } =20 +static void ath11k_wmi_tlv_cfr_capture_event_fixed_param(const void *ptr, + void *data) +{ + struct ath11k_cfr_peer_tx_param *tx_params =3D data; + const struct ath11k_wmi_cfr_peer_tx_event_param *params =3D ptr; + + tx_params->capture_method =3D params->capture_method; + tx_params->vdev_id =3D params->vdev_id; + ether_addr_copy(tx_params->peer_mac_addr, params->mac_addr.addr); + tx_params->primary_20mhz_chan =3D params->chan_mhz; + tx_params->bandwidth =3D params->bandwidth; + tx_params->phy_mode =3D params->phy_mode; + tx_params->band_center_freq1 =3D params->band_center_freq1; + tx_params->band_center_freq2 =3D params->band_center_freq2; + tx_params->spatial_streams =3D params->sts_count; + tx_params->correlation_info_1 =3D params->correlation_info_1; + tx_params->correlation_info_2 =3D params->correlation_info_2; + tx_params->status =3D params->status; + tx_params->timestamp_us =3D params->timestamp_us; + tx_params->counter =3D params->counter; + tx_params->rx_start_ts =3D params->rx_start_ts; + + memcpy(tx_params->chain_rssi, params->chain_rssi, + sizeof(tx_params->chain_rssi)); + + if (WMI_CFR_CFO_MEASUREMENT_VALID & params->cfo_measurement) + tx_params->cfo_measurement =3D FIELD_GET(WMI_CFR_CFO_MEASUREMENT_RAW_DAT= A, + params->cfo_measurement); +} + +static void ath11k_wmi_tlv_cfr_capture_phase_fixed_param(const void *ptr, + void *data) +{ + struct ath11k_cfr_peer_tx_param *tx_params =3D data; + const struct ath11k_wmi_cfr_peer_tx_event_phase_param *params =3D ptr; + int i; + + for (i =3D 0; i < WMI_MAX_CHAINS; i++) { + tx_params->chain_phase[i] =3D params->chain_phase[i]; + tx_params->agc_gain[i] =3D params->agc_gain[i]; + } +} + +static int ath11k_wmi_tlv_cfr_capture_evt_parse(struct ath11k_base *ab, + u16 tag, u16 len, + const void *ptr, void *data) +{ + switch (tag) { + case WMI_TAG_PEER_CFR_CAPTURE_EVENT: + ath11k_wmi_tlv_cfr_capture_event_fixed_param(ptr, data); + break; + case WMI_TAG_CFR_CAPTURE_PHASE_PARAM: + ath11k_wmi_tlv_cfr_capture_phase_fixed_param(ptr, data); + break; + default: + ath11k_warn(ab, "Invalid tag received tag %d len %d\n", + tag, len); + return -EINVAL; + } + + return 0; +} + +static void ath11k_wmi_parse_cfr_capture_event(struct ath11k_base *ab, + struct sk_buff *skb) +{ + struct ath11k_cfr_peer_tx_param params =3D {}; + int ret; + + ath11k_dbg_dump(ab, ATH11K_DBG_CFR_DUMP, "cfr_dump:", "", + skb->data, skb->len); + + ret =3D ath11k_wmi_tlv_iter(ab, skb->data, skb->len, + ath11k_wmi_tlv_cfr_capture_evt_parse, + ¶ms); + if (ret) { + ath11k_warn(ab, "failed to parse cfr capture event tlv %d\n", + ret); + return; + } + + ret =3D ath11k_process_cfr_capture_event(ab, ¶ms); + if (ret) + ath11k_dbg(ab, ATH11K_DBG_CFR, + "failed to process cfr capture ret =3D %d\n", ret); +} + static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *s= kb) { struct wmi_cmd_hdr *cmd_hdr; @@ -8932,6 +9019,9 @@ static void ath11k_wmi_tlv_op_rx(struct ath11k_base *= ab, struct sk_buff *skb) case WMI_P2P_NOA_EVENTID: ath11k_wmi_p2p_noa_event(ab, skb); break; + case WMI_PEER_CFR_CAPTURE_EVENTID: + ath11k_wmi_parse_cfr_capture_event(ab, skb); + break; default: ath11k_dbg(ab, ATH11K_DBG_WMI, "unsupported event id 0x%x\n", id); break; diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/a= th/ath11k/wmi.h index afc78fa4389b..baed501b640b 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.h +++ b/drivers/net/wireless/ath/ath11k/wmi.h @@ -1889,6 +1889,8 @@ enum wmi_tlv_tag { WMI_TAG_NDP_EVENT, WMI_TAG_PDEV_PEER_PKTLOG_FILTER_CMD =3D 0x301, WMI_TAG_PDEV_PEER_PKTLOG_FILTER_INFO, + WMI_TAG_PEER_CFR_CAPTURE_EVENT =3D 0x317, + WMI_TAG_CFR_CAPTURE_PHASE_PARAM =3D 0x33b, WMI_TAG_FILS_DISCOVERY_TMPL_CMD =3D 0x344, WMI_TAG_PDEV_SRG_BSS_COLOR_BITMAP_CMD =3D 0x37b, WMI_TAG_PDEV_SRG_PARTIAL_BSSID_BITMAP_CMD, @@ -4237,6 +4239,48 @@ enum ath11k_wmi_cfr_capture_method { WMI_CFR_CAPTURE_METHOD_MAX, }; =20 +#define WMI_CFR_FRAME_TX_STATUS GENMASK(1, 0) +#define WMI_CFR_CAPTURE_STATUS_PEER_PS BIT(30) +#define WMI_CFR_PEER_CAPTURE_STATUS BIT(31) + +#define WMI_CFR_CORRELATION_INFO2_BUF_ADDR_HIGH GENMASK(3, 0) +#define WMI_CFR_CORRELATION_INFO2_PPDU_ID GENMASK(31, 16) + +#define WMI_CFR_CFO_MEASUREMENT_VALID BIT(0) +#define WMI_CFR_CFO_MEASUREMENT_RAW_DATA GENMASK(14, 1) + +struct ath11k_wmi_cfr_peer_tx_event_param { + u32 capture_method; + u32 vdev_id; + struct wmi_mac_addr mac_addr; + u32 chan_mhz; + u32 bandwidth; + u32 phy_mode; + u32 band_center_freq1; + u32 band_center_freq2; + u32 sts_count; + u32 correlation_info_1; + u32 correlation_info_2; + u32 status; + u32 timestamp_us; + u32 counter; + u32 chain_rssi[WMI_MAX_CHAINS]; + u32 cfo_measurement; + u32 rx_start_ts; +} __packed; + +struct ath11k_wmi_cfr_peer_tx_event_phase_param { + u32 chain_phase[WMI_MAX_CHAINS]; + u8 agc_gain[WMI_MAX_CHAINS]; +} __packed; + +enum ath11k_wmi_frame_tx_status { + WMI_FRAME_TX_STATUS_OK, + WMI_FRAME_TX_STATUS_XRETRY, + WMI_FRAME_TX_STATUS_DROP, + WMI_FRAME_TX_STATUS_FILTERED, +}; + struct wmi_peer_cfr_capture_conf_arg { enum ath11k_wmi_cfr_capture_bw bw; enum ath11k_wmi_cfr_capture_method method; --=20 2.34.1