From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 1B57215E5BB; Sat, 17 Oct 2026 17:25:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792257918; cv=none; b=d1QeR+pz5RLixpIU538Pe5GO/8Vej7fsru+11lC8j5BCyyP8/W6i9btmU176QCKipTbhOr4G5gkXEegTkcpev8YTGsH0yQvFl+F4TazB+fdl5h+YyE1BnqPRy8VGVufHfrCpEX0tzdrQNBwukVNxoCfcaiKy1Z+qe9Wsg3VcGfE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792257918; c=relaxed/simple; bh=d8ITgMN0SkOyiJng3yjgFqCwRbofwAW0MFMD8dXnDHI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M5QLtnTSV8RcxqF04D8XSLry5+t5B/f8ybh2gPVpceDa/gvbLNTVjLuur3xnsrOVAWEB/mXs7/fTJuC7mloxGe1Q3GyZw048VA+ETS9Vg2WsWbhfSSa0JmIacWOL4JKfJK4GUkqP8eC06lPGyRptX9CxqegVD+x9ZiyVGzVQWgg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=HROJI7Jm; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="HROJI7Jm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A66D1F000C4; Sat, 17 Oct 2026 17:25:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1792257917; bh=pP8dW+ZkxwKFgP38se5aYK29A8c68VG9I0rcdPrGYIw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HROJI7JmtUlR5EAorYrfZ3ooJ1m0+x5U6STvnSTwV2sUTzEl9RwHl1hcM0xjhT/VB oN/lSq0UHwq9FVJAA/R5ciH6cd1HnnbDbgJhB1zj39DzYE7utUuu0TwEGJGpWqShwy xE3+X1uMMgv2Nn2BemUYVlyfQMwAFIWcQDtETEY8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Karthikeyan Periyasamy , Jeff Johnson , Kalle Valo , Jeff Johnson , Sasha Levin Subject: [PATCH 6.6 0713/1674] wifi: ath12k: fix incorrect TID updation in DP monitor status path Date: Sat, 17 Oct 2026 17:49:45 +0200 Message-ID: <20261017160449.408980164@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261017160431.119607952@linuxfoundation.org> References: <20261017160431.119607952@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Karthikeyan Periyasamy [ Upstream commit ebee84cc961cd3947015efbf4a5dbea63b11c5d3 ] Currently, an incorrect TID value gets populated in the monitor status Rx path due to an incorrect bitmap value given to the ffs() built-in helper function. Therefore, avoid the decrement and directly provide the TID bitmap to the ffs() built-in helper function for the correct TID update in the monitor status Rx path. Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1 Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 Signed-off-by: Karthikeyan Periyasamy Acked-by: Jeff Johnson Acked-by: Kalle Valo Link: https://patch.msgid.link/20241217084511.2981515-6-quic_periyasa@quicinc.com Signed-off-by: Jeff Johnson Stable-dep-of: ecfc13138992 ("wifi: ath12k: Avoid memory leak while enabling statistics") Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath12k/dp_mon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/ath12k/dp_mon.c b/drivers/net/wireless/ath/ath12k/dp_mon.c index 4df497b36a3bd..650266d206671 100644 --- a/drivers/net/wireless/ath/ath12k/dp_mon.c +++ b/drivers/net/wireless/ath/ath12k/dp_mon.c @@ -612,6 +612,7 @@ ath12k_dp_mon_rx_parse_status_tlv(struct ath12k_base *ab, case HAL_RX_PPDU_END_USER_STATS: { struct hal_rx_ppdu_end_user_stats *eu_stats = (struct hal_rx_ppdu_end_user_stats *)tlv_data; + u32 tid_bitmap; info[0] = __le32_to_cpu(eu_stats->info0); info[1] = __le32_to_cpu(eu_stats->info1); @@ -624,10 +625,9 @@ ath12k_dp_mon_rx_parse_status_tlv(struct ath12k_base *ab, u32_get_bits(info[2], HAL_RX_PPDU_END_USER_STATS_INFO2_AST_INDEX); ppdu_info->fc_valid = u32_get_bits(info[1], HAL_RX_PPDU_END_USER_STATS_INFO1_FC_VALID); - ppdu_info->tid = - ffs(u32_get_bits(info[6], - HAL_RX_PPDU_END_USER_STATS_INFO6_TID_BITMAP) - - 1); + tid_bitmap = u32_get_bits(info[6], + HAL_RX_PPDU_END_USER_STATS_INFO6_TID_BITMAP); + ppdu_info->tid = ffs(tid_bitmap) - 1; ppdu_info->tcp_msdu_count = u32_get_bits(info[4], HAL_RX_PPDU_END_USER_STATS_INFO4_TCP_MSDU_CNT); -- 2.53.0