From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from stravinsky.debian.org (stravinsky.debian.org [82.195.75.108]) (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 D44923859CB; Thu, 22 Jan 2026 18:41:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769107318; cv=none; b=mXEir8V7z3tWpRQXfOE2tI5GAEJnZueY1Oz5N/Ju4ScQrT9GjbE2Uu3D585oMogiaon6HqJbMwYhAYXP0+AdELJPpviQ1fzyauGA0Qp42x9pYjXrKfs0ynr1CEIqpGriLP2wxsGsOqb2sZEl7SrouMhu9V7wkY7vh2XUGAg5cq8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769107318; c=relaxed/simple; bh=xjfGrJ9ogmU02tXh4UwJsiacW3KcvGXHd/h59cpJCJU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EkRugySm1EJzmSX/k6LoALIn1YacEpd5OBtJ3SNkjPML/ibrOP1uu7u6f3QSB7OoJE2O1KEsbUEdJQ/VuVQAR87w8VcrRmikLlyMZssw/dy5wVqeiY+Nz4UsgRKrzhzQyE6UzM+6a8l40Bgzdala67VzoztB0F+b9fZOpKoAolE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=bNfNiXPB; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=debian.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b="bNfNiXPB" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description; bh=+Ieldrz0yCTZzK/huBW1mkitT5A3IA5rZUXCCnhdv+8=; b=bNfNiXPBqOd4lHTo+SwidUgz8T 0uM096VXGUo0YE14qMLTSvNXpw6+k4SEqpmXs5pEEXMw+/vu1TEh0Fsit1iaQssibsDpJWP51H2Kn wZVqib+ZW3o2bupfS2PrAx0u7cu9gMJ57VRhMiOZsFMhiKk4A+VGiLJp93AHe/VlJMdZD1V6+Ezze DcbGz1CSntKWhMQEo5UED9mgzHXMidSIkgPVOtzUsYzbts7wUTQrpsNJZFqe5lJQPi2RTu69df4Yy OvAVY8hlFcZs0e4UBpGfm801N7DKQVcz9b9yhS1eZIViJgCVB133QJc+4LOfyMAWOIZ95dF7bk3IL oxhUOIiA==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1vizcX-00DE2W-Ib; Thu, 22 Jan 2026 18:41:29 +0000 From: Breno Leitao Date: Thu, 22 Jan 2026 10:40:20 -0800 Subject: [PATCH net-next v2 8/9] net: sfc: siena: convert to use .get_rx_ring_count Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260122-grxring_big_v4-v2-8-94dbe4dcaa10@debian.org> References: <20260122-grxring_big_v4-v2-0-94dbe4dcaa10@debian.org> In-Reply-To: <20260122-grxring_big_v4-v2-0-94dbe4dcaa10@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Igor Russkikh , Simon Horman , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li , Alexander Duyck , kernel-team@meta.com, Edward Cree , Brett Creeley Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, oss-drivers@corigine.com, linux-hyperv@vger.kernel.org, linux-net-drivers@amd.com, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=2810; i=leitao@debian.org; h=from:subject:message-id; bh=xjfGrJ9ogmU02tXh4UwJsiacW3KcvGXHd/h59cpJCJU=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpcm8kwMgayWGZil65b7m91kTJjZMqKDCbx4NDa 3ny/Yf0Sl6JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXJvJAAKCRA1o5Of/Hh3 bfEsD/9GFdvicyZuKksa/LMwMan8K3l2ul6AbpK+dk0soRUKMkhZOBa8M1Rs+GmAmMVY6kS0A7s B6n1MKjcxLSzkX2ZOcexcD3hEzx72woM8b8GU/sDHc97GDRyRnYNUPBWMnkM6Imim4TiUIz5oZa xdK2r4vYkFIlAQPvVlSGRZnDWf08/y8Yre4FD61jK3pJZbYCRDG9iMLQnLS9YQ3+x02YOKU8pvz WEAhRokUN2USk3qFyUsP8D/ACO/22I4d3fxiYTMCuDZ4dqJgS3uBMrgM7noyQxHdNehe74UGd/d CBVOTtTIXJzu5MBsveBv0yN/4u1uUKqXIm1cwFUlSxyHL62IhXtFG8XJTn0kQvHh8mtpN/+KoD+ A327CRIZDiPv1CwuK8YAjYpGe8LTXjIZSIxPCDKqMYLdmrsumP//6N9lPC4jUXqVxrWe1DZKELI jDHDPpkYUVaai3BPUE4l0c0MrUxYi09HLfYAasVJC5csDgF6OcWAfsquYF6sJuOWZeYV21mujtG 1jRwctHNQZhASgWtpElJI+muqrGM1Tmr2gtIe2WANfPVgdkMm8cJTIsuW0FNYB5ZmiyQvajLkH0 AiC5zyhgnGryduqWCnB89Qr8/BqUBLwcNAKa/VWjZe1UkDMrdiJHGZbV6XKHqwjbOwliRquKN8r yoNTjNDZuw0nCgQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Use the newly introduced .get_rx_ring_count ethtool ops callback instead of handling ETHTOOL_GRXRINGS directly in .get_rxnfc(). Signed-off-by: Breno Leitao --- drivers/net/ethernet/sfc/siena/ethtool.c | 1 + drivers/net/ethernet/sfc/siena/ethtool_common.c | 11 +++++++---- drivers/net/ethernet/sfc/siena/ethtool_common.h | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/sfc/siena/ethtool.c b/drivers/net/ethernet/sfc/siena/ethtool.c index 8c3ebd0617fb1..36feedffe4444 100644 --- a/drivers/net/ethernet/sfc/siena/ethtool.c +++ b/drivers/net/ethernet/sfc/siena/ethtool.c @@ -261,6 +261,7 @@ const struct ethtool_ops efx_siena_ethtool_ops = { .reset = efx_siena_ethtool_reset, .get_rxnfc = efx_siena_ethtool_get_rxnfc, .set_rxnfc = efx_siena_ethtool_set_rxnfc, + .get_rx_ring_count = efx_siena_ethtool_get_rx_ring_count, .get_rxfh_indir_size = efx_siena_ethtool_get_rxfh_indir_size, .get_rxfh_key_size = efx_siena_ethtool_get_rxfh_key_size, .get_rxfh = efx_siena_ethtool_get_rxfh, diff --git a/drivers/net/ethernet/sfc/siena/ethtool_common.c b/drivers/net/ethernet/sfc/siena/ethtool_common.c index 47cd16a113cf1..c56e0b54d8541 100644 --- a/drivers/net/ethernet/sfc/siena/ethtool_common.c +++ b/drivers/net/ethernet/sfc/siena/ethtool_common.c @@ -841,6 +841,13 @@ int efx_siena_ethtool_get_rxfh_fields(struct net_device *net_dev, return 0; } +u32 efx_siena_ethtool_get_rx_ring_count(struct net_device *net_dev) +{ + struct efx_nic *efx = netdev_priv(net_dev); + + return efx->n_rx_channels; +} + int efx_siena_ethtool_get_rxnfc(struct net_device *net_dev, struct ethtool_rxnfc *info, u32 *rule_locs) { @@ -849,10 +856,6 @@ int efx_siena_ethtool_get_rxnfc(struct net_device *net_dev, s32 rc = 0; switch (info->cmd) { - case ETHTOOL_GRXRINGS: - info->data = efx->n_rx_channels; - return 0; - case ETHTOOL_GRXCLSRLCNT: info->data = efx_filter_get_rx_id_limit(efx); if (info->data == 0) diff --git a/drivers/net/ethernet/sfc/siena/ethtool_common.h b/drivers/net/ethernet/sfc/siena/ethtool_common.h index 278d69e920d9f..7b445b0ba38aa 100644 --- a/drivers/net/ethernet/sfc/siena/ethtool_common.h +++ b/drivers/net/ethernet/sfc/siena/ethtool_common.h @@ -37,6 +37,7 @@ int efx_siena_ethtool_set_fecparam(struct net_device *net_dev, struct ethtool_fecparam *fecparam); int efx_siena_ethtool_get_rxnfc(struct net_device *net_dev, struct ethtool_rxnfc *info, u32 *rule_locs); +u32 efx_siena_ethtool_get_rx_ring_count(struct net_device *net_dev); int efx_siena_ethtool_set_rxnfc(struct net_device *net_dev, struct ethtool_rxnfc *info); u32 efx_siena_ethtool_get_rxfh_indir_size(struct net_device *net_dev); -- 2.47.3