From nobody Tue Feb 10 04:07:56 2026 Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52]) (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 6F32826981E for ; Fri, 9 Jan 2026 17:42:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767980538; cv=none; b=e8XtwD3JaMYXyyt2SrGOHA3X+/8PzMHtRbaZrgfcO7622fwr8bRuEtr44i9EIEiCJVkYT/mOcS6qywsiahcYijIRYMkjtDN/yyPFJci0LqYHKu0TCy8d/qwjX+eQU7NumNFu7VPCj+MZrz+oLw/a0jqFoy8ohXw1PqaMuMX3jnA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767980538; c=relaxed/simple; bh=nSSmLKtyU1zlKP9DUyP3r37XriJLC9nOjHP570WhOzM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uRe1G+PGXL2tmmRjepHL4CgmaNbEx4BDgRjZm5mjyG3pc1AqhKkW5BSfQsK8zO9wTDrj66fXMlGQR0fnIVr+yc+H2S8SSWBuqBvzBUIjL3o9iK4RqT/XJiIWTaUHMcqG8Qljha9v7h+YbMt/WzXIDaMWtJRDLqH+a739zcyd95g= 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.52 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-f52.google.com with SMTP id 46e09a7af769-7c6e815310aso3607655a34.0 for ; Fri, 09 Jan 2026 09:42:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767980531; x=1768585331; 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=CbdIE9v0fa9ML9Z9sZ9loulF/PgXCckwh2pAu6KB+5E=; b=IAOg40Zxs7gVhuPOirI6B74zrjvXhTlU5xz8/NXp/B/Bs5F3ffGFXzpNg4Pbncq/iS 9Wc+eXt4reh738WLOc5UK09NqY4AFdj3XUOh2mAjrqUJWZ/Mt535wx6DZ/O23W3FlJXF APDsEJoqD2+5NCFLOkEfx5a50kTslRfNwMct+Ht6gaQG4Y0bcUIOLTZRkjsfTvnhuOt2 va6cS1uZyQxcSXYkaRjI5mC/ycpjMvweDq6LCe+mHghvbsqYJHl92bHGNcIv4PghK/DD lICIAKtcOslE/mhNCLNny4TBR7ypuCnliJ43VHHzCWC/bnfOAO4++Ta33bqrzTpf5k8z TdHQ== X-Forwarded-Encrypted: i=1; AJvYcCV1hOBSnmnQT7f+dhyhNE6znup+7za0dT8PX4YtwxSzwT2anv86Zu6cWU5ESrJdIslpnyhBUuDLrvCClrA=@vger.kernel.org X-Gm-Message-State: AOJu0YwCnSw1yZVeYWyHbE8N8P0N+hO8qslhWGxl8K06vgMS9JzN+jbq 9vcf9p7YLwFxZBSfyVwfiDZ+LVnX6NNxQPNeA78RMBKd8jgT503mq7IU X-Gm-Gg: AY/fxX4YyCDTti5bArPfxdSra6ZvSewRAbNy9eKjaXSFqDcRY+YeLRAG1bUaB26pgRc RUNbdaMI8AgR45IYIqYpx/s0YgPfPoW8h/smpLWJTevQtYEweDXLeTBXHYb3jg62LYPU4H9OqZ7 qUWd1HYZl/dnhtXI7YZssnPtwO66L8tbpvkOmjiG1ScOJmiwNW3JMMEb7VvIiYp8dA+spMYWvFe u1MfxkIIDl13eHCrVh8eFZuc72vLfGyOz2PDyn/wgtT77jjv9zokMgYiGcg+n8eLwQgY53crbkn 7fGWJtzJ7Y9g6SA2b1xwvuYExMHrgY01Gx2P8r01csNVqHjyx64LBjvAtH1PKdl6Gja+zIqDn62 CD1HUJs+HIfM84oGRUsJobQYtvzi2dzNI30t+WCTZlQcjAqn63eBJfmDsp9CfS4FMc9b2piElER v4+pILPcIZPTB2 X-Google-Smtp-Source: AGHT+IGKx0GKrzFK9GaqAP6eokjpQCh4koDyXIEbvXkNNmoUPTe2yWkCNi8aKe+qUMah74mE/E0jQg== X-Received: by 2002:a05:6830:7194:b0:7c7:54e1:a3ad with SMTP id 46e09a7af769-7ce50c00c51mr6786596a34.17.1767980531589; Fri, 09 Jan 2026 09:42:11 -0800 (PST) Received: from localhost ([2a03:2880:10ff:52::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7ce478af63bsm7468893a34.16.2026.01.09.09.42.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jan 2026 09:42:11 -0800 (PST) From: Breno Leitao Date: Fri, 09 Jan 2026 09:40:52 -0800 Subject: [PATCH net-next 1/8] net: octeontx2: 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: <20260109-grxring_big_v1-v1-1-a0f77f732006@debian.org> References: <20260109-grxring_big_v1-v1-0-a0f77f732006@debian.org> In-Reply-To: <20260109-grxring_big_v1-v1-0-a0f77f732006@debian.org> To: Sunil Goutham , Geetha sowjanya , Subbaraya Sundeep , hariprasad , Bharat Bhushan , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Cai Huoqing , Christian Benvenuti , Satish Kharat , Dimitris Michailidis , Manish Chopra , Jian Shen , Salil Mehta , Jijie Shao Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=2059; i=leitao@debian.org; h=from:subject:message-id; bh=nSSmLKtyU1zlKP9DUyP3r37XriJLC9nOjHP570WhOzM=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpYT3wgwvFwhQ3IeSuFMS7v132a8iUqj/ET/JxD 9S2FuRQjp+JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaWE98AAKCRA1o5Of/Hh3 bVSbD/0VM6uSORFP1EJPOafmDKtFHK3IpY2Ds52XCBuUWAu3hhivFo+DrvmhcHxu1YopJHCBGk8 JYKPxSd6cYSKBXk5PP28azfD9b0ExRXf0039IgbkPNbnIzkPKK7kC/OLcZcvpXaoc1bk5rhiYvs O8eyC4xMmJvMQWwEM3i+ximMY1amiKWcLpTDUSzcDhNcf+mUTSBQJshAbkkpEkP/0G7bry1YcDR QTNc6pCzeu/bczJ1fO9KEVjz56H54db9ArY/+I1FGB9UjmTBZ721/pP+oh7F6zTEz+ggIDa3pg7 kkb3KRiEP5sMm4HpJ4WTxCaZ+v3sLhxKbQ+VQHDkmvBWyxvgKhzKc6FtrKUSmGdhrOFGUEqvyim 3sWQKj8IDfg03RoOVLh7sbY8MT7TGvxFYmBTiWH3uWaSSiwEDd5wizWYFEYXxBHU7IPWGotwGiv BlteVtPnuxCONEyt5B6u7KNO62KgItMTa57OpLDMfqxScn1yzHWxuW8RzLQFbIV5TRe5xsg4Y3v iq08yjSgCIqk8Fczpof5ZwtMnGMoIwYjjudr+maQ7nMOY6sOfcPtmA1BF3Q6CGbz+pCjuXlfgfU FzExyuXs2K97aYtdjpWuRaLU2hw3jeHit4i+9i3XVOQL6bGfo55i7+fpAvCVziOup8J/Qlh2oiB xTpuJ+U9jq/6k8g== 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/marvell/octeontx2/nic/otx2_ethtool.c | 13 +++++++++--= -- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c b/dr= ivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c index b6449f0a9e7d..8918be3ce45e 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c @@ -568,6 +568,13 @@ static int otx2_set_coalesce(struct net_device *netdev, return 0; } =20 +static u32 otx2_get_rx_ring_count(struct net_device *dev) +{ + struct otx2_nic *pfvf =3D netdev_priv(dev); + + return pfvf->hw.rx_queues; +} + static int otx2_get_rss_hash_opts(struct net_device *dev, struct ethtool_rxfh_fields *nfc) { @@ -742,10 +749,6 @@ static int otx2_get_rxnfc(struct net_device *dev, int ret =3D -EOPNOTSUPP; =20 switch (nfc->cmd) { - case ETHTOOL_GRXRINGS: - nfc->data =3D pfvf->hw.rx_queues; - ret =3D 0; - break; case ETHTOOL_GRXCLSRLCNT: if (netif_running(dev) && ntuple) { nfc->rule_cnt =3D pfvf->flow_cfg->nr_flows; @@ -1344,6 +1347,7 @@ static const struct ethtool_ops otx2_ethtool_ops =3D { .set_coalesce =3D otx2_set_coalesce, .get_rxnfc =3D otx2_get_rxnfc, .set_rxnfc =3D otx2_set_rxnfc, + .get_rx_ring_count =3D otx2_get_rx_ring_count, .get_rxfh_key_size =3D otx2_get_rxfh_key_size, .get_rxfh_indir_size =3D otx2_get_rxfh_indir_size, .get_rxfh =3D otx2_get_rxfh, @@ -1462,6 +1466,7 @@ static const struct ethtool_ops otx2vf_ethtool_ops = =3D { .get_channels =3D otx2_get_channels, .get_rxnfc =3D otx2_get_rxnfc, .set_rxnfc =3D otx2_set_rxnfc, + .get_rx_ring_count =3D otx2_get_rx_ring_count, .get_rxfh_key_size =3D otx2_get_rxfh_key_size, .get_rxfh_indir_size =3D otx2_get_rxfh_indir_size, .get_rxfh =3D otx2_get_rxfh, --=20 2.47.3