From nobody Tue Dec 2 00:46:52 2025 Received: from mail-oa1-f51.google.com (mail-oa1-f51.google.com [209.85.160.51]) (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 0D67531D38A for ; Mon, 24 Nov 2025 18:19:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764008362; cv=none; b=BK6C6Vc/bjpNPWXquQ/k9pohbsxCBUvJ7o1WtLe8XQmaujJ38b4AYG3gYsseWnaOqI0OwzhgUxb9dzMT2+T+Vm1QQE4HKcXDDImjl4IxWBbgRZswoisPyH+WXM/xhZYBcadNworGDoH8Ls8fL0adShZN5Ny53/w/P2aQT5tzvUo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764008362; c=relaxed/simple; bh=+tr0rXCH3AppraOpbUulaj+yjW39IimK04ZXWNj9Ab8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jHVHa1ZoqbrioCmZtZ40rCvhuaKKyjgwxYZTIYHtjVvsIs/VG1txmUXTuVDLe6mrySAhcN/TbUgXowOQD4dXypPVlb0uBOj5AforGEUCT6kI/Nz6BIVv4nPneysxB1bsnrmZvmWNBm3D9YAQZy4arLs2ZWAeXxrGZQevc8X0p8o= 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.51 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-f51.google.com with SMTP id 586e51a60fabf-3ec3e769759so1181024fac.3 for ; Mon, 24 Nov 2025 10:19:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764008360; x=1764613160; 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=Fm7T4kYpemJMMvjDtiDQYS0ccg85PvSfsO/Tmuk9TY0=; b=ql9wosmqXVm2nLIS00j6Xqm0e9DH5aKWOwuuSEAboaCdGQ972/H55e+XbhMmxe1GLz oC97iL3J9v2rV95MTAt2nDsGHr+jldclg0QzJC6W7QzSZozyokriSpmCV5Dc45IlJKxG a26zxjzUd5fJzPuRMa+EoE59JyESNZGxe8NVUYym3MrAAeSY33geou0DXVkA/umC2ieM JQJunijaFg/zx9VmBKstpzvCZdTis/7GUgmwqIORJopnyXMFnnYLSMQk1R3xFJhUGslk 4JQ+5l/o1sHsKHhrKhrKuajMoQJNnxL4pFJE07JJ9KYkJeGpYc5fmRVFKM2tsRMZSL8k DCpw== X-Forwarded-Encrypted: i=1; AJvYcCVo3hmYwf2Jb9Wu1+wFzNtCWEcLGOwadiBugPA7kxmvzLpyyA6YL5CWU4k+gkJAIYdO/geRyV4J4UmCLjc=@vger.kernel.org X-Gm-Message-State: AOJu0Yx2DUDpLWPcmW1ql7I45yx+mQpgo+gQ1UG1qu1vnsvvkuOC4H/G yciCZUWiJ4rNxOMou8+qFtypErL5vOs8L5RyNHYfas+BcG4mdVbv++Sg X-Gm-Gg: ASbGncvWYnTBBsqIJXzjlPkTRNji5B9NWoJk38djrEssHt1tkznRurbJguJgscvx/bU BAJDrHeAnsTkGFKctE7hfd7Yv6LuufjvGdeIGCcAYm8BfKKYewF2i3Oj4j8V6Au/nodPPYEDFhN USBW7o0bSDB5FscjgNwHvRUna2fs73RcuK5k2UZWtjbI4qJbh2wYWv/+2jblhSZ4A8jS1Dl7hKN 4sspnRmosMv883fTjT1jRcS2jNGSzNVkRk8SxGd9BVxflMkUkxKStAsjnoMYEz23/4lP3NRs8SC wmHjhL+IaT9FF9oeo9S/rqDGzS1/9JF9pNexWwGrFIdiAUmHmG9wFS/Rx++2rlbIT0pY2dEIhiL SmVCYz4TgC3uD9vqDmO78ch6mkIU9bznhi0ARLgoyZjkOYwUgsKpqe3wg+Em2Aj6o9AlsU+qKjN YygadqQo8xiNRthA== X-Google-Smtp-Source: AGHT+IHk6DmiZ9rpOaxacJxdWVhUPb7ROk8BC/Lrjvw36nO5cYN272dniKUvdPt3nFoemdv0k23irQ== X-Received: by 2002:a05:6871:a509:b0:3ec:3464:6a01 with SMTP id 586e51a60fabf-3ecbe2e2531mr4998928fac.22.1764008359961; Mon, 24 Nov 2025 10:19:19 -0800 (PST) Received: from localhost ([2a03:2880:10ff:5d::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-3ec9c2cf16asm6481464fac.5.2025.11.24.10.19.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Nov 2025 10:19:19 -0800 (PST) From: Breno Leitao Date: Mon, 24 Nov 2025 10:19:12 -0800 Subject: [PATCH net-next 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: <20251124-gxring_intel-v1-8-89be18d2a744@debian.org> References: <20251124-gxring_intel-v1-0-89be18d2a744@debian.org> In-Reply-To: <20251124-gxring_intel-v1-0-89be18d2a744@debian.org> To: aleksander.lobakin@intel.com, Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: michal.swiatkowski@linux.intel.com, michal.kubiak@intel.com, maciej.fijalkowski@intel.com, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@meta.com, Breno Leitao X-Mailer: b4 0.15-dev-a6db3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1896; i=leitao@debian.org; h=from:subject:message-id; bh=+tr0rXCH3AppraOpbUulaj+yjW39IimK04ZXWNj9Ab8=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpJKGdghtwLmciShpO+hE5nMVvZSncmpHb5w+dv GWfQi0xDpuJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaSShnQAKCRA1o5Of/Hh3 bbtbD/0Vk0xiqTFHZzmeMTEhz0ob741q7xVzRMymgLSJXw7eSNIwOzXeIVsoN3wJ/mVaMB28xsm mjRUf4HqK0HA2pmdVUi+MZVXG4LD63Qt3XWlj8oyb0iIrSuwpY02UGWkWN0Ry4FjMLuRHwLO6QF FrHGwuBCoFbZ+M8aE64uqAF/rRaTX97ZTY6/o4gPfkxtzfJJ99lr/DP1xQgjr5rM0Xb3wXu01W8 03mGJTg4lGgp8NLBE/6WSRLgyuQE0KpEJDg60iQgfC86R/ysrNoGmV4Fsa1LmOsLE2xeZtiPCB2 HBye5VM4ciChfusUhN7wpnWbtRsz6esv+FcgFHZhzLp7v4BNDDd0EOCODb8mjPmOOKDs4Wp22ra xwuyupifJ4y9SUS5dPuMa8bAOQboHmzh4bym61lUWT0RCv96W46gOkRSGuhZvj9ACgkr2pLLNL2 AzaVSl8R6D/iqC2G9bGsdpKbLjoMP6hx8BNt1DNEpwN7Le8TSolSaOTBWmvDu3/9zkCWLKdUQOz sm/XBYxY1JXuaVG4w8cl6WzPRcJ0p+Br8RxPJvasxn7whhRR5kAv3Za5rwaNwf7Zf/tuBmhzP3x 9VMdP5qSjtqjOe8fijA4LXqYTJcRdaaGkA1L2dJNBeJSR6Y38KqEscHc/x3tXN1hAGZqVMHDT1/ 5EJWH6oCFLFcX4Q== 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 --- 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