From nobody Mon Dec 1 22:06:15 2025 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 5CCFE30E84D for ; Fri, 28 Nov 2025 13:11:55 +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=1764335517; cv=none; b=FZ9CxMHOYReSceuM1X6pG9FiB4eGP1wbIjnnC2wypiMdEhSHCedrDS1RXBkyTefIoa794lh1o0KbqhHXZLT1ukFqoQGCgkVQImhQS3S6DSKcaFkzNe93K6dKOjCH8p4Mp0/70Bg28uJjHKzofVziZYpCVlTNPaA9GmsxqqKE2JE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764335517; c=relaxed/simple; bh=CZtYG+v51umTKq+EUEZdPSfD+cLS70zLo9KxgodZhEk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nY1278IFMHsqgSC1MFvk/O4KCE6WQlEzg5lSC9m/HuxkZwh6xjSnDpdoKvNaq7j8NiEUobyyfJzoSB+jxtTwf9eFbkdP+CckfsEGkpp6JyFLHvTsbcFXl0i09tTZG3JiR03a9+YiFYcdIzzQA3Qeik8AggVTdzxTsSD2mx7oVKE= 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-7c75dd36b1bso1125515a34.2 for ; Fri, 28 Nov 2025 05:11:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764335514; x=1764940314; 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=1Ws+64tDZ1NawiccgOINKTEQFjVR5AX3Ovp0pOwcfDA=; b=IRxqMdYmeiit5EIB3aH+JwsAxKR3/r+xXOGApKwDoVKun/p3a/x6JgF4zwg0B8nT5e pHXRLPxSDwG3oCa59jn2AGiFwDhFHcCQvpczVPfIAsf5/Z6Kj5AP5dFsaVlWXyhD4a5r kTDLOI3fXnwzFwWpn49BNDZdgVWOOIwsQEtzk3/oVQLGFIuSYdsrDMOM0nAMAEiMPQKb PY90OxUPThWS44R+ilYQ7Mfk/tHJ0HMrHRManFwI8HTpmKIJq5NwdE4e6dMehdirJZA5 Z6J9+8+bW4IktB5xGtXn70xQeF1eC8a0ejGzd0kmC/25fOu3+9DLxfcCM5OXTbA4RbTq UpdA== X-Forwarded-Encrypted: i=1; AJvYcCVRtMu7Lz3Bsg+zzGmCvokh9JIcmrhpIcXtUzzOUwrzCc234UGpQFwFiodcUFfMa/ac6IAIqoRHQVyF9tQ=@vger.kernel.org X-Gm-Message-State: AOJu0YycKkuzllCJgup2lpz6tqtJmKS9Gg7BIe0W9i+VQ2ObiHsYmXDu f5ahv7Qp5TYvB65xcFx9Fexhic47PoKTR2OhVczGmXDerzBZ3dT38TZB X-Gm-Gg: ASbGncvbwu5kPQVO8dW7Xa5bze7ioB06stN0/r0wa+jt37TUBxkhXxNFvTEHTGScoYW 5gGepoEPcwSASANTkSXgH5lcGfMbVBivToDEERSGwzMJiPsVSqP7HrEg/QiJ0Ov+jNqF1T1YQMI NA7+bTccQAHciO2XkILDQ+r3t/BIqhuKrzn2iaiT3HLffHwq1l6t1ntSZ+kaZiC90N6YnsgQtK2 3FZt+CfRXJwJFPRnWTZm4bG6UfLeufSRcC16ZOOC8vJ+z5sAyywKoRN2spUBFhC8hxf8zEiRR80 kdIrswjpz1+0eutFOhbahlVAYcX0FCJB5pGTxntT1asln0DCZ4aau4vo6RnNykl0Oq4VGX/QC45 eDCFxdditvCZsgFLTFmHskMfG25dk1960RJvb+3ByShLlLmagWPDFcvuEORjVYurxBXLhj4psm9 4IMUi+9UnNo2uQ X-Google-Smtp-Source: AGHT+IEgl8gjrsk4JsjIK4DYaxFmEftv3fqxBhJyfVyr6YWaXxtVod4kuEHssBMt6l++8++WJT6VhA== X-Received: by 2002:a05:6830:4386:b0:790:710f:60e3 with SMTP id 46e09a7af769-7c7c43809ffmr7586357a34.23.1764335514394; Fri, 28 Nov 2025 05:11:54 -0800 (PST) Received: from localhost ([2a03:2880:10ff:9::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7c90fe15847sm1504747a34.25.2025.11.28.05.11.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Nov 2025 05:11:53 -0800 (PST) From: Breno Leitao Date: Fri, 28 Nov 2025 05:11:45 -0800 Subject: [PATCH net-next 1/3] net: gianfar: 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: <20251128-gxring_freescale-v1-1-22a978abf29e@debian.org> References: <20251128-gxring_freescale-v1-0-22a978abf29e@debian.org> In-Reply-To: <20251128-gxring_freescale-v1-0-22a978abf29e@debian.org> To: Claudiu Manoil , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Ioana Ciornei , Vladimir Oltean , Wei Fang , Clark Wang Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, Breno Leitao X-Mailer: b4 0.15-dev-a6db3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1895; i=leitao@debian.org; h=from:subject:message-id; bh=CZtYG+v51umTKq+EUEZdPSfD+cLS70zLo9KxgodZhEk=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpKZ+XYiy9nO1IgJzH22i4LrieODa4xNDr9G2Dr ODhcJJgzPGJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaSmflwAKCRA1o5Of/Hh3 beHqD/9K4lb8U6+g1KmKvt5ihwvxD5pTy5FHJyIErxaMfkKOjZS+KZEzjJmLBaB+dTJ1pHksj0G rqxDhTYiqOcRDFiLOZxIYPBp0AcvabxGyiNcAdsh13/R7AKTakG12VQeqgJpCuUuJwnrvs1zb6X JiHq0QTslGjmivzO3U3V8qH9h+9thNQe7vf2cXicnJKiDlbDLIZcvs0duUgAFTrLieTIw7N9MOx JGUbz444LduaHs33BTcJ5KC5NPV9ng4vbLm2Z7ef/5GSANs/WGQS/undOwVs7iSPuJ2Y31iiYiV 4b44Bw2lZdEZA+MvV1dNoMiNs5Rd9rNIiFJt1YStIrd8fVSCiiTOYxLg37dO4vu5mo3cCj8Hq9c 90DOZTdDn+D6CF5X09ZZS3v/CDbL6b52edpYrsq5S0Pi76h3neQL5w7t3p8Uu7tlEsa8Kp16VF5 L5hv+nZwoL2WVt95oO7EOBW7peiXXEw+2f2xqIgmFRhuZHITyC4DzQfw8NBp7WtGlsVF8NdrO6d LMb311hR3FsXbngDgalMnQg2OJ8KWbT/lvbEt6jbpqTVx8DKB2sV8Zi8qh/DxrjICXddG2WtHf8 O3lyNztAXgfxRE7ZihWgUV4bgEaDK7HxQvpHrLpoA1H8BTB/SruCFc1RuFlvx/WM+rTEMFQxCD0 L+CKSWXTWeUQ0NQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Convert the gianfar driver to use the new .get_rx_ring_count ethtool operation instead of implementing .get_rxnfc for handling ETHTOOL_GRXRINGS command. This simplifies the code by removing the ETHTOOL_GRXRINGS case from the switch statement and replacing it with a direct return of the queue count. The driver still maintains .get_rxnfc for other commands including ETHTOOL_GRXCLSRLCNT, ETHTOOL_GRXCLSRULE, and ETHTOOL_GRXCLSRLALL. Signed-off-by: Breno Leitao Reviewed-by: Simon Horman --- drivers/net/ethernet/freescale/gianfar_ethtool.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net= /ethernet/freescale/gianfar_ethtool.c index 5fd1f7327680..6fa752d3b60d 100644 --- a/drivers/net/ethernet/freescale/gianfar_ethtool.c +++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c @@ -1431,6 +1431,13 @@ static int gfar_set_nfc(struct net_device *dev, stru= ct ethtool_rxnfc *cmd) return ret; } =20 +static u32 gfar_get_rx_ring_count(struct net_device *dev) +{ + struct gfar_private *priv =3D netdev_priv(dev); + + return priv->num_rx_queues; +} + static int gfar_get_nfc(struct net_device *dev, struct ethtool_rxnfc *cmd, u32 *rule_locs) { @@ -1438,9 +1445,6 @@ static int gfar_get_nfc(struct net_device *dev, struc= t ethtool_rxnfc *cmd, int ret =3D 0; =20 switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D priv->num_rx_queues; - break; case ETHTOOL_GRXCLSRLCNT: cmd->rule_cnt =3D priv->rx_list.count; break; @@ -1519,6 +1523,7 @@ const struct ethtool_ops gfar_ethtool_ops =3D { #endif .set_rxnfc =3D gfar_set_nfc, .get_rxnfc =3D gfar_get_nfc, + .get_rx_ring_count =3D gfar_get_rx_ring_count, .set_rxfh_fields =3D gfar_set_rxfh_fields, .get_ts_info =3D gfar_get_ts_info, .get_link_ksettings =3D phy_ethtool_get_link_ksettings, --=20 2.47.3 From nobody Mon Dec 1 22:06:15 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 E173532C934 for ; Fri, 28 Nov 2025 13:11:56 +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=1764335518; cv=none; b=ZOSTBq35j77ZL/Ezz7UUqCA5UW+m0bjyvt/Rzmn0KYdD31rOACXik243jW4GixbgQkClv6644+snwSavHOgEY+zympzoVID/aAc8qZEHpUNLaoZYchoxo1idGyhPsPPBuG+GEmvbouF+YOeB4rncZDlL/fiJNEdiy9f9KELvJqE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764335518; c=relaxed/simple; bh=HiLQX29b5guv03Xa2F9dczNRdVutcFxPYhQoC6d936I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sLqslHllJiLjAHzn9IXiTMFSGKcdU9VOoeMLCsFOskd9iTYROwCJrMcxIxRLmn3XWzzRoC197V7LLAPE+FmtU0G9E9cP6CVNX2eMyG3rU1EV4Tkkzti9+dY0rFhX3rP5XbPD7dgwk64+i8eRBOCJhooBAi98ujqxCtQOOPIoCAM= 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-3ed15120e55so979855fac.2 for ; Fri, 28 Nov 2025 05:11:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764335516; x=1764940316; 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=S8uFw/PujVTH/oHeKrVPdOpFhoSGuPIY79hEVzuk/E0=; b=lkEqZCmi6RT9YuO/mKWW7f6g3loUOyLMhQXSZXCs7RKzAwvvCJcsi8qkAl4mKLDbZq KTMtz372UJBQmaDC0JbqQQNeglpiEG2XFKQkX/s669ui0OqdM7AjEISamVivgN0v36QX 0h7FUa0vOyhlGgzHK8xQtRezG/ck6zJ/8SEQlxrsbuinZIcv8LcFKolsMbotabXThkqs nJhFs9xYhE26HtRhEYZf7puxzBLPCMUUkKn4p0G9M6vwPifXZUNJYvOo25SXIvkYTkGy eMftgBWkxrX56fELdPRWlzBdfxvE33av/sSXbeMhvN/L86xJF5t38C1QilTyzWutSgnB HmJA== X-Forwarded-Encrypted: i=1; AJvYcCV1skMUHmx45jzpSb0zhxwrcj1iu+q8L1IvnGjAkXjz66Dxg6QUdc+7p98WNPszqw6AJlBDXwOxZiXH6Qc=@vger.kernel.org X-Gm-Message-State: AOJu0Yx77sRgouSgJT5VHajiASjWCVaKjjvK3ksgxXDmcyjTh1+AfcXo ZV6EeQw3OGyZZtPj87iQjl6ksCATMcjCP+9QX9zkURDUKfsErzj3qRDP X-Gm-Gg: ASbGncs+G3Js57JNz9LxYYjstGV67Aor+lhOT3UHI4MTz39OXTE+FoAxxlsWjVkmmaA zjaP2R8ZUqarvFT71bAKQw1yrwrXJ3IbPsHb2gSAJ1HSDQcwiaOPv8iUefQxfraJlmlrjXzvh2S oUR8/e9C9BenYa8rHK/tm/7MGb4UyxzGBxIQrfVWnmNrj3ZFM5ZauDYR52kv2RLUk+ts03pdImD gc+/nFyxit87kYyxj+SWVBNETXGWAG16494qpTPOi9JDI8FG77xY2xKE8JU6HimkTvJHH3M23go zMG4AdbDJ0X4dD0sEcJ9aeLMsQNv2JUISH2/6ieglfwyIdtdX+aOh1dPUxmtkNl+y/9n5141hd1 E5bsncVUDuSR1a4csIMXYToD7YHHhIzrjNnjjQeJSpUQgwmYR+qD7MVjjtZbthEtmcPUfOMyyEh izDvh2SgWx3O3vDA== X-Google-Smtp-Source: AGHT+IFBWHNf82+ULMr9U1nzWRrRHHaPVEV1BeMSqdhxpkXed25KiTLYCHDZPov1Zae2zfsdagAxdA== X-Received: by 2002:a05:6870:8303:b0:3ec:2fe5:2b44 with SMTP id 586e51a60fabf-3ecbe57e931mr12197828fac.26.1764335515545; Fri, 28 Nov 2025 05:11:55 -0800 (PST) Received: from localhost ([2a03:2880:10ff:4b::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-3f0dcfdba71sm1748612fac.12.2025.11.28.05.11.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Nov 2025 05:11:55 -0800 (PST) From: Breno Leitao Date: Fri, 28 Nov 2025 05:11:46 -0800 Subject: [PATCH net-next 2/3] net: dpaa2: 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: <20251128-gxring_freescale-v1-2-22a978abf29e@debian.org> References: <20251128-gxring_freescale-v1-0-22a978abf29e@debian.org> In-Reply-To: <20251128-gxring_freescale-v1-0-22a978abf29e@debian.org> To: Claudiu Manoil , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Ioana Ciornei , Vladimir Oltean , Wei Fang , Clark Wang Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, Breno Leitao X-Mailer: b4 0.15-dev-a6db3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2015; i=leitao@debian.org; h=from:subject:message-id; bh=HiLQX29b5guv03Xa2F9dczNRdVutcFxPYhQoC6d936I=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpKZ+XV22COGsOLITZ0lkbHuNzbbAaJN2GXBGn+ /E0fAnmGUaJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaSmflwAKCRA1o5Of/Hh3 beJqD/94vMrgnJ2jURPp+1ZIJV9lbvrVc6p10TeXxyPaB4P5iQ+RS9+y1pVEhMZw6EpFBGzVe4g InvmdUTudeW77ioI8EAYyZgSa0Bp47JT3fkTCQyBLsVQ7+nVO4E4rU6v9XecqSSzscg68mUOmSw HS4EUnKyenXxV6TaXmGG2JNmroiHrJ040MdMEXjQoAcBoWYf9Qav1ih47fEbey+zXX+Mcw7RQgP g/n6c8bkxSk3HTc+KrNsDZIQ7xuVCc5Ab6663ERHDyJJeqs+4Eh4D00m0kawhIPYOqn+KoTorag hPkanv6hPv58aPsV0ZSyMvj87pXtaRVOg7M4D/daCwpXaPf2PCWtU91l7WbtUo55gBG8b+R6RGx a/hsxuafNW4duAWThw2i2BI8h/ZaDoZzX+wJfKKEYwkhL/fvn4q30nxtSDgyaY3WMw/jcoreS1N BpTbCSvtZ8IvIa1Nib5hzQjE5XthiIni/vtbqYXCrVWqVVVMUXqUYdyuQ2kgD64uVCtAw26rm5y al4gwwe9zTooh+V+NwbA+rFX0oLtm4ENbKzMtovD89BH838cV17Tm6vQo60iTtfDdfr0Jz4/cTH U0VGRIMiQ8mE9zyOtjPwQS2KI+DGfVCcLO6pUnVGRZ8HNEj1mRcm4W5zPRMXx93AAyolX4j2rJy 1zIrrwzotdXAsFA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Convert the dpaa2 driver to use the new .get_rx_ring_count ethtool operation instead of implementing .get_rxnfc for handling ETHTOOL_GRXRINGS command. This simplifies the code by removing the ETHTOOL_GRXRINGS case from the switch statement and replacing it with a direct return of the queue count. The driver still maintains .get_rxnfc for other commands including ETHTOOL_GRXCLSRLCNT, ETHTOOL_GRXCLSRULE, and ETHTOOL_GRXCLSRLALL. Signed-off-by: Breno Leitao Reviewed-by: Simon Horman --- drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c b/drivers= /net/ethernet/freescale/dpaa2/dpaa2-ethtool.c index 00474ed11d53..baab4f1c908d 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c @@ -711,6 +711,13 @@ static int dpaa2_eth_update_cls_rule(struct net_device= *net_dev, return 0; } =20 +static u32 dpaa2_eth_get_rx_ring_count(struct net_device *net_dev) +{ + struct dpaa2_eth_priv *priv =3D netdev_priv(net_dev); + + return dpaa2_eth_queue_count(priv); +} + static int dpaa2_eth_get_rxnfc(struct net_device *net_dev, struct ethtool_rxnfc *rxnfc, u32 *rule_locs) { @@ -719,9 +726,6 @@ static int dpaa2_eth_get_rxnfc(struct net_device *net_d= ev, int i, j =3D 0; =20 switch (rxnfc->cmd) { - case ETHTOOL_GRXRINGS: - rxnfc->data =3D dpaa2_eth_queue_count(priv); - break; case ETHTOOL_GRXCLSRLCNT: rxnfc->rule_cnt =3D 0; rxnfc->rule_cnt =3D dpaa2_eth_num_cls_rules(priv); @@ -949,6 +953,7 @@ const struct ethtool_ops dpaa2_ethtool_ops =3D { .get_strings =3D dpaa2_eth_get_strings, .get_rxnfc =3D dpaa2_eth_get_rxnfc, .set_rxnfc =3D dpaa2_eth_set_rxnfc, + .get_rx_ring_count =3D dpaa2_eth_get_rx_ring_count, .get_rxfh_fields =3D dpaa2_eth_get_rxfh_fields, .set_rxfh_fields =3D dpaa2_eth_set_rxfh_fields, .get_ts_info =3D dpaa2_eth_get_ts_info, --=20 2.47.3 From nobody Mon Dec 1 22:06:15 2025 Received: from mail-ot1-f48.google.com (mail-ot1-f48.google.com [209.85.210.48]) (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 3239C32AAA0 for ; Fri, 28 Nov 2025 13:11:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764335519; cv=none; b=YddbxGfllE3gGWQ1N8zHWQ2Q3wOoiehwg3RBu19xygkUhzQa12XEPZRKFewbJPBPMRdzGXSis87/7MVBPCEcs/l94TKQ7xMAdJBQC+QouFW98WTCNk6qH4dLsj33Jp9lU9SGpf4OtiJCKNAhfrPebM/y0byw6OAS8RLRJk4om4Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764335519; c=relaxed/simple; bh=2lBBGtbpdV5DXN7KxOXjZ1azz9sLuN4ZCOjMsuSwRi0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DmFBVEYmWpZACW9U+0VhbDWZBrJ5QiIrL2hcLL2gwSP7xPT6dCvWRIKBz+6qdDxoY8VMpxoKjkqX9Bj5ZmjjNpYhWWSPL311qiHeaXt6iIENx+oNsZpfB8hdz32l0CTYQ6evdKtlA5DCacblX6cPT8eXNGb/GV01CvKhmd5P+Ec= 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.48 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-f48.google.com with SMTP id 46e09a7af769-7c730af8d69so1029096a34.1 for ; Fri, 28 Nov 2025 05:11:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764335517; x=1764940317; 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=sKWeKuaV2cQ3YWbYkDtqBuXi57iQyEyQduoVGOATIxE=; b=Hjzkd2IIrkqmTdLdLcj7Kj6dwb294AWWXIvq/W6WUUz00kvwZTmxE2H++jKXUm4Vhk 0kFzO5PwX2jD/jp6iNzllCwpDQpsAA0aKNXeGIxIoOABneaBeoBHxG9IHL0t4VI4LZrV 1xe5TY26/oTrhYnAcDPJ8thHAgRjhSeKq7SurttSUkKeO72pfLum+MuMwUXBhavCrIh/ o+eiWbfuZX0ggzUWQV3AE3+2Yb374NEOSdIRCpSbgxkCoWZl08OTTQElMlOFgZ6ximU9 sCIsj3aIpDx3EOQkSL/SQhUa4g9k5zQ7gT1zkN/SyJiq1XJ3TMFFr56kKLoCXXEgi9At JjHw== X-Forwarded-Encrypted: i=1; AJvYcCWYO+wnmMo806pjfkSSbOt9sAsZRFI8CLdU5hlBqZWkyAbceGhxmiwyJLd/Nr38P6M1Nm0SyfTVs4HFqic=@vger.kernel.org X-Gm-Message-State: AOJu0YwDkGSy0d0FbojlEPvJNySV3l1niAh076cWKFDp+agfrExoY+AX hdvo0JYUlBB4JpC1hex/jqH29goEg7XDuUNdArbf0wtgXA5ddNfTBsxz X-Gm-Gg: ASbGncvCVSq/qYzStkNp5s3tmMuCqtToeoHxULF+X0rdxgqyFGrKGYAWNHj6T029440 vSvbZ+GcVXYNZWJMNehKeZXUjIbj0KyUOSuN3F0lceMoJi6U0SwJtYjLcMh2/GOcUspGmh+8W6i liJOH8GbV+2lsu4byeBoM5znDmnXKIvHeJ7OVuKvMbvddPmCyT5+d2jMsHV+pDirRbgosdeql15 HiXDKZECJV+UiV+RWUUKbayeAaWWRhkqtLMyFt/ZDW3F12BKlT6iJSzSR88XWUKOnFpDFxy7Xar xSGD6A4dMbJB6J2aBGozo1OuIcgHRh6Db0OwiB+xZC46k371peOnS88nip8p8o1BDTulWorD2sF xpSgFHksGfCnFcCo7Esph2QHko85cjejgFDPcyT30QCHAMb4SNy2OIcQydQM8+WtMJQEgYqGGZS adNSkCkk64F2Rl X-Google-Smtp-Source: AGHT+IHDt9muzXLpJ08dmr9nRH8MkfCKvdJMJZIyqcjd0o7V9rE0bBdangKbYLhxGraSt3y37BIhuw== X-Received: by 2002:a05:6830:6d4d:b0:7c5:2dbf:4a7d with SMTP id 46e09a7af769-7c7c4417c31mr6805059a34.31.1764335517098; Fri, 28 Nov 2025 05:11:57 -0800 (PST) Received: from localhost ([2a03:2880:10ff:8::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7c90fe0be23sm1511333a34.21.2025.11.28.05.11.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Nov 2025 05:11:56 -0800 (PST) From: Breno Leitao Date: Fri, 28 Nov 2025 05:11:47 -0800 Subject: [PATCH net-next 3/3] net: enetc: 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: <20251128-gxring_freescale-v1-3-22a978abf29e@debian.org> References: <20251128-gxring_freescale-v1-0-22a978abf29e@debian.org> In-Reply-To: <20251128-gxring_freescale-v1-0-22a978abf29e@debian.org> To: Claudiu Manoil , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Ioana Ciornei , Vladimir Oltean , Wei Fang , Clark Wang Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, Breno Leitao X-Mailer: b4 0.15-dev-a6db3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4346; i=leitao@debian.org; h=from:subject:message-id; bh=2lBBGtbpdV5DXN7KxOXjZ1azz9sLuN4ZCOjMsuSwRi0=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpKZ+XG8PkTM2KXwRPs2dFLtodOxmqdrpX27ZJY taWCXZxoGWJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaSmflwAKCRA1o5Of/Hh3 bSndEAClw2hjYW556ZDCm2/Y9wBZPq0WKjWqpPllMXBmXd1CtlaBezODOYDokvmipIJgGBCS8qT GW10XgdAPneR5lCwYhPhg2YRNY5ngl3kthjWLtafM6eIFm+mPSuj2N3KeRUDS9aoG+fEapuGvQ4 oq8OGBVVsYMRDCGFNrVuPcMUA7QaBnmmWtMwy/8ErhsoFecZ//jUw17o8eEuGLDEbMLcgqGBk+w ZXaJ5wwDIPUvGQL2gdbbjkvlTSnNHJg3wypPpl902wpl7xMJPk4/dS5VDtXDX3v4RlkOwRYDosp DCpizVVUXN9gvEB7z7qTrAn/aATrmuueyxmTR7h2ZqEax/RPYlMgCzB5lnyiJVUTi/ehvwtWand IAwArJZUFka2UtVpQ9YDsA4JIDrjz835URE3xktqkPjI6mYVapccVvaKfl4H5O72Be5rn3HQ25/ BfvShnuXVlWyBjzFx89EgSpgUf0YjGZpm+t7WZ22XZQ3KXvnyGcKCF2tf2BUbo+tzS22AtlY7hS moVzHLG5Hx1mc35XOZNGrlStlyzkusaVGJpwVYHkrRDhseAl8PqJpHJt6GIqYCXscTh/2vrRmPH rYLeDMOppmyKKcKGhldDx365OSb46X2ykc5mWmyhhnmE0KELQXj2gGlOYCHWWos1lhoFJYNPR12 8Rw6ShiqDaujgcg== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Convert the enetc driver to use the new .get_rx_ring_count ethtool operation instead of implementing .get_rxnfc for handling ETHTOOL_GRXRINGS command. This simplifies the code in two ways: 1. For enetc_get_rxnfc(): Remove the ETHTOOL_GRXRINGS case from the switch statement while keeping other cases for classifier rules. 2. For enetc4_get_rxnfc(): Remove it completely and use enetc_get_rxnfc() instead. Now on, enetc_get_rx_ring_count() is the callback that returns the number of RX rings for enetc driver. Also, remove the documentation around enetc4_get_rxnfc(), which was not matching what the function did(?!). Signed-off-by: Breno Leitao Reviewed-by: Simon Horman --- .../net/ethernet/freescale/enetc/enetc_ethtool.c | 37 +++++++-----------= ---- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c b/drivers= /net/ethernet/freescale/enetc/enetc_ethtool.c index 3e222321b937..fed89d4f1e1d 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c +++ b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c @@ -633,6 +633,13 @@ static int enetc_set_cls_entry(struct enetc_si *si, return enetc_set_fs_entry(si, &rfse, fs->location); } =20 +static u32 enetc_get_rx_ring_count(struct net_device *ndev) +{ + struct enetc_ndev_priv *priv =3D netdev_priv(ndev); + + return priv->num_rx_rings; +} + static int enetc_get_rxnfc(struct net_device *ndev, struct ethtool_rxnfc *= rxnfc, u32 *rule_locs) { @@ -640,9 +647,6 @@ static int enetc_get_rxnfc(struct net_device *ndev, str= uct ethtool_rxnfc *rxnfc, int i, j; =20 switch (rxnfc->cmd) { - case ETHTOOL_GRXRINGS: - rxnfc->data =3D priv->num_rx_rings; - break; case ETHTOOL_GRXCLSRLCNT: /* total number of entries */ rxnfc->data =3D priv->si->num_fs_entries; @@ -681,27 +685,6 @@ static int enetc_get_rxnfc(struct net_device *ndev, st= ruct ethtool_rxnfc *rxnfc, return 0; } =20 -/* i.MX95 ENETC does not support RFS table, but we can use ingress port - * filter table to implement Wake-on-LAN filter or drop the matched flow, - * so the implementation will be different from enetc_get_rxnfc() and - * enetc_set_rxnfc(). Therefore, add enetc4_get_rxnfc() for ENETC v4 PF. - */ -static int enetc4_get_rxnfc(struct net_device *ndev, struct ethtool_rxnfc = *rxnfc, - u32 *rule_locs) -{ - struct enetc_ndev_priv *priv =3D netdev_priv(ndev); - - switch (rxnfc->cmd) { - case ETHTOOL_GRXRINGS: - rxnfc->data =3D priv->num_rx_rings; - break; - default: - return -EOPNOTSUPP; - } - - return 0; -} - static int enetc_set_rxnfc(struct net_device *ndev, struct ethtool_rxnfc *= rxnfc) { struct enetc_ndev_priv *priv =3D netdev_priv(ndev); @@ -1335,6 +1318,7 @@ const struct ethtool_ops enetc_pf_ethtool_ops =3D { .get_rmon_stats =3D enetc_get_rmon_stats, .get_eth_ctrl_stats =3D enetc_get_eth_ctrl_stats, .get_eth_mac_stats =3D enetc_get_eth_mac_stats, + .get_rx_ring_count =3D enetc_get_rx_ring_count, .get_rxnfc =3D enetc_get_rxnfc, .set_rxnfc =3D enetc_set_rxnfc, .get_rxfh_key_size =3D enetc_get_rxfh_key_size, @@ -1363,7 +1347,7 @@ const struct ethtool_ops enetc4_ppm_ethtool_ops =3D { ETHTOOL_COALESCE_MAX_FRAMES | ETHTOOL_COALESCE_USE_ADAPTIVE_RX, .get_eth_mac_stats =3D enetc_ppm_get_eth_mac_stats, - .get_rxnfc =3D enetc4_get_rxnfc, + .get_rx_ring_count =3D enetc_get_rx_ring_count, .get_rxfh_key_size =3D enetc_get_rxfh_key_size, .get_rxfh_indir_size =3D enetc_get_rxfh_indir_size, .get_rxfh =3D enetc_get_rxfh, @@ -1386,6 +1370,7 @@ const struct ethtool_ops enetc_vf_ethtool_ops =3D { .get_sset_count =3D enetc_get_sset_count, .get_strings =3D enetc_get_strings, .get_ethtool_stats =3D enetc_get_ethtool_stats, + .get_rx_ring_count =3D enetc_get_rx_ring_count, .get_rxnfc =3D enetc_get_rxnfc, .set_rxnfc =3D enetc_set_rxnfc, .get_rxfh_indir_size =3D enetc_get_rxfh_indir_size, @@ -1413,7 +1398,7 @@ const struct ethtool_ops enetc4_pf_ethtool_ops =3D { .set_wol =3D enetc_set_wol, .get_pauseparam =3D enetc_get_pauseparam, .set_pauseparam =3D enetc_set_pauseparam, - .get_rxnfc =3D enetc4_get_rxnfc, + .get_rx_ring_count =3D enetc_get_rx_ring_count, .get_rxfh_key_size =3D enetc_get_rxfh_key_size, .get_rxfh_indir_size =3D enetc_get_rxfh_indir_size, .get_rxfh =3D enetc_get_rxfh, --=20 2.47.3