From nobody Tue Dec 2 01:26:23 2025 Received: from mail-oa1-f41.google.com (mail-oa1-f41.google.com [209.85.160.41]) (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 8FC7C351FB2 for ; Fri, 21 Nov 2025 17:02:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763744570; cv=none; b=Ag74MoeftC75hPFoym1LM/ap3E+tmgjoA1PFwEDsBxMvGrCNksnKzNdfxPJKtRo7X2v9CgZkh8NOpqAsB6noFt9ZKJqENHzv9FIrYLP32nnov7E2Iho5mo4pYbpvmUAwFK67ukyIKft/7i9clHopYPuVuENAH3sMkx0AU+5tP4k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763744570; c=relaxed/simple; bh=XF93bhl71hsuF18ZYsVmWcvRHzSNIMnpweA016vU9qg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RHyDfpiiwKjM++/lJL4FZ44ANu22HMYacfbARwxAGk/KVyvt3izHXLwgJ5YFBfs8msCj1vs0TbCQ2YqohlwaJUAX+F5B5K9S92vRTx/P5MTyYmG9hjiFQiPP09y4qvtWL7YQYCoxz0eTDWNtmSGmLeiWQhv6zwRBCzh1JboV86o= 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.41 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-f41.google.com with SMTP id 586e51a60fabf-3e0f19a38d0so1425692fac.0 for ; Fri, 21 Nov 2025 09:02:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763744566; x=1764349366; 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=QBMGNHlPCrE6F/5h4n23j+Tr/lWB3KZnRoWf+L2l9xE=; b=Fn2W/++7shbV6NSWKzKdOloCHQ7YQHAEmBEGkRwws1NEjUvV/0n8WrxpdJajTTOjA7 ZDUgR+09VdiUl64UeVD7r/Ktn6OPL0Nfk1P5w7GBuSUrR3dCa94c1l2+8q0LqF91t7Jg u+4roKHyVFunoQjf4fVmSM4XGGqdgqbqjzZ6admuOfOexxiqeKPzd/22CswpeAd/EWx1 74VqtyBkIwqJ3RbsMNMUGQgNHxuKvEqnr51dADG0kSlVV4gTnE5wI2bQigYze+QLDZbI T59CMeBPgKn6R/zEj1hC9bV/mext3HWNt/osBRhTFwv/mOFJJ2Z29yXIG/NT95+TFkBp H5vA== X-Forwarded-Encrypted: i=1; AJvYcCXj7+IJykY6CEmzz1oDot0+YwSLpX1gVJDVU4Icvaq0cpJ5/BTQJmTNapdRLeF/E3MaUa98A/j2PFBn5Mw=@vger.kernel.org X-Gm-Message-State: AOJu0Yxu37IK+Ot4KJcdp5EuMM0THCeIDS4drEIgMnHE3tp9LxoGWYob wF5PmjyQwCv48TuJ6rVxO8qukl6RymXxtFTUAqVE1aB4yq51N/U1Ob4Z X-Gm-Gg: ASbGncvgh3hW9MlqFtxcRW3pY89GMeRHBQMQD0/JzAITAnSwS9UWMlUMsPLLdFsy7aQ 0HFJvGYCSw+i1WTNLP/69L/5V47+MVTC5fiqyn+FnujzpP4MrMKDQDofqlNWIEDZ8EjesBMNqyj bn1kpbo5T77/TNlnAHnOuNlpj9srhFjeed6u6cjvPiNDRg6kICZp62ou2x1kt4gUZuQZLBVeVq5 N24Z9rXSeVd0TdRQ2UGNZ6Ers5ZU8b1p8csHY59tHCQ5aIvzapRZlnn+XwPtJQr0jzgOoVswPRe iEpwbEarrrA1P4ReFIhSr7i4VwbFdsfKpFQ2PpmEdyvmx0u+kglyIFM4pUgY6RJmVwATxwfpdv1 EDVsvHeF2oo3ViB4cuvgLJPB3YNGPYKDsfsq5/VeK4vVoBBwpU7LC6wRPa5sE+qlP0f+wG2AAbM 2JhKYKfIW2D5iJUg== X-Google-Smtp-Source: AGHT+IGFlWod/7UHOmXZrbtbGiqn/1bAOycgTeQqjLFgqyLFih1hCaBR4MWaMjlJaZWhS8tDyQF6bg== X-Received: by 2002:a05:6808:3099:b0:450:bc7e:85f4 with SMTP id 5614622812f47-4511291f137mr1332446b6e.5.1763744565918; Fri, 21 Nov 2025 09:02:45 -0800 (PST) Received: from localhost ([2a03:2880:10ff:40::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-3eca814da76sm2316596fac.1.2025.11.21.09.02.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Nov 2025 09:02:45 -0800 (PST) From: Breno Leitao Date: Fri, 21 Nov 2025 09:02:36 -0800 Subject: [PATCH net-next 2/2] net: mvpp2: 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: <20251121-marvell-v1-2-8338f3e55a4c@debian.org> References: <20251121-marvell-v1-0-8338f3e55a4c@debian.org> In-Reply-To: <20251121-marvell-v1-0-8338f3e55a4c@debian.org> To: Marcin Wojtas , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King Cc: 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=2110; i=leitao@debian.org; h=from:subject:message-id; bh=XF93bhl71hsuF18ZYsVmWcvRHzSNIMnpweA016vU9qg=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpIJsymGMfrQRjvOKIZHVu8dIzupCC8qpL2YtsM /UenPVVPXGJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaSCbMgAKCRA1o5Of/Hh3 baNnEACQ8szUMDRCIdA3P3ph4FDxlK8pbCVgXzUNg9wPrqEC8XxOAtBkJkKltkjr9XbB/3fmhB3 AKWQRTVnx+ZldCNWMalzI9eRwAhdp7Twa1FOqq/t0dMb7Sbq5nunXd5sSOBHlac1zRT7zzwwDVj xelAMsUsYFdnIrecMQgxqFqY2peEpljZftVFFdIgQ8U+Z1zsR8ZUmqv7ztactvjAgYORk37bXkw /hwljVPs9HbszPWDkFqBQNsWwrCH0GZD3F2E/Y0JJAqqFLImrk7QSuRCK/lMIrT2r2ZGC8OLFGo 6MkxK3zKqT3WuIUOSKuNX5o6ApEZc/+p+RxuLUqKURxr91UQxy4woCE5Fq19pIFzRAwY6o0FbwE ubN039Dp9dXLEh/tRVr8z7l7JK0d9C5EHw8XCYlNVeerfNH//zwIEb2f8ZsFVps8HHsQKc011hS hahnFHnnRqmSoEbwkQBaye4dgL8G3q5t5TsrHwtbdZVVseGvUmW8vwM6pnX1xhCM+5JSTPWRZoI A+vI01uuyLhM+W+OSRdBJ+bWcz+SRzxS4S/bWZGNM9iw78lfz+AQ91RyP+LXzf49VWAUHSmvOM7 N4n6/z8lUVxQRyqcba0sllQwzlt3mrGhVDpJYnmJrGpCLdHZO+mu+bKzQ9Pvzla6Uk1/5uVXphD qMtkbIHnG+6r2CQ== 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() for the mvpp2 driver. This simplifies the RX ring count retrieval and aligns mvpp2 with the new ethtool API for querying RX ring parameters, while keeping the other rxnfc handlers (GRXCLSRLCNT, GRXCLSRULE, GRXCLSRLALL) intact. Signed-off-by: Breno Leitao --- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/= ethernet/marvell/mvpp2/mvpp2_main.c index ab0c99aa9f9a..33426fded919 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -5580,6 +5580,13 @@ static int mvpp2_ethtool_set_link_ksettings(struct n= et_device *dev, return phylink_ethtool_ksettings_set(port->phylink, cmd); } =20 +static u32 mvpp2_ethtool_get_rx_ring_count(struct net_device *dev) +{ + struct mvpp2_port *port =3D netdev_priv(dev); + + return port->nrxqs; +} + static int mvpp2_ethtool_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info, u32 *rules) { @@ -5590,9 +5597,6 @@ static int mvpp2_ethtool_get_rxnfc(struct net_device = *dev, return -EOPNOTSUPP; =20 switch (info->cmd) { - case ETHTOOL_GRXRINGS: - info->data =3D port->nrxqs; - break; case ETHTOOL_GRXCLSRLCNT: info->rule_cnt =3D port->n_rfs_rules; break; @@ -5827,6 +5831,7 @@ static const struct ethtool_ops mvpp2_eth_tool_ops = =3D { .set_pauseparam =3D mvpp2_ethtool_set_pause_param, .get_link_ksettings =3D mvpp2_ethtool_get_link_ksettings, .set_link_ksettings =3D mvpp2_ethtool_set_link_ksettings, + .get_rx_ring_count =3D mvpp2_ethtool_get_rx_ring_count, .get_rxnfc =3D mvpp2_ethtool_get_rxnfc, .set_rxnfc =3D mvpp2_ethtool_set_rxnfc, .get_rxfh_indir_size =3D mvpp2_ethtool_get_rxfh_indir_size, --=20 2.47.3