From nobody Mon Feb 9 06:30:57 2026 Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com [209.85.210.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E5AEB4418D2 for ; Wed, 21 Jan 2026 15:56:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010984; cv=none; b=Mb1yzdWjPwyBCzK4I4uDampd8GyfcmRYLCyS0p6pZndHLuvuLIHzLYq7rl3WPrAIvyNNzuQ2568F2Y8ZIgHMZ3nxFrvWN9ySiMyilZKCqXC6JuG98PATwrPb9svgkHXMrKdgVM0H6cIxWXvvQh8kEgYMEjlzJlUbE4/qRFEBqt8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010984; c=relaxed/simple; bh=bJbfYoi9ePT6GJvQe190QXenIvJlnJbG5gCYyHOYLyw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NDBn7xiVAKAY0HXivYFagbnOIekgEQI6Y5noIG5myXR6AD/gZIDz39OtFggmktWTqvp6NZ+EUv3Z4LiQgX25f/hpAZ/MBeq7nxfRsbE5YjqzbD8Ip8nTyJ6qJQsrjmbACopojF1RB9n0QmOLJFwdaq52HBZDfQj2l0j6C7LqCJg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.210.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ot1-f53.google.com with SMTP id 46e09a7af769-7cfd48df0afso4380756a34.1 for ; Wed, 21 Jan 2026 07:56:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769010980; x=1769615780; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=0dc9BpwHRAb/FF2L8Jh14J11cIizVUqlWjJq5crcpt8=; b=ecMAAJG98UGIjQ6vylLrgo+HIrfVLS839Ol/GI/uGz1vPRt8gFrXBHUT/Od+kqNNSR hfqSPwJtf3B55yp/o17mApZult50wbC00qvE8V5NcHB13rqNX0e4GiY5FTk+ejCDWPVQ IJNdi5htrvHntSeQjBqmkmFh40TTjHQl+qc17Ih/LF05U27KGA+Zea76MSdiaB8/2Nkb zEspaff4d6CHDEubGHLy2D9BpL3GSXwhe3XQ5LPJq8k7Aj9uklPE/DviuEyQ3pozuqln y4QWug3LA/R6TLSL/+pWgLvkREF0CEs7pTC5jReG6J0nuQxU4yBaFj7CInmPZug+qSVP iCEw== X-Forwarded-Encrypted: i=1; AJvYcCVto4aD5tn0vpKCp4EZ5V0MnKZKKb2HYTPY073cYQZ0ADYZJoBb+UKybuU5A05T+6FQ2WPRwVyEKbqd1As=@vger.kernel.org X-Gm-Message-State: AOJu0Yw5JYsc/O8GCLQXspIBgsWeqVQuw8kpLGDtlXFZeeCjbe0ugq8F yYpzdy0Gp5ZkG3SXksqExaUBIxDmHS0oCuwG7bes5/ZtZtUylzWYjcYl X-Gm-Gg: AZuq6aICR+sqfRI584hbBdT27+osmXrlcP+HVR1qDyY9f/rmRhbvZQ+xcVL02qfpO1F qGQZ+bDP5eWPbl5GSsbSzLr+i9FKnKqedMnxBs1ct90h4o6QXZC7QSjPuIV2C90PH6mK3TQnRiy p+NSC3SPgAiOtIpb/r4M2EprnSiEee0XsKtz6jhkK1tApmIvii1KvC947jgk24PTxOeML6XGaFY eqz2pCLWrN6EDW2L1Dpiov2C4OT4z64QoNZq+IvPCld4TV9ogUYpaLelWHmgRrD0BOiypLFm04q nW2/ARSdxzEzqk1Hk4nGCN2y/MG/aaWgtoPFKxhEKlwJjUSsnWaqA+pq4wZ2pCWzfClnqS0u+jU aYJPxHjzajZcv5k2HFMzQvbLyKcc4fH0hsWvvRe8QS8rx/XcstWje9KT6ihPw1+KL0LxJVyjIhd rQ3A== X-Received: by 2002:a05:6830:34a3:b0:7cf:da36:4c7e with SMTP id 46e09a7af769-7cfded34418mr11426838a34.8.1769010980605; Wed, 21 Jan 2026 07:56:20 -0800 (PST) Received: from localhost ([2a03:2880:10ff:5e::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7cfdf2b5a74sm10537443a34.29.2026.01.21.07.56.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jan 2026 07:56:20 -0800 (PST) From: Breno Leitao Date: Wed, 21 Jan 2026 07:54:38 -0800 Subject: [PATCH net-next 1/9] net: benet: 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: quoted-printable Message-Id: <20260121-grxring_big_v4-v1-1-07655be56bcf@debian.org> References: <20260121-grxring_big_v4-v1-0-07655be56bcf@debian.org> In-Reply-To: <20260121-grxring_big_v4-v1-0-07655be56bcf@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=2883; i=leitao@debian.org; h=from:subject:message-id; bh=bJbfYoi9ePT6GJvQe190QXenIvJlnJbG5gCYyHOYLyw=; b=owEBbAKT/ZANAwAIATWjk5/8eHdtAcsmYgBpcPchCHxqClAg62HFeFAbMUPfCD84HYKp+kg8Y i/NEdAJ4MWJAjIEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXD3IQAKCRA1o5Of/Hh3 bbMSD/YiyXHZnrDbsbyzXsekkJF8wGQm8LZpBCwBjpqlmXQJrnLP0W0wE13XKmuWQhINTucgY3l PLMJW6H0Rv+97H/qPjnapi09wOKxEJysm6NkE3uq3qitja+AdkOsgnBUd7R10UYGND+Yd43LQAO bUYb5VeMFLVU7SNfdOIKO0ktpnbuUFXKXRlFEL0w+5q+EOpJShFdb8l65n+SCKgK/4m1uyBPLZj xpZ9LOf4hl45EsABkRQIXGc71tBlqtpvcyzo0lltZHa0FNpTEu9e93bmRGK8GmFLqlSFu3Vh6su KLRcTkll/+NlBneEbd3uqlHMVPBFMkQ64C6Cs28/69w+DzcvXwnQxJfS8ATSui5GtibOsp3yM61 bZuApi8NGJCBQ+gBaKgnqfu2qXZyZdyENmAZ6/S7bRbB5ZWUmC1rwCn1ZvTkOoXPp4J7ehwKgaO m756KVYP65F4DbsAoEc0LaaiFORa7OxJ3rhk4bztDt+8Av7/sUFwlhSfC4dmujMkSIiM/1noxWR 5K5MqZYwQlxWzz7wd2hjSDbGC1bYtTXOazDO7a8jCACSdoDwEty0/sIiDu4yzto73wKAwoNCPZr mdQYldtkShmobp6SldWy1h2ELbmREQkeuvxCClQAAFYNBxMHg78eNSNOLgLe7EnFkmLvFAQablG d06e/Vh/5IkuC X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Use the newly introduced .get_rx_ring_count ethtool ops callback instead of handling ETHTOOL_GRXRINGS directly in .get_rxnfc(). Since ETHTOOL_GRXRINGS was the only command handled by be_get_rxnfc(), remove the function entirely. Since the be_multi_rxq() check in be_get_rxnfc() previously blocked RSS configuration on single-queue setups (via ethtool core validation), add an equivalent check to be_set_rxfh() to preserve this behavior, as suggested by Jakub. Signed-off-by: Breno Leitao --- drivers/net/ethernet/emulex/benet/be_ethtool.c | 37 ++++++++++------------= ---- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/e= thernet/emulex/benet/be_ethtool.c index f55f1fd5d90fd..87dbbd5b7f4e6 100644 --- a/drivers/net/ethernet/emulex/benet/be_ethtool.c +++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c @@ -1073,6 +1073,13 @@ static void be_set_msg_level(struct net_device *netd= ev, u32 level) adapter->msg_enable =3D level; } =20 +static u32 be_get_rx_ring_count(struct net_device *netdev) +{ + struct be_adapter *adapter =3D netdev_priv(netdev); + + return adapter->num_rx_qs; +} + static int be_get_rxfh_fields(struct net_device *netdev, struct ethtool_rxfh_fields *cmd) { @@ -1117,28 +1124,6 @@ static int be_get_rxfh_fields(struct net_device *net= dev, return 0; } =20 -static int be_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *c= md, - u32 *rule_locs) -{ - struct be_adapter *adapter =3D netdev_priv(netdev); - - if (!be_multi_rxq(adapter)) { - dev_info(&adapter->pdev->dev, - "ethtool::get_rxnfc: RX flow hashing is disabled\n"); - return -EINVAL; - } - - switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D adapter->num_rx_qs; - break; - default: - return -EINVAL; - } - - return 0; -} - static int be_set_rxfh_fields(struct net_device *netdev, const struct ethtool_rxfh_fields *cmd, struct netlink_ext_ack *extack) @@ -1293,6 +1278,12 @@ static int be_set_rxfh(struct net_device *netdev, u8 *hkey =3D rxfh->key; u8 rsstable[RSS_INDIR_TABLE_LEN]; =20 + if (!be_multi_rxq(adapter)) { + dev_info(&adapter->pdev->dev, + "ethtool::set_rxfh: RX flow hashing is disabled\n"); + return -EINVAL; + } + /* We do not allow change in unsupported parameters */ if (rxfh->hfunc !=3D ETH_RSS_HASH_NO_CHANGE && rxfh->hfunc !=3D ETH_RSS_HASH_TOP) @@ -1441,7 +1432,7 @@ const struct ethtool_ops be_ethtool_ops =3D { .get_ethtool_stats =3D be_get_ethtool_stats, .flash_device =3D be_do_flash, .self_test =3D be_self_test, - .get_rxnfc =3D be_get_rxnfc, + .get_rx_ring_count =3D be_get_rx_ring_count, .get_rxfh_fields =3D be_get_rxfh_fields, .set_rxfh_fields =3D be_set_rxfh_fields, .get_rxfh_indir_size =3D be_get_rxfh_indir_size, --=20 2.47.3 From nobody Mon Feb 9 06:30:57 2026 Received: from mail-oa1-f42.google.com (mail-oa1-f42.google.com [209.85.160.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 545B63D4127 for ; Wed, 21 Jan 2026 15:56:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010985; cv=none; b=B6jczqeMTpYdNPvHGTKx3KuswNTtldVJ4juinuoLcoJF8uHTvMXyRi+VbO8ZSv1tnlBBGe3wWgYacy+vv39SMsMXJFRPm5m6sNZN0ifCIgSCpna9+ClA1fx4ksajdOjFmCZSteSYF7MX3QRHHp+ZN9n5HFEOCT2DBeNp7eCns4A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010985; c=relaxed/simple; bh=GFft51yuC4WzV3G/D8GfSip18W6gE1bf2WP0ZpHcZxI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OToa1ip+FfNxjt2xgloF8zgZMGj46i7L6Jqx0LzCX998wwyG4B35KPRlb2We50JCBBicDXeP3EflearXjxu9OYxr9mfQu57EZxhTh0MFXiWNcjz40hcA8JdSmo5EIu7iIvtxxHTJ8ayS3Asbdw1ewTQjUhQjnt4Uyx3l4vNRhII= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.160.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-oa1-f42.google.com with SMTP id 586e51a60fabf-4041c73ab4dso6987fac.2 for ; Wed, 21 Jan 2026 07:56:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769010982; x=1769615782; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=78P/UAV1LWhbyJcJa9mSCIGPHxQe4k7cpmkiJ4BHBmg=; b=BhzRm9wzWFksx5P3VL+aN+nRKzQ27NSui1RFh2LiEL9QBLfQKXLXn95EO5oei9kTxH xKDHkb4Tggus1qJ5GnzlZ4LjDohBeXofCyA2NJCVrF4FYpnkJWQgTLdJPZzjSGZKfvKf 92qMRW0liz4AqGSwpIVNgOVNDjOXD+B9Dc3IVgBZRS2aVoGtwvQgp2GEBHWcRPCMJjs/ l7nyCk3HMxEq085tGyEwET15d1KcdFDifZ57xhcLx2kl8uR96qxYrNgdG/UBfhXA3Kh4 2XueISvqphNu+69kBL2X5m06FV4slLkl2CeX0jdEB2D/WRqaP5PmJ33/MOLUGPLFeV6G F6FA== X-Forwarded-Encrypted: i=1; AJvYcCUoBe4sgH3R90Mc1ORdFjSOfozWanT6zo+XEyg2yCs6QEQa66U1XfSawopnlS4/o+mDGB7yNYY7lmSFewA=@vger.kernel.org X-Gm-Message-State: AOJu0Yzx+XnC33AUyMzlI7L4ypN8eN6gVtns+7okWJ4s4q/ghCN0eIUX QSzMcL7FMmyaHFzHsx7nxPEfGCBSbgbpLru5Wr1SxXeaqS9XiLWkIEgV X-Gm-Gg: AZuq6aKXtET/RYQJEo5C8cS+aQjBfsVNWQLpTXre5woFQ0Ha/eF0txLOG0Gj1748V/q W4ND9QZBnJVDGFpPQOHkX5aQYZSebvch3EcDg0+LPbtOnIX7Uqev3g8ftFve/ej1TMvl5ZViceO mmOqrvVh9g3o9NP7YdW6kAaZkVMPy1vIALV4YocUzUHVxQ3M6Sl0J7EIW/Ns5rQ0wtBtfSmm8vS Y3kPcPu1bDGVCofNj2PvL5nGp03ILMrMKsezwBu++kViBSPXC3Eah7Ax3RyFH8jlyOavsuwV9Kz nJ8/a2pzEab+QYsuf7Kycb0QDCs7xnjoPvF0mQgd0I6P+LBQiHGQsENHJe51H+vDhmM51wALTk9 z25OxiSRDdP77vQEP5yP477AnrtMcc3TBJ1lfnxUVmtMKH/wYl+L/zoV0bFXMDkitE0HP0AXOL8 PhTg== X-Received: by 2002:a05:6870:45a1:b0:3e7:e70f:fd64 with SMTP id 586e51a60fabf-4044cdf9cfemr9891329fac.14.1769010981636; Wed, 21 Jan 2026 07:56:21 -0800 (PST) Received: from localhost ([2a03:2880:10ff:44::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4044bb528d5sm11496023fac.8.2026.01.21.07.56.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jan 2026 07:56:21 -0800 (PST) From: Breno Leitao Date: Wed, 21 Jan 2026 07:54:39 -0800 Subject: [PATCH net-next 2/9] net: atlantic: 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: quoted-printable Message-Id: <20260121-grxring_big_v4-v1-2-07655be56bcf@debian.org> References: <20260121-grxring_big_v4-v1-0-07655be56bcf@debian.org> In-Reply-To: <20260121-grxring_big_v4-v1-0-07655be56bcf@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=1756; i=leitao@debian.org; h=from:subject:message-id; bh=GFft51yuC4WzV3G/D8GfSip18W6gE1bf2WP0ZpHcZxI=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpcPchwxi8H8OguEoWaW+kmoGlddgm3A5pgpqon /JUdTObJxmJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXD3IQAKCRA1o5Of/Hh3 bf7pD/41NmC5S3hL+B74vF2Opj+sDa22FIvCQbBe++dUZjtwVsisqSgWxLJ/B2rMO/CA8696S9K hx0+mQcLxTHhKYMrqk7KNVkSawjR6lSELsYYLraBScPWN5K+tN3sUYx897DHykjwYSLSI5BaEcS rDHG665uApAOYLxbJTcMjt3Ek4WqdiY5ULBKjYfc8tGTsPI4flTPH5Y9Z7PZTsZd9zHznCLptC9 Q/QZqzBPox9DM4bpgRytV48W/k6MMJXsNE+XbjT7YX6fRn/7vcQK1sgvkKApwC+wzPdTsabII9q 5t20R2VoaCRSgS3uJRLUqZ4Pu3qYVKxN38jDadJM72RyuL9jzK5HljpGRC7mYk28qeFXIz7KJ31 YLhm23Dg+nC2ldGSviunTAEaor+YdHx3fgA7oHjmoBuI9Lq6NmPJvUYh3x1izX9vl/PwHQd4ty1 VbHjE0SmHFoc4ZK8DhMLrKYy3QRUMpoSGc23y93sX2zLs1jEZZx8RfmU9DTZ6hYwSHYoFU6XGgD 6fw0gqIWkRIQhRmX8zCXb0oDoF3Z+2tuoDdPfGCyypYAGH5GKy+kiV080XJttGzDp6DR+yhtma7 9Vi8QZaS2b69SuOgveMIT3Z3babc6VSU09iQk/GHNky6QAqFUVKFbIJ8Zht8P+VDtSPhtn9uO2l 7ESqVrCXTu3ldWA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D 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/aquantia/atlantic/aq_ethtool.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c b/drivers/= net/ethernet/aquantia/atlantic/aq_ethtool.c index 6fef47ba0a59b..d8b5491c9cb2b 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c @@ -500,20 +500,22 @@ static int aq_ethtool_set_rss(struct net_device *netd= ev, return err; } =20 +static u32 aq_ethtool_get_rx_ring_count(struct net_device *ndev) +{ + struct aq_nic_s *aq_nic =3D netdev_priv(ndev); + struct aq_nic_cfg_s *cfg =3D aq_nic_get_cfg(aq_nic); + + return cfg->vecs; +} + static int aq_ethtool_get_rxnfc(struct net_device *ndev, struct ethtool_rxnfc *cmd, u32 *rule_locs) { struct aq_nic_s *aq_nic =3D netdev_priv(ndev); - struct aq_nic_cfg_s *cfg; int err =3D 0; =20 - cfg =3D aq_nic_get_cfg(aq_nic); - switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D cfg->vecs; - break; case ETHTOOL_GRXCLSRLCNT: cmd->rule_cnt =3D aq_get_rxnfc_count_all_rules(aq_nic); break; @@ -1072,6 +1074,7 @@ const struct ethtool_ops aq_ethtool_ops =3D { .set_rxfh =3D aq_ethtool_set_rss, .get_rxnfc =3D aq_ethtool_get_rxnfc, .set_rxnfc =3D aq_ethtool_set_rxnfc, + .get_rx_ring_count =3D aq_ethtool_get_rx_ring_count, .get_msglevel =3D aq_get_msg_level, .set_msglevel =3D aq_set_msg_level, .get_sset_count =3D aq_ethtool_get_sset_count, --=20 2.47.3 From nobody Mon Feb 9 06:30:57 2026 Received: from mail-oo1-f66.google.com (mail-oo1-f66.google.com [209.85.161.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4540D43DA58 for ; Wed, 21 Jan 2026 15:56:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.66 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010986; cv=none; b=olzxlURg2IKd59eb3gIQmCue8MZPK/E78KcDDKkZReoRYvYtp6Sx3bjM3vPLM4XyDgSPhfgYuyf42e+VZz4h7TM6ijtp9xGFzXGAhnA8f2KF8EmQ/enckLEuL6yzDcPn4bfMHnPfJYsRBGpgb8l8ijbM/Jg15PR3vaQNUHicfao= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010986; c=relaxed/simple; bh=T8U9YBL53JqT7WigLAduxBIVpfy/A2owaIdOZQB9pK8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Q5VqMfjkd5PyszpAKDg4Uisb18u3NUsm6iEI3srJTY20GSJjRlBXt0k2hF9zMjcbmPjZr0CmJWxL4tEk8atdy7KqJ1/zlikPkKAJJlvzl6oOgu4l/nzlN/pCA08HvBNbKqfhjNPVwbvdSwMTp4CYXyfkZVQXCtoyQVd4RUv58FY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.161.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-oo1-f66.google.com with SMTP id 006d021491bc7-65e943048afso4314eaf.0 for ; Wed, 21 Jan 2026 07:56:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769010983; x=1769615783; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Ek0t028DajpwRbdMOHJ1y71aPEyjkP5BEsLC81+5e0M=; b=a4qCSa0PbqbfeXIKO0BdivCUSr6vq9zUg4rUUvz8IrO4+Dk7kCamXRjU9Q5Je2tvt3 IeiTY1+AyS4SVq1XhWzqsnqw1eQepCHX+1L5h4xYdztjIaYnHHzP9PXIuDwh0CC1+vxN 4qZZ+C+Dx0tA48XFS5Jnt0W05/LHgRoWLOOGMJj36zt05jhfJAIi6VSsnjf3sDKG8fkC htnn9+vQH9f5YhTbMFNwkQusP1Uczu84Om+7qoTw76Vz1U1d1UWR2u8CuhtCqcVot6dn phy22zylRbnLclEJnXkAA/oQPUQrSc/ljsx5CjSxzzA5hJK6KyHGIWlALCM8Yi/xi+S9 mA9A== X-Forwarded-Encrypted: i=1; AJvYcCVakJJWBuAT9pxxv3dRpaVmhsQOB9JMZxQfxG4g2StuGObeRSxBy8VzebyMovdyUTB5TC54BWeCBjJuo1M=@vger.kernel.org X-Gm-Message-State: AOJu0YxKlgNqy+KrhlPbE7bNCPBZZ/FPppjpBcQOpv6m4zZzO7TYB51k l/SgEWLKfcEf0Pa35xwaHxP/7mP2uBN97F2pq6IUN3UGYEfICfTcEdV3 X-Gm-Gg: AZuq6aJlemQi9RJX+PNEmLedovoOZ9uZg+pLNLPAZd5sxY/WUV/VMjjFJ0DjkzmkoiY Y2rFx3vMqG2Uis4CszDIDqwbpaY0V6Np1BYCso2/RdZRtSaRKgGGzPpRe/dG0LUazJp5VycQOBr xVWPxF9uFYhoapfYAd1FYGj+KlnkWIeAEiBpxH78tUecUzzElV3HtO+4XrAb8lJauPSKIDXMh/I OQNPa68bRjucD3PREnDEjjlScxuzRAS4QJBiLWn3OXSbmg3qOMlZ6WWAnkASprlM+wrkNH4Ma7B Stf5MWo/V2ntvQIIwgWSpl1WDUz3aECVDLj/9yoXAlElo3SDIp5DdadIR7ION64DKwNpYYwfti1 kbwemwVrvIf0lCOMMbRBYCd/MgBRLokOvm0ZLe7McUW2tdNVK5DGCnqd0dfIyTqSqF6AwWSLDYs f6VQ== X-Received: by 2002:a05:6820:458d:b0:65f:6d50:e41a with SMTP id 006d021491bc7-661188d51efmr5368293eaf.15.1769010982826; Wed, 21 Jan 2026 07:56:22 -0800 (PST) Received: from localhost ([2a03:2880:10ff:73::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4044baf52f3sm10966601fac.2.2026.01.21.07.56.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jan 2026 07:56:22 -0800 (PST) From: Breno Leitao Date: Wed, 21 Jan 2026 07:54:40 -0800 Subject: [PATCH net-next 3/9] net: nfp: 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: quoted-printable Message-Id: <20260121-grxring_big_v4-v1-3-07655be56bcf@debian.org> References: <20260121-grxring_big_v4-v1-0-07655be56bcf@debian.org> In-Reply-To: <20260121-grxring_big_v4-v1-0-07655be56bcf@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=1605; i=leitao@debian.org; h=from:subject:message-id; bh=T8U9YBL53JqT7WigLAduxBIVpfy/A2owaIdOZQB9pK8=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpcPch+6e/Eu+iQKP10pTrr3CuNmT6FBdEQqk9M xMfYtB4256JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXD3IQAKCRA1o5Of/Hh3 bQcsD/45AXMgZGsQVC3J9pUfksTc1zQn1m85PMlFNKytYDezn7OrWQabGu98CEQ/ymbdPzZScix j3P16XF7hrTPu18ir6yQ1p0vHBYbgHTyZduh/10/ZqD1Wjt5twHKeDSwVrSSKI5m8/ao//PpQ5T 5g+CoNBuuAHZH0dK/U3jaWUQYhblyFoYJE/6LBDcIGOdAF2fOscjXfXD0lQe2FCYHIms2Mo3qXq 7yCGgpbIu9v9bVvFoGf5vE38eIb+o5qwcKvu0bNa8/JGWnHaZJFqnXyM0cUaJeSL1g//EsviHx6 mUxC6Cvt3DQW24HTiV3b+8r2w1wskZeDbix23XbmcCEeipg1XgUvWoSRb7wyxzCvQA23kv82H+l 6yVwpoSAD1Fe2rH0QS+wkkr5VUakvdufnE/ajUGEs5g+ptYA7S5YeqtVDlONQB1lkX7jXMs/W76 dIXqBNeNKmqEEL7VuQ/ES1PR52/XYKTXByWcDGbp1WvLB9nVWEWrhrm8XEl4gsoo1rhoDoPcxib xKDiUs6sb37qHSZCfF885e6jhUh5IHEPgN+Sr3YEyqhmxi/XYZafLNuSFEuCbHL8q289u3iC4hl 1T5VTD3cvXEcBZyD0xsUzap9CWNxbqssjWJwp00B3fCYVB0raH/qSKLtHAEi517Zh8fzuclqokw cE+RB1zkrcsNTyg== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D 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 Reviewed-by: Subbaraya Sundeep --- drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers= /net/ethernet/netronome/nfp/nfp_net_ethtool.c index 16c828dd5c1a3..e88b1c4732a57 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c @@ -1435,15 +1435,19 @@ static int nfp_net_get_fs_loc(struct nfp_net *nn, u= 32 *rule_locs) return 0; } =20 +static u32 nfp_net_get_rx_ring_count(struct net_device *netdev) +{ + struct nfp_net *nn =3D netdev_priv(netdev); + + return nn->dp.num_rx_rings; +} + static int nfp_net_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, u32 *rule_locs) { struct nfp_net *nn =3D netdev_priv(netdev); =20 switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D nn->dp.num_rx_rings; - return 0; case ETHTOOL_GRXCLSRLCNT: cmd->rule_cnt =3D nn->fs.count; return 0; @@ -2501,6 +2505,7 @@ static const struct ethtool_ops nfp_net_ethtool_ops = =3D { .get_sset_count =3D nfp_net_get_sset_count, .get_rxnfc =3D nfp_net_get_rxnfc, .set_rxnfc =3D nfp_net_set_rxnfc, + .get_rx_ring_count =3D nfp_net_get_rx_ring_count, .get_rxfh_indir_size =3D nfp_net_get_rxfh_indir_size, .get_rxfh_key_size =3D nfp_net_get_rxfh_key_size, .get_rxfh =3D nfp_net_get_rxfh, --=20 2.47.3 From nobody Mon Feb 9 06:30:57 2026 Received: from mail-oa1-f45.google.com (mail-oa1-f45.google.com [209.85.160.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 64E6847AF5F for ; Wed, 21 Jan 2026 15:56:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010987; cv=none; b=c82yLG6F8InPI636zf9NaUnd54Z9cXCGFjLw4srHeB0PbaJ1nuqDFmUoCABHHGh+fH1W/vSZRa41168RZnFS6wcN/s+nBBCw9X7l/JOO8qsOEiMJF6OzCwho2Hdv6Sz3sFcFSQuH89tqRn31DX0gm89CPrPad8O7tBOuojLbX48= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010987; c=relaxed/simple; bh=KiK6mfmbvfAjTMgI1Nxjqq2yBnQ7fftuW5wYTWWOth8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=O5lOCwyiLQ9YAzjPPLcksayMXpLJj2BBxeP8LunsTDeLTMKH0/JgtXVPXOKUXpBxUN/nI8bvx8XKxd9rGvh7RM/6nNLdX5ZPsA0aihwUkxCPVGiZp0T+tcn+sG5lhwiTMnglYC/c2MjlHO+f4fgFIDzkR1mKzcuCIzCzCEZS7M4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.160.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-oa1-f45.google.com with SMTP id 586e51a60fabf-4043b909ed4so9208fac.3 for ; Wed, 21 Jan 2026 07:56:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769010984; x=1769615784; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=obI4wQS/LQ9vhDitZWs7Cx+s8XoRN4vJudvn3e5+msk=; b=Wk1RTckksY5CgN310nRxyoSZ8ybFOwTdZI82skRijE33a2eykE2307C/lFBipP3OLi 29joqoinuP74gCs2ZdTHgalHydIliBhhk8ACKHDP6/OHBYPXVuGPdA+cvuVUstqSL1fU e8+Vg+mZVINRaha1WXWVdY+dRcmQZkctbzZu2EWYIy9NjigHj8Y+t/NKBmuFL9YSA36f 4PjSEKARlwPsxF4xMekMOE6PPA6K9dd4Mb6LiAVJ+hZ2s/SEmSJEpEwPX4dEZJPt3G2S qI5hft+oYxpgxjnS8qACNSGIDgABc90YoPus/7KX0M9IgaJeodLPG51z29rdpBmvnuzF q30Q== X-Forwarded-Encrypted: i=1; AJvYcCX8dHqMwF255hR/Tq6fuzNTM33FE96SI3AHD4hNvpCl6iuWwiSVbJW7ytDlxM5xXqxt4po7TqgRKNk4j2I=@vger.kernel.org X-Gm-Message-State: AOJu0YzkS3ZbiH3QObun7Qj29ybJGDlvN0uCEf/eMm3Fuh981t4qBqbW GiwnnR+/Lt3bnYttmt1B/kP9frk5GmTMk121DVgPWnYTRTF/scPBzeuR X-Gm-Gg: AZuq6aKM/f3R+gP2UuPa838glO/pqpEDA0QiEmQkN49oKRhTbMA2AUEpZpKbSf7Mnyt xLIwNhF3fao1kn52dQKxI/HCT3gx2r/e+H4ctnNZuJJHeYYhGL7Kx8Y98IrVbR7AsogWaV2FM28 1YffF0G0zUedYU3AOqwNlOwSAwULmgQxLZytzX5KucV9DQeLYevMN6GijS7vaPqNym1JsM83Hrx 8ny8o0E/aKzbt1Fwb7oaeb06eQGGmbD/XjH5gvYXpxYEi6BxN4oVLhlVKury1a9GCmkD2QUzCuI 4XfDe/bxoPArtfuYs5h6dy8vZp8iRqgpjIxR6I50O/8xLmrqU3V3UQM9t0S7rn9ddWW+h608ava gLFR51HCXBYEc6XtETvsIPO7Kgy5WgY9NMI3JpV739FT0HlQEMp1s0zZAvEAqKJf6dTJQQmBYZq 32tkVX3Dq07StA X-Received: by 2002:a05:6870:96ab:b0:404:3569:5a41 with SMTP id 586e51a60fabf-4044c48851bmr8465128fac.43.1769010983920; Wed, 21 Jan 2026 07:56:23 -0800 (PST) Received: from localhost ([2a03:2880:10ff:50::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4044bb51d4csm11180043fac.6.2026.01.21.07.56.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jan 2026 07:56:23 -0800 (PST) From: Breno Leitao Date: Wed, 21 Jan 2026 07:54:41 -0800 Subject: [PATCH net-next 4/9] net: mana: 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: quoted-printable Message-Id: <20260121-grxring_big_v4-v1-4-07655be56bcf@debian.org> References: <20260121-grxring_big_v4-v1-0-07655be56bcf@debian.org> In-Reply-To: <20260121-grxring_big_v4-v1-0-07655be56bcf@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=1650; i=leitao@debian.org; h=from:subject:message-id; bh=KiK6mfmbvfAjTMgI1Nxjqq2yBnQ7fftuW5wYTWWOth8=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpcPchuDZz2+z3ebNhVWvJuTRSz6BSL//QPW796 671I66a6waJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXD3IQAKCRA1o5Of/Hh3 bZ65EACXI508P/RfwmkFR+L8D8KIHhJLLGUTsHGVjf7f9Uzbxq1t5/rrWDTt0LzUqDjFooCLwyJ NAPPf9u9UEpKrVBeJ5qG7lNHbk6Ky/b8SEiGGZKVJPV3dqIzhhaiuIVNkrIDXjbqfjdT9Sg2wDv pzvi3YTkEd0kWWdk78owEkZQAezX8WB1kNjAxyuukT+ODvCFQVHhFPhzdiQ8Bun+WouGUtNveAd +EWtKYH5fKPUucNkEkLhlbEhMC/ebXKNXQueOamJj+ntMcFXgidY1pdwefIqtoYe2JcU3LcgID0 MyCeNp8I5LkPIETtF/XiDk9Lceuw7D6bSPHDcWeRQMjMLHrAzIH0i6aWXn9h2HmGP8xCx2ocgPs d4wlIEwi29qh0/t4snIuu+3KsnggeGblNdrnywSZL034mOuzRQQlts+GlszBXLeV9mVoHitLTiY K+IujBqywA39DOWRCUHjCleMUH2/ygr1YN03sHmm612ZLHoJbPpCrQG/24G0q2IWlxkydxMQhxQ lfXJsFAipVTTZRJqYsNen+XbQKYSGiyNb2nDQC21kmGrX+cIVcgkgUG6zyyHV0MgrXTmbs/8Whm 5ddLIlmTa2w15UOJOSRLnGcQ8K8ZqEt7y4CFh1TvVZseEhRiu9MooSRKujESwSL8EWbytf50r+w 2NVXroXMqRDJzMg== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Use the newly introduced .get_rx_ring_count ethtool ops callback instead of handling ETHTOOL_GRXRINGS directly in .get_rxnfc(). Since ETHTOOL_GRXRINGS was the only command handled by mana_get_rxnfc(), remove the function entirely. Signed-off-by: Breno Leitao Reviewed-by: Subbaraya Sundeep --- drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c b/drivers/n= et/ethernet/microsoft/mana/mana_ethtool.c index 0e2f4343ac67f..f2d220b371b5d 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c +++ b/drivers/net/ethernet/microsoft/mana/mana_ethtool.c @@ -282,18 +282,11 @@ static void mana_get_ethtool_stats(struct net_device = *ndev, } } =20 -static int mana_get_rxnfc(struct net_device *ndev, struct ethtool_rxnfc *c= md, - u32 *rules) +static u32 mana_get_rx_ring_count(struct net_device *ndev) { struct mana_port_context *apc =3D netdev_priv(ndev); =20 - switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D apc->num_queues; - return 0; - } - - return -EOPNOTSUPP; + return apc->num_queues; } =20 static u32 mana_get_rxfh_key_size(struct net_device *ndev) @@ -520,7 +513,7 @@ const struct ethtool_ops mana_ethtool_ops =3D { .get_ethtool_stats =3D mana_get_ethtool_stats, .get_sset_count =3D mana_get_sset_count, .get_strings =3D mana_get_strings, - .get_rxnfc =3D mana_get_rxnfc, + .get_rx_ring_count =3D mana_get_rx_ring_count, .get_rxfh_key_size =3D mana_get_rxfh_key_size, .get_rxfh_indir_size =3D mana_rss_indir_size, .get_rxfh =3D mana_get_rxfh, --=20 2.47.3 From nobody Mon Feb 9 06:30:57 2026 Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5689F3EFD05 for ; Wed, 21 Jan 2026 15:56:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010988; cv=none; b=jZEh6Lpz0Z3Eksngk9zIQdU1yjrb7+KMzHnyPl19+Xp52/dezRHirxQEmcuPnwyk6lemmyisioOL/UOHofW2UR4526to/gxaAw2sAMNb2Lj2t/DmgPh2VUPSWJCyBoktuoJu9Du7JRNmmhuDwAjtZjBXme5jd990+hThFgZ/w8g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010988; c=relaxed/simple; bh=IMKgxRU1sol0qv3q4ykIX98inRbeR6UTILUypHJQ1KU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gCVvJJcOqKdlG8B+MhcHwqi1DPAc8M0kNNMkdHf/2+jky9M2nqNGR14iKpA54NsfED0CN2jwUK3M8V0MjISaIsl3snirbCvjRS5EotfXYUKnNqbPy2A90Ky98FlVa+OFVXWgTAbpjsbkux0G0RzqzBKfb3O6LG6eoIT/4Xc7+YE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.167.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-oi1-f174.google.com with SMTP id 5614622812f47-45c9f47e1e8so14566b6e.0 for ; Wed, 21 Jan 2026 07:56:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769010985; x=1769615785; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=6idYD0AKGESVEMq5nLW+uYD0VvpAsFD+VjX/8Dx4wWo=; b=Q3i9y+LzTCGNrPB+kdFjJOCPqeL9w/UKjJMNfNme8zQL+1tqFWwb7YCsWz4W3Uu0y7 knp0xCajenbM8Ywqf1aihxiU0pGCqQJVeLWG3i1xSR3y8xj3pHw/0mPPHk2GNBjNkfQa NX6UChrQfqEVj+NB2TooT4JCFUVww32GYtQ1ZHY0kDKgVwa6gW7BdahHOsc92t0Z1LpY xqx5Iswlrn07FbP/Pdmo8xTkku/UnEwOE2i5KVGhrv/BZWnuesSsPzoZWJk7XqVWUh9n r8v+ikG2bITgBZNmnUWb7QjFhOGEWBaPWwV7yt1/6hLk0tIAUl/P23GB+uzue++/toqo HTiw== X-Forwarded-Encrypted: i=1; AJvYcCUYK2iNN162YRbif3clMicylPqZUnfRGn2XaReypAEqDml5cSC6Dxl7/0Fp/lPUn9UimepaixHYqSeW9I4=@vger.kernel.org X-Gm-Message-State: AOJu0YygEKJngCjt534Hn8tfM/mBUWpuetkVtRkDpQgzCMxMKTK3XR75 DqF70cQ/XkeZ9G807MStTtamf5vRGXamzWkv0GfR27b3LpSfJ3yaSmM7 X-Gm-Gg: AZuq6aIBZMjhWjUvBhjFxHACk2KxAhzqiznf8/8aDrRYndHZIX+0nw2by2QVD/0DcnQ vocaaXkSJ8r+/zraV7UhtsQlaShfUCYE6yCT1RqCKxMoJlEhv0mK/oDmc76nMUa2rEINf15nZLM q2mj3iRhs83bjdiEVBm3H3bGSheVd16eouT7C9rqrowt+0EFpFjCSFp0pIx0IxKzwmuDuOZUUDf +mnML7W+CSCyLFPtPK6gAQcpUjwQqQr7znBvXJqWvnnEXxVq0zhNCaj6NTulvjIae6DuPm4Z+A/ c3CIU5avUnf1X2y4Jpiy0OoB4eT2fsEFSGWcyMDePz9zvI4UEBvnXKJSHIIRqPPz9rsG3tw3mnh iILfkmvLh7eofnr0S3EbRV/N9ER7d88HWtPvtRihpIGydSuktrfgM+6TLbu6Ce6XDSXwQgULPzz i5IQ== X-Received: by 2002:a05:6808:1801:b0:453:50af:c463 with SMTP id 5614622812f47-45c9c14fd86mr6820343b6e.41.1769010984991; Wed, 21 Jan 2026 07:56:24 -0800 (PST) Received: from localhost ([2a03:2880:10ff:44::]) by smtp.gmail.com with ESMTPSA id 5614622812f47-45c9e03faa4sm8763844b6e.18.2026.01.21.07.56.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jan 2026 07:56:24 -0800 (PST) From: Breno Leitao Date: Wed, 21 Jan 2026 07:54:42 -0800 Subject: [PATCH net-next 5/9] net: fbnic: 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: quoted-printable Message-Id: <20260121-grxring_big_v4-v1-5-07655be56bcf@debian.org> References: <20260121-grxring_big_v4-v1-0-07655be56bcf@debian.org> In-Reply-To: <20260121-grxring_big_v4-v1-0-07655be56bcf@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=1641; i=leitao@debian.org; h=from:subject:message-id; bh=IMKgxRU1sol0qv3q4ykIX98inRbeR6UTILUypHJQ1KU=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpcPcimRzZNJSf4d1IZxSV2HQSnbvSRZ+5v/wtx 2BlvP6rC5KJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXD3IgAKCRA1o5Of/Hh3 bRjCEACgNH/DrBH3/TwdObeQBxDKQ7ri1VmY7UxH12naM375gcloF5oYaCC0Pk01M7Ncq72hwni gLDjbTsuQydWPhTRSh+jRQNZqUts5/jMyls9SMBdv7gqyKL5fg68fljW6jg9h/YpPbAF0CuSpvA SN7HeNH6i1WOl84JyeUA0QCGOknwIIkHSpBJ46s+d1h/RMLx1zlFhSk1FHeTyOjaBnthP1AWnn1 hkzCGVgZ6hK4rbqjE0t7K0k+HS1X7oWJ3/KOG/f9vjeEwKO4kpSOszKoSBcDZl3YuggjxKJY6qz r6Dvx8Iuj3Svowtx2cmQvBUsEm2MMum8aOBkKo+InxoOs3YFrDrkqjkge0d35p8CF+D+ckWsmyR fae5k1dxkVjFpMGsltyMCv5KqSwBd3cOXtVf4EzCmhkADGnjfhVG5GE7XS/c2hN8GMMS2E4hyun uN0ZY9ze9aISu4y9s6LStKVnwxkwGOOoVvjIQo+iw9RpKPo2wFtl6DdSg3D/Frk4goh40hhBnS8 viYUzFM/O6c8LzxKV/6uiM1d0+V7UOZxQj4oDT1/4KvisfOkF8lA4IhibwuRGscXVLr7oe0n811 yETZIMGNqb/cRZLWJYwq3SNJNcFkD0xnzSG9RdO3eoluiG6lMzQsfYnr3jZQluo1wZHI3ECecXY 3fRz+TAC8y16fZA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D 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/meta/fbnic/fbnic_ethtool.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c b/drivers/net/= ethernet/meta/fbnic/fbnic_ethtool.c index 61b8005a0db5f..11745a2d8a443 100644 --- a/drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c +++ b/drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c @@ -825,6 +825,13 @@ static int fbnic_get_cls_rule(struct fbnic_net *fbn, s= truct ethtool_rxnfc *cmd) return 0; } =20 +static u32 fbnic_get_rx_ring_count(struct net_device *netdev) +{ + struct fbnic_net *fbn =3D netdev_priv(netdev); + + return fbn->num_rx_queues; +} + static int fbnic_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, u32 *rule_locs) { @@ -833,10 +840,6 @@ static int fbnic_get_rxnfc(struct net_device *netdev, u32 special =3D 0; =20 switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D fbn->num_rx_queues; - ret =3D 0; - break; case ETHTOOL_GRXCLSRULE: ret =3D fbnic_get_cls_rule(fbn, cmd); break; @@ -1895,6 +1898,7 @@ static const struct ethtool_ops fbnic_ethtool_ops =3D= { .get_sset_count =3D fbnic_get_sset_count, .get_rxnfc =3D fbnic_get_rxnfc, .set_rxnfc =3D fbnic_set_rxnfc, + .get_rx_ring_count =3D fbnic_get_rx_ring_count, .get_rxfh_key_size =3D fbnic_get_rxfh_key_size, .get_rxfh_indir_size =3D fbnic_get_rxfh_indir_size, .get_rxfh =3D fbnic_get_rxfh, --=20 2.47.3 From nobody Mon Feb 9 06:30:57 2026 Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 89D5548C3E3 for ; Wed, 21 Jan 2026 15:56:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010990; cv=none; b=ZUrARhEfK0pHS5OR/b4N+cwPCAx+mUuM21kI46Rmvjzps5BvqkM0G+zh2MSS+Cxr8tj6cvgXKFovbXVHIV72Qn6VrSqJGC6GiSeo6g/JBS6ZarhYYjDRbNnbOQ8dtg4GfYAk74X5u9k/fj/BooNhOnikg6UPVg/W/uQCAd3uLvk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010990; c=relaxed/simple; bh=pkEoGJuqg0YDIqMIGUKdaE1F45xTi6l/4mTUar5JB5Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=K9DV/uRQgrz9iX2WZ1c+NJ+NXZZYor4r3V4t6GXdrFxMB1O30vE/Kr1u2n1YvxZM4aIaAYG+5RrQrAdrL6qgWHaZcVKmDej95nnsXC91ME/BozNhz1s5QjYpRL69h/QlIPa0Qm2IbKkpzswm213vg9raxTjD8hWR2Ln8a6WRMEU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.210.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ot1-f50.google.com with SMTP id 46e09a7af769-7cfd9b4e3f8so2284944a34.3 for ; Wed, 21 Jan 2026 07:56:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769010986; x=1769615786; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=FwHTliNXI2EqMwiHbVh6QlzrgN72rnVMTKEWdOsyi80=; b=IyK1sYJkrzCYwfTaj/2SBS33fSzA684Wv/krRjBQYLOsVqPjVqAzxwvW9NR5APFdga ybg7KYqbaq1a6NgD1krGYN8R7c405vlOKPD1zLu+doI0BBIo9spzB9yCAPpev7qHXj9B 71eXEyfOZ4vr+s3DXVqX5V9hnXhBpcVblkU6CAyQjF3VJHcYgG9d5NrQjJunnlZ9G67h oE+4rrqppY+3zLJrn4y50kao5/y2AzHYYLWoQBja7NMhKX5WeLMiGrP38ppRYUNxsya8 wLXRvp+CEg4uOSOVok6bk7ZnWMmnmgF2izGXo8AVN718pOJu7C/D0CmEfSUH63QctW0c ti8w== X-Forwarded-Encrypted: i=1; AJvYcCVB5MQl67r/1LEAf7XmmBSM5PvsjVvkZ2EU/9Cji8GRBSFHf2CoRzHQjLrRhIyai2MrdYLutNvZ8eEBhV4=@vger.kernel.org X-Gm-Message-State: AOJu0YxAMRiFv2kzOeR2xK3VUjoEvBvsEwOhBRKCvMOpsVTz31kIW/m2 HWesQF258Ysi5pSt7+ZbyGMtZgDBbgOc2+JXmF5D1TY/mpQnydXDz1BJ X-Gm-Gg: AZuq6aLAHeHLpyRvNk15t6YFHc0Aqn2C/lCSPMY5J8gTRVQIex1azxEP6QwleKGZYxL SJLdDd9uNiuvnCWEctEYWzCansrDe7Ahf0eJ+OFcAAvWF3kUTeW/PDxjlFn5dLWwzG0vm9b/uA4 eVhFd9bnFkGsCN2wcSsUoiYOUMw9g6nghDmo1KO88oRb/z/lmz0q3YQJC4uM2SO2hwuYYVicZmh RHpy47e75ek5agEnNteFUP+SZ9yB0qZrGSlGJZe1rKXhFK8ywdVxp+bQ/7Tpdzqpi/rp9aoucHT mf/Z7+yS5IbLrjacfwksGjgKKaqE40yswWR7yZhq9TTtIPFLps81BQcLDTE2C4Zlmo3E6q1IXrf +lBJKaah7HHhksy9CQkw3iWZlqgUzh3/AfulGKTXDxAB4I/cLXF8B7Cm+oWtZ7BRZ7I0rP3GucP D2Ew== X-Received: by 2002:a05:6830:6f8c:b0:7c7:65f4:1120 with SMTP id 46e09a7af769-7cfdee2b207mr9697792a34.23.1769010986084; Wed, 21 Jan 2026 07:56:26 -0800 (PST) Received: from localhost ([2a03:2880:10ff:4e::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7cfdf101198sm10999966a34.13.2026.01.21.07.56.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jan 2026 07:56:25 -0800 (PST) From: Breno Leitao Date: Wed, 21 Jan 2026 07:54:43 -0800 Subject: [PATCH net-next 6/9] net: ionic: 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: quoted-printable Message-Id: <20260121-grxring_big_v4-v1-6-07655be56bcf@debian.org> References: <20260121-grxring_big_v4-v1-0-07655be56bcf@debian.org> In-Reply-To: <20260121-grxring_big_v4-v1-0-07655be56bcf@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=1806; i=leitao@debian.org; h=from:subject:message-id; bh=pkEoGJuqg0YDIqMIGUKdaE1F45xTi6l/4mTUar5JB5Y=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpcPciYhTeDmt3w42UdoGNb2eei7e+myHymvVTE hkXk7LP2KSJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXD3IgAKCRA1o5Of/Hh3 balqD/kB8AVVJD8dSqtL+vQ04BXPOWjX5hZlbGqjpp9sRadkhKckdk3ClKhX+XszkZgZ0GkNl5h IV8pC9OY+2++QdFCtmItJmuJNtRaTzVZMPM8U8T6JYsWq5R3ERBuMBZhlrPkSO4kZiK1I4aLdda jRkDa1DHMI3p2/pbK16NuabhOv3MhKoMoLqUMXu23UedkscxH0BKNSW4OaGOm8t1nUIrj0QLOyC LSrrrkGZ112KWIji+faPFspMduraDfLPoiQV2F/8oynQ6UaBvO5ZTClxrLxhiWkpD7TPbioKHrS BzSL3sxIHNH/0Xi/FAJVt9fzK4FZM2tJgMNcVL/cp5HJ3quw0LujzdjDhYNyAKq8WTeJ8ck8FQM X/u6MGhitcDbh7I9XzDbGyNo07FW6IVyVnVAYq3qTEpq6hZ7mTc9RpAnkYuuk5T4q7iYvK3hJB2 gkDk8FzsGQNmkY+ycIT1iAeZ9uy17aO2u7dXczuKXa2X3KFaIdJF8S6TafhyQ0dYwiP+S/YhXMf vNbUXybcdvK1aJgWxYAnItqgsnXbM8ZZtAjkbNHvtbb4/t/liQEGQKRM+0W5QlK2o1Tfmeh6+yD eYHN090qersJOJZUUfBQITn0A7y8bF6lVJQ33tRTFhWHA+nxlS02dB7NE4uGTzLjopILZM/mjwK gYeq5ptLK3ai+Qg== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Use the newly introduced .get_rx_ring_count ethtool ops callback instead of handling ETHTOOL_GRXRINGS directly in .get_rxnfc(). Since ETHTOOL_GRXRINGS was the only command handled by ionic_get_rxnfc(), remove the function entirely. Signed-off-by: Breno Leitao Reviewed-by: Brett Creeley --- drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c b/drivers/= net/ethernet/pensando/ionic/ionic_ethtool.c index 2d9efadb5d2ae..b0a459eeaa640 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c @@ -843,23 +843,11 @@ static int ionic_set_channels(struct net_device *netd= ev, return err; } =20 -static int ionic_get_rxnfc(struct net_device *netdev, - struct ethtool_rxnfc *info, u32 *rules) +static u32 ionic_get_rx_ring_count(struct net_device *netdev) { struct ionic_lif *lif =3D netdev_priv(netdev); - int err =3D 0; - - switch (info->cmd) { - case ETHTOOL_GRXRINGS: - info->data =3D lif->nxqs; - break; - default: - netdev_dbg(netdev, "Command parameter %d is not supported\n", - info->cmd); - err =3D -EOPNOTSUPP; - } =20 - return err; + return lif->nxqs; } =20 static u32 ionic_get_rxfh_indir_size(struct net_device *netdev) @@ -1152,7 +1140,7 @@ static const struct ethtool_ops ionic_ethtool_ops =3D= { .get_strings =3D ionic_get_strings, .get_ethtool_stats =3D ionic_get_stats, .get_sset_count =3D ionic_get_sset_count, - .get_rxnfc =3D ionic_get_rxnfc, + .get_rx_ring_count =3D ionic_get_rx_ring_count, .get_rxfh_indir_size =3D ionic_get_rxfh_indir_size, .get_rxfh_key_size =3D ionic_get_rxfh_key_size, .get_rxfh =3D ionic_get_rxfh, --=20 2.47.3 From nobody Mon Feb 9 06:30:57 2026 Received: from mail-oa1-f49.google.com (mail-oa1-f49.google.com [209.85.160.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6B0AB399A41 for ; Wed, 21 Jan 2026 15:56:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010990; cv=none; b=danaXVX+5urLVsLrs+nkHZkoWoe9OvVFgzUanXlIO/QPpTfM0wxEcFbHDDyHED70w8DPgzoFb8/5IY4/GwNkI7/fCRmTiVPtYSWjq33lh4g3NdwnNF5EY8GhjSmjDF4XK7JyO9m8exCQUcORBJnNZRxxMLwacNVHTCDYhwOnqGA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010990; c=relaxed/simple; bh=xqDRg42cn9s+PQJV3QJKXzwsDuQzgQ88O7+U4GmtgGA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fbWmcvRWWDVuh0WbTmE7r/CkzW+r4Myy6lfygRhxxeLqnZH8Pc51weYjE/XEH2sjqVmgaRE5aLwYh2qjAiNM2zQxbiEeXzF8XqQSLuo04fTKwlw0asrgJIv9dSfGc5vbnSb9KF/vaOffM9c/1/aRnqrO/NyngEiHHhQRersH8EU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.160.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-4058fd4666eso9237fac.3 for ; Wed, 21 Jan 2026 07:56:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769010987; x=1769615787; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=yFPLZuBBqgdNTKRLDjxt0gL81wNcNDScS38n9r2rPKI=; b=JyJYqd7Di8l4gidQnMj9AiwiYQOiPj8xsK3IsjyXTiLX0DCH3C7QDp/ZtTHAYv4DWn Zm9jVrDOX3uOpUirD3Pq+fpc3vVzdQFjqjkok7Djc9fBPPBH1pwvxZ3LFmDT37RKbBT5 hGYvsdQGfIBbJnw/HvTrvFpe/r/Sj8/15jTst9wHTU7elakNY2Kiv0XWlkaOcKBcUwKP yKKnx+EFMucUSIuhBrEtD9XAfxDDgEOB9ZXZiur5TAvYa/SPRqVOHPnQwCee88W8nM8o smfVBOYNw82gyJdQgolANeACAdNeesOBx78UyCzYwCWOkfT3VpMEPBp0AexEff6NvAsV wTPA== X-Forwarded-Encrypted: i=1; AJvYcCWgBFGeNAhg30zWlcOVcWGkNd6V9s8JTj8L7H9ZzU2bMeMsJ67wXiGp8AmSvhhvYYBG9H2s0RXeSU0bqhI=@vger.kernel.org X-Gm-Message-State: AOJu0Yw7Gmm3BnB1p8r9VjclnMGGobY5sAu8hXfNun+emKXJtQgbmYSZ na5CJxBNga8qcIkc23IwiBMtRZU5pnuEEWLg+UOTIDvBFMweMOv52FY8 X-Gm-Gg: AZuq6aJ93aHBRQAleT2TCPuDxjq8AkqFCX6lKoFWO+ga7SUaYAtm+NhvpEVgfppqLzD OOPJA7fnSBfEkJJedIFoAZWutlKfVYzcX2CAVhzT5lfl6AD/uzHAOczoqmU18p4vKwln4JRd1OH aOtlUUjUeDf9zq6iVnCat+RrwbvONfx9MVrVwNn8K+NUGvQD6LiX+kqtn3MjDt96PdM8SfrF6rc EocZL04NiCwZRA44jTKn193Y+Hb5Fijy3pXlemyogkaIwOYsTID2nEBAYlTfSLggAyXVqwm3Lwy dPZGokcvPcJ46uZSV8CEc94yRAnGCBMxvO6fRmbrENqCoWv3ngJ1cEUDv3TWzJZf9VGTzI/7/xa ZelKEIsEypVy5qRJMs1uVp7+LmLxBwNIDlLcuRn/zMLOS1qVHqPU2aGSOUWtQJ7sDrzsNmaQly6 jS0A== X-Received: by 2002:a05:6870:b0f0:b0:404:406d:97f0 with SMTP id 586e51a60fabf-4044cfd0fe0mr8580116fac.29.1769010987141; Wed, 21 Jan 2026 07:56:27 -0800 (PST) Received: from localhost ([2a03:2880:10ff:74::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4044bd150dasm11715344fac.14.2026.01.21.07.56.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jan 2026 07:56:26 -0800 (PST) From: Breno Leitao Date: Wed, 21 Jan 2026 07:54:44 -0800 Subject: [PATCH net-next 7/9] net: sfc: efx: 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: quoted-printable Message-Id: <20260121-grxring_big_v4-v1-7-07655be56bcf@debian.org> References: <20260121-grxring_big_v4-v1-0-07655be56bcf@debian.org> In-Reply-To: <20260121-grxring_big_v4-v1-0-07655be56bcf@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=3292; i=leitao@debian.org; h=from:subject:message-id; bh=xqDRg42cn9s+PQJV3QJKXzwsDuQzgQ88O7+U4GmtgGA=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpcPciRWUko2VZt6F/WLprp19CaDmdxXd8gCTmr AmzhFwNFtWJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXD3IgAKCRA1o5Of/Hh3 beweD/wJr1aUPxdEVvGudYkpHRXkoauHiVaUAquCOEQS5q7dCw6OoY+ZwsfHls/avBc8uTZgItZ XGWoLFa2DsgWkHzOXdGqUmAsPTQMDkDiddYSTAOn1BwZmN6VcOg3VAP7nmwSrT/WDjR72I+BalU DUKINlJbkdNlGYd6vZbe7ZoV3QvFLU8BKDXM6d6XYg5LYvYvgozFXKnzTBLGvubC2DFyAjmn9x2 2F1nHN/n0l2g0xXxcM028KJH8bEc8wp1txT9jmaC4cJHf7+P2yW9aJsKw6HHQoq184e/KF0ftKg OVWhhdcBnrio2QK+EphKSfwgEALRKfW4mFwk3y9nH8lEaVJay3bilCnLC+c/S3sj4sA6UrNXREw p1WPnaISpR7sS5fY4VFDpJg3F2f7/w8LdlkIvF4kf+Pgz1bqA78dYYVQUCDVIyHdLC66S8mMej+ 05uazO47nnZajuunxq3DremWh5C07PUU6t/vfBErzkjZJvUGulOGaPy3s4/ySr4LXn9fvg+JpFX nixOd1Icr4TDir+wVlrKDmbfuL1nzHNabNV7gb+Gp0RA8a7G64t/oK8wGTzOrKosBfsYGYfsiTM C8QpWeLAEpvS6DiuErtvWC7YXs4A9QGCJvh2hYMb9+LksxWV5oKlTDGOnZrEZd/tfEPUnzd03C/ Drv7vNcmKTyq5ug== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D 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/ef100_ethtool.c | 1 + drivers/net/ethernet/sfc/ethtool.c | 1 + drivers/net/ethernet/sfc/ethtool_common.c | 11 +++++++---- drivers/net/ethernet/sfc/ethtool_common.h | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/sfc/ef100_ethtool.c b/drivers/net/etherne= t/sfc/ef100_ethtool.c index 6c3b74000d3b6..05dc7b10c8855 100644 --- a/drivers/net/ethernet/sfc/ef100_ethtool.c +++ b/drivers/net/ethernet/sfc/ef100_ethtool.c @@ -54,6 +54,7 @@ const struct ethtool_ops ef100_ethtool_ops =3D { .get_ethtool_stats =3D efx_ethtool_get_stats, .get_rxnfc =3D efx_ethtool_get_rxnfc, .set_rxnfc =3D efx_ethtool_set_rxnfc, + .get_rx_ring_count =3D efx_ethtool_get_rx_ring_count, .reset =3D efx_ethtool_reset, =20 .get_rxfh_indir_size =3D efx_ethtool_get_rxfh_indir_size, diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/= ethtool.c index 18fe5850a9786..362388754a292 100644 --- a/drivers/net/ethernet/sfc/ethtool.c +++ b/drivers/net/ethernet/sfc/ethtool.c @@ -261,6 +261,7 @@ const struct ethtool_ops efx_ethtool_ops =3D { .reset =3D efx_ethtool_reset, .get_rxnfc =3D efx_ethtool_get_rxnfc, .set_rxnfc =3D efx_ethtool_set_rxnfc, + .get_rx_ring_count =3D efx_ethtool_get_rx_ring_count, .get_rxfh_indir_size =3D efx_ethtool_get_rxfh_indir_size, .get_rxfh_key_size =3D efx_ethtool_get_rxfh_key_size, .rxfh_per_ctx_fields =3D true, diff --git a/drivers/net/ethernet/sfc/ethtool_common.c b/drivers/net/ethern= et/sfc/ethtool_common.c index fa303e171d98b..2fc42b1a2bfb7 100644 --- a/drivers/net/ethernet/sfc/ethtool_common.c +++ b/drivers/net/ethernet/sfc/ethtool_common.c @@ -850,6 +850,13 @@ int efx_ethtool_get_rxfh_fields(struct net_device *net= _dev, return rc; } =20 +u32 efx_ethtool_get_rx_ring_count(struct net_device *net_dev) +{ + struct efx_nic *efx =3D efx_netdev_priv(net_dev); + + return efx->n_rx_channels; +} + int efx_ethtool_get_rxnfc(struct net_device *net_dev, struct ethtool_rxnfc *info, u32 *rule_locs) { @@ -858,10 +865,6 @@ int efx_ethtool_get_rxnfc(struct net_device *net_dev, s32 rc =3D 0; =20 switch (info->cmd) { - case ETHTOOL_GRXRINGS: - info->data =3D efx->n_rx_channels; - return 0; - case ETHTOOL_GRXCLSRLCNT: info->data =3D efx_filter_get_rx_id_limit(efx); if (info->data =3D=3D 0) diff --git a/drivers/net/ethernet/sfc/ethtool_common.h b/drivers/net/ethern= et/sfc/ethtool_common.h index 24db4fccbe78a..f96db42534546 100644 --- a/drivers/net/ethernet/sfc/ethtool_common.h +++ b/drivers/net/ethernet/sfc/ethtool_common.h @@ -40,6 +40,7 @@ int efx_ethtool_set_fecparam(struct net_device *net_dev, struct ethtool_fecparam *fecparam); int efx_ethtool_get_rxnfc(struct net_device *net_dev, struct ethtool_rxnfc *info, u32 *rule_locs); +u32 efx_ethtool_get_rx_ring_count(struct net_device *net_dev); int efx_ethtool_set_rxnfc(struct net_device *net_dev, struct ethtool_rxnfc *info); u32 efx_ethtool_get_rxfh_indir_size(struct net_device *net_dev); --=20 2.47.3 From nobody Mon Feb 9 06:30:57 2026 Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A6BBE49219B for ; Wed, 21 Jan 2026 15:56:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010993; cv=none; b=beHeXz+QwlqYC24stqFYhTUSM9T1mmyb3Iku7cdhOyNWdWWcKuRAaYFhcXDb90FXyhmvHJxt7aD7Yx9Gm7bEnp15APmlaIeqwrDcYvI6zmcCrh1aeeCId89N1aGaCz78D0sCb+IDU4AvPrN2jFTpwZ+LEmj/tBdDl9AeIihgrm8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010993; c=relaxed/simple; bh=xjfGrJ9ogmU02tXh4UwJsiacW3KcvGXHd/h59cpJCJU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZDF+T79clph55o8kI4k34ye/Uchytu5rHTKW2T3nBqvOdoaqymEvKqtjMTk8tiep6G16R1+pytQ8Mma5my8rKsU9VmDnc+NITrmL1AUhZB110J7ydQehi70Z399xfOU07E7QRpRI5YBlJSWyMmrwFNuS26BGgrSnjs3FeVsSF3s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.167.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-oi1-f174.google.com with SMTP id 5614622812f47-45c86087949so7228b6e.2 for ; Wed, 21 Jan 2026 07:56:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769010988; x=1769615788; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=+Ieldrz0yCTZzK/huBW1mkitT5A3IA5rZUXCCnhdv+8=; b=XJ6DlGYAbDvWXJsffF+ZklO53gRaMnONI2UfQseP/h2g+JPnzVUkPDwTRmF4kp0xOo uei00kxzneZFYv6KbugnIzSQTje3DzGcxtfbKH22wZbxjtG8VSipW0w3M8MpblpcHfC7 ymV9VtKrTwdSSEYlmZgQxukj5GraRJzfs9cfo262Bo4sW1yn2JtMsnSyEkiC6wI9XV1U yA8py+Xo85knwTfPRdZrWSgFcwSGeUqD2EGad10noyYHi96FqjPW6gsw57lkgA8/1gBy 6evTLH6gvbGevfwvsvmpRK8Ydv10BrWC8hQ0Oe4RKAE0buT1xDTHB83GNzelFHMos2Wc 19Ig== X-Forwarded-Encrypted: i=1; AJvYcCW+yEBRGMMLTDdbqb6mlSjLcDVihYcUys+RI2bB2LWU7YvRggEVfKQnsK3a9zDQMksBAVwylm7hS+HCkcc=@vger.kernel.org X-Gm-Message-State: AOJu0YwUBzvD8CSkgC1XotlYduHKxsK+2M918qBga9BwzvuJkcU1hvir FlMAFGXxiXowcH4+jLZwzcdbWchT6rDyib7IjWkAn/5B5Anu/5KxTxvH X-Gm-Gg: AZuq6aLDm6BQxiigiBfGX/OCsVNIl0SCdbivlG1Zaa5/6p2xY15f4GGQUlS0KxWCcN6 KemZywBTh62fmEKy1b0pq/XrHdj245wCl4HaL+UxLXaP1bAdHK3yMJ9nmNXTK82DVtfPN1yfVev yuuqMsuBslRbXGM+HBMlu2GpcdbVVvgcqlpfaxeUqdhONE1PMcZZ6XTOOzEqOBFIV95NKKTJUPQ lTnx9kBtP5aM42jUpsug2TVOIEVDAdo8HoICRMOPRueX+uGhPYqoOyiDCfaEyq9wSgGeRLZxFLA 1nolxGf7tYyb9Ndofgvt3WfMNCbbOyVuEYqZ5wzRKxqNvltvzDgwjTetD16qBTeES0BYAk2Ra4U 2PxCRIcQ7sH9koHQzy5I2o+iHR4oIKJjs9VwpgtzEwV5lDYh2trxB4o964LNRXu9JcWx8Rr5ZD9 evqg== X-Received: by 2002:a05:6808:4f60:b0:450:b43b:3142 with SMTP id 5614622812f47-45c9d929969mr7203814b6e.67.1769010988269; Wed, 21 Jan 2026 07:56:28 -0800 (PST) Received: from localhost ([2a03:2880:10ff:49::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4044bb545b9sm11333368fac.9.2026.01.21.07.56.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jan 2026 07:56:27 -0800 (PST) From: Breno Leitao Date: Wed, 21 Jan 2026 07:54:45 -0800 Subject: [PATCH net-next 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: quoted-printable Message-Id: <20260121-grxring_big_v4-v1-8-07655be56bcf@debian.org> References: <20260121-grxring_big_v4-v1-0-07655be56bcf@debian.org> In-Reply-To: <20260121-grxring_big_v4-v1-0-07655be56bcf@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/8eHdtAcsmYgBpcPciGOYn92BaHKmt39fyKEVo/6aqUOA9Owk6p ALiwAeiGYiJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXD3IgAKCRA1o5Of/Hh3 bc4MD/9ApFcQWd4wCB0+XaKw9CUrjtiZ1/9w1xeC9mclcB8VU1LWhvZi6l93u+gdbsGC3CVvxOb KWMuwCUfv2vCmHtCO1tgnOfoBbhNo810fO2p/s9+d9UXFzFzYqac2Vlq4jxziJt1zmdReIEqq5A XGvZhBUFypdT+SSuRv49IHaqa2V/uhij6GsqG9yQ3z8qfFdmBfVpROwLpegk7fN8Jq3CE+DGrJW 0z+/AB3dmcPipLHEYC0ackpMW5obztm4RaYWfa+OTpUF/xMKuZncQbyIbMOJIrjT4lBtp4f+kZi JUAwSf3S+JGca00Zg6tSWAwCDYZLEHZiT4HLyZh2i0buOK+VaheoCG0XINc9R72iPUKfaHvSt/l m/74NmveJRxiC9JY8Hq3ifpjSYO2FgKxkJyUBk1Df2ZMG3mgos3mDJALwsb7hwLwDER4bSEc3ef 3s6t0LOuhtHWySesMhP/KNzpMjsXIT/IX2gN6rQJvfNin3tTf2TwhUJPMpEAhOJo0QRDW/ZRiZG nUScCW8hoG4+3Fg8EryXKxCyeOjKjlAinPwFSybRFrwK+dbG7TLD7fQ9rThlgct2c9AFhIP4Z3q C5RdMmMgaJZ9S6ojA0iQpxdEYKif6POwplsweLpL46MyBow2BGMDbxOiWysh5Ztj0H9r/aAFEar 3sJgShl9z7rgdvQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D 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/etherne= t/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 =3D { .reset =3D efx_siena_ethtool_reset, .get_rxnfc =3D efx_siena_ethtool_get_rxnfc, .set_rxnfc =3D efx_siena_ethtool_set_rxnfc, + .get_rx_ring_count =3D efx_siena_ethtool_get_rx_ring_count, .get_rxfh_indir_size =3D efx_siena_ethtool_get_rxfh_indir_size, .get_rxfh_key_size =3D efx_siena_ethtool_get_rxfh_key_size, .get_rxfh =3D 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_devic= e *net_dev, return 0; } =20 +u32 efx_siena_ethtool_get_rx_ring_count(struct net_device *net_dev) +{ + struct efx_nic *efx =3D 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 =3D 0; =20 switch (info->cmd) { - case ETHTOOL_GRXRINGS: - info->data =3D efx->n_rx_channels; - return 0; - case ETHTOOL_GRXCLSRLCNT: info->data =3D efx_filter_get_rx_id_limit(efx); if (info->data =3D=3D 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); --=20 2.47.3 From nobody Mon Feb 9 06:30:57 2026 Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 89A274949FC for ; Wed, 21 Jan 2026 15:56:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010994; cv=none; b=e7XlDFntfq5/gYl2HWXPmlSfUucg00ng6yn6NMIXSV+l+53AmtFHLOG0cY4lSK++KJpdySFP7PR4Pmn9df+z1JjCbUj/TllPJpVlv/rapexYC4Mw50UExtDxkO0F8MzfRtCWtxpiT9g1jpz3qr6n/ggI8BSE9IjlSEDhGuAZ14M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010994; c=relaxed/simple; bh=kqzS/7eXjKQG4xiemTDsmFZRs2ALv2BsjFw/ViIR5ug=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=U6cxLHdLNm6iqZ5nYeHY+A647/qafd01e+2Jz0kqZNVd3kmlHdwXduiDU1VKHD5T0HgbsRqqIBIr8pUvfqNYyVp3JXZegg3V6lv/nrVUJ3Cf6oQIuZPsHOGksOKB7toTEAmHuUcfjW8YysmGII5A0LI4S44PFmu2LUt0hqdsVE4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.167.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-oi1-f175.google.com with SMTP id 5614622812f47-45c83c49213so10728b6e.3 for ; Wed, 21 Jan 2026 07:56:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769010989; x=1769615789; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=BvlsW4lqNl+1+09mnU3bYFr4itCF0ttr+C2yEDPsR5w=; b=P5/YhrAoWCI2V1kiYpcNaW+DiiGu/5pggr4kR0o/WDn/cPK+cMmjwjbHhO0POu7nh5 dd78Bn3267+SEuo4uhT36O8/Lm0F2g5Dp9tQSkWluL4zJoCFA987aThG1Cc0P+YjUwq/ 2E/gRDjMnTpkyLgATq+oIkZeMtEvS1x8aZOP4zop+nmwLErbtjQnFeA6syxaz0i4w36o XTLaoUzkHTOJY/LA7mSuUQKYF7HO7gz9gpdDpD+0P9Sbhtt1yQ/DM6aYllKhKNsQBLAl uGGFjqqlg6hMeFSyhqvIifb3ar4yP3bEjs5Rrt2lqLNb7j5wai5fu1RzW8WzCkczBS2a YuIQ== X-Forwarded-Encrypted: i=1; AJvYcCUYtZ89xYwRVj4ERQ6Ds1ESHZBcD+QNVP/+Jv6Aq8Vn6XdgHVd5oZktdp0XDP68MaivcnljEOSIhOCXD/U=@vger.kernel.org X-Gm-Message-State: AOJu0YzT9YiiQRQgrqN/pEJLuuKt267zklJVn2dUf2RtPacGpR0eaJAP rNONXhUkt1mCFIFoM0dmsruwrgF3vxeHHjroao3Sf7xu0ViejmYKndfK X-Gm-Gg: AZuq6aJ5/XImgOJkOQli5PWKZirpKVy43AtgTCQ3zSdj+lV7PK7LKc4g3dWPNxSSxTu Hw4H8BdA3yCNFInMyQNl52rq98X1yP2qYEPvJ+IvW5bxrvyylg2M039uqwWh2Rlc72VF9uod2b6 NnlfXadDAFojthYkwCRe1xUPQHggbqTCOPBOFz0C2la0s2mW3X4SRvb0THtT2Y7O+j7RC2hcHGh L47FO5tNL5fMMRHsgto5TyueG/Y43p2dbtM0/TdoFZcRjMgoFCoYgNzjI2QH06EzAmhHK9EueCI xBPVP7Zb0MvU8/PZqGmAyJHWw3zT38bGs7aN6XIVuXJA9nWs8Q9jpqsmeYyONhAoc8VMHVwQblx Jm5Y/qWZT9KOgYJeQ8HRMXUsXsJRMqoStAyzmJUwCmIGw4WnD5wcdY1A5GPzpohN64Ak4hE4GIp zd X-Received: by 2002:a05:6808:1207:b0:450:f17d:860e with SMTP id 5614622812f47-45c9c146db5mr7453499b6e.47.1769010989362; Wed, 21 Jan 2026 07:56:29 -0800 (PST) Received: from localhost ([2a03:2880:10ff:9::]) by smtp.gmail.com with ESMTPSA id 5614622812f47-45c9dec6619sm8684288b6e.3.2026.01.21.07.56.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jan 2026 07:56:28 -0800 (PST) From: Breno Leitao Date: Wed, 21 Jan 2026 07:54:46 -0800 Subject: [PATCH net-next 9/9] net: sfc: falcon: 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: quoted-printable Message-Id: <20260121-grxring_big_v4-v1-9-07655be56bcf@debian.org> References: <20260121-grxring_big_v4-v1-0-07655be56bcf@debian.org> In-Reply-To: <20260121-grxring_big_v4-v1-0-07655be56bcf@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=1636; i=leitao@debian.org; h=from:subject:message-id; bh=kqzS/7eXjKQG4xiemTDsmFZRs2ALv2BsjFw/ViIR5ug=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpcPci73BBafszurpkpislh2ZdfEde9KM1z3BTH bEi/YHQ4KqJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXD3IgAKCRA1o5Of/Hh3 bW8xD/9h5DYoUj0BnDZx0DxqyEswo0Yz24BdyMadcONl2aU6A/5L0TN0u8VNDwSsWgG+fnZxzfR 0kHcfXVG8VstKhv6WBMC4KO1magMR4Lx3JYC22oDObaXt2v5Y0T7QAFhVc5PKptaqbhRPvlEcZN 1unciuhewFPcqJbCk6kpIvhbnNIY1YQA+YL3S5AVwJLGQFEl648DGshte1NMUainY1FRJzIOXZJ 4GrJrJkkpb9DrbLw5/tOn/HudzHV5/eCLJJj4M7K+AqBwreaMY1wzbe3mO0amtQgxgkEFEKIgty 0InW+tYXBOA/7shGFBMmhLckz6+yyDQz4tX5Z6F6EisOINVh+IghhbpQY9+5krZdeEmjm0ksSf8 smqvc/Qh/olyNs/+9DSROujp3XnNIyKb1mU37/30xZ3U7at0PE0hyenclY51b2lnpKU+YSR+eZB bT8VP4nh7dJjCb8vSM21cU0LGpf1s8nkWKllnCNL34XZXQ0moTharhlQpikpXe+R6URX5SEgh2o 8NpNLahAV7Az19qYncrEyF56TzKpBQNX3WfsPoM99oCxmkNP49P7Qs5qZI0dB8mwx1kmqtMWALQ fBl93SueB5K5ODRvXlBT/rrqhdsnXPaQ+1y6DKBTLMeK89Kb0y/0QFD7LrTz9A1HY4wHRz2RILz CB90w3nUtgxXUwQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D 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/falcon/ethtool.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/sfc/falcon/ethtool.c b/drivers/net/ethern= et/sfc/falcon/ethtool.c index 27d1cd6f24ca1..0493640315454 100644 --- a/drivers/net/ethernet/sfc/falcon/ethtool.c +++ b/drivers/net/ethernet/sfc/falcon/ethtool.c @@ -974,6 +974,13 @@ ef4_ethtool_get_rxfh_fields(struct net_device *net_dev, return 0; } =20 +static u32 ef4_ethtool_get_rx_ring_count(struct net_device *net_dev) +{ + struct ef4_nic *efx =3D netdev_priv(net_dev); + + return efx->n_rx_channels; +} + static int ef4_ethtool_get_rxnfc(struct net_device *net_dev, struct ethtool_rxnfc *info, u32 *rule_locs) @@ -981,10 +988,6 @@ ef4_ethtool_get_rxnfc(struct net_device *net_dev, struct ef4_nic *efx =3D netdev_priv(net_dev); =20 switch (info->cmd) { - case ETHTOOL_GRXRINGS: - info->data =3D efx->n_rx_channels; - return 0; - case ETHTOOL_GRXCLSRLCNT: info->data =3D ef4_filter_get_rx_id_limit(efx); if (info->data =3D=3D 0) @@ -1348,6 +1351,7 @@ const struct ethtool_ops ef4_ethtool_ops =3D { .reset =3D ef4_ethtool_reset, .get_rxnfc =3D ef4_ethtool_get_rxnfc, .set_rxnfc =3D ef4_ethtool_set_rxnfc, + .get_rx_ring_count =3D ef4_ethtool_get_rx_ring_count, .get_rxfh_indir_size =3D ef4_ethtool_get_rxfh_indir_size, .get_rxfh =3D ef4_ethtool_get_rxfh, .set_rxfh =3D ef4_ethtool_set_rxfh, --=20 2.47.3