From nobody Tue Dec 2 00:25:38 2025 Received: from mail-oo1-f42.google.com (mail-oo1-f42.google.com [209.85.161.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 DC2C02FE061 for ; Tue, 25 Nov 2025 10:20:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764066006; cv=none; b=lvjmc4HQs/wDDFt5TgMP0XAXjs5krIPlqmC2wSooJ0DpLAtzRLgKsfaQADTFL6joBUo6c4rmXe0/dhC6sIWceLv0N/I9i2rgoC83GcGX4yZcIVNmOrW8dDb4vjnRoHxzXE8pCWUh10FGL9rn8EPrYg4ysQPBQhi0nifA3zWfV54= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764066006; c=relaxed/simple; bh=dXV72bqndpkkvzq9o6QtXIzE69babSsUr1zwRzXjy7A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PB3+Thnh3FbVXXyxR4aIYoSWKDpN0oNVvVKGy4NDuajGzM18xwl0NuvYYEk6qerFUk79zmVDSVkEqeyrMwCkcgG7nBPBWIRfjx74lf3Cp/eHSDCHA/FE6XbQYUjGwBFkwN8eTmlb31yoTVjzdygkbP1MQxeJKKLr4Kl+dR4040A= 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.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-oo1-f42.google.com with SMTP id 006d021491bc7-6574ace76dbso2137312eaf.3 for ; Tue, 25 Nov 2025 02:20:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764066004; x=1764670804; 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=Tvbta4fVdZn9vAqQBg3FZCIOEShaAvkwCR4RcvEMvMU=; b=LKXcma53cPUFkkfDLqG/n5xAKG6rPG2aEhwmt20ltTeOfRBisi3nruThq4mSpU0b0e gr00YUkApUh740Izxq34q9bAxxQXWV915rakOzcH1nsFdbSIj4pFL2hUHK2JUiFNiwSt RzGXHbqIHSxbterI85NHKpjYyHGyvsbIYo8o2aZ527Ew5GhrkMjpVlf8w5bclgTLdCkw rrV1LLs4ANeKWTKlsiOcLziV2/Yw8M158hZMBwfPDnYGSbRQCsKO/gHfbvPtPFZN6vcp LlyG08n7J0Z5IgV+NKR/CVSAUM1vmFgkDdqOxEFY0pHUVWSdzLpZSQnMMEt2fS9xwfXM tbRA== X-Forwarded-Encrypted: i=1; AJvYcCVxOIxAr3gqqCcjnebjmXvcrXucEtEXMCapamCq1zX2YR5RqduOPX4P4tTx4bxC2sByEvPmd+G1B1IbERw=@vger.kernel.org X-Gm-Message-State: AOJu0YyOYrOOjdrvyNqfZi8p1Kjz3+CLWZwY/JTOHPkK21DkvsU9GIkF KRZrtWTIDaFJDZUIEikARxo8Q1jGFPlEylKwOBLrBvb6SQ2sIQyVXO0Z X-Gm-Gg: ASbGncvI30rtAWpkqYZU3aYfhe2Wp/TR3K0nmnjMN3PZg67Rgz913U8VF3gxmJ1exXL bNECFS/O6ZY1VUN5J8gestWG7aTuBykns5ZcDru+uZ38Aw1nPbyMLRLTQb96xE7WVPNObGjEXUW 1xH/j2lPiQ3ZzowtqtOze1kpkg4x3/0f4W6PFW1c12oYnEtwfqhAFgP+dftO1r3RbTrq9aloK4t lzKS68UQCxtAIo7h4LqiehwPmzfne2WpSv2plvF7WCypPWEBTQILsyuPQ2gMmH+7/ZKfVKc5dRU LiuB7ialLWz9YhruT+2W7MGpjmdL0eZbUuezKxxqI7WkD2EX8t5CPaXYNAXsgnpaNHhpOKjAT0B mzVm57KB3xoXsgQDB507SCmiMGCnCJGaUvTjJeBdhIBqYHhdKMvaj86OyKkY9liBbYlpIUdhAXD qobHCQ/2/JDG4iXX+ymCGS X-Google-Smtp-Source: AGHT+IG0n0J7rKRKrTWwDRtn+YiwdUe/ykWABXHXC6gNlvNKhYZ7bef0l5IiHuvPmD0px4kFdMhhrg== X-Received: by 2002:a05:6830:2b0c:b0:7c7:6da2:6d6d with SMTP id 46e09a7af769-7c798c4acb9mr8363612a34.5.1764066003793; Tue, 25 Nov 2025 02:20:03 -0800 (PST) Received: from localhost ([2a03:2880:10ff::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7c78d4280ddsm6145336a34.29.2025.11.25.02.20.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Nov 2025 02:20:03 -0800 (PST) From: Breno Leitao Date: Tue, 25 Nov 2025 02:19:51 -0800 Subject: [PATCH net-next v2 8/8] fm10k: extract GRXRINGS from .get_rxnfc 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: <20251125-gxring_intel-v2-8-f55cd022d28b@debian.org> References: <20251125-gxring_intel-v2-0-f55cd022d28b@debian.org> In-Reply-To: <20251125-gxring_intel-v2-0-f55cd022d28b@debian.org> To: aleksander.lobakin@intel.com, Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@meta.com, Breno Leitao , Aleksandr Loktionov X-Mailer: b4 0.15-dev-a6db3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1964; i=leitao@debian.org; h=from:subject:message-id; bh=dXV72bqndpkkvzq9o6QtXIzE69babSsUr1zwRzXjy7A=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpJYLIAMYpRybdfkoBMBylttuJo/I+zxk10WasV OHTbp/453GJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaSWCyAAKCRA1o5Of/Hh3 beq9D/sGrH7k8zyr42hndTHDhiu3C+5sa8ejE3PTLKXfz8VGFpSwkznKO3f7QGhI+fhLBP0aPN1 FO/fj0bnQA55HE3/gO6mdw+Y6Y4LFlL41U3T6Z5pLty6QrgbpOKeRTVoXA7NJeNiGB1Mgyaa+O4 2nqjhJsF93MHNuBOONOtiq1Hjz4QrbMqPLacFotgrEobYEqjR+HWYIIlrpaHcifg6Pf4J2Y6B4W UPV63dTdvs68k037miseUbQSqRfLa+RanPmZUby4C1TOWqfJCIjoP/XF59uWtuIhGat39Ri83oD sZLxizdb5iEVehz827agbw5CDq8i2E/xOveVYBGZNDNJxkgg3Dp7GFOu4dUoYJx1FqwGDSqtp+7 T6QaUEiDadl57/vHgGTjTBLtsNRDgKfkpqeOVPAnxrILZ5mSVDiW/iFzFVT3Fik1TdvB11Cc4+X 1U8w5+ISyAJx6jQ8Y7mO3fh10d0boHc+1EMJjY7reRm2cNvZ193tW46EaeDd72gmvUr0WYql0V+ qMztuITVslcHA0JkDqJGoZ5ULWLF33SRDwjh/WtCnbjMlICzk5Qs4tWJ6GCj1N8cgrhJdYgRrAq n1oHTCrplBgL07N+ldMZpwJdZC24gl3MB2Q/jWiww8Sg64qRJA6oya4FYHqLfFH0nGQq31EMb+m x7CGTmvx2hs3cfw== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Commit 84eaf4359c36 ("net: ethtool: add get_rx_ring_count callback to optimize RX ring queries") added specific support for GRXRINGS callback, simplifying .get_rxnfc. Remove the handling of GRXRINGS in .get_rxnfc() by moving it to the new .get_rx_ring_count(). This simplifies the RX ring count retrieval and aligns fm10k with the new ethtool API for querying RX ring parameters. Signed-off-by: Breno Leitao Signed-off-by: Aleksandr Loktionov --- drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net= /ethernet/intel/fm10k/fm10k_ethtool.c index bf2029144c1d..76e42abca965 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c @@ -734,22 +734,11 @@ static int fm10k_get_rssh_fields(struct net_device *d= ev, return 0; } =20 -static int fm10k_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *c= md, - u32 __always_unused *rule_locs) +static u32 fm10k_get_rx_ring_count(struct net_device *dev) { struct fm10k_intfc *interface =3D netdev_priv(dev); - int ret =3D -EOPNOTSUPP; =20 - switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D interface->num_rx_queues; - ret =3D 0; - break; - default: - break; - } - - return ret; + return interface->num_rx_queues; } =20 static int fm10k_set_rssh_fields(struct net_device *dev, @@ -1160,7 +1149,7 @@ static const struct ethtool_ops fm10k_ethtool_ops =3D= { .set_ringparam =3D fm10k_set_ringparam, .get_coalesce =3D fm10k_get_coalesce, .set_coalesce =3D fm10k_set_coalesce, - .get_rxnfc =3D fm10k_get_rxnfc, + .get_rx_ring_count =3D fm10k_get_rx_ring_count, .get_regs =3D fm10k_get_regs, .get_regs_len =3D fm10k_get_regs_len, .self_test =3D fm10k_self_test, --=20 2.47.3