Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Wei Fang <wei.fang@nxp.com>
To:     davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
        pabeni@redhat.com, xiaoning.wang@nxp.com, shenwei.wang@nxp.com,
        netdev@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org, linux-imx@nxp.com
Subject: [PATCH net-next 1/3] net: fec: remove the remaining code of rx copybreak
Date:   Tue, 18 Jul 2023 17:09:26 +0800
Message-Id: <20230718090928.2654347-2-wei.fang@nxp.com>
In-Reply-To: <20230718090928.2654347-1-wei.fang@nxp.com>
References: <20230718090928.2654347-1-wei.fang@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dnzKrugysw8uc21sYRA3ZQQCWN9z/npCbbW7lrLylSL4neE6iwUzidWqE1/L?=
 =?us-ascii?Q?geH3nKJDk5tcybul7easwVpra1JhQ1jsRuRFTPSYszr4yJTPS3jDXeoUAYIr?=
 =?us-ascii?Q?Tzgn2hgxbddOCNRGhbqCt3s6HEgwav8BnrdnXXbe29pQrpj+40+YUTkLS1jz?=
 =?us-ascii?Q?AHAG9PKM29DGC48rV/Z9FfQs8MVBQkdllY31hrll4Df/MPY8GwOE+aLs5uxf?=
 =?us-ascii?Q?HfoGID9I1+2Nd6t7vaesgGdxXlkP9jyUk2AIZQ6/pQtpi8ObKSffTK4Aw6tZ?=
 =?us-ascii?Q?EoTtPyY4a90+H9TuzNTnU//5NAh5y3ZtEfJp61kwiddw6SrcQDcIRxplTspe?=
 =?us-ascii?Q?ODnPCIPfuDxt0daE58SIV8ONkxc2YQioJqj7M2pmgSZJ+uTiX4XDpkK7+t7A?=
 =?us-ascii?Q?H9w8AM9LnukUbSNtqHEI8uZ0eQm74SSDIiBF83nYndXW3FjHrKJO/SYtbET4?=
 =?us-ascii?Q?iT7LvU+OF0diByhjSj58ZfhELK0B3uL8oKogcosjII3hBmqVmmQSYwxLUjG5?=
 =?us-ascii?Q?amWjg+gCxm98mDksgkjtO8DJRac5tG5aC58ZIfTeMO9plsL9OscLdTe9dWJN?=
 =?us-ascii?Q?iiMb0U1KvQXUZx1qYNt91/v4KWopWjFI9+o+YLbL3lG6xv+JOWAoymrbVHWn?=
 =?us-ascii?Q?k79y9kDnBr6plNSVkb7LKOQNMYlGoVTq5DIh4d9rYza3o9152tlMkS1hsqWC?=
 =?us-ascii?Q?R/txQVtibryi1cuvUcasT7LeWbWdioNgj4usnHGzaeqCyaFQ+qoEY07RCbkp?=
 =?us-ascii?Q?guIyLJbobpDUMO+5/iAG/omr3LBoos4rsJBsSXlfCzDYGEogy91SzfZFrcR0?=
 =?us-ascii?Q?NoK+gDYR5ovP/il6lhAvtfOsUaxfBFQCmC4YThtjVCBtFlInKNqfFdsw3HBJ?=
 =?us-ascii?Q?KxfqaV4kaEPUmryR7ku03bffHk7mi0Q7NTycFwIfDGJteK37MCJD85+Q+nLS?=
 =?us-ascii?Q?dFnFGRzbTEZGkNVQBtgRG8VWVR/EHqxRNC4AuAjTHBGfr+KeUDmK3SXKgN34?=
 =?us-ascii?Q?bLYM5hMLBHhPDi5990YEsykPeaKosTSVss+0Z/SLrzr/5kdkM+mL4C9sZTML?=
 =?us-ascii?Q?El4RF621ILv4UG/UXvtPJKQ+0wtYZEKJjJ2n0+VH6SWFffPyYfwlO8Ufn91Y?=
 =?us-ascii?Q?23buDDIg2j85Uwb5ZUwejkn0K5KFXT9vNLz2PB/o6B5Ms+hoyre/tc6T6iA7?=
 =?us-ascii?Q?U54rQMXNf6SZ0dC9S1rFHKbSDyzCLnQyXQfgyOJYFGvTv1bo9U0egOoni3Ui?=
 =?us-ascii?Q?AKGqSngbPmKePu+fUZn8CWCrxr0g1BXoS/xdR85O8Z2+JlXoO0YGNk1kjAlu?=
 =?us-ascii?Q?idFAnMJdf6alJ14St3yohAN95U/v7hwSZVemv3ofcFaHj0xnNnk/F7BPU1o/?=
 =?us-ascii?Q?ox/r2nOcbFxTyzhIUwzkI4ppzxGKEvjWpYlGmAC+tH88C30/SJUZCkUvEiJS?=
 =?us-ascii?Q?4F5Loam/szSoiOCnxYCLS+JQ9WR2evxs8Rda4hTNwZYQK+fRCuFGLJu34GKm?=
 =?us-ascii?Q?uWYsK9z7n+3tonAbqhvwCMjbsbRoLtN8Vkt7YGVuDTuSF6r3+GM/po/tkR+h?=
 =?us-ascii?Q?cPOYKcO5nBvuR3tiA5xH4mZXTpi3sBDPMMzbLAyU?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d716ef09-30e1-4050-a2bb-08db876f9e40
X-MS-Exchange-CrossTenant-AuthSource: AM5PR04MB3139.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 09:16:07.1027
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: oYyv6pnQIuA8V2vZuPSscP3X8VDZ84vWCyPmjKA6i67Giuyzsyaxv7pkuiJ4ywUqLG8Q/tKEHBNfGuqTU7rskA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7832
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Since the commit 95698ff6177b ("net: fec: using page pool to manage
RX buffers") has been applied, all the rx packets, no matter small
packets or large packets are put directly into the kernel networking
buffers. That is to say, the rx copybreak function has been removed
since then, but the related code has not been completely cleaned up.
So the purpose of this patch is to clean up the remaining related
code of rx copybreak.

Signed-off-by: Wei Fang <wei.fang@nxp.com>
---
 drivers/net/ethernet/freescale/fec.h      |  2 --
 drivers/net/ethernet/freescale/fec_main.c | 43 -----------------------
 2 files changed, 45 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
index e4b5ae4884d9..90de14975837 100644
--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@ -680,8 +680,6 @@ struct fec_enet_private {
 	struct ethtool_eee eee;
 	unsigned int clk_ref_rate;
 
-	u32 rx_copybreak;
-
 	/* ptp clock period in ns*/
 	unsigned int ptp_inc;
 
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 1063552980bc..d33bf7979430 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -327,8 +327,6 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address");
 #define FEC_WOL_FLAG_ENABLE		(0x1 << 1)
 #define FEC_WOL_FLAG_SLEEP_ON		(0x1 << 2)
 
-#define COPYBREAK_DEFAULT	256
-
 /* Max number of allowed TCP segments for software TSO */
 #define FEC_MAX_TSO_SEGS	100
 #define FEC_MAX_SKB_DESCS	(FEC_MAX_TSO_SEGS * 2 + MAX_SKB_FRAGS)
@@ -3065,44 +3063,6 @@ static int fec_enet_set_coalesce(struct net_device *ndev,
 	return 0;
 }
 
-static int fec_enet_get_tunable(struct net_device *netdev,
-				const struct ethtool_tunable *tuna,
-				void *data)
-{
-	struct fec_enet_private *fep = netdev_priv(netdev);
-	int ret = 0;
-
-	switch (tuna->id) {
-	case ETHTOOL_RX_COPYBREAK:
-		*(u32 *)data = fep->rx_copybreak;
-		break;
-	default:
-		ret = -EINVAL;
-		break;
-	}
-
-	return ret;
-}
-
-static int fec_enet_set_tunable(struct net_device *netdev,
-				const struct ethtool_tunable *tuna,
-				const void *data)
-{
-	struct fec_enet_private *fep = netdev_priv(netdev);
-	int ret = 0;
-
-	switch (tuna->id) {
-	case ETHTOOL_RX_COPYBREAK:
-		fep->rx_copybreak = *(u32 *)data;
-		break;
-	default:
-		ret = -EINVAL;
-		break;
-	}
-
-	return ret;
-}
-
 /* LPI Sleep Ts count base on tx clk (clk_ref).
  * The lpi sleep cnt value = X us / (cycle_ns).
  */
@@ -3240,8 +3200,6 @@ static const struct ethtool_ops fec_enet_ethtool_ops = {
 	.get_sset_count		= fec_enet_get_sset_count,
 #endif
 	.get_ts_info		= fec_enet_get_ts_info,
-	.get_tunable		= fec_enet_get_tunable,
-	.set_tunable		= fec_enet_set_tunable,
 	.get_wol		= fec_enet_get_wol,
 	.set_wol		= fec_enet_set_wol,
 	.get_eee		= fec_enet_get_eee,
@@ -4525,7 +4483,6 @@ fec_probe(struct platform_device *pdev)
 	if (fep->bufdesc_ex && fep->ptp_clock)
 		netdev_info(ndev, "registered PHC device %d\n", fep->dev_id);
 
-	fep->rx_copybreak = COPYBREAK_DEFAULT;
 	INIT_WORK(&fep->tx_timeout_work, fec_enet_timeout_work);
 
 	pm_runtime_mark_last_busy(&pdev->dev);
-- 
2.25.1