From mboxrd@z Thu Jan 1 00:00:00 1970 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 BFA4137C907 for ; Sat, 9 May 2026 02:59:15 +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=1778295558; cv=none; b=igUPr/HL2Vl7IeqEkkfZKUJcjoRHMM7uGK1jg07ZrHiYNDtWa7VECwa3qH3fyTWph+5Nwti9pO6wvLddMIoFkJTr0jgb18of6RvnzWqTP0yDU0Rx59FSCIRWsBYFy76RqjAof7XdtGC8wJe09SgcYjQcL1DYH2i2ZDXGidvkiDQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778295558; c=relaxed/simple; bh=UHaA3B0jh+nvgq1/LHaBWTAGcWv9PRMNVGESqVddsP4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sEUmS+mZlpq9Q4lWmEJhlDPDuXu/kyzVivLGl7HAxJF0e5w5BeOvyQe/j3hU5NA1qyoxg2TjU4XHcCQ6/xY7QYe+9E/SdJ3M/Cju5qz/k9b13mXi0KAyU8/OZiUd3EG1D/PECi0dW4SlXLm7mqjeWHrhGfEMMIP6/MI4AQgK+KU= 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=pGb1IPo6; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=geD8GEls; 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="pGb1IPo6"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="geD8GEls" 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 6492BofJ656656 for ; Sat, 9 May 2026 02:59:14 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=y7PQ7mMFj09 RBEC6R19QFDNhjCRnQR0cfi6POVI/210=; b=pGb1IPo6bfOm0gu+mHpxhaTKbi9 UjKoBXxQdtVgUN9kISSTTOtU+w3bOpxuQjyXAaEqz+r6X5ms+GMg436bjjvC7VpL xviUwWERJx1TAyEVTaLLr5+TIFpE7zWhOwgfXWiUWMc3GhrkwvhlwrMHHPO8Se2t ILg3mEkFq5GNL7ogx9PRDO3uuKB1jX5xxRdlkTsWqsVRirG4RLOoiGXznnSWyezw cMhFFoC0wzBUXsqZiJCUYIBY0MiRLjmDHnh/x7lBQh/urZ8gP/wD9d3+dZWVuAbl XGlrxEsBSEkJiYbRuwy2APe0bGJbZfN933qH2SsB4LH45aGKkMzrkKa3h8A== 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 4e1ux6r2sm-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sat, 09 May 2026 02:59:14 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-3663cbff31cso3615976a91.2 for ; Fri, 08 May 2026 19:59:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778295554; x=1778900354; 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=y7PQ7mMFj09RBEC6R19QFDNhjCRnQR0cfi6POVI/210=; b=geD8GElscXFjIKio5QprYd7qDeJsMiSbRrJULAMb9+6i1L4IV+2CAHZfqsYzEI2fir wzQwttlUOdDcQByuCkl85mvwz64UyTcaEJhouW1Dr0CDYgEAvdYQmFs62hY7m/sbne0y ejW0mx5SF4mt2qAgLuwiA3oIgvs9xBDd1FDsoFMYf8CgJa8UjYlLu9B+1UXk6AwEE/Tj NTtMhwgR2TSpQyXZmHVF1nDDWBw/AKNWMcmDqpAp/vG9Yy35oRvWiIBhTDxOxX9NJCTG /BLOJzT8RhxJXEgnfO6uPCERzCPe5S9j7NS3KTB98N7pCCyhnKQYSOZQz8LFUYfQjipm RZtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778295554; x=1778900354; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=y7PQ7mMFj09RBEC6R19QFDNhjCRnQR0cfi6POVI/210=; b=aPgDc4rNbtGuO4TWewiYhIkkJzQKFh2tXfVSj6SivjlPsW+MIRaANP1QN8H18MaHjM 7ObHP9/S723xcC+UcmLHtdamlnhBOxNbWIdrt+lzi52LHhbGvnZcjvmDi6gVqAuKN8Fu oe83tsxopCyXENKaBRFqXG8yo86cRtPlk2vZBc9PkSbc1R0ecCZ0aaGTGfZ6jKXYzZRC eN/QdfmR7E2d5affaqU2GS0kusQTt95cBzeVQcL1p1y0KQ19qDHV69e0GI+skikYJEqx e0+Hhly/q3S1TBGKoHbbImDTjzsGvPIT2dqBQepz23c82TghviKiEchRkRIrNd8CzCMM WdiA== X-Forwarded-Encrypted: i=1; AFNElJ/JQfrvCpOljewqs5DSeKMHXFbLTXrpMLdx433DzXCs4V8l4cmi4BbCOU7hTLqjuRYOcAVtMK9+metko9I=@vger.kernel.org X-Gm-Message-State: AOJu0YwgJGzuWhdia7AbhTokM4PwWdJ5gRuTNymZzRbEUZlJM8tCSQU8 kRC5lP7owjs8pTRkvxMDz5Q44mgRWo3n6rqcovE80kAu6Ccc/uYlDMKmjVn9b2MFGbooh/9ebz4 mDI+06rutXKU2JUiro2xXDP7LXAS9rulLPPCkC3/iq4Y/316fPfUWIJanlrK3O8Hqa5M= X-Gm-Gg: Acq92OG2/cCwTUmQajE24IRIBAfWYYKYeVr6nQqG3XE3NOlIiAOyLAjaYE7TURdDOoY tFFwE1Eys3i/w67NrI/QzQtso9u5h0Kx0bYd39yH5RXtI/Go+OkZkBNjDdaZscK3APOM1KmK9qN 55KAruzUdGgFI8OEB2XEfoxoaGWYnKVNSpV9AiSF0jkf/RXGr23O1m70OkLGOuy/valJecNdUQL wyLcxp4jVBfZdeFDE8XfzS2MVYMr1d+ghJQ6CbCb0t2YvWzFg0PLVsnNuN8L94CfcneRP28xpgG sdn1O1Z2gjfqeioF6gEdPSPnvXUT2bymSHnvrh/ejXV0OgfXerJf462lkO0RrBRfFCd/RBmgfUC glsUiwPhiUaGM9eVfjn1GFK78ZHk0qr7stQGMUaHSbpr6vR+shpHvP2BpKhM72qnH+dRFGeK+88 iltDoC X-Received: by 2002:a17:90b:2691:b0:359:fe72:3559 with SMTP id 98e67ed59e1d1-365ac46dc62mr16763810a91.21.1778295553639; Fri, 08 May 2026 19:59:13 -0700 (PDT) X-Received: by 2002:a17:90b:2691:b0:359:fe72:3559 with SMTP id 98e67ed59e1d1-365ac46dc62mr16763787a91.21.1778295553087; Fri, 08 May 2026 19:59:13 -0700 (PDT) Received: from Z2-SFF-G9-MQ.ap.qualcomm.com (i-global052.qualcomm.com. [199.106.103.52]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-367be8be938sm750899a91.4.2026.05.08.19.59.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2026 19:59:12 -0700 (PDT) From: Miaoqing Pan To: jjohnson@kernel.org Cc: ath12k@lists.infradead.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Miaoqing Pan Subject: [PATCH ath-next 1/5] wifi: ath12k: fix TLV32 length mask Date: Sat, 9 May 2026 10:58:15 +0800 Message-Id: <20260509025819.1641630-2-miaoqing.pan@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260509025819.1641630-1-miaoqing.pan@oss.qualcomm.com> References: <20260509025819.1641630-1-miaoqing.pan@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: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTA5MDAyNyBTYWx0ZWRfX7VIsy/Zu+KHE huGz1evELU9A4HIRvmhY8Dksw0n2Hf6xJoaz4S5raBit1p2PeoLxzgYTYy54UOU4YMQTRE6OWdd Fz7C1iXZSiDn9DPj0mqACJpvqq/bmhlgjzRbXue6lTZ9BI5p7HiRPRt2RM7vOcIkEExKCZkVJEH Ov5vJSKL+X/J+qYScymgCZ2DJbMdGilm92ts5VTHSamVqOuzYefdiDGDRPSJG6IHQbfIAuC+xkI QyEgLNzxwY99/0yvato+tL5qZ1cZlit1TkQxDX74EQ79j2w57EA9z97Thtc+28YAwzHk5w4fu8c Qy/2ub5MDwCmHopogq0GGdoN5FUrAfwMgQVU/HFP5Kub4OsRmMQmTnFGAOOgHNJEiHaXa7X9y85 EJkz1tE9+fbvWEi72odg7qvGkQuvljnltiYCqOr4iG8FhbV0GqTjjfhURiaJ+MIwXj+Epazaynr 3ItcPRmPzwllLgAKuwA== X-Authority-Analysis: v=2.4 cv=QJZYgALL c=1 sm=1 tr=0 ts=69fea302 cx=c_pps a=vVfyC5vLCtgYJKYeQD43oA==:117 a=b9+bayejhc3NMeqCNyeLQQ==:17 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=oTESD8Iu_DoklxnQOhcA:9 a=rl5im9kqc5Lf4LNbBjHf:22 X-Proofpoint-ORIG-GUID: aZcS0fI-kCk8DTdfchfDAK1lF5Srb_CV X-Proofpoint-GUID: aZcS0fI-kCk8DTdfchfDAK1lF5Srb_CV X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-09_01,2026-05-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 adultscore=0 clxscore=1011 suspectscore=0 spamscore=0 lowpriorityscore=0 bulkscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605090027 HAL_TLV_HDR_LEN was using the wrong bitmask; fix it to cover bits [21:10]. Also drop HAL_SRNG_TLV_HDR_{TAG,LEN} and use the generic TLV header bit definitions for TLV32/TLV64 encode/decode to avoid redundant macros. Tested-on: QCC2072 hw1.0 PCI WLAN.COL.1.0.c2-00068-QCACOLSWPL_V1_TO_SILICONZ-1 Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c5-00302-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.115823.3 Fixes: d889913205cf ("wifi: ath12k: driver for Qualcomm Wi-Fi 7 devices") Signed-off-by: Miaoqing Pan --- drivers/net/wireless/ath/ath12k/hal.c | 8 ++++---- drivers/net/wireless/ath/ath12k/hal.h | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/ath/ath12k/hal.c b/drivers/net/wireless/ath/ath12k/hal.c index a164563fff28..f03817b2fbc5 100644 --- a/drivers/net/wireless/ath/ath12k/hal.c +++ b/drivers/net/wireless/ath/ath12k/hal.c @@ -828,8 +828,8 @@ void *ath12k_hal_encode_tlv64_hdr(void *tlv, u64 tag, u64 len) { struct hal_tlv_64_hdr *tlv64 = tlv; - tlv64->tl = le64_encode_bits(tag, HAL_TLV_HDR_TAG) | - le64_encode_bits(len, HAL_TLV_HDR_LEN); + tlv64->tl = le64_encode_bits(tag, HAL_TLV_64_HDR_TAG) | + le64_encode_bits(len, HAL_TLV_64_HDR_LEN); return tlv64->value; } @@ -851,7 +851,7 @@ u16 ath12k_hal_decode_tlv64_hdr(void *tlv, void **desc) struct hal_tlv_64_hdr *tlv64 = tlv; u16 tag; - tag = le64_get_bits(tlv64->tl, HAL_SRNG_TLV_HDR_TAG); + tag = le64_get_bits(tlv64->tl, HAL_TLV_64_HDR_TAG); *desc = tlv64->value; return tag; @@ -863,7 +863,7 @@ u16 ath12k_hal_decode_tlv32_hdr(void *tlv, void **desc) struct hal_tlv_hdr *tlv32 = tlv; u16 tag; - tag = le32_get_bits(tlv32->tl, HAL_SRNG_TLV_HDR_TAG); + tag = le32_get_bits(tlv32->tl, HAL_TLV_HDR_TAG); *desc = tlv32->value; return tag; diff --git a/drivers/net/wireless/ath/ath12k/hal.h b/drivers/net/wireless/ath/ath12k/hal.h index bf4f7dbae866..b3a89ace5a97 100644 --- a/drivers/net/wireless/ath/ath12k/hal.h +++ b/drivers/net/wireless/ath/ath12k/hal.h @@ -1442,7 +1442,7 @@ struct hal_ops { }; #define HAL_TLV_HDR_TAG GENMASK(9, 1) -#define HAL_TLV_HDR_LEN GENMASK(25, 10) +#define HAL_TLV_HDR_LEN GENMASK(21, 10) #define HAL_TLV_USR_ID GENMASK(31, 26) #define HAL_TLV_ALIGN 4 @@ -1462,9 +1462,6 @@ struct hal_tlv_64_hdr { u8 value[]; } __packed; -#define HAL_SRNG_TLV_HDR_TAG GENMASK(9, 1) -#define HAL_SRNG_TLV_HDR_LEN GENMASK(25, 10) - dma_addr_t ath12k_hal_srng_get_tp_addr(struct ath12k_base *ab, struct hal_srng *srng); dma_addr_t ath12k_hal_srng_get_hp_addr(struct ath12k_base *ab, -- 2.34.1