From patchwork Mon Apr 21 02:34:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kang Yang X-Patchwork-Id: 883586 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 56CEB2571D8 for ; Mon, 21 Apr 2025 02:35:42 +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=1745202944; cv=none; b=ddUT8DEY8j3xuu3W6+Sb2O4gh8SpVlJnXd6YWGZ8st8/QUdUUM/v9m9bfYReueDn9aQi0oPEiF3ckMAgTSfJDZ5M2KY4yvykxKTKK70DwRWQFnO4Br+2NtVppxaBaKfZwvkqGnV+RCetQp6sWBt0EIUZoQv/3o7FJg8EG4SfORs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745202944; c=relaxed/simple; bh=NDS5KIp4JbiQJbMDUBU+LRiTZZHwICPTJbbejXyWZR0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RM0xj46pLtGqt9WmBzB0Qe0DLin8oHAq1j6ZYfYnHJDqFuRDzaUb+ZAfuRDT7ZzGCytnue0oxMNC4QJp3Jy9bqJDLqMvSwYE7hop+mUG+fSqQciZbatQNKTKpkoKvse8PeSbn5veg4QwP2TXEve5aG0jCMabPIdAEk5EZ2CB7VM= 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=hxmy0TNm; 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="hxmy0TNm" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53KMo9oJ031101 for ; Mon, 21 Apr 2025 02:35: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=nrfVX/gBeLQ iUTHGX4OfY5iM7SyOYw04n25h+TZF3B4=; b=hxmy0TNmSg+Ymc+ve17EOuZcwLz u8JByzuQWxbuLNs2CzZQxOWNDk5brWrGYuuZOt+EF3KnYk5NUgz8lICBSWOub2yV CxdwBF+8utVpCV1POVI92z3VMsV+5z/2GLlchDJgM6pr4XMv5U+Vde3BGdKP5+hH k/Jb2YQQ+7p6oewkHzGwJIGw9OdtMqm/c8hUTT7ifo7w9xKkgf1+LrubWw3Owsnp fgjgdWuistD5iYoyFj8vNRSbBkdtcvsIEfgb/7iLeUP2LIwc0O1dK3Q7F5U+m8dM GnbsoXnQCISzHxb89nWGq0XGzomIpoJ0CDUDTbYTz2leI4oQZ/8xXiInVxw== Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4644kjaq31-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 21 Apr 2025 02:35:42 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-2ff605a7a43so5306708a91.3 for ; Sun, 20 Apr 2025 19:35:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745202921; x=1745807721; 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=nrfVX/gBeLQiUTHGX4OfY5iM7SyOYw04n25h+TZF3B4=; b=TyGqmF9FepSFsBtalnJg/Yp4+P6ZupbK6GWkEP5RMo2dq6pICBMYk1QxUGLS/rjhsJ B/gXjeaJixVDNgRfrO6po/WOcTbS1h2smuwDguYyi8xRnii72gUYRcq6EjTB7Fwut7PQ JWN3yMzG1efNTgCP1dn2wnW+j2tdZfu1OhrqGbpw9vYc3SXWNDqvuqbHZxfcevT2qAW7 p62bSlQCpGOwEKPHHqgGjoTn34Nt+YeAgmvejsc0i2Ip6Pvo9L5qup6L+RDvbXgGleWu GbpnHL37Vve2r4s0cwMTx1Fc4c9XhnFjtQPOXZgA8IleXxpOVWEp92DP8p856t5C8lyr pXIw== X-Gm-Message-State: AOJu0Yy00KfsbNFjIwNh+wU6baeSF4UhHIQiDGoj/AmPvc0gmgvuLqON vhIbM3OVRncFi+GYSalwreeNKhjFvlCG9j3zFFs4xm0bgIq0DnQZGlne5z4Doh23RpRszzzU+0p asblnX74fNB++oyfeUkmBL8XSN6Wu44V86vpYRzFGHW02mft7UFcaghMZRpoc5W0I3eNRPO1n43 hp X-Gm-Gg: ASbGncuZQdYtX7zJkZuh6oRizo5v1Vw9N+L8hAJY1DYcxer8epuaB8VInrDquSidPgw Ol68LQ1bwDaZroawAnabzZVp7uHsJQoGLB0Jh9gt98NEwlq2sgxekw/B9DjTO8Ds4j0/+QTuZhw 4OqjRlKHicdZ2vhhjZtUJ+QUNLx94JfcY+90lpH93L5FNoGUdOvdvrJ7/oRvH9ODLbvpt/72J9H bxZLuRQXZFHSdDnR4vR4lnpa4HV30gQMEpG1pR/azw7JXh4kyK7om9Un4BQya7vjtlJXKLgt9Wd +KAlfIqPxVLBjFL/g/LwFJFv/hrlKouh5g1V8UETH/78ef0q1KcUd4BIzuyGMjd1c39cb35K1LR 890hHvr+PuwA= X-Received: by 2002:a17:90a:c105:b0:2f9:c56b:6ec8 with SMTP id 98e67ed59e1d1-3087bb579b7mr16101176a91.10.1745202921299; Sun, 20 Apr 2025 19:35:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFwIQAaaajvjoyocb0BpfSXshEezhkBoqxZJ+lZKhKxZycXlXlbETJq5aZORWHIEhSCaAa0ew== X-Received: by 2002:a17:90a:c105:b0:2f9:c56b:6ec8 with SMTP id 98e67ed59e1d1-3087bb579b7mr16101156a91.10.1745202920814; Sun, 20 Apr 2025 19:35:20 -0700 (PDT) Received: from kangyang.ap.qualcomm.com (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c50eb4287sm54631685ad.130.2025.04.20.19.35.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Apr 2025 19:35:20 -0700 (PDT) From: Kang Yang To: ath12k@lists.infradead.org, kang.yang@oss.qualcomm.com Cc: linux-wireless@vger.kernel.org Subject: [PATCH ath-next 01/13] wifi: ath12k: parse msdu_end tlv in ath12k_dp_mon_rx_parse_status_tlv() Date: Mon, 21 Apr 2025 10:34:32 +0800 Message-Id: <20250421023444.1778-2-kang.yang@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1.windows.1 In-Reply-To: <20250421023444.1778-1-kang.yang@oss.qualcomm.com> References: <20250421023444.1778-1-kang.yang@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-GUID: 8aW7hYDcxuRgj1Uaxg3YcirUe9Iqf0O9 X-Authority-Analysis: v=2.4 cv=f5pIBPyM c=1 sm=1 tr=0 ts=6805aefe cx=c_pps a=0uOsjrqzRL749jD1oC5vDA==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=IxprkX8A5F3MZX6Gb8UA:9 a=mQ_c8vxmzFEMiUWkPHU9:22 X-Proofpoint-ORIG-GUID: 8aW7hYDcxuRgj1Uaxg3YcirUe9Iqf0O9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-21_01,2025-04-17_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 impostorscore=0 adultscore=0 priorityscore=1501 clxscore=1015 suspectscore=0 bulkscore=0 spamscore=0 lowpriorityscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504210018 Currently, error bitmap and decap format are parsed in ath12k_dp_mon_parse_rx_dest_tlv(). Then stored into dp_rx_mon_mpdu_list. ath12k_dp_mon_parse_rx_dest_tlv() and dp_rx_mon_mpdu_list are only used by QCN9274. For WCN7850, error bitmap and decap format are also needed. So need to parse MSDU END TLV in ath12k_dp_mon_rx_parse_status_tlv(), this is the common function for WCN7850 and QCN9274. Then store error bitmap and decap format so that QCN9274 can fetch them when processing MSDU payload. Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1 Signed-off-by: Kang Yang --- drivers/net/wireless/ath/ath12k/dp.h | 2 + drivers/net/wireless/ath/ath12k/dp_mon.c | 78 ++++++++++++------------ 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/drivers/net/wireless/ath/ath12k/dp.h b/drivers/net/wireless/ath/ath12k/dp.h index 706d766d8c81..2ce6f0d7574f 100644 --- a/drivers/net/wireless/ath/ath12k/dp.h +++ b/drivers/net/wireless/ath/ath12k/dp.h @@ -121,6 +121,8 @@ struct ath12k_mon_data { u32 mon_last_buf_cookie; u64 mon_last_linkdesc_paddr; u16 chan_noise_floor; + u32 err_bitmap; + u8 decap_format; struct ath12k_pdev_mon_stats rx_mon_stats; /* lock for monitor data */ diff --git a/drivers/net/wireless/ath/ath12k/dp_mon.c b/drivers/net/wireless/ath/ath12k/dp_mon.c index 17117315ec7b..7404d21eed3b 100644 --- a/drivers/net/wireless/ath/ath12k/dp_mon.c +++ b/drivers/net/wireless/ath/ath12k/dp_mon.c @@ -1416,6 +1416,40 @@ ath12k_dp_mon_hal_rx_parse_user_info(const struct hal_receive_user_info *rx_usr_ } } +static void ath12k_dp_mon_parse_rx_msdu_end_err(u32 info, u32 *errmap) +{ + if (info & RX_MSDU_END_INFO13_FCS_ERR) + *errmap |= HAL_RX_MPDU_ERR_FCS; + + if (info & RX_MSDU_END_INFO13_DECRYPT_ERR) + *errmap |= HAL_RX_MPDU_ERR_DECRYPT; + + if (info & RX_MSDU_END_INFO13_TKIP_MIC_ERR) + *errmap |= HAL_RX_MPDU_ERR_TKIP_MIC; + + if (info & RX_MSDU_END_INFO13_A_MSDU_ERROR) + *errmap |= HAL_RX_MPDU_ERR_AMSDU_ERR; + + if (info & RX_MSDU_END_INFO13_OVERFLOW_ERR) + *errmap |= HAL_RX_MPDU_ERR_OVERFLOW; + + if (info & RX_MSDU_END_INFO13_MSDU_LEN_ERR) + *errmap |= HAL_RX_MPDU_ERR_MSDU_LEN; + + if (info & RX_MSDU_END_INFO13_MPDU_LEN_ERR) + *errmap |= HAL_RX_MPDU_ERR_MPDU_LEN; +} + +static void +ath12k_dp_mon_parse_status_msdu_end(struct ath12k_mon_data *pmon, + const struct hal_rx_msdu_end *msdu_end) +{ + ath12k_dp_mon_parse_rx_msdu_end_err(__le32_to_cpu(msdu_end->info2), + &pmon->err_bitmap); + pmon->decap_format = le32_get_bits(msdu_end->info1, + RX_MSDU_END_INFO11_DECAP_FORMAT); +} + static enum hal_rx_mon_status ath12k_dp_mon_rx_parse_status_tlv(struct ath12k *ar, struct ath12k_mon_data *pmon, @@ -1655,6 +1689,7 @@ ath12k_dp_mon_rx_parse_status_tlv(struct ath12k *ar, case HAL_MON_BUF_ADDR: return HAL_RX_MON_STATUS_BUF_ADDR; case HAL_RX_MSDU_END: + ath12k_dp_mon_parse_status_msdu_end(pmon, tlv_data); return HAL_RX_MON_STATUS_MSDU_END; case HAL_RX_MPDU_END: return HAL_RX_MON_STATUS_MPDU_END; @@ -2223,45 +2258,6 @@ static int ath12k_dp_pkt_set_pktlen(struct sk_buff *skb, u32 len) return 0; } -static void ath12k_dp_mon_parse_rx_msdu_end_err(u32 info, u32 *errmap) -{ - if (info & RX_MSDU_END_INFO13_FCS_ERR) - *errmap |= HAL_RX_MPDU_ERR_FCS; - - if (info & RX_MSDU_END_INFO13_DECRYPT_ERR) - *errmap |= HAL_RX_MPDU_ERR_DECRYPT; - - if (info & RX_MSDU_END_INFO13_TKIP_MIC_ERR) - *errmap |= HAL_RX_MPDU_ERR_TKIP_MIC; - - if (info & RX_MSDU_END_INFO13_A_MSDU_ERROR) - *errmap |= HAL_RX_MPDU_ERR_AMSDU_ERR; - - if (info & RX_MSDU_END_INFO13_OVERFLOW_ERR) - *errmap |= HAL_RX_MPDU_ERR_OVERFLOW; - - if (info & RX_MSDU_END_INFO13_MSDU_LEN_ERR) - *errmap |= HAL_RX_MPDU_ERR_MSDU_LEN; - - if (info & RX_MSDU_END_INFO13_MPDU_LEN_ERR) - *errmap |= HAL_RX_MPDU_ERR_MPDU_LEN; -} - -static int -ath12k_dp_mon_parse_status_msdu_end(struct ath12k_mon_data *pmon, - const struct hal_rx_msdu_end *msdu_end) -{ - struct dp_mon_mpdu *mon_mpdu = pmon->mon_mpdu; - - ath12k_dp_mon_parse_rx_msdu_end_err(__le32_to_cpu(msdu_end->info2), - &mon_mpdu->err_bitmap); - - mon_mpdu->decap_format = le32_get_bits(msdu_end->info1, - RX_MSDU_END_INFO11_DECAP_FORMAT); - - return 0; -} - static int ath12k_dp_mon_parse_status_buf(struct ath12k *ar, struct ath12k_mon_data *pmon, @@ -2335,7 +2331,9 @@ ath12k_dp_mon_parse_rx_dest_tlv(struct ath12k *ar, pmon->mon_mpdu = NULL; break; case HAL_RX_MON_STATUS_MSDU_END: - return ath12k_dp_mon_parse_status_msdu_end(pmon, tlv_data); + pmon->mon_mpdu->decap_format = pmon->decap_format; + pmon->mon_mpdu->err_bitmap = pmon->err_bitmap; + break; default: break; } From patchwork Mon Apr 21 02:34:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kang Yang X-Patchwork-Id: 883591 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 3E00B17BEBF for ; Mon, 21 Apr 2025 02:35:35 +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=1745202937; cv=none; b=UcAveoLimkixXfsOlhVZMpNZGANLMkd4RiLU47u+aTlHYDWANicPNce3i8SI/JIhlUKiom/G4Mkz5jbGIT1Ctoz6Kq9dsl83gqaufgsJ0mWrNjrJPeExM4qpAGufKJNzSh5X+gfYkLaHAeQgLhnlOcsjQ5OrlrjMmWKtgH1uof4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745202937; c=relaxed/simple; bh=PynSTx5juJKKbG8xZydzO4iDHs2RJgq4NypZJsbDUos=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jTo7tjgFfqPc9ixBI42fXB1BI220kEfrbfAhC4wyV+wJRZU6NhKQ+1C42xdNOt1BbWykBD3BXSEB/iJS+zj+5HyM2yibtFBNI2hK29LXLuCLwK5zJ0uls1k2unz6Wp4pOz9+QytVo+VUmbPIKevC8FYXHA+2VUJkofOPzmun1pc= 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=S+zjEQ1f; 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="S+zjEQ1f" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53KNDrVD025830 for ; Mon, 21 Apr 2025 02:35:35 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=tW3j/DnQ/3J QHYjRoZr4kKxIV+9c+oTW2VadZhYyqC0=; b=S+zjEQ1fwS/x18fHYHy3HkSP3Dx w5p8IdCS7F7T/yvFb4PEa90JLqDQ/q1KrRPJfI4HIgHrrFl9UyIcNJVKF2BRgoSd NPtNgOJ3AktD5Ih2duu7YSqNh7WwN0Lxk5BJFGPKmLMhwnPsd+pjZElC5kdHcmW7 DgCm42q7jaSS4PYbFrEC2NKgRyxr+N5fCRiHIMrXdNyE3IXKrLvauEjfSVc7YynM L9kOZWJJWeetdisO9YXoGq8r2htf/IP/bPWC9QCB5/pkeyk4PbcZgRVpxWdNo/Aw hlrauzSwevUDNQ137ZVE/VQP05P92PHJtaK/qStmbdghsnS84ABmQCZ2uRQ== Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 464426jqv7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 21 Apr 2025 02:35:34 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-2ff8a2c7912so2761139a91.1 for ; Sun, 20 Apr 2025 19:35:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745202923; x=1745807723; 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=tW3j/DnQ/3JQHYjRoZr4kKxIV+9c+oTW2VadZhYyqC0=; b=YPCJfO9RZqjy9Af7Vbine87FgsCk77NplVkhtynwoA2jZJmt0mNB8z3Xcxej6pKk6F qJmnN4uojwWNALn/N1MpgLZPFxHPbthIjygQNm1JYPjrr7UGHwsLKRe/A+uz110aNu/4 gB0N7rk541v+l2NKnl/yjvO/E81V3S2HsexfIQBdJ801wFV1e8Rmr6N07l69bpTje3ys +fG+d36amI3XZaoMENvePpYAjsVyrD5/1FI/HY2QgDV4MuFqBP2WUIFfsBSbrk3M3YF1 chJHagKnMKIdAEYvua2UEggjyN3A/s46W1e2ZE/j7G9hpE2hTXoGctxmBjgpcT9hswTu 3sJg== X-Gm-Message-State: AOJu0YyXdGoUizGMmOeIgQiT6g4WaRp69DbzW4A8QQLC9DcVAUlD63pb IKvFMVN9fVibbZP2ynoIEHyvjtPd1LUI9k1Eb/sQMjKXAwhq3bvVewNMl4ukNLIq+jChzT1kqru 2BSic5J85v7YRUehMlWMWW37uvpTzAWRBS5wd43oyI2rLg4sPYEiiwXQ+2E1EQSA2Tw== X-Gm-Gg: ASbGnctKlVvZJI4Q/ZF9tI7M+jWR2YQ+X7VS9eJ3HZhri3qhoDoab2AQpD+Qq5wRLnK zKN8L8hAH1ugeSbFxiri9lfM/KGiImX8tbWCilTYvbUFPXgYTp6d+tCI+CqSxZQL3e+gj4kXxmX /8vM5ti22wLsjvJ8K5bYcgoUBq3UPt67aNotRtdvTnojYy/WzbrD/4GV7rhcssH9uICSDcKzi1G kUui690x0O18uI9bjfPgNq1n6sDHZuYTSbCJt0GY86cJx0SioEsbtkcH6tiAf0sHb/f6p+zIfC5 PJkCYy0FWQ2APcmjq02EK1S2A2dHBQlMiVPOJMZSo1ZK2MlydSeAAf/WED7ujWMw9UbEtIpA/4K VRXfL9Vz32JE= X-Received: by 2002:a17:90b:5608:b0:2fa:1c09:3cee with SMTP id 98e67ed59e1d1-30879bc43b7mr15652646a91.9.1745202922768; Sun, 20 Apr 2025 19:35:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF/mlRGhasf2sU4iF4A5vEYt858J1hyPpugHlHFsR0aiwrQcwl6dk1z1Pj1OmGFdXZ3u9KOdw== X-Received: by 2002:a17:90b:5608:b0:2fa:1c09:3cee with SMTP id 98e67ed59e1d1-30879bc43b7mr15652623a91.9.1745202922344; Sun, 20 Apr 2025 19:35:22 -0700 (PDT) Received: from kangyang.ap.qualcomm.com (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c50eb4287sm54631685ad.130.2025.04.20.19.35.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Apr 2025 19:35:22 -0700 (PDT) From: Kang Yang To: ath12k@lists.infradead.org, kang.yang@oss.qualcomm.com Cc: linux-wireless@vger.kernel.org Subject: [PATCH ath-next 02/13] wifi: ath12k: avoid call ath12k_dp_mon_parse_rx_dest_tlv() for WCN7850 Date: Mon, 21 Apr 2025 10:34:33 +0800 Message-Id: <20250421023444.1778-3-kang.yang@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1.windows.1 In-Reply-To: <20250421023444.1778-1-kang.yang@oss.qualcomm.com> References: <20250421023444.1778-1-kang.yang@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: DB5OC9c1Rj54H6aDkSLU_PGopU0Yf4lq X-Proofpoint-GUID: DB5OC9c1Rj54H6aDkSLU_PGopU0Yf4lq X-Authority-Analysis: v=2.4 cv=IP8CChvG c=1 sm=1 tr=0 ts=6805aef7 cx=c_pps a=vVfyC5vLCtgYJKYeQD43oA==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=5djAQ6t7vT4tMu-sRqoA:9 a=NqO74GWdXPXpGKcKHaDJD/ajO6k=:19 a=rl5im9kqc5Lf4LNbBjHf:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-21_01,2025-04-17_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=856 spamscore=0 mlxscore=0 malwarescore=0 clxscore=1015 priorityscore=1501 bulkscore=0 suspectscore=0 lowpriorityscore=0 phishscore=0 adultscore=0 impostorscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504210018 WCN7850 doesn't have RX MON component. So it's monitor mode design is quite different from AP based chips like QCN9274, which have RX MON component. ath12k_dp_mon_parse_rx_dest_tlv() is such a specific function for AP based chips. So don't call this function for WCN7850. Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1 Signed-off-by: Kang Yang --- drivers/net/wireless/ath/ath12k/dp_mon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath12k/dp_mon.c b/drivers/net/wireless/ath/ath12k/dp_mon.c index 7404d21eed3b..351f52138d39 100644 --- a/drivers/net/wireless/ath/ath12k/dp_mon.c +++ b/drivers/net/wireless/ath/ath12k/dp_mon.c @@ -2368,7 +2368,7 @@ ath12k_dp_mon_parse_rx_dest(struct ath12k *ar, struct ath12k_mon_data *pmon, hal_status = ath12k_dp_mon_rx_parse_status_tlv(ar, pmon, tlv); - if (ar->monitor_started && + if (ar->monitor_started && ar->ab->hw_params->rxdma1_enable && ath12k_dp_mon_parse_rx_dest_tlv(ar, pmon, hal_status, tlv->value)) return HAL_RX_MON_STATUS_PPDU_DONE; From patchwork Mon Apr 21 02:34:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kang Yang X-Patchwork-Id: 883589 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 7E8F12561CB for ; Mon, 21 Apr 2025 02:35:37 +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=1745202939; cv=none; b=KHArOcGc+7UiE+DPUa3z7JUQmxb66WOsPVwf3KFeRxOwTCygRMBj5uNgaIMM3hqyAqq4fe4fRSAaGrJJOf/0BZsKzgbMs1UqQ1x0iQltkTbQSVk4phAKevwxJNPBpxuHCadUR6xRWZ/Svj4ZYucGinzZLYXyxe4F4Pl4PVzAaHE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745202939; c=relaxed/simple; bh=K5xaLtmpNUnpc1IAEQ0v+p1vPoWB68c+yZdkvhzeBnQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ld54NUfwpXOiEqxYMyqZyYFkz6iyuw1CUrjMNLrfo1f7tClP5mJIHCIFyyne59jQ5/CRhzwQvgSmorjrGLVcfp8iatTjiGrg8TLXdYeEC+I0LZBHH8htOlBCe3SzeTlKUK0Xxi7VfWUZynotcDMCmuzUYX8FRswOffZMQuNrIc8= 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=AlFm21Lb; 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="AlFm21Lb" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53KNSC8c005295 for ; Mon, 21 Apr 2025 02:35:36 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=wVtxNw5DxWb z/CXXulYnPYRQliO3LecSwULeLmAboJg=; b=AlFm21LbYJj3EenBOE+jcFd6oeq Cym2uuPu0hlepFFi6cbt1jUnq5iiupnBMrDWRh6f1m1V/HhGwtNNohtMaFSEtrGz ILPMsVI/iAgVN0d1qxGEzGUA2eWEI3mAV2rquBWelT3xtWTaCWAJNHztKLk9avlX yjbzjTZDigCYvlWGyr+6JnZY0j55GnV2sRsh67GRyhok/F6mcJa7K0Fcqg+JUtBq E6456oFXDZfesFVZ4oZPnlEGIdw4zpFD13lDz5qi8+5dv6Id9aGiRmFn2gqCYo1U 1MPCIU4YMbt8pR0CV2zTKdMZRyTBX3sarL2zty297iifTvuJQ9lS6nVmrzw== 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 4641hhjx67-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 21 Apr 2025 02:35:35 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2264e5b2b7cso30438325ad.2 for ; Sun, 20 Apr 2025 19:35:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745202924; x=1745807724; 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=wVtxNw5DxWbz/CXXulYnPYRQliO3LecSwULeLmAboJg=; b=aq6SZvtKjVblUePdIJHVvpapfqrURyhxvq4dwGto3Q3kw6hYgz6RO2WGrQsI14NC/Q OMk1+B+qT+8XiAO1Fv1+HLtcCLFvmnaZDS9Yw51uoI9QLKhJ0o+uZTc4Iyg6M1MRZPki n8PrWUXdf+uHtUPqeScLsQgcm7RCRT3bLzeMBukdGrMpUlkWS/+qQhW18WtciCaUzFmW Xyel5x8GgYIxpwOyEh3QZVLtCFLLfUkkm4X1fiBYRQqLP+Jkq4E43NsTlfOx8HyySmAN 8qZSH2BBrLqbecRynLAIEN2VR0U9CrA5xUNcvL/oXJEE2wHL78SxERoIN3n01zte+OCz +knw== X-Gm-Message-State: AOJu0YyIzVBz4SMr8/SYXDONqBBu6BgJ+r5au/I1lQrBXWdutpGAUdGD FfBSY5LVs9YPWv6+71qyRzG1LQJenqDjd55+V7T2QuLDM1KYyFeth2TTUdyOZGdRejPq+YMBsKC 6qaee3JVy12CiSF6qs76zvwkfNwB2K5ZLvojfCouoVTLhvsNL/oOuRBE7vJ/5nzhnUK9w2HhUYf mp X-Gm-Gg: ASbGncvEEJW7HPfvMb3M1zRlWnmYM20L9Ny5VQVNw4Lbd02SF6UinJ6nhjRQb379D3T nqT02pV9jF8gd6QG08c5QAlMvQEoy7gzTWyDvWTtPsHFNkEzzhNm15rIblMJAgnDesHSenIzxym i09ttWPvsb7pqkdyn1fUKXiP0eTaALv1evis4YpEqD3Hrlgn/LaRTesJVgwJyN7BaDhxYejUkt9 4t/voh10f/gCoC4Viwvfy52NXFWBCeGbmsGUoJrAQ+6YXnhzsjwaqxKaHxHSWXTX5Lbb7o3w6zj GU+Xe/WsQ5sgfrfx1x7NZUPzhuMT5WCQumlw5GqCEZ04xHs6LA/lcsmZt7thNYn4cpIFPxSCVvy Z0b/5pQvjaH8= X-Received: by 2002:a17:903:fad:b0:211:e812:3948 with SMTP id d9443c01a7336-22c530b58acmr153912335ad.0.1745202924321; Sun, 20 Apr 2025 19:35:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGFqGK/inIa5ejxkMdbcFeJZ8pLIYi7teaTtugkmA1mPFJuqCIhvkKKJQaD5g3jdWNigIP40w== X-Received: by 2002:a17:903:fad:b0:211:e812:3948 with SMTP id d9443c01a7336-22c530b58acmr153912115ad.0.1745202923904; Sun, 20 Apr 2025 19:35:23 -0700 (PDT) Received: from kangyang.ap.qualcomm.com (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c50eb4287sm54631685ad.130.2025.04.20.19.35.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Apr 2025 19:35:23 -0700 (PDT) From: Kang Yang To: ath12k@lists.infradead.org, kang.yang@oss.qualcomm.com Cc: linux-wireless@vger.kernel.org Subject: [PATCH ath-next 03/13] wifi: ath12k: add srng config template for mon status ring Date: Mon, 21 Apr 2025 10:34:34 +0800 Message-Id: <20250421023444.1778-4-kang.yang@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1.windows.1 In-Reply-To: <20250421023444.1778-1-kang.yang@oss.qualcomm.com> References: <20250421023444.1778-1-kang.yang@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Authority-Analysis: v=2.4 cv=Fe43xI+6 c=1 sm=1 tr=0 ts=6805aef7 cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=bJUolzXMejWutlsJL5MA:9 a=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-GUID: A36eqjiRo_3JK0BcsQoe1NvdyMzreyf1 X-Proofpoint-ORIG-GUID: A36eqjiRo_3JK0BcsQoe1NvdyMzreyf1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-21_01,2025-04-17_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 phishscore=0 bulkscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 adultscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 suspectscore=0 spamscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504210018 Currently, the hw_srng_config_template does not have a template for mon status ring. But srng config template is necessary during ring initialization. So add a template for mon status ring. Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1 Signed-off-by: Kang Yang --- drivers/net/wireless/ath/ath12k/hal.c | 9 ++++++++- drivers/net/wireless/ath/ath12k/hal.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath12k/hal.c b/drivers/net/wireless/ath/ath12k/hal.c index 12d0f991a47f..ed268089f9b6 100644 --- a/drivers/net/wireless/ath/ath12k/hal.c +++ b/drivers/net/wireless/ath/ath12k/hal.c @@ -154,7 +154,14 @@ static const struct hal_srng_config hw_srng_config_template[] = { .ring_dir = HAL_SRNG_DIR_SRC, .max_size = HAL_RXDMA_RING_MAX_SIZE_BE, }, - [HAL_RXDMA_MONITOR_STATUS] = { 0, }, + [HAL_RXDMA_MONITOR_STATUS] = { + .start_ring_id = HAL_SRNG_RING_ID_WMAC1_SW2RXDMA1_STATBUF, + .max_rings = 1, + .entry_size = sizeof(struct hal_wbm_buffer_ring) >> 2, + .mac_type = ATH12K_HAL_SRNG_PMAC, + .ring_dir = HAL_SRNG_DIR_SRC, + .max_size = HAL_RXDMA_RING_MAX_SIZE_BE, + }, [HAL_RXDMA_MONITOR_DESC] = { 0, }, [HAL_RXDMA_DIR_BUF] = { .start_ring_id = HAL_SRNG_RING_ID_RXDMA_DIR_BUF, diff --git a/drivers/net/wireless/ath/ath12k/hal.h b/drivers/net/wireless/ath/ath12k/hal.h index 4adef9240409..f627cd01f60c 100644 --- a/drivers/net/wireless/ath/ath12k/hal.h +++ b/drivers/net/wireless/ath/ath12k/hal.h @@ -498,6 +498,7 @@ enum hal_srng_ring_id { HAL_SRNG_RING_ID_WMAC1_SW2RXMON_BUF0 = HAL_SRNG_RING_ID_PMAC1_ID_START, + HAL_SRNG_RING_ID_WMAC1_SW2RXDMA1_STATBUF, HAL_SRNG_RING_ID_WMAC1_RXDMA2SW0, HAL_SRNG_RING_ID_WMAC1_RXDMA2SW1, HAL_SRNG_RING_ID_WMAC1_RXMON2SW0 = HAL_SRNG_RING_ID_WMAC1_RXDMA2SW1, From patchwork Mon Apr 21 02:34:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kang Yang X-Patchwork-Id: 883585 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 64E9C25743F for ; Mon, 21 Apr 2025 02:35:46 +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=1745202947; cv=none; b=rK7uWqzHj+R6vwL0Qu+pfq8zObgatbZ/Lql0h/i/1rcUmW6TIK8/Kp0cE2DhHWn1vN5VO7lnyoSY+Mpu9je8vkHYpSVocJTTU/SzyUjG3Iw5UYEtqmi75kAWPnVs6hAY65YrIl/K8gt+h0eSuUP0V5qidcYRsVU40t1Ims9xYMc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745202947; c=relaxed/simple; bh=rLpO7Y8954n3j1upUWUFmlRfbkdQGCH4q0s1m7xa+5U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SfIlJGJKWq7VcRm2vcPhwwg/4nIY3o7b7dGw6OvXHhf9on0CQPaVheDoT8J8KaAkaQq41kfgg1cKfNemTS5/JcpYTX7zGgQACCg+DU8jeqtBZvDxKyhRh8JN7zS1gxIgAYIoBMZPiQTuDIgEI6iSMfanfwsqXOfb1tqp+upOGdU= 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=EvDEmt6o; 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="EvDEmt6o" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53L0kIne011539 for ; Mon, 21 Apr 2025 02:35:45 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=Yfl978/6DVA zdrvKcsOLE0Dq28H4fccwkP87PFt/Ov4=; b=EvDEmt6oUkzko+S1fMV3gzZktTX a3AwTarE3VioM6083GmPUVafCqzJ8njkBrR1qpVn80GzI2rtJ+DQXM8pjbcNkPud f+POAiwAZB7Lq51Mx7JfzlxzX0/lOKPVofdhiMGFzx/qzZavh1qoVLapTP4315xd jbv18FnTWw8h9UE8XpAQf1XdMwsD0tbXPwzQFcKLJEgL7Yfwd2duVuy7Lf7+/Kg5 bGpcmJ4yVOMhL0MMUkJvWeny+Inakh0yzt9+IOmU8bBehv9ZdK+w+e9L8nHpnxYq 9QxP1aKVMnZc93a6KEUd+MOyg2uP1cHCT46ekRxVYRY7KduL9Nc/JiJNatA== Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46435jatpa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 21 Apr 2025 02:35:45 +0000 (GMT) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-306b51e30ffso2882867a91.1 for ; Sun, 20 Apr 2025 19:35:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745202932; x=1745807732; 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=Yfl978/6DVAzdrvKcsOLE0Dq28H4fccwkP87PFt/Ov4=; b=Krmus6XES/vSARxmPglTsFKp/OkogOP/iH7PqB7o26FocI3ZDYEcT63wHdLo+w2GoE tPY1VbFIeUceGkOI3rmcTSn8baD3YeYMFVytoSkKIhdslwxHDTbXfmIQFfZi/0N59jgu RMAGsB5boP13DMYKgQRBZ6r7vQVfFEAEP2j65X8TCE/1aU1azQIoJm2QRaautPjC3QoR 7fAYiFCNhS/QHntN4eixNcI7YFAsKhpemtA3GfFOO7fGR9yH133kKRbWZBJJIm1/fu+q RUY/qCACA0TBplnzWf5/ZoUMBJLfi4yA9nbgkfq/AVRkAk3DTNeAni6Y1J+nOLgqMs2u VKrw== X-Gm-Message-State: AOJu0Yy4UxqTOeZzKGaPZ8aY4UGmMH+IjFsW1SFSuLnXFmS+WJVzEtBM YdQo56qu0mfgXCJWdUpTcNeds/hV2wz00971zBkxAUdBivcQxbqLcB3t7adS/aQeYGZzzQxoyRP hDwhVMxgFA4WuX8t8JLjhIN86M8Ikk9Uhi7U4R1WYU93wbVFyt0Xi7ZoM0t+fXsgRAw+Ud/eBPU 32 X-Gm-Gg: ASbGncuvQnemIOdO0aOTV/m/3uHimbSNZfW9oJAwzdFdHvgr0hMuat+PGrJ3VDzu6I7 uHxRToxMbNNgvTpfJQOvd+F5pv4OgTwkIKkDV3IHR2I1ozkx6qHip8Y4ngh7LNnhU7EoOsWkI2Y P9ZIsvYxdT4qDsy8dhwHLCpnJ8XZ3y80xCmCfSkTeEzjLY6AhHZds/0YRAF9w/YPlcPK9cfqeyw QX1RK3RTwtw1hTxiLcgpLubWwrIcTmfDQUsvkgWGa9GyRd0i6xLuHbqZQufusytDFtat476AzgM 8Q96cFIcnP4lmFZrhesW2n7YxMZuh+eXU3aJm7a155+IM+y3Z8RMZp+LBMqPo9qIPJ/GDoMX4Zw g6y8ZbOPcDfs= X-Received: by 2002:a17:90a:fc44:b0:2ff:5a9d:9390 with SMTP id 98e67ed59e1d1-3087bb4763bmr14940766a91.8.1745202932103; Sun, 20 Apr 2025 19:35:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJWr31nrrw0P6zwG32PyGdkDtAxQr1SHu7NB4egaaypIx3/fAo+01+CCetoDxkqeJo7ekzaA== X-Received: by 2002:a17:90a:fc44:b0:2ff:5a9d:9390 with SMTP id 98e67ed59e1d1-3087bb4763bmr14940748a91.8.1745202931688; Sun, 20 Apr 2025 19:35:31 -0700 (PDT) Received: from kangyang.ap.qualcomm.com (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c50eb4287sm54631685ad.130.2025.04.20.19.35.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Apr 2025 19:35:31 -0700 (PDT) From: Kang Yang To: ath12k@lists.infradead.org, kang.yang@oss.qualcomm.com Cc: linux-wireless@vger.kernel.org Subject: [PATCH ath-next 08/13] wifi: ath12k: fix macro definition HAL_RX_MSDU_PKT_LENGTH_GET Date: Mon, 21 Apr 2025 10:34:39 +0800 Message-Id: <20250421023444.1778-9-kang.yang@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1.windows.1 In-Reply-To: <20250421023444.1778-1-kang.yang@oss.qualcomm.com> References: <20250421023444.1778-1-kang.yang@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Authority-Analysis: v=2.4 cv=EOYG00ZC c=1 sm=1 tr=0 ts=6805af01 cx=c_pps a=RP+M6JBNLl+fLTcSJhASfg==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=kP4Qih6RMaO1GLBjTmAA:9 a=iS9zxrgQBfv6-_F4QbHw:22 X-Proofpoint-GUID: SQachWrUilBgkMggTVPRx4kCrauzWZs7 X-Proofpoint-ORIG-GUID: SQachWrUilBgkMggTVPRx4kCrauzWZs7 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-21_01,2025-04-17_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 mlxlogscore=846 mlxscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 priorityscore=1501 phishscore=0 spamscore=0 adultscore=0 impostorscore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504210018 Currently, HAL_RX_MSDU_PKT_LENGTH_GET uses u32_get_bits to obtain the MSDU length from the MSDU description. This is not right. Because all halphy descriptions are little endian. So use le32_get_bits for HAL_RX_MSDU_PKT_LENGTH_GET. Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1 Signed-off-by: Kang Yang --- drivers/net/wireless/ath/ath12k/hal_desc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath12k/hal_desc.h b/drivers/net/wireless/ath/ath12k/hal_desc.h index 49eededbfa9d..c7a8b26d38a7 100644 --- a/drivers/net/wireless/ath/ath12k/hal_desc.h +++ b/drivers/net/wireless/ath/ath12k/hal_desc.h @@ -707,7 +707,7 @@ enum hal_rx_msdu_desc_reo_dest_ind { #define RX_MSDU_DESC_INFO0_DECAP_FORMAT GENMASK(30, 29) #define HAL_RX_MSDU_PKT_LENGTH_GET(val) \ - (u32_get_bits((val), RX_MSDU_DESC_INFO0_MSDU_LENGTH)) + (le32_get_bits((val), RX_MSDU_DESC_INFO0_MSDU_LENGTH)) struct rx_msdu_desc { __le32 info0; From patchwork Mon Apr 21 02:34:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kang Yang X-Patchwork-Id: 883588 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 48CAD44C63 for ; Mon, 21 Apr 2025 02:35:39 +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=1745202940; cv=none; b=rORYnauWK7C8sLTaJE5U6YNPIZz71BtjIh/yDt/9smGFKvYOWP8PQ0PxoELYUmRbak57pEERVAx4XhBE/Xe+lWzRjgFKauqdlQJmPd/gcb3fX7AR2+oTXl3S7UMcx/jmQzyh9GeQfyWg1+OywBp3WQmVXNyOlRGWpl0gmJHaY4U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745202940; c=relaxed/simple; bh=FbQG37UzK5XB0vzPgovjxCGZbV56d8kL6EjLW9x0tSo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=h29gmal2IzQU+8/j5nDAOYFTwE8ECgovGQPfLUXFrDJoTTL7PdNHtd9waYi166VQJmWYt3umBFdSPsNgQF2Nl6zRbUzCpKfhXwJ81MZa358QFw6huJhYEwip2o0WQDlVpeVek9xuli82Oq6bXLph1veaR+kCMz3hed0OQYhrSLY= 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=ngWAxCRx; 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="ngWAxCRx" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53KMPAvW013841 for ; Mon, 21 Apr 2025 02:35: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=F/0lxe84XJz nWjf2P/60iOZ5+OXxV9SomLFyZxivZLw=; b=ngWAxCRx7y3Rz8gIt2jo0FSPoY4 QW2L6CAHnv/+iGl6L8F6ciBDRhoPgDCGcGJcAd6wCdbYnhe6Gj/fu+kYPEpzZhzY IpL7tpX8LK6PnK6xAkjC4o5A5NNrotsrKue20aHu87WFYWWZZZ4dqOF612xh3KVr 6lXMUTn8gExsz3gQ1vEYn4XlXW50L7fPkoGZ6edM5wgNOtiQg7wQ/e0fG6jSjWKk gzIrz2mdA9iUUH7kXrDQ4Dpu9+xg8PF6ZfO87iYdAN+K+tXyO9rEtcmiw9XLwwCC Iiy9beR7PFUZobGVpK4j0Kr/Z6Hx7TJT14b3jiDPfvL8K6a6lsz2AqGZTHQ== 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 46454bjpu6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 21 Apr 2025 02:35:37 +0000 (GMT) Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-227a8cdd272so30310575ad.2 for ; Sun, 20 Apr 2025 19:35:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745202937; x=1745807737; 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=F/0lxe84XJznWjf2P/60iOZ5+OXxV9SomLFyZxivZLw=; b=AaOujB3tO6mPbTJN6bcPoWLaTqmoE9yCKOgFWXd++P/r0TYW7xphkkgnn7WLrR1FQH lVOLcXKannWNQx5w8V8dA1fTQqNd6CZ257gYQeMUDXvQ8xGoXhxgvNraKfJ5ZQpRfLS6 mXXq6AsZl/YmezArCBWarDo3AYtDcm+30udQcXfMmng6AP7hSux+v00iM8J9ftFssHs7 rlTwyokokGdPCGqkuJKv5bjIfLuoLhqRhRdraKWZ7G7tvbodchNJeOTnqImFKUaWX8+h kWwj2sSzgDmjKIIDp/0oOdR8qghZrT5aRjUW4ZBYU3iBGB0DpW4haPdTlD6Q8DKt+cPo oV2g== X-Gm-Message-State: AOJu0YwO/IoYG4GMwNOWcURigpEs4kTh8UbKa5TSoccma32RDNugZp5z zy/muqXhBfH7iCCCfaNOBdKV9C0zE2zU3T1Dc/Dq/rPIY+ttDZ7Ki+66U8SARElbLzc+M59rdSi sEL0nslPmBqFuFcdtBBURBBM68g31iXM/n6onjoxiXn5GnJ9jGLLWU7Zg5XXikoCi+Tn85CGdVd M8 X-Gm-Gg: ASbGncu/9MfqRjxuxvtzinmYQTj4/PP890E2KUM90E76MUlWgXt/Ik6ADDfLRfpa1nH 146P942ILteUVdVU1dxAfP1bKoS73eKIZqhIJrJgSyv69GMDThjOrbIPzVVnhAvXfbZI+2k8/ix 3QcOlF1NY+PKGMUISpp8xgEDSYQB1EH17W71UmVkBH8RuwJJPJglXzDThWF6y/j9/znDEhWB6kC DDhUo8T3rZS12t/kM/MgSTVMA2VI78OdV9CKKPI20sPiykKa4icFP0VpeZxN6gA+vGTwvTvVaHR njANhrd0bbROptiUa4t0z6grCTHTHj8DcQeg5nXMZpTd/7ymhD98h7p7dZkPHSN6NQ/RrD1guTz F6fPgUB6pe6Q= X-Received: by 2002:a17:903:98c:b0:224:1780:c1ec with SMTP id d9443c01a7336-22c5360dc12mr180997535ad.35.1745202936758; Sun, 20 Apr 2025 19:35:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHq65mC6OoIEizuH+antbg5u43zDy2K9uh6Jfs02F6+tCcXiuhMp7miRMqAwHqfSQiJRlO/Vw== X-Received: by 2002:a17:903:98c:b0:224:1780:c1ec with SMTP id d9443c01a7336-22c5360dc12mr180997315ad.35.1745202936404; Sun, 20 Apr 2025 19:35:36 -0700 (PDT) Received: from kangyang.ap.qualcomm.com (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c50eb4287sm54631685ad.130.2025.04.20.19.35.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Apr 2025 19:35:36 -0700 (PDT) From: Kang Yang To: ath12k@lists.infradead.org, kang.yang@oss.qualcomm.com Cc: linux-wireless@vger.kernel.org Subject: [PATCH ath-next 11/13] wifi: ath12k: init monitor parameters for WCN7850 Date: Mon, 21 Apr 2025 10:34:42 +0800 Message-Id: <20250421023444.1778-12-kang.yang@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1.windows.1 In-Reply-To: <20250421023444.1778-1-kang.yang@oss.qualcomm.com> References: <20250421023444.1778-1-kang.yang@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Authority-Analysis: v=2.4 cv=cdrSrmDM c=1 sm=1 tr=0 ts=6805aef9 cx=c_pps a=MTSHoo12Qbhz2p7MsH1ifg==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=qa2sE8eil9VosqwbHagA:9 a=GvdueXVYPmCkWapjIL-Q:22 X-Proofpoint-ORIG-GUID: WIWeJwv0tFwgExgrm1bbd2CXNPBXU7Xc X-Proofpoint-GUID: WIWeJwv0tFwgExgrm1bbd2CXNPBXU7Xc X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-21_01,2025-04-17_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 suspectscore=0 phishscore=0 adultscore=0 mlxlogscore=969 malwarescore=0 clxscore=1015 spamscore=0 priorityscore=1501 lowpriorityscore=0 impostorscore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504210018 Some monitor parameters are only initialized for QCN9274, but WCN7850 also needs them, so initialize them for WCN7850 as well. Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1 Signed-off-by: Kang Yang --- drivers/net/wireless/ath/ath12k/dp_rx.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/ath/ath12k/dp_rx.c b/drivers/net/wireless/ath/ath12k/dp_rx.c index b3f638af1717..828ed55f83f5 100644 --- a/drivers/net/wireless/ath/ath12k/dp_rx.c +++ b/drivers/net/wireless/ath/ath12k/dp_rx.c @@ -4606,17 +4606,15 @@ int ath12k_dp_rx_pdev_mon_attach(struct ath12k *ar) return ret; } - /* if rxdma1_enable is false, no need to setup - * rxdma_mon_desc_ring. - */ + pmon->mon_last_linkdesc_paddr = 0; + pmon->mon_last_buf_cookie = DP_RX_DESC_COOKIE_MAX + 1; + spin_lock_init(&pmon->mon_lock); + if (!ar->ab->hw_params->rxdma1_enable) return 0; - pmon->mon_last_linkdesc_paddr = 0; - pmon->mon_last_buf_cookie = DP_RX_DESC_COOKIE_MAX + 1; INIT_LIST_HEAD(&pmon->dp_rx_mon_mpdu_list); pmon->mon_mpdu = NULL; - spin_lock_init(&pmon->mon_lock); return 0; } From patchwork Mon Apr 21 02:34:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kang Yang X-Patchwork-Id: 883587 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 E665B2571CE for ; Mon, 21 Apr 2025 02:35:41 +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=1745202943; cv=none; b=kaXpzEznXtJ6EzMkl4RB7E5yncsp3HtQi8pYlPqsqEvB8VN6TI6dwBAPtNiIw25QVecE3o/HI3pKnXec6gMI3t1NQuoBmM4YPHn4YrUNVvQHA4IfmYfonPeRrLFRbuHhtE1Vt0sx4fD/4aeS7ZTYaosyhBazjSD9a05snCvXYOI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745202943; c=relaxed/simple; bh=Cn0zf3ReHTZ+gJOA+d/mphNbQfvn8BKjPgiNjFuRAUg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mcNghz52ti2NQYptBT/tJou+rAvkaZVDMmp6A0Ov+2cXzLO1t0LsCXDeIj3SjhSVe5EJb2C2Tty4kQSWg15eraKcQE7Y2IyC/1ubQIzH/B3be9mnwPIHHfIuFHqPYtsi4oebHLLR8CkGEEKZLbZtjc9otMx0Z7s/c7KKLVeGmyo= 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=U1ihZKE4; 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="U1ihZKE4" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53KMWErE001601 for ; Mon, 21 Apr 2025 02:35:41 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=gesON2CEg60 SDvlicUFLEupsU8yrVPsf/z621XhBNZM=; b=U1ihZKE4MmcJ8hgojGukEruQOAH SHwvWSAQGyyu6+ccskEz+u7I4Cni7IH2rEhV8Gcp9QfeAeC1lGnNe+k7KPxw+XP9 VHDgfDD7v0AIG8MsSBN9WZnnTHjCcXo46b+iNGrsCc6lM7EhjZOEe/ckrOeofqbW ZM0pOCCOE6X7zsKQal3o668Uwgc5MR2UfwG5F9B3/xBfZw25wS7HnT7NYaW6hKj/ /mDtXSJDCXMBJinsy09j4W+ZPF2YOSOCTgTgHoV5JJPcOcdYytSawg1QB+WDFr5i N1UWYvFmO4zBcvpZSm/OpEc9CTAlUWiWghkNcUBTP6HTue7UZ1rfj+V2Fxg== 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 4644kjaq3s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 21 Apr 2025 02:35:41 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-224347aef79so49125095ad.2 for ; Sun, 20 Apr 2025 19:35:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745202938; x=1745807738; 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=gesON2CEg60SDvlicUFLEupsU8yrVPsf/z621XhBNZM=; b=JWy269NrGtXagWHMeHWPss0aiRGHNKadmIPapTr/FBhH7IrTh2S9AHOvbVAumHQUQC vdnBTX8ar6ekQiCUICJald3GaPtIAw9s1e2+u+pTsTwTVVS2eSdt6DpiXDUSg457kY+F 2YAB/CL+pfv+H8C3xP4zr7OMdfWkvHEVYhV88zgB2GWWxRTXX0Bsn/EV3Icy0Ur3iEZ+ X2ilYfgjWEfLTpq4RiRHGY5PayOiKf7yuKwvNcrqjLxHBetCXQhn02x5NzDrVXYi6mNm s2iZQsWUjKrjp0Ixo4TRtB2TrTBb7cwLtVfobWmnJ+O6tY/nIIa4vrjvfwviw1USSy07 32Pw== X-Gm-Message-State: AOJu0YwY0a97xnSIyxHBxyWS6eEYzXlTsgM1KYRUnGPH/SV/ziXbiv/j vZzsnrclsm4oXrUTH6Tk0p5KGQNWVMdrr1xMbfRqeUlXqtGDe8EceSMZeDzVvku5tjSjJaTP19z 6lUKdsoX61VGXHDg1GZre2da+FB+OAvHl0zDM7x9BhGMyOWJ+gge0iLnbRdWrVH5pnHPaRdFSpn My X-Gm-Gg: ASbGncssZu+zqVTbkPlhQ+lbxDtDKpEzWQeXiTttq2e7qKXEyGMDwfocW6S07iXV69Q HgwqLaD7CwDUOuu+k0q1PkV0tmDbm0Rt2/lUTyL4OQV0bMDcBjW/DEMRrITUcAn8lQ9GcD31/4d fJjYLEub4h65NYUSyYac+xtBGBfeiFbmXZMGBWUbM2erxEw5oo75kXF6KCeEAA13qYutCM0EZ8J 69F8I8HgOgpnuIepUJgswtvcM061LYZ2h9JJClabHy4Xk9e7uzoJVMU3zc96mWzJHS9oLY67aFB m63Ps0MXrdYmpwKEr+EjCGWyPH+Kiax6jeG6RDHyf2KOzr2ogKu+4evnJl/htsW9yBWyIIqxsLH TKfh5wIE00M0= X-Received: by 2002:a17:902:d546:b0:227:e74a:a057 with SMTP id d9443c01a7336-22c53631d76mr157868505ad.44.1745202938317; Sun, 20 Apr 2025 19:35:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGQrbfsrPTpnu5PWwGEpRYv0c+vIVsT++xkokknPcxMUq0vFPisysy1eBQlP3GsCCga9SrssQ== X-Received: by 2002:a17:902:d546:b0:227:e74a:a057 with SMTP id d9443c01a7336-22c53631d76mr157868195ad.44.1745202937884; Sun, 20 Apr 2025 19:35:37 -0700 (PDT) Received: from kangyang.ap.qualcomm.com (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c50eb4287sm54631685ad.130.2025.04.20.19.35.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Apr 2025 19:35:37 -0700 (PDT) From: Kang Yang To: ath12k@lists.infradead.org, kang.yang@oss.qualcomm.com Cc: linux-wireless@vger.kernel.org Subject: [PATCH ath-next 12/13] wifi: ath12k: use different packet offset for WCN7850 Date: Mon, 21 Apr 2025 10:34:43 +0800 Message-Id: <20250421023444.1778-13-kang.yang@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1.windows.1 In-Reply-To: <20250421023444.1778-1-kang.yang@oss.qualcomm.com> References: <20250421023444.1778-1-kang.yang@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-GUID: 4OyQ_XlIyGYPSeGter_-eaojSVVr6X4Y X-Authority-Analysis: v=2.4 cv=f5pIBPyM c=1 sm=1 tr=0 ts=6805aefd cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=QblmAMADz5KIc7vKYBUA:9 a=1OuFwYUASf3TG4hYMiVC:22 X-Proofpoint-ORIG-GUID: 4OyQ_XlIyGYPSeGter_-eaojSVVr6X4Y X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-21_01,2025-04-17_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 malwarescore=0 mlxlogscore=837 mlxscore=0 impostorscore=0 adultscore=0 priorityscore=1501 clxscore=1015 suspectscore=0 bulkscore=0 spamscore=0 lowpriorityscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504210018 In ath12k_dp_mon_rx_merg_msdus(), will set packet offset to 8. This is a right value for QCN9274. But WCN7850 use different hardware rings for monitor mode because it doesn't have RX MON component. So the packet offset is different. With current offset, upper-layer application will failed to parse the payload correctly. Should use different value for those who don't have RX MON component. Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1 Signed-off-by: Kang Yang --- drivers/net/wireless/ath/ath12k/dp_mon.c | 29 ++++++++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath/ath12k/dp_mon.c b/drivers/net/wireless/ath/ath12k/dp_mon.c index 7e0dc4d0327c..28cadc4167f7 100644 --- a/drivers/net/wireless/ath/ath12k/dp_mon.c +++ b/drivers/net/wireless/ath/ath12k/dp_mon.c @@ -1948,6 +1948,24 @@ ath12k_dp_mon_fill_rx_rate(struct ath12k *ar, } } +static void ath12k_dp_mon_rx_msdus_set_payload(struct ath12k *ar, + struct sk_buff *head_msdu, + struct sk_buff *tail_msdu) +{ + u32 rx_pkt_offset, l2_hdr_offset, total_offset; + + rx_pkt_offset = ar->ab->hal.hal_desc_sz; + l2_hdr_offset = + ath12k_dp_rx_h_l3pad(ar->ab, (struct hal_rx_desc *)tail_msdu->data); + + if (ar->ab->hw_params->rxdma1_enable) + total_offset = ATH12K_MON_RX_PKT_OFFSET; + else + total_offset = rx_pkt_offset + l2_hdr_offset; + + skb_pull(head_msdu, total_offset); +} + static struct sk_buff * ath12k_dp_mon_rx_merg_msdus(struct ath12k *ar, struct dp_mon_mpdu *mon_mpdu, @@ -1956,7 +1974,7 @@ ath12k_dp_mon_rx_merg_msdus(struct ath12k *ar, { struct ath12k_base *ab = ar->ab; struct sk_buff *msdu, *mpdu_buf, *prev_buf, *head_frag_list; - struct sk_buff *head_msdu; + struct sk_buff *head_msdu, *tail_msdu; struct hal_rx_desc *rx_desc; u8 *hdr_desc, *dest, decap_format = mon_mpdu->decap_format; struct ieee80211_hdr_3addr *wh; @@ -1966,8 +1984,9 @@ ath12k_dp_mon_rx_merg_msdus(struct ath12k *ar, mpdu_buf = NULL; head_msdu = mon_mpdu->head; + tail_msdu = mon_mpdu->tail; - if (!head_msdu) + if (!head_msdu || !tail_msdu) goto err_merge_fail; ath12k_dp_mon_fill_rx_stats_info(ar, ppdu_info, rxs); @@ -1995,14 +2014,14 @@ ath12k_dp_mon_rx_merg_msdus(struct ath12k *ar, ath12k_dp_mon_fill_rx_rate(ar, ppdu_info, rxs); if (decap_format == DP_RX_DECAP_TYPE_RAW) { - skb_pull(head_msdu, ATH12K_MON_RX_PKT_OFFSET); + ath12k_dp_mon_rx_msdus_set_payload(ar, head_msdu, tail_msdu); prev_buf = head_msdu; msdu = head_msdu->next; head_frag_list = NULL; while (msdu) { - skb_pull(msdu, ATH12K_MON_RX_PKT_OFFSET); + ath12k_dp_mon_rx_msdus_set_payload(ar, head_msdu, tail_msdu); if (!head_frag_list) head_frag_list = msdu; @@ -2037,7 +2056,7 @@ ath12k_dp_mon_rx_merg_msdus(struct ath12k *ar, msdu = head_msdu; while (msdu) { - skb_pull(msdu, ATH12K_MON_RX_PKT_OFFSET); + ath12k_dp_mon_rx_msdus_set_payload(ar, head_msdu, tail_msdu); if (qos_pkt) { dest = skb_push(msdu, sizeof(__le16)); if (!dest)