From nobody Mon Feb 9 17:58:03 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 029FE30CDA2 for ; Thu, 30 Oct 2025 04:31:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761798721; cv=none; b=XVGeIzYPi34WUkAWy/2jiMv0aPiucOK5NH1W5pvbGHbq86tUveUjjRdHM7fvj6jBAylxu8OKK7Gt9ohXuCGIBPLEoZs9ZeNx9QS65PBVF3cZfIY6mSQio5XYUqD9K/MoZ1YyQlSeb61ENk24UYH0WTJsBvZfN3PodEyyDoAmfIs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761798721; c=relaxed/simple; bh=u7mSf6Oe2DM8bm7Lvc7T16fetnQ4nPuMyEbxTml4kTo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XuoH2PgLhAGNrpWu8n0jOwAwxPO8BQggEazAmGF3z1Ol2Aa7hkdy3dBlQlSq57ES8YZyvcJtFyhArNtA4r3PFSjoLyRnpj4tNP0XKBo6y8Mk/+wF+JQt6OOq5lrcDko3VgxY6Sc+tjwDLDQcmQp7K1wRdLuPja8POXKGkH7oh64= 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=Qwih7JQ6; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=FjZrGOnn; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="Qwih7JQ6"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="FjZrGOnn" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 59U1lWN74135361 for ; Thu, 30 Oct 2025 04:31:58 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=MCLFs78Sdm1 7inBFh7Sx5FZ8I8XuvthrkpG5LmudJXA=; b=Qwih7JQ65x3c6HrgFwilOThQpDe bH9IGMUtEtLq3aE01Whkd7qHybmYcHhfTN23hm+yCf4N/thLZeF0S4NYUfNTwHni 7dzPvhVhAPwMt2IMjSDVm7CJevmz3gOWP7TIDAy1w1ocmD/wX8L5hxdi4PhJq7e8 RuKxfqBcV/HU2OiXR40Bma5Twm20WYxOASCu8e2LNCWTEeVb2NJqKxc3sHj2U4bf NB8heo2SPP3L40CmYCVoOxOR1L+iItHB/Wr/R5zg7H84/k05amBRc/KclYkDgSmE wa9U3HHycGCycS5rNNiKNXt9YDkTdl5Bv+8sNmEMjkNkboKxOYj5Wyg+bBA== Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4a3ff9uamm-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 30 Oct 2025 04:31:58 +0000 (GMT) Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-7a26a53a4faso485021b3a.0 for ; Wed, 29 Oct 2025 21:31:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1761798717; x=1762403517; 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=MCLFs78Sdm17inBFh7Sx5FZ8I8XuvthrkpG5LmudJXA=; b=FjZrGOnnWLprHVWEOQszUSM6SMEFR/VYkZ0+Vx/OWlUI8s/09NDV1AfCmPROFeYHYM 2aG4U4Mzn/JmkZnh2qjHEs3CvGk2R06odu5AlAnwtGCIdkRPtUtweDT6mDRG/qkeqwXh lzZdkdZFKSN3dE32OAY6sS1fXHDSA+yH1+2ewpQbtAi1wTzfVYmWv9p1LeBLyosJEO9M 3Cim9fpIr5Vmub/EInozLk5+WZr5tfeeRMBdkOiM6++XOhoOAGdHS3q3g5xBovObXNdK 78zRCQSAuwKHeKMLlxmSBblNCEvyc6Ywb2KFzgkJq0B4Dm99TsdDFPwtKh7yf7acDFa6 pyCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761798717; x=1762403517; 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=MCLFs78Sdm17inBFh7Sx5FZ8I8XuvthrkpG5LmudJXA=; b=Q29w3YXe1olO3XSOCcAETN60i07cQn2dWbW9U9olWd4LwDtz7f9wosJMG41kvDP+DD 2ahIz0VJ5ccMtlEH6Z6kpYrKOZHt5+Ays7YrWJXamYDwoEVR85drDdBTyQgPzgZRFpp7 EGTArk9AbBkqOOPMaQwkwiyNJjwyAjFFyNmPBfjfBv6CgxHrQUR4B7pzsfb1Er7xXZ2U jLVgPoRQ0KmNh/bOwb4bhlM8lAPE+XZbTiPu8Uggwplx++Dz89t0tnU4efSEQ8JUEbmQ 2frLG9/aqjfOgWvm8Y+o8JEh33SmMeLylqpKoaNR0VuRv4Ri2RPQRNeY+sLRdOjo5jv+ 6Img== X-Gm-Message-State: AOJu0YwFrawtStpIT99H1/7Pbzw+sRYfRYTs5CtzgyBuuX1jvVG3re38 bcEPvbmIBeGv0sits5nKtTDBe4zqSle7wMH4RnEx76JDhAb7fKzhCVk8Gs9Kku6bRmQWXoGwlXZ U4OJPkRHtphVB/UgZsdFNS9SjzGUdbKtlah+epgsKYwA88NVKdnJwh1XWG/d0EvMQdWo= X-Gm-Gg: ASbGncvrFsvpiBmGPdFYFqhb63kRqnZHrCdXlXiU5U6dmdoNO81QEpDykqiAB7Yq/Tw Cr2iHhv5J8enKSTDSdNZN3ppwYW1oRspV1hXBFJfVauLN4rlU8abS53+VTjEeAc+FCUupV2dYYq 7At90t52MlkqxTak+FdKFYbOMN2nM/XNpSn2/e4ZGGlDKu9Yw1vzysTXWHU2qA8pJQymbOXygLT TiViyZV/15GhVmxC1HwmxHLhSqlZSf11mhK1C44aOKIZGoHo56Poq2EshXVlbKGoQeq4pj9epVf UyIQSxassS1gDBcrhhp5A+XWNxrlTEMGIZQ54KeexBiZP7yfAeqcr7jT+/k9xd4VFpl/xJAYXzG XB1BfLqg977R9AT1YQhBoV6AAgHfQQLTk8sA4Sz5l7cm+ X-Received: by 2002:a05:6a00:3e25:b0:781:2740:11b2 with SMTP id d2e1a72fcca58-7a626b0f088mr2343451b3a.25.1761798717289; Wed, 29 Oct 2025 21:31:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGAfBl2G5onTm/2C63I66scK6Jblniz4LlgqBi4Ewn6uGe/WRu1H7dbc64jNJvoI1t+3sW+/Q== X-Received: by 2002:a05:6a00:3e25:b0:781:2740:11b2 with SMTP id d2e1a72fcca58-7a626b0f088mr2343390b3a.25.1761798716609; Wed, 29 Oct 2025 21:31:56 -0700 (PDT) Received: from hu-yuzha-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7a41409e456sm16912161b3a.71.2025.10.29.21.31.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Oct 2025 21:31:56 -0700 (PDT) From: "Yu Zhang(Yuriy)" To: jjohnson@kernel.org Cc: linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, ath11k@lists.infradead.org Subject: [PATCH ath-next 5/6] wifi: ath11k: Register DBR event handler for CFR data Date: Wed, 29 Oct 2025 21:31:49 -0700 Message-Id: <20251030043150.3905086-6-yu.zhang@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251030043150.3905086-1-yu.zhang@oss.qualcomm.com> References: <20251030043150.3905086-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: Ny3G3qicdlrf5kvhn_bcxoE37eD3cKwL X-Proofpoint-GUID: Ny3G3qicdlrf5kvhn_bcxoE37eD3cKwL X-Authority-Analysis: v=2.4 cv=Cf4FJbrl c=1 sm=1 tr=0 ts=6902ea3e cx=c_pps a=m5Vt/hrsBiPMCU0y4gIsQw==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=x6icFKpwvdMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=X6MYPc9AQ2pAf6QSHKQA:9 a=IoOABgeZipijB_acs4fv:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDMwMDAzNCBTYWx0ZWRfX6ceOvdxAm1dr YGR1s8dfgoWXdFaMnw2zCZu1232v4dq1YpCsUmd9H2OIobAfQpoEaxQs5C6467fTzZVSUF/rLRp ASIFPG8lwU+CXyvEFzDUdAtAbfhV6vzoryTc0PpOxel52nt1W4zllqVnsWz9og1XsPcs2FjRQdG j2ns+u1DwJFSjqgxdfnmGVr3VSneEYLTbiqNl4ybJw1rGLzfnKaA6R0yfPhpWomoREK65nNQoVA 7xSysegkAtxf2bPHr8rDBqziGJQ1WB5qJ7mRFqBrx1Uav80d/tbr/u81/8jQxiQCi9tIAgmV4sw x0ziL7vJVpskY6zjNRkiPLJHom+yxX+zW7LKM4LoRPZMGkA0XdubbxA92v9ycAAR5EXHuv/X00E JW41NiGlCuJIznHvqj0qhhET6U9OlQ== 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-10-30_01,2025-10-29_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 suspectscore=0 phishscore=0 malwarescore=0 impostorscore=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 spamscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2510300034 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) --- drivers/net/wireless/ath/ath11k/cfr.c | 235 ++++++++++++++++++++++- 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, 334 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/cfr.c b/drivers/net/wireless/a= th/ath11k/cfr.c index 0a7dcf7b7793..e8a976d64733 100644 --- a/drivers/net/wireless/ath/ath11k/cfr.c +++ b/drivers/net/wireless/ath/ath11k/cfr.c @@ -8,10 +8,243 @@ #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++; + } + } +} + +/* Correlate and relay: This function correlate the data coming from + * WMI_PDEV_DMA_RING_BUF_RELEASE_EVENT(DBR event) and + * WMI_PEER_CFR_CAPTURE_EVENT(Tx capture event). + * If both the events are received and PPDU id matches from both the + * events, return CORRELATE_STATUS_RELEASE which means relay the + * correlated data to user space. Otherwise return CORRELATE_STATUS_HOLD + * which means wait for the second event to come. + * + * It also check for the pending DBR events and clear those events + * in case of corresponding TX capture event is not received for + * the PPDU. + */ + +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) { + /* We are using 64-bit counters here. So, it may take + * several year to hit wraparound. Hence, not handling + * the wraparound condition. + */ + 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 { + /* When there is a ppdu id mismatch, discard the TXRX + * event since multiple PPDUs are likely to have same + * dma addr, 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