From nobody Mon Dec 1 22:37:16 2025 Received: from mail-oa1-f50.google.com (mail-oa1-f50.google.com [209.85.160.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 9504B32AAA9 for ; Thu, 27 Nov 2025 10:26:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764239193; cv=none; b=sNyPx33+mm7lXJH9bij9VEFXDB5e/OqNC1GicOWdwx0ZvLQo4LnyyHZ4UgN7iFsnvSwyBp3QYsfMciLa9QQaymCsGS5B9syYdSWDZSi1Wqou17yQ6/h5Pij3j2iieXWEGC6eIoS2sep7+uAJX6Q1cOdBgzTnOKwJJ50+6mJWnuo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764239193; c=relaxed/simple; bh=VCp7Y+Tood+qYY9gKVPbLuTiQtOR8gQ16oIE6JhuthQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Pk6Y/Midb+WVAYl+P60IZ2mf7y7+P7xjbbZEBKxmxBAS1EcT2l+wEIunZGXoXDCNg+WdoM/KD5I/b06zMTUu5k3hplVLzCgr8pk4EQP/EIIjyx2EpswptecYaeUhX9KGPk76fY5cmjm9qKgaJBHO1wHmk06AxzS9P6XvnrvDRsk= 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.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-oa1-f50.google.com with SMTP id 586e51a60fabf-3ec6c10a295so150575fac.0 for ; Thu, 27 Nov 2025 02:26:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764239189; x=1764843989; 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=A1AKmuP1PpwnfsktfsfygiNqAcVa5BhdNFVANeglQeI=; b=A55fhWoMvQV7dCbrZczIgIp7bWcC+Ca8CGbmRsKVOzayuSKQ43Hi+VNBpJMqvy5Abw fqP5sXA24c7pUyFbw74ZVeIFjsPw5xSNLBaMS16tIvbv4F6iJrs59Ba1/MKgDucb3SoE 3i9E7cdZZmtEcvTFdG3W/OjB1T9pyjgxYkJ/0MTEx1XEPaCZm+KfOEmlIlFx3JmN9U2c b/mhodCAOntEzXH+70bkzmshelRKJNKSxMXx3YN7NtUit2Ou0/MMggmuW+A16wBYwG+j rKrJZXq7xefKrjgY2yQlgdIHDP+dgnV1SQaBQxfGe1TNMjQ2E0sRDcMuvhC7tUwlDAeD ILMQ== X-Forwarded-Encrypted: i=1; AJvYcCVa2dWS5iBRMIcFt7EVs8ZRJqT5WfXpW0g2ZGZ7Bkfg6VCtQF3P8FJ7wVOAm/nZ7E7WDO28kfqnh4fL5PA=@vger.kernel.org X-Gm-Message-State: AOJu0YyePP4SInemGGKFRvrQtHeI6tIekG7tEn7CrcH4QCMidJiZc2ya oKHG9Tff910zvIeGftYrhCk0u+9HUyPYCdybPzaT0QyRMmkBEZviqatx X-Gm-Gg: ASbGnct05QHpPyY1MYVhAp1kQEMFyLP7aTN/xY/86raKlo1IUKUy8sRkCNmpTkmFd4x mtz/8qeuO/SpiJutdA9p/4sYHF7NTv/6iQT4JSYPzFIc01JFTP6fjpcUvOAZaIAb27bWHfR9VBf gG9S7lo9xRfvgy6+ADvKiRL7JPF+5EoWGJuuSeF9WNB3K8M3U34mVxVKDO3F2IYDWOmSE4UO9ez NpIt9GoJjHTCTz8ywpWq3tc6lrTPuzRxc5Emj1ntGQ3xa9wmEJT4SAa68zEJzTtNAzv3Gp8bstU UBaORcGMVGGd1vUn5oKQuC84ds7vDaXExSgSM9iE5HS3tjnX2/4EMoyUTeXpUiqk8DV0nCVJmsx 2q1Mcrhk1Ga3PF6pkanhERkhmr8c00aCyixdPQ6aVUBIhUGOgiV3qrxF2XjX5CoVmCVcg/kcUYJ Ize7NbhW5lzmL/Zg== X-Google-Smtp-Source: AGHT+IFc6lzuGdsJj0w9mKHy2vMevso+PQqCJqGAgOyqYEVarWmRO1Pt/Um0y5D+b3CPZa+Tf5FJ/w== X-Received: by 2002:a05:6870:a193:b0:3e8:8dcb:cdbd with SMTP id 586e51a60fabf-3ecbe58b0ffmr10660650fac.43.1764239189634; Thu, 27 Nov 2025 02:26:29 -0800 (PST) Received: from localhost ([2a03:2880:10ff:5e::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-3f0dd02a927sm354511fac.19.2025.11.27.02.26.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 02:26:29 -0800 (PST) From: Breno Leitao Date: Thu, 27 Nov 2025 02:17:16 -0800 Subject: [PATCH net-next 2/2] net: bcmgenet: 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: <20251127-grxrings_broadcom-v1-2-b0b182864950@debian.org> References: <20251127-grxrings_broadcom-v1-0-b0b182864950@debian.org> In-Reply-To: <20251127-grxrings_broadcom-v1-0-b0b182864950@debian.org> To: Michael Chan , Pavan Chebbi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Doug Berger , Florian Fainelli , Broadcom internal kernel review list Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao X-Mailer: b4 0.15-dev-a6db3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1950; i=leitao@debian.org; h=from:subject:message-id; bh=VCp7Y+Tood+qYY9gKVPbLuTiQtOR8gQ16oIE6JhuthQ=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpKCdRPki6apUWu987FqBbqmLIB9pnz9Jx7FNbs FhZkWNanvmJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaSgnUQAKCRA1o5Of/Hh3 bac1D/9/I4MOfUcDCCxydGc8qZb5rPXKk6C7BPmIyEvM9/3uuFwlu/PmXltMUmQSv+YqeyZyaNQ 7NYDfTlh1E4mPpH93RUOoyk7RBfFLmchb/0Krq5qS0KRZF2B1L7IVzNxLY57GKdn/pUrERScx+e p1uDi1MAdxMcdrBGrfscp5rtWfbqJseVee9QohNGEQSeAxNtS0bGrcaHhA7jUeTEpIkVGPolI2z 2MNB9xflCEOHzzWjfWK3nkZNx2hm6dlWv4y/twhQNNa1qIII8k8yowdwcmGlW+lmKBIsGgPed2H NZruEuGCyPuumC+p1SGF+E+vDJ2XGih41SZU3KWese6Jiu1/UgNThZtRctMpgVt7Pdsoc1Otobn giOoU+THBlmV8jk6JW6kPBVFZkGaEqbHsNHgzmOiYghnBGknOOgv+WfrZiqjr9IrZng2h7++UwN aNJaL0kbtEm5ndyZie6lxLHIvGgTwOALChtIMQ2J3XjKNuYI3CM4MyQ1WCoFu/SoO+ITiL1auaY Yv6Ogwrj7ZHeWah626xbqucA+qRVJp0wOa9yJwfKe0hV+eXNmGjImNmBNHM5aEOLBKA+xSyOCLJ dOX1QvHaZ6EVsGcWezM8CHTdXdCKn37Us+N/Noh2cOvaXOCJV8WO9GH2bK7wK9xS2LAn+uweRpc 1ahHPZBakgscwhA== 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 bcmgenet with the new ethtool API for querying RX ring parameters. Signed-off-by: Breno Leitao --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/e= thernet/broadcom/genet/bcmgenet.c index d99ef92feb82..05512aa10c20 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -1640,6 +1640,13 @@ static int bcmgenet_get_num_flows(struct bcmgenet_pr= iv *priv) return res; } =20 +static u32 bcmgenet_get_rx_ring_count(struct net_device *dev) +{ + struct bcmgenet_priv *priv =3D netdev_priv(dev); + + return priv->hw_params->rx_queues ?: 1; +} + static int bcmgenet_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc= *cmd, u32 *rule_locs) { @@ -1649,9 +1656,6 @@ static int bcmgenet_get_rxnfc(struct net_device *dev,= struct ethtool_rxnfc *cmd, int i =3D 0; =20 switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D priv->hw_params->rx_queues ?: 1; - break; case ETHTOOL_GRXCLSRLCNT: cmd->rule_cnt =3D bcmgenet_get_num_flows(priv); cmd->data =3D MAX_NUM_OF_FS_RULES | RX_CLS_LOC_SPECIAL; @@ -1700,6 +1704,7 @@ static const struct ethtool_ops bcmgenet_ethtool_ops = =3D { .get_ts_info =3D ethtool_op_get_ts_info, .get_rxnfc =3D bcmgenet_get_rxnfc, .set_rxnfc =3D bcmgenet_set_rxnfc, + .get_rx_ring_count =3D bcmgenet_get_rx_ring_count, .get_pauseparam =3D bcmgenet_get_pauseparam, .set_pauseparam =3D bcmgenet_set_pauseparam, }; --=20 2.47.3