From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 07B641CAA85; Tue, 20 May 2025 14:16:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747750577; cv=none; b=FsrMJvp15IYTxf1CIlok4bud71miKtPH+qOGi/0f+QY3JFHwl1fHfXPhcTaGLyIYf5kE+qPas3bi1M/f+680i2uc9LNDwbFG5ZQEQpIG1aSUOIjesvbtGkdavpVsF2nU5w2O2SntMPb8Frbm2wZXvebWNaRfJx7AeUC5CgaikIo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747750577; c=relaxed/simple; bh=wgeqe8oZgSAvombEColRHgIqEjJt7NkIZuAZ98XY0GQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c2uSld5PAQhVhAuEirH8zFHqmLVUHOEcMVq6LbvoFlpTsbyI+b850t1/i9+J/wiLrMed3PODK6ZMewZxuPa64PJUUKg+X+wyN9N23265Q/LE4mLpnpDfL88X5dseb01G1kTfCeeQZOzW7z+3spXXEAAFwYfBcwfYZyA/kiTZHOI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TF7c5EQz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="TF7c5EQz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 84963C4CEE9; Tue, 20 May 2025 14:16:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1747750576; bh=wgeqe8oZgSAvombEColRHgIqEjJt7NkIZuAZ98XY0GQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TF7c5EQzKpthCoWQdwL4CNmP6PtwLf/Dm5r2WKcZ97/tzuXhZysxCxjUg6snIBQFe GqtqqTg8Y5cwFM7uj39bR0RSU71cQGXSuBPMCOk7xdYc/zpbWKh3rsgnyh4pEAWwfV Sq8i5ophbF8wjdyqJugnYXslLkcfIiEEOrwuorjU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hariprasad Kelam , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.14 054/145] octeontx2-af: Fix CGX Receive counters Date: Tue, 20 May 2025 15:50:24 +0200 Message-ID: <20250520125812.696972405@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250520125810.535475500@linuxfoundation.org> References: <20250520125810.535475500@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hariprasad Kelam [ Upstream commit bf449f35e77fd44017abf991fac1f9ab7705bbe0 ] Each CGX block supports 4 logical MACs (LMACS). Receive counters CGX_CMR_RX_STAT0-8 are per LMAC and CGX_CMR_RX_STAT9-12 are per CGX. Due a bug in previous patch, stale Per CGX counters values observed. Fixes: 66208910e57a ("octeontx2-af: Support to retrieve CGX LMAC stats") Signed-off-by: Hariprasad Kelam Link: https://patch.msgid.link/20250513071554.728922-1-hkelam@marvell.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c index 8216f843a7cd5..e43c4608d3ba3 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c @@ -707,6 +707,11 @@ int cgx_get_rx_stats(void *cgxd, int lmac_id, int idx, u64 *rx_stat) if (!is_lmac_valid(cgx, lmac_id)) return -ENODEV; + + /* pass lmac as 0 for CGX_CMR_RX_STAT9-12 */ + if (idx >= CGX_RX_STAT_GLOBAL_INDEX) + lmac_id = 0; + *rx_stat = cgx_read(cgx, lmac_id, CGXX_CMRX_RX_STAT0 + (idx * 8)); return 0; } -- 2.39.5