From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 490B1C433F5 for ; Thu, 24 Feb 2022 00:12:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245197AbiBXANL (ORCPT ); Wed, 23 Feb 2022 19:13:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245191AbiBXAMy (ORCPT ); Wed, 23 Feb 2022 19:12:54 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84AED5F4D0 for ; Wed, 23 Feb 2022 16:12:26 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1FC1C60C47 for ; Thu, 24 Feb 2022 00:12:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 32A09C340EB; Thu, 24 Feb 2022 00:12:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645661545; bh=uBU5IRJiHSNhzaQz/uOHAkPGRc5LpheNcZXPw3O1shI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T33PtrjlmZFysr0KYFsiZkDOmPU71+OadK72owa5K8ZADUFahigGMEXcV60YKtDSv WUTDwhAgj9UWiB3HZlbdd7BQY9J6uA7XCIveVlOBxvQHwrmuvZJCbDsjUEv/bGAYm/ necWI6JmmCGloaUjGiY+mJpYzcD+irTcciPlNaJRf16GkN438CxM2hTuSGFXnBB/Dc ZrCi1uiqWUKQ0tgurJyzmDiykyXfTWZeHu82hMJ4f3rlidyM5ggm/yjNOm1u/HVreq bCSZKNKczvMOm+5d7IOg1hCdmNbcoBLtzt9xcGADYG38YER9kHPq4oboN09vM3TETS Acp3e98f6ccSA== From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Lama Kayal , Gal Pressman , Saeed Mahameed Subject: [v2 net 15/19] net/mlx5e: Add feature check for set fec counters Date: Wed, 23 Feb 2022 16:11:19 -0800 Message-Id: <20220224001123.365265-16-saeed@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220224001123.365265-1-saeed@kernel.org> References: <20220224001123.365265-1-saeed@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Lama Kayal Fec counters support is checked via the PCAM feature_cap_mask, bit 0: PPCNT_counter_group_Phy_statistical_counter_group. Add feature check to avoid faulty behavior. Fixes: 0a1498ebfa55 ("net/mlx5e: Expose FEC counters via ethtool") Signed-off-by: Lama Kayal Reviewed-by: Gal Pressman Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c index 26e326fe503c..00f1d16db456 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c @@ -1254,9 +1254,6 @@ static void fec_set_corrected_bits_total(struct mlx5e_priv *priv, u32 in[MLX5_ST_SZ_DW(ppcnt_reg)] = {}; int sz = MLX5_ST_SZ_BYTES(ppcnt_reg); - if (!MLX5_CAP_PCAM_FEATURE(mdev, ppcnt_statistical_group)) - return; - MLX5_SET(ppcnt_reg, in, local_port, 1); MLX5_SET(ppcnt_reg, in, grp, MLX5_PHYSICAL_LAYER_STATISTICAL_GROUP); if (mlx5_core_access_reg(mdev, in, sz, ppcnt_phy_statistical, @@ -1272,6 +1269,9 @@ static void fec_set_corrected_bits_total(struct mlx5e_priv *priv, void mlx5e_stats_fec_get(struct mlx5e_priv *priv, struct ethtool_fec_stats *fec_stats) { + if (!MLX5_CAP_PCAM_FEATURE(priv->mdev, ppcnt_statistical_group)) + return; + fec_set_corrected_bits_total(priv, fec_stats); fec_set_block_stats(priv, fec_stats); } -- 2.35.1