From nobody Sat Feb 7 19:41:20 2026 Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11010036.outbound.protection.outlook.com [52.101.84.36]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3BA8A3446C4; Tue, 11 Nov 2025 10:00:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.84.36 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762855239; cv=fail; b=qwTwUgnxtJ/IfAT2jFLfJvxg0ybaa3V5nzl8dVSvzzeUIvkrWTlqbWgIRKsYrNkWWYCFOGZ0pZuDfpdcJCNPPGxIY/+vk0GViSUM6XfMcJX6ayshaJh7VhV9i4n4xqF59beHrYOi2sF76txX5/QDxcB+FfnqTA5VqGK1j4XIhB8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762855239; c=relaxed/simple; bh=oQrikl104AJ8yyoJnHHT+/XaNQNUS7YsfRYI0o/qFlg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=R2Pjbq6K5SrpNc1opYquHL/fB6iB5lhyZq2EaK3tb024mu38NLOlSrvhx3/yxRIAX7kjbRStyTVJSnmliwr0Vxz2QJLyUJ0xLpAly6mlydJqLyOz5nbtEK3DSwA9oPJpDQQ2hYKc2Bh1tQeFvE89ZiE84boo8wBkAF9g40k3YuQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=dpEkhpcj; arc=fail smtp.client-ip=52.101.84.36 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="dpEkhpcj" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gLfU6+pjUrb6dE0a2pNg9ZFMJ4CEziTvkhJn2z+mP0KOi2y24na5PD8VokqH8kbTV0K6eNn+k/qXzTaL1rczw3DhWOvslqrKW7LVHnazKB6+lsy7TjlkxWpe6sYUUZrmDelj9pRGwv6CkJ8KVjaYnRW0PLsa3HQTZPQL6vsHSTKVOCd8KWpyFaXWk7hR8/4tNFibVFTqFRDQJ7cxNy0cs8qiAqyY91/9I8o5ehS6Wn9LRfZ/wCpkgU/ZeU97ufjKkZuAyChQpfKC4mLOoQTN2Mdf5/b9r741stime1YHZxRUNrfHlveq/64T1vkZZtvf7xVv4SCCDb3KhgluEVHLJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tZm77dXD3tLtmfNNTHfWiA377WwZnqJxRGdkeGZgQL4=; b=I4nzJ7Et2jXa7swEREC90wU8XbpXHdBsF2QpfX8GcksSXVPE97QaEZfbjn+wam+dKA1huV/naj9tijcfGN+tVClgtbcuHbUqMOVGxTZaibpiMTZpzOLkzl9NjojXgMhzj7EfiA2ZKlHIh+54G/JWOxRICR/+J0g5KJ1uYrPKyPShqc4kUiJU/BHX5DyXgFPjJaL9SNxv5dqo9ErmsDGFHh+D2OlEMJktke7gTNVbN90u320OWigjXyJvym8X5Am4bW0OOFqci5R9LiNgU+q7kmLyT49ychMKVxY88QNIaExVM0gjB/gHriON6kq8r/bxaSxp1G9nMFp4MXnIxMabMw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tZm77dXD3tLtmfNNTHfWiA377WwZnqJxRGdkeGZgQL4=; b=dpEkhpcj2Hw72ZWYGalqVx7qKVDDVVFGo7FVUQ6m2W+XFXce4KfhNtLrOg1TgoFmdNUBqHIRPxcH0f3BWTR/lvVlM+axfkmp9YzX05y77Ln+rQFwhHL2QnwIxKsmMSviqu1e24CDmX44FI6mxKVdH/KtCX6sP7lmSfDD/KqnhuCUBOOB4ViJPfpPiA41pAo4NVOFzXrrFPWp3cbMf3AI/DMn14EinK6UPtEqzCdalaRH4QiD+dUpITATgBk5SD4C3CycHByMY1KGsUZSUfoZzhXUbe+jUslA2P3qfFZ/IIKnUI2BguxJg32bY/awRk7vq4oc4D9+PdL6myZyVatGUw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) by DBBPR04MB7545.eurprd04.prod.outlook.com (2603:10a6:10:200::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.15; Tue, 11 Nov 2025 10:00:34 +0000 Received: from PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db]) by PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db%4]) with mapi id 15.20.9320.013; Tue, 11 Nov 2025 10:00:34 +0000 From: Wei Fang To: shenwei.wang@nxp.com, xiaoning.wang@nxp.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, eric@nelint.com Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 1/5] net: fec: remove useless conditional preprocessor directives Date: Tue, 11 Nov 2025 18:00:53 +0800 Message-Id: <20251111100057.2660101-2-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251111100057.2660101-1-wei.fang@nxp.com> References: <20251111100057.2660101-1-wei.fang@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:1f6::14) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|DBBPR04MB7545:EE_ X-MS-Office365-Filtering-Correlation-Id: ee9b5a73-5df0-4616-4cb4-08de21092809 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|19092799006|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?KSUVkOe5ydUYMRCoL7RdLbjtv9H4DfUnL5YiRgD8urVIdOfgJ2JvHBcwEgub?= =?us-ascii?Q?bXMuMHZi0imzOUDqnCV2e6vVCGTleJzatrq/3VIltSX05hbG+HyvOff5J2+k?= =?us-ascii?Q?Tjo/R69vSSDE+SQSh3kdRxmYw4cJ/anVL+E4I4+CD3CzfFlZuca9VhU7m4W2?= =?us-ascii?Q?YCOYc0eeXCNAKKgUvtdv3qQlq2YnlWeXOcIFTdLXgxGjXfGfV0KMZc716a1F?= =?us-ascii?Q?QX6DPqCkMArly2ZPkgcWuLzNktKzLRX68KzsXmsY15YyWxBfp9v3YWB7b6u/?= =?us-ascii?Q?MDeeDFyapsZRXBZZZvdz8wh8/71htF+T0oD00i/SmQoo8GhtHkKDTvdBFzmR?= =?us-ascii?Q?IQflTnFEaGvWAxa+4YyyxJmdqJEWpQoLOovxKH5k52Apwpd31J8/LIUZKjvh?= =?us-ascii?Q?s8Ymp2Wrt42cc4LpDih7Dhl2U7iul3V0u/1HJdpAlx9w/R/UW6MDskXq7PWI?= =?us-ascii?Q?nYyl5KGp1lE8QkAdF6aYaxj/U9yHXFq2qhUbbQ3tn+nxvgS76QLRkvcdOH8T?= =?us-ascii?Q?n/Y6b/K3UAIj3JNCcjZsip+Z0qJu+as1RVsWrb5m5dAGUQsjU0NjCsol+NDh?= =?us-ascii?Q?CwHAaf42IgmRtIGQkNGDLX9Ym0Iulf6Ck6HjVS65JbZGx5DlNaaiHXF4u49b?= =?us-ascii?Q?F6zipNck4+/N8yvgvL6Bww7nYB9hSQKPuaVmMNoWrTCjgtwPrVIozPKOXWpv?= =?us-ascii?Q?JjVK6BKb0CapwKhaoZ7JMwz9hY5C0YMS08aPhSv96D70YahIP/iGJD0kMvJQ?= =?us-ascii?Q?7d+CXp1e/bXuRTDWFJe18ltSjgWHzYYVcvakcw1faHFF3oDKUWBMBqY2SEVF?= =?us-ascii?Q?7KyrXx7skbnMSAR29Zr34qOMfKmv3KiQaAgA5l1y4Vy+uGiizS5QJV/uHUdx?= =?us-ascii?Q?+/+OdSnyvBqOgIlnUO4z9ODZfkvdto4S45UkChbHnH6G0qGyR79xp+oZBwAt?= =?us-ascii?Q?yn7vChQ9uMOwYgfkWzsZ5MiURHFMwxrXsbe8Bcr9N7nH/RMsTaKmAJrYffHm?= =?us-ascii?Q?l+1wUlNHC1Rb191XRPvyQnwd7hd0kjjhoFwWaKEeA5FqpOIO1sb787hE8dG9?= =?us-ascii?Q?5zzNZ6jR0zb/GdlHyCQKjJdnKkCayb1Ibv8/BMvx2JlpIivL8JRTtVLobviq?= =?us-ascii?Q?/dOYq2e1D9R7uOyoaQPiFdZsIPoVtCAM3YPlXFDxMD9/vnO+5k/4wIyMEgIt?= =?us-ascii?Q?D0E6J8VGq0tDIR06EPj9JdRcZ4ZIALois8xkS2vYfT8NoD18UzajlvUVa0/Q?= =?us-ascii?Q?RuPerzF4oHBo9InLVkPWp6O2higs0FtITmEh4jbFwWCyuwj2bohpnNZEskjZ?= =?us-ascii?Q?uaZD2gplA0sfk/pMot2qUvpNuDKbXo0KA6lzPcmW/wwflvXHFxAdRhvW+TFY?= =?us-ascii?Q?oor/Zr2UIWcsLi63JSeCREqtNUPgbdJEWyzLhI+UMMtVto2oqFQeRzSLXbOM?= =?us-ascii?Q?Y+I+GdK4LKDl1LVSXyXuKirlSlgNpbZceLD4Z4r3TJWwv9BnDMcNgirDtENX?= =?us-ascii?Q?lqGRMXRXuVmzxhQO3NWm5F2xh+ny1usT6rNW?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB8510.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(19092799006)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qdArv6NvxpdvCgL9m/ejbCag+zXLE6Vw8D/6CIKdJG6FQwYJkZqZXDNJjSS/?= =?us-ascii?Q?0Zb+YPHQeHVzVlOz+3Zxd7n+Irigo2X6dc9Qsv0l5Q2BAOA6roLMH1vbEg0H?= =?us-ascii?Q?UwJUCYaLWJMeU+CKUEzGMOoyk8cx0kDTyAMcCsopQ5aS8KdWrmoU32lz84mG?= =?us-ascii?Q?3PmDq+A0GXJtyUr30xsW2K3WnOhWl8QR7OwGkY+kySWBX8vyTqYt2O0sY2WY?= =?us-ascii?Q?0PwUkqz+E3AJ/lG+ChXCI+jWkkCjKZy+YNc3P7ne5gCIbheS2Ge3ffI0jnHR?= =?us-ascii?Q?mcYwY9vifZZowZlTMU4hdbvxfdeRqX5NGroIqMt55/UCGMJYcAfKzun5+Vk+?= =?us-ascii?Q?VSJAxcf2LEXKoWZf0N00ZLxyLsUTT23XedjpQ1d9eGrQOhq2qOePLt28G1/a?= =?us-ascii?Q?u0e2PBPjjPNiRsrBWrsx/7+Ku+8OSYvBCW+kXJb3PMWY19Uke2I37KrLzMmU?= =?us-ascii?Q?+j2ex/wgH38nCYMDArXH8tH+AEkwKLe8DXcJQu2BD5NBdiEnMhpQUk5zvWdg?= =?us-ascii?Q?sTMzYqhEIw7HuRGl3hdMRfbI3yREO7B3yCPDdUaztKDhaj8ddYK05sshr3b9?= =?us-ascii?Q?avyBcUaLkb2+B//9cf0HRI4JIXqctOwoqbdfJo8weg9zwv7LJhXxFuDDjLgc?= =?us-ascii?Q?2MsY+SLOAmhIITI6s/ZatwIL9uFC98sPOZVESz8L0tvx5dlA8Sqh0Q+WNbmO?= =?us-ascii?Q?FpZ7+sKCrB37XYYgNpH2VR/slUdX0eAM0uU1gCFDEzp+6WJqVodep/4y6HF3?= =?us-ascii?Q?H+bmWsyyv9i3Bmqd6FbN/t+NNWYVWlIlrkPyGT+4KoQccMo+Rk7+QjsHBA/g?= =?us-ascii?Q?zv0IL0jQij4i3WSqhIfjbgVzByK7hW84MRJS/O4CXiRH2FJQJE82tXZB0jKg?= =?us-ascii?Q?ozBJpoIatp1U2CQ2Hqw/yqIV5RkdKQuPuAvWR4wzL1pbKM/OgRwfMeDNudu6?= =?us-ascii?Q?m8g5pcchTO+3VN6o+0+w8qyIiPHVNWe0ZShdUTn5Qg81iG7RyIGlgE5k0cGC?= =?us-ascii?Q?t2dZtU+t7UahBXp9nZfcLy+ECIqnUM10k3SJC9aq0tIW5F17ns1/lgFBYkna?= =?us-ascii?Q?0gZFYi9kmyu6gv4XWkz3M5g07F5IF1koeKakkOfSeZK7kL5LlPJRFWogkxI2?= =?us-ascii?Q?6dA+R6HiXnli9hINOTWR9UHrc187S5AiU5SmX4jVTtB5msN26aPFwO1EIYYm?= =?us-ascii?Q?guc4lhvpTNAlmV0cwm8+F2CU6Y45DDK0nKMcOa6jPrzP07P0wT6rRcSLVOCG?= =?us-ascii?Q?0HJrtOpX31fLidJKzCZM3LloF0yITMTBDEXh2mN/t3g9VGpF2aG5KfuFoCc0?= =?us-ascii?Q?zHxfwI/vF2Ezjr1blKkA3YG62i8FSqbgBYr8QQLxE06XpqzUhVaZATBZoIIp?= =?us-ascii?Q?1/PKXdnBHsoP+kfexNJ3hzka6Ta1jhgJC8jT+hHeeu4DSMefTM+8ebyvMzLK?= =?us-ascii?Q?mv2wyxblDcn9p3PvgQasyMlZGyZX+4rzBeVgFSI5rGjsTPNZGB8HudQvenq3?= =?us-ascii?Q?/NBHbyCqxx+P/XF6FBZl2/P3Io5vc/Ht40vNpxp6Yy2p4iOixukowwGQr2xI?= =?us-ascii?Q?QFw5+AcbJTfFJrTCTyAn8SX+5P9CNyRErfAJLaeL?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee9b5a73-5df0-4616-4cb4-08de21092809 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2025 10:00:34.5965 (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: MXYHuutKoVrLzWZNSuoERGcqSMIq6zt0NgYdxhJx8UoVvL+jxb+JVT36i4EgexX3lEO5BdmbskJ3OGyTQDudTw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7545 Content-Type: text/plain; charset="utf-8" The conditional preprocessor directive "#if !defined(CONFIG_M5272)" was added due to build errors on MCF5272 platform, see commit d13919301d9a ("net: fec: Fix build for MCF5272"). The compilation error was caused by some register macros not being defined on the MCF5272 platform. However, this preprocessor directive is not needed in some parts of the driver. First, removing it will not cause compilation errors. Second, these parts will check quirks, which do not exist on the MCF7527 platform. Therefore, we can safely delete these useless preprocessor directives. Signed-off-by: Wei Fang --- drivers/net/ethernet/freescale/fec_main.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethern= et/freescale/fec_main.c index 742f3e81cc7c..e0e84f2979c8 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1773,7 +1773,6 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_= id, int budget) __fec32 cbd_bufaddr; u32 sub_len =3D 4; =20 -#if !defined(CONFIG_M5272) /*If it has the FEC_QUIRK_HAS_RACC quirk property, the bit of * FEC_RACC_SHIFT16 is set by default in the probe function. */ @@ -1781,7 +1780,6 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_= id, int budget) data_start +=3D 2; sub_len +=3D 2; } -#endif =20 #if defined(CONFIG_COLDFIRE) && !defined(CONFIG_COLDFIRE_COHERENT_DMA) /* @@ -2515,9 +2513,7 @@ static int fec_enet_mii_probe(struct net_device *ndev) phy_set_max_speed(phy_dev, 1000); phy_remove_link_mode(phy_dev, ETHTOOL_LINK_MODE_1000baseT_Half_BIT); -#if !defined(CONFIG_M5272) phy_support_sym_pause(phy_dev); -#endif } else phy_set_max_speed(phy_dev, 100); @@ -4400,11 +4396,9 @@ fec_probe(struct platform_device *pdev) fep->num_rx_queues =3D num_rx_qs; fep->num_tx_queues =3D num_tx_qs; =20 -#if !defined(CONFIG_M5272) /* default enable pause frame auto negotiation */ if (fep->quirks & FEC_QUIRK_HAS_GBIT) fep->pause_flag |=3D FEC_PAUSE_FLAG_AUTONEG; -#endif =20 /* Select default pin state */ pinctrl_pm_select_default_state(&pdev->dev); --=20 2.34.1 From nobody Sat Feb 7 19:41:20 2026 Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11010036.outbound.protection.outlook.com [52.101.84.36]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 624DB345733; Tue, 11 Nov 2025 10:00:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.84.36 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762855241; cv=fail; b=CeZuoijZ+jf3f+peC8K1ro1g45WJwE3dul71SAPrtHQpeDI0GmKgOGNrgbCvbhisP2CHNi/dRXwBCP4BtscMaXbjvF6qMDxWWBTa7LPka8fUtnqMI2IEo1ZN0DgRYnsCJSTORogYVq4//vjjDQzSTQMAbYTNJ1cpUC3QfnNg5Pk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762855241; c=relaxed/simple; bh=4FzeVl2h8opWldluNDKo3pIYa53btCbUpgk6A/BGvXU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=aCF+JVLqi1vFMSSAG5v7LStVgxVKE4pyvipwbAoVFFC9ofjeAXUbTsmSUTnTK16TkDusUu41XgaVfLgYhEbKbGRa/aqZWfuxPw/jBHS1KPukEyUtQlGSHv5WWTzps800Pv0asp55SVWD4dKmBxwiyJM6wxLxBJPUGSZ75wi1jAI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=DEx9YKbA; arc=fail smtp.client-ip=52.101.84.36 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="DEx9YKbA" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RiGPYwWum5dE7vvT0mSvX9Mvnl4K8axia4TMV1D2BLq58HMShLTDBLGKQQqLoTM3Duq0xDGkJK5Ckn6gdoQbQ2xJhdBQGtbISj9ePZ7L3yGnB8CLcb52vAL9bsb7XQEX70NfV3Gn2KyH2QfX5LNCzsiK6u6y8+vGJ1Re25gOzfhxcllddBpitx/CDkm74wDouyCaJpDg4HcqNG0XBIXDUTUkzawKIjzr55h6sIr6gUo+U+q7WkFqWbaf8k0nsHVxIeLKExIIR622EVOTZ4TIbwaigtCZyIYV2JiKYaWOW0T6w51itJ58jUD/o+6VrtzVnpVuuu665ly1t2yU0l7QNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=76nKMqunUH0Yo7AsvhZ7ttV9zDzbysHhol3+pS9P5ZE=; b=jVFfuEWRNnGqkMdSxovC/4PzQ9LmBgzr7Sxkp3QNtay/GlW75b1BX8YCNjTiLLPF59qDl0HdDYmht6mhWmwX9wQrCMlQQzh48/d3N0CrNOBIUuynrkTYB0DXRp3eb1n7CPZvfuO4xh/Uu42UcHlP0joHqNe2GeJL7dzp87BmzDVyyM3b2RPJZI4zW7Hxz4goop0LeLruxFIwhRnWO0Nh4ixXnmK5ukyrHE2qq9RlX7hcEqjQqqMvvrFQ8MnKTNi9Y4rbrWRhqk7KNi0oFv6bFV2S2RsT07JLqGgCZBz2yETDbXKzqDgehAE0s3ZAE1/GOwhMQHzu78XglPfdprOqCg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=76nKMqunUH0Yo7AsvhZ7ttV9zDzbysHhol3+pS9P5ZE=; b=DEx9YKbAt9PS0yiIS7AXEki0dBywqzWUMRaglqgrx/M2IdHkcg71pzw2U5NZgVuwIXH7mkTNjjhZ9PNtQrhKhSU/ZejT8/b/pRTzOa/qhXqmUszH44U4Suk7JsOvavv57fMv2xFynNCiRdu9R40ygnYbhdb4McpPYaiJFW4AUGW6APO2noTnr5V92dBHNHl4iPnb5CHhpolkoTyLktqdaTzi+CicIenhAW+v3Ym51UspdekDoBDV7ugeuGaRRX5afJvOykcCFkE4DKjBQHJEJVdQHKTUg3W7Bh6bajfWLs0/uhrvOPiZcmR9rdsvMVdKcsh5pTskgLMATKisIeHtTw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) by DBBPR04MB7545.eurprd04.prod.outlook.com (2603:10a6:10:200::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.15; Tue, 11 Nov 2025 10:00:38 +0000 Received: from PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db]) by PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db%4]) with mapi id 15.20.9320.013; Tue, 11 Nov 2025 10:00:38 +0000 From: Wei Fang To: shenwei.wang@nxp.com, xiaoning.wang@nxp.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, eric@nelint.com Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 2/5] net: fec: simplify the conditional preprocessor directives Date: Tue, 11 Nov 2025 18:00:54 +0800 Message-Id: <20251111100057.2660101-3-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251111100057.2660101-1-wei.fang@nxp.com> References: <20251111100057.2660101-1-wei.fang@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:1f6::14) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|DBBPR04MB7545:EE_ X-MS-Office365-Filtering-Correlation-Id: 37bdf387-9a6c-413d-1824-08de21092a23 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|19092799006|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?UdC571Y1K9FHd88/+xZsIEBLkAA6zxAtwUQ6QOMh3/rxbChVMi7tdRlkaOLX?= =?us-ascii?Q?dyhYZpEUZSw9Vn7xAoDxsth3R1FllVJjGTm2aB1X4nzcfRTkGj1JfFnmUmKZ?= =?us-ascii?Q?2t4Xa0rY3X0vXiqyhQrd3qCtnP5Op5KqMYAUbHmZSzA51WD64dh3G8zw3cIu?= =?us-ascii?Q?tO24xt3gkbiTwGGMZ+r59yv3pQWIZAr6Kl3luCBpGEZoe83f+htz4hxd4ujf?= =?us-ascii?Q?tY2+QYXOCGfNHAMRyMyd65u/IGaDItByu5enKRIW9e2fKgEQH5YL08PVwNO9?= =?us-ascii?Q?FwRcW9JlJwBgvkBgPMZMWfsVgCtepz1I9L1wlhGLUerGELl5wlqRFLlPGTsE?= =?us-ascii?Q?i1OGzuv2MwssrjDdnjNMQKcl5Cr+PTM36IG0ZUQ/HCZ9kEAsgJD4i6K7kB9o?= =?us-ascii?Q?UCR80YeW+0Kzf1Jsc2UdTPZ/6j8C/2Vj8VPEoyDbcQCfA34VnMoJ+I9azvzs?= =?us-ascii?Q?x6Y2lzAg0AevrZv4KGIYQXPbs0x3Mv6exlvVYVMKj4JsIXtaur490D7gq8hF?= =?us-ascii?Q?5Kp6Vw/bFN5/1qFRXvyWYfHJ4w0tcluSF2iMhXnLMM5uTt4GHHwN8mtPiNdV?= =?us-ascii?Q?CaPmFrLKvSSYv9yCTihYIpEtn8lKzRdmjPn/Fkyqe/U8FUochCbd9pjyRgVB?= =?us-ascii?Q?a06ENBk5SuEVodJXV3zeUqRyemklFvDsYrFPxlYYxGGW/4+CqMGb+Y0LCq4O?= =?us-ascii?Q?qrUwi8TKHt05xz27bB5fC1aHYANhBUnFeVmVhmsk1qYG3nO4AIocMwiJaacl?= =?us-ascii?Q?QC4FYkB09gJZViu+QHAwDMHrQnI1IuxsbYojiJVJgXSrLHtKwdqTmwBfeQ+e?= =?us-ascii?Q?lrlb2ufBSu4iricSCDZGg5ByLX+0guj1v6Yv2DQ+q0TdHONR2s2l5nLMerpK?= =?us-ascii?Q?7PF20bkM5PLNhkMBjSc17U2MB49NoBXpvRG9Ejzg0ughQAnPf4kvNt2j8elB?= =?us-ascii?Q?1SWDN1OM+wfOuj2MFqDlpuyPzklwa2Wauh/QeytFEI2FIl2PYUc30NpxTmm1?= =?us-ascii?Q?2qgAUZy/hWEWsnNZGSRYEYGOdQvyabMe/oB5dChpY/bGFBh7LR2wdIUGe3Kv?= =?us-ascii?Q?h+cmroik4lN25aXxrg0XIU1dSEGpRTatqKEdx25rXl+QDCfCgcyqXsRYvcS8?= =?us-ascii?Q?h0ba9nckkmRJDw/jcxkmXZbi5KTW56Dc705z2Xo+yNUYLosxdDlEuONUsiQT?= =?us-ascii?Q?b4SpYQ7WijMFSmg5bYUc3Pmh+SOyZ0GBpQI/uAPDLYWCKNyg2d8BPO3GSPdH?= =?us-ascii?Q?5anQm5KsKhEW0nrA4Z1f2wLkDcL9v640v9h6qLAQUJLmfcopHDcjieAC0LOe?= =?us-ascii?Q?y/6w/ESkzQ9ZZmoaPZ+hQnbvRGwKD2ZiJoZ7kyON1TWb9xDbTJuwNH3OcAoh?= =?us-ascii?Q?x6Gs3i9RV5Hu4kvpfCHip5mOJnKTfMT9k/ul4NN83S8IhZvTnWA2jTf0qVDq?= =?us-ascii?Q?QGU9J4urgpghC62pQpJqyTtsjDXvYunnOgTcYJkzs5iNaLEKqG8+Pymy4goV?= =?us-ascii?Q?eI8+LWoKre0O5X9jgCYfFmpWuxwDOb7IRCyM?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB8510.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(19092799006)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?w2ihqeF7WmeYYo2iVnW/ewsKym+NQi35hjk4VNgc1YMw52RwNTs0c02bg/fo?= =?us-ascii?Q?mIA7Qy7vV73wFvNoNe8xLI4V9mHG47n3xAJvDwrFMMDFhnwT6xU7+3pM80U1?= =?us-ascii?Q?SJgXazn0H82kXmDOJsX6cF4IV8B288aBvmArUwrxqgS1A2SalEdkKFg3XhGl?= =?us-ascii?Q?Lhvhp4WXzJ6gZTTrAQ/G3wKLf1FsjFh5PUc1gnE9R1RGYkOWfYlSk8kFsaPO?= =?us-ascii?Q?g23OtiditM9bx3XaE7FIXAk0dYBJ8N+KyBijePlLWs6nynHpUCXYlrQ8Y8y2?= =?us-ascii?Q?jXptY2C87/uapMgL8DVdjny7HILwqdd7J52xy5o73me/EQM4xFkEC19FAxum?= =?us-ascii?Q?OY2D1eD3UUdGhxTOgpDUBK4aTS9yeJVkmZ8/WCWSsbYeX10U21ROl/5skuvL?= =?us-ascii?Q?GMa5eiSKKwgV4Ub3LPS4w/jIOa2/szWzunoI1PKszUjpLOMtRTFjLpo1PWvX?= =?us-ascii?Q?3+CQZkhxX3Msrs1QT7eRwk41MfRnouApwuJG416Vu9uSmVWBMlpTytJuWEeu?= =?us-ascii?Q?DPCqXVuCD38YDKPXccqcqwgR2lHWuq5Ym2gQ9sNrlJ0wFuws+KGu9pmyz0Rm?= =?us-ascii?Q?Fu9vuENcULdO8GS3rl5A9AiD4ZaRq0NERUv7/77iPZbH1pMUMmiH2bmn/MRA?= =?us-ascii?Q?QdaK/pKC5xuWd8iLlu8RJdSciP4f88RAlB1ID0GQtTmGfAdIIi4raF2CYfEE?= =?us-ascii?Q?s83RqGVN7Ln8WKssgQ7E8hXHc/s2iBS6hpwNRHbZXgHTMDPjYGm2J9d0hiz/?= =?us-ascii?Q?uJKyIHROGmE9ldFcrzeOYk5xOsccME7hDFBsuR+zkhMBuJ31G7Lppm88szq1?= =?us-ascii?Q?bQ3vXWtLrvETcfkhqiC8dkhNxzwa+xu90zRMYlCVSqiU5oox8tez+VaUJco4?= =?us-ascii?Q?3jcI8Via4YYIyzjLPBvviF/koV4zUJZ/CIh1W8UKGwSHhu8fC7geYkS6imk5?= =?us-ascii?Q?XPxQRR0Ap/T8zoy9Ms0NPeePNXRKSaV+zEET2h/tMyuSZJeAbWgHrVaAQq7f?= =?us-ascii?Q?sP5vd/Xqtc1WCqCFz2wt7Iybuf3lODWy+4rDw9LkDR+jvTSDnm8tuXJe8dPa?= =?us-ascii?Q?baUzsfTO0PQbEIOfy6mrS6+2M4ruT9TLjc4+7XCdqZfxPcPSHzoNu4Pp3YfR?= =?us-ascii?Q?wzwUl8SmU4fQF6MUfkokvbC6vfn7IRDsuvMfEAdRpaDjpojoulE3Ovn/ryS0?= =?us-ascii?Q?qIY1Tb8TTGUW7pOPKP2UuEb/f+Qtu3+ANYwQ/wAPiO8yhGuH18dqFZQQXOeM?= =?us-ascii?Q?WkneqN+38NAMn90R73I8SwuTP1ZzDptpMUlHdW/yP1aFV7M6k/h/E94IgdDK?= =?us-ascii?Q?Q5SPk4RW6zUYw+qtl/mQXM+3EGTZXCFmnQrX95O3/qLxL1jJBFFZoxYKoMpA?= =?us-ascii?Q?HMinpGrFQ+eyPdTSYX349x5RJKNSZ7o4253sXHz2lf9B33F/CSgFsPSF13xK?= =?us-ascii?Q?nDmTeZxQkfQFHKdcfOLDLwux5kPGusg/ndz1pu1D6dG6eCJI5BlbfDxfbDzw?= =?us-ascii?Q?OhLjxx+3/P3os/NDnBbNJTpkrnqnm9gS4Bt505+fPnLw7XET5eZmn3b5kfAI?= =?us-ascii?Q?Ux7lIz2EIFW0TOkrNmacByWAUDTI/FduavULYMXJ?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 37bdf387-9a6c-413d-1824-08de21092a23 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2025 10:00:38.2306 (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: tAZapM4lLf1RrxUP4wFHbkX0Wo3Hd47iRERv/Ppz9jrEhGloYgtLVDw9o6JN7e3VaFEHPsAsy0OWgAxWCC6M8Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7545 Content-Type: text/plain; charset="utf-8" From the Kconfig file, we can see CONFIG_FEC depends on the following platform-related options. ColdFire: M523x, M527x, M5272, M528x, M520x and M532x S32: ARCH_S32 (ARM64) i.MX: SOC_IMX28 and ARCH_MXC (ARM and ARM64) Based on the code of fec driver, only some macro definitions on the M5272 platform are different from those on other platforms. Therefore, we can simplify the following complex preprocessor directives to "if !defined(CONFIG_M5272)". "#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || \ defined(CONFIG_M528x) || defined(CONFIG_M520x) || \ defined(CONFIG_M532x) || defined(CONFIG_ARM) || \ defined(CONFIG_ARM64)" Signed-off-by: Wei Fang --- drivers/net/ethernet/freescale/fec.h | 4 +--- drivers/net/ethernet/freescale/fec_main.c | 27 ++++++----------------- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/fr= eescale/fec.h index 41e0d85d15da..8e438f6e7ec4 100644 --- a/drivers/net/ethernet/freescale/fec.h +++ b/drivers/net/ethernet/freescale/fec.h @@ -24,9 +24,7 @@ #include #include =20 -#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x= ) || \ - defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM) = || \ - defined(CONFIG_ARM64) || defined(CONFIG_COMPILE_TEST) +#if !defined(CONFIG_M5272) || defined(CONFIG_COMPILE_TEST) /* * Just figures, Motorola would have to change the offsets for * registers in the same peripheral device on different models diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethern= et/freescale/fec_main.c index e0e84f2979c8..9d0e5abe5f66 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -253,9 +253,7 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); * size bits. Other FEC hardware does not, so we need to take that into * account when setting it. */ -#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x= ) || \ - defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM) = || \ - defined(CONFIG_ARM64) +#ifndef CONFIG_M5272 #define OPT_ARCH_HAS_MAX_FL 1 #else #define OPT_ARCH_HAS_MAX_FL 0 @@ -2704,9 +2702,7 @@ static int fec_enet_get_regs_len(struct net_device *n= dev) } =20 /* List of registers that can be safety be read to dump them with ethtool = */ -#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x= ) || \ - defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM) || \ - defined(CONFIG_ARM64) || defined(CONFIG_COMPILE_TEST) +#if !defined(CONFIG_M5272) || defined(CONFIG_COMPILE_TEST) static __u32 fec_enet_register_version =3D 2; static u32 fec_enet_register_offset[] =3D { FEC_IEVENT, FEC_IMASK, FEC_R_DES_ACTIVE_0, FEC_X_DES_ACTIVE_0, @@ -2780,29 +2776,20 @@ static u32 fec_enet_register_offset[] =3D { static void fec_enet_get_regs(struct net_device *ndev, struct ethtool_regs *regs, void *regbuf) { + u32 reg_cnt =3D ARRAY_SIZE(fec_enet_register_offset); struct fec_enet_private *fep =3D netdev_priv(ndev); u32 __iomem *theregs =3D (u32 __iomem *)fep->hwp; + u32 *reg_list =3D fec_enet_register_offset; struct device *dev =3D &fep->pdev->dev; u32 *buf =3D (u32 *)regbuf; u32 i, off; int ret; -#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x= ) || \ - defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM) || \ - defined(CONFIG_ARM64) || defined(CONFIG_COMPILE_TEST) - u32 *reg_list; - u32 reg_cnt; - - if (!of_machine_is_compatible("fsl,imx6ul")) { - reg_list =3D fec_enet_register_offset; - reg_cnt =3D ARRAY_SIZE(fec_enet_register_offset); - } else { + +#if !defined(CONFIG_M5272) || defined(CONFIG_COMPILE_TEST) + if (of_machine_is_compatible("fsl,imx6ul")) { reg_list =3D fec_enet_register_offset_6ul; reg_cnt =3D ARRAY_SIZE(fec_enet_register_offset_6ul); } -#else - /* coldfire */ - static u32 *reg_list =3D fec_enet_register_offset; - static const u32 reg_cnt =3D ARRAY_SIZE(fec_enet_register_offset); #endif ret =3D pm_runtime_resume_and_get(dev); if (ret < 0) --=20 2.34.1 From nobody Sat Feb 7 19:41:20 2026 Received: from GVXPR05CU001.outbound.protection.outlook.com (mail-swedencentralazon11013054.outbound.protection.outlook.com [52.101.83.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC8B6346FB2; Tue, 11 Nov 2025 10:00:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.83.54 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762855246; cv=fail; b=QLNPoehouE8KGZO84MhO1YSmKfOQRB97z69M0n9OyAnrqfChaBaKD6YesQr6JtT2AsmyduRCQBlA6BLvhE76Ysdt7RjsIVo1ajJhW5QPtLpQgT/3MzD8AWXCiX0BRgdlm5VYiBlDGzOK7jvdQ+40ZkL1oE341bZYKJnrKVtASE8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762855246; c=relaxed/simple; bh=qntyOaVvILoxRCPPoipzddWgdR4s3vwtW75F/1cGPEE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=VVyqNiCsJ2Sh1TEYRgr0TeXzGEEN+O/wDLtI5YV+2yL+kBw6NyFk2K3Z6gdg13TRJRZRJrLhWlEIFq6t5CJ78Dk/bnvHKOl2Wj1w77uwZtqfYwfIblC0s1XiYXQwTodZUbKHWiu9rp7IZ2k1f21XU5K3NeLb5ViwMWcCvtYaIZw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=oFu2Jiow; arc=fail smtp.client-ip=52.101.83.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="oFu2Jiow" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Buy1Tc4Jw/a772bkLerKdcEA+Dzj8EsTFJqHXKx8BPf6rMKxHX/ZxVWVgxrorJWEvHJoiAm+apj+05qpo6yD3Mheozm9wGSq5O0EoR1Eg6TfCkxXgACPW8Oeyh6mm8rU0utlriLojZcAql1H8Hbc2LwVloc3LYhfzS8aHKrh0JMHeguJzH5KA7ximr6QtDPlsshS4t6C4qiNr951nkmiuI5XL59Ddy98tSwMUO1qFcLQ7q8Q/sW6x0imI9NJTdrNxjZ588U3gLQgKJ3Tq4CTcjmTcDnYnJfciWQYntISTdKGjuJYLdxv7iWnlwPIxmTyNf5o6vgYaPNk6IY0ASk+Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=92CYP/z3nQQ/CFHhL6IdXpcswu6JKSihE/6Idb+EzqY=; b=oZ7p3hMUw+UUwSQvv0s9ryg5P4YpKTLNA0L7I7qXZCTpglg3cwlviTfPrrNcsdB2YzTHdUJmRqXn0LJWh3s2KvU+YJ5QFTWdFYbC1jK6u7JP3d1EdPVU3pPDjvY+nKdd3GzweuT2zuWjlymRmzSRqQcj5vgVV+7whelJbmVFKiUGy2PPSSFjwAPlEAUHuy1el/tE9Z8bLz8OdMQZVT0m/5NxwESpA74o5XCEhWnJID3soPL9wDu5MajC1wuDybquAZuT6035SXj/+uCJA+hdP6Q6+76WlsuBdz0wObBcf4Y46XcOR4YOFUBCx/3aH5diM11Y6Ccph0dEotoe8o0amQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=92CYP/z3nQQ/CFHhL6IdXpcswu6JKSihE/6Idb+EzqY=; b=oFu2Jiow7bz3OGSpqByaVUPlFwSAd9qNiAAh1sF4LBFAW1o8Cen6FZEadiSApK1X6GcxouOp0Y0UyMzGTtE76kduLAfFem+47sOTktmWLqGp6YjEJlkLJUKqH+Kot4hDh8Gjx9Ha5cncVYM+PYL9uhKXGVnrTDXEIqnth0onCCf8ZO7tM+httcACuaGje3lVYBiHRiIEnm6MUt7JwTlws/VKiUgj+o8QzuxZGc5CYCfzPH0HtLQUdtiOGN9nbnqzFHUeP9jsaU0Nhl4Yk7A7jN46+5xBUA7begsMY7wlyoiyF6SntkVrIhBddi7TmVV7lxheG9DhgHWC3ZvWOa+XJw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) by DBBPR04MB7545.eurprd04.prod.outlook.com (2603:10a6:10:200::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.15; Tue, 11 Nov 2025 10:00:41 +0000 Received: from PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db]) by PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db%4]) with mapi id 15.20.9320.013; Tue, 11 Nov 2025 10:00:41 +0000 From: Wei Fang To: shenwei.wang@nxp.com, xiaoning.wang@nxp.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, eric@nelint.com Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 3/5] net: fec: remove struct fec_enet_priv_txrx_info Date: Tue, 11 Nov 2025 18:00:55 +0800 Message-Id: <20251111100057.2660101-4-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251111100057.2660101-1-wei.fang@nxp.com> References: <20251111100057.2660101-1-wei.fang@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:1f6::14) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|DBBPR04MB7545:EE_ X-MS-Office365-Filtering-Correlation-Id: cf841497-865d-426e-982d-08de21092c62 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|19092799006|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?NoNNc3avm/w5lSupNTur27gzI2qZGsy3kRoDexZzfclJ3nZsqK1LD79HEpjC?= =?us-ascii?Q?qa++mnsj3tt6TEM8Yorfoz3IaACR4ZsPfsm8Sx1LWYTZGQhH1hn3vPMhiVQO?= =?us-ascii?Q?LL5IF5/CfSFVCcIu4uMfT3EWYvBPkatX884aAqIHZGH9GXatc063UG/xhS8Q?= =?us-ascii?Q?eD7X4GhT5G20+ulEOlUGbL//7mQzYdYPaNj/GJL88jfYgnlC1IG+of9z4/Zf?= =?us-ascii?Q?J6p5o/OX5dxJ2ZJxFZ0Dgzr7UmRiPb1FG8pwuK/8WjfXZSHm3ma9Lcgmn3gh?= =?us-ascii?Q?SU97X65IjfUdB54C4gP2tH8bikiq25FNMgpdq4yFMH40641rmFbCbWCORFsI?= =?us-ascii?Q?a8hg1TMJjwer13jJCL4/4iorc5WYOesx46VBYyvYdlBPnhw46oh5LhWbW/pN?= =?us-ascii?Q?vQmhDWvVcn8JuD+4fs9XyVzJVfk8N4+fG7j1NT7/ZO5nK6qWGC7Rgfiv0z8a?= =?us-ascii?Q?zTx9whoUNhTQB5zmLxTORKyVRQYuql5mkT4RjgeeNmV0XO+VyVD4BaN0FSPN?= =?us-ascii?Q?yoPTcAPJDb3E6X4jIGQY8qiwwi63+c7VvmhBI/yTlnzvsNFHj1p833tgSmwi?= =?us-ascii?Q?iLdlvs64V7d3CrAfNn3lBHBlQ9xu4VyRKVD7L958WbbphGiuBGiKhRi1YsLO?= =?us-ascii?Q?tQfDD+fAqiQlrTPy010Eg3SWSgSEXgBkrxecdOf5H4hKV5evHC55kQp+8Pnk?= =?us-ascii?Q?IZlfZsOyPuSpbAcxnNzrqkqEpWXdLM2eTC2SZZZ+dwbNQbWVrVBRhOPoth5Y?= =?us-ascii?Q?Ad5P+FMGzkaefy5YHzgU+Ee9Ao/B7RU8eT/xUQYdfOHxF89ba4bnkf0ljhAT?= =?us-ascii?Q?9x/4y8qcRt+/TFiL6nxKOEtOeDYu2NUgTSeSK04efB5Xb4jKff0fAkp3pkS5?= =?us-ascii?Q?aPT5KvtCNgKXUkaKcRPreEPEOn4KtAoSKtEJUmReuE478mFmCTcAs65wqrOf?= =?us-ascii?Q?ksLiQBinyQWSuRjRbthVc0u8TFwlL1H2Hks9eprQpdPeGPwhH11EhzeFVrVx?= =?us-ascii?Q?fxrlpBc/6McUpU+edmDeBWoTxnJXtdaYGJc0sUsuzA3Vq9KXg0ShbfN8OFfx?= =?us-ascii?Q?oP3oEAF6D0i3MczMH8R5ameJ8XXN6HLsbghaLlWYXIVguWJ5Upr5U9VI7yR+?= =?us-ascii?Q?8RkgBSL0Y7MijWYRBZDkDQ+tg/6paqzlUcsZ53h2yhDCj28Rx+mVynGpfADI?= =?us-ascii?Q?7alkr2JHCq1jzM7dgr8ZeNrDCvvTVPM97gWCpgZ1HoeFLCnsZ1v19ci9UdwU?= =?us-ascii?Q?xV1dWHjExBRX5NDTr0XdnCPP7URGLn8n8FnLXXAhaoM6pPAimKRGqQaz/6zZ?= =?us-ascii?Q?Xv1aU+tRCjdEooZZqutCJET7cfqIcZKQrQ3avm9YJluucPgbtRMe+sjn+jBL?= =?us-ascii?Q?jhiCC2YayJHMB1FMYE27rMY4htDb2u8pcufsvYkAjamAtvus54a9szUCIKHK?= =?us-ascii?Q?LRMUqU7NhU6j/MKCDDn8I9g2aPpTs4a7MDZy1sWjpPUukpMp+WYhHihKGNA0?= =?us-ascii?Q?IuVKQye5OycTBWyAgAb4hNPhCgnqnDPJqsnm?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB8510.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(19092799006)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sf/d11JYCmGkERwD1eA8Pm2U3wsSwopFR/egFWAeKqEz5LEiZvv+FezJg7Sg?= =?us-ascii?Q?elyNhDzm1HF3Hc7j+woXWfjvOpZtwq95iSs36NJNpy++VdGsX0Rjt1sc/Xe4?= =?us-ascii?Q?9d8R3jN3jSeLUdBpwsR+tiNHE1jz2KcvxBHChZ8cXbjA32ahPtlIzXdGgflY?= =?us-ascii?Q?z9kw7t+CEBE5/J5u595oHQ8JTBcQb4YpIM7R52LBCQeFXdu16YrLrmXoFU1l?= =?us-ascii?Q?czkzuGTOMSVLHKPr3XAl3xcnXrGlsx4NRIyGDccDg9xoleHTf7GPcFLW/v2S?= =?us-ascii?Q?f74OyNNbBnxsTbY078ku1jqPiTcnwvKHQJfuAoP90M4uUm2rpmmz8SMDA387?= =?us-ascii?Q?SipSDUNT3RtQn0O2Pc8GtaFRZlKp5VyJzPFdTH/WQ1bvHGn/cYvCAuRqkwu+?= =?us-ascii?Q?WSN/JbO3+3cODuFBQbIRGO14uN9opUUCj1aAxw1Fj5r25m7Yvl0nmLWxY2K3?= =?us-ascii?Q?D5Bh3hNjMLRWEDrpRueh9pZE3fhLX4pnjhAUyd9RzzXcJMh37rPgLllZdEqr?= =?us-ascii?Q?1pI3xKVusZS463+nks5pyipMXnzQDD2+P9P8QJ/4uLz8ULFf9PkTQ4/FdfsV?= =?us-ascii?Q?hpPNca+mhYZDx5PF/gbEgSu2Zs5L+HPufp1Ar6ryhxVMslUNNePFA8vFzQc7?= =?us-ascii?Q?XOHePnyA9YQpgkeBbn9Aj9jyzr3PAZHRDHQT4pLu2TUGqHHwKqgdw/JFOf9f?= =?us-ascii?Q?Cts0f7Mu7IJNhlovMe/SFmj7Law/nIEdhB7/Z3yQNQeHbp7aZH9w5tPJ3VEM?= =?us-ascii?Q?GQwx+Zmbt7yFrhQgZ7rnuiYeyRnbgyH73gqsjSzKX92m0LGsn7K2MP4qvj94?= =?us-ascii?Q?ZnX1qyVpIPWyfhTMhd7cR1jNblivRRRz4chGMntZHKydXX8mygD44IOW0j7y?= =?us-ascii?Q?dyHWuh+4df8E0w6ElXtGhbG6ijhhQCJ/lAMtSmVYdOExlaRa7EklehGob69f?= =?us-ascii?Q?VxEbY1Dif6H8H2ciRkt0fNWG+7LaRmjd9geYsXjQ4nErgL/Lz25nW6oULNry?= =?us-ascii?Q?h1XlxxveM14q3oHK5XkcYCAdH/r+ZxUuoHeSh68bD9LdBgM5BSiFFzPhfSPK?= =?us-ascii?Q?nK8MZ9UkBuZfxB77IQIJI2N6sXlghCdDJyTrJsJz5SUCc+KLaApS4eWO4JEX?= =?us-ascii?Q?rEtEL19qSRBn1Xut3vVNgntgvfmHe9ERvboB8S+p2QmMSztHWYHLlllTJI5f?= =?us-ascii?Q?LflW4qmL5IV8NAj5qhKPK5oT8+EOBS8hYki53RuNsTASz6jFXoWnFzWoApqg?= =?us-ascii?Q?5SqfSUeZ6wslbT5dP6Q4ADwjBjAKuvtDFF0ImcMpGF1GVT72vyLsnQmJSW5n?= =?us-ascii?Q?yoz21eDRPkyGVTrDUb5+zxr91URuBu75LjZ1Czju19tyKMvYi1YuevgbFO6x?= =?us-ascii?Q?MX/bzONaAMY3NVpteqv04HbHc9Qy38TmokG/7aBHH68lhnQNVqZZW9WC5cJO?= =?us-ascii?Q?ilzLA2AQmdT1eiGpv02/2pcLIHiK82E3fvogFi/KtN8T6hGMB5fCls9yqih5?= =?us-ascii?Q?pfFzmuKt5mNf5P6I7nmDJkoL7j1SAG5/Wgv+zLiigmkGkGwS9dPw8Bh9s1zA?= =?us-ascii?Q?i0tlI5wZNoCUsodaNTeu63MR0aHMAtPfrKmkuyw3?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf841497-865d-426e-982d-08de21092c62 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2025 10:00:41.8763 (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: hovHPskHjcsUasiLNAea1IpOYS8jLUHATNqiDkn13qsLDj+T9PgUdHp4TaOpW9sBtRUIYoSBJdeD8GysiNhssw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7545 Content-Type: text/plain; charset="utf-8" The struct fec_enet_priv_txrx_info has three members: offset, page and skb. The offset is only initialized in the driver and is not used, and we can see that it likely will not be used in the future. The skb is never initialized and used in the driver. Therefore, struct fec_enet_priv_txrx_info can be directly replaced by struct page. Signed-off-by: Wei Fang --- drivers/net/ethernet/freescale/fec.h | 8 +------- drivers/net/ethernet/freescale/fec_main.c | 11 +++++------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/fr= eescale/fec.h index 8e438f6e7ec4..c5bbc2c16a4f 100644 --- a/drivers/net/ethernet/freescale/fec.h +++ b/drivers/net/ethernet/freescale/fec.h @@ -528,12 +528,6 @@ struct bufdesc_prop { unsigned char dsize_log2; }; =20 -struct fec_enet_priv_txrx_info { - int offset; - struct page *page; - struct sk_buff *skb; -}; - enum { RX_XDP_REDIRECT =3D 0, RX_XDP_PASS, @@ -573,7 +567,7 @@ struct fec_enet_priv_tx_q { =20 struct fec_enet_priv_rx_q { struct bufdesc_prop bd; - struct fec_enet_priv_txrx_info rx_skb_info[RX_RING_SIZE]; + struct page *rx_buf[RX_RING_SIZE]; =20 /* page_pool */ struct page_pool *page_pool; diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethern= et/freescale/fec_main.c index 9d0e5abe5f66..5de86c8bc78e 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1655,8 +1655,7 @@ static int fec_enet_update_cbd(struct fec_enet_priv_r= x_q *rxq, if (unlikely(!new_page)) return -ENOMEM; =20 - rxq->rx_skb_info[index].page =3D new_page; - rxq->rx_skb_info[index].offset =3D FEC_ENET_XDP_HEADROOM; + rxq->rx_buf[index] =3D new_page; phys_addr =3D page_pool_get_dma_addr(new_page) + FEC_ENET_XDP_HEADROOM; bdp->cbd_bufaddr =3D cpu_to_fec32(phys_addr); =20 @@ -1834,7 +1833,7 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_= id, int budget) ndev->stats.rx_bytes +=3D pkt_len; =20 index =3D fec_enet_get_bd_index(bdp, &rxq->bd); - page =3D rxq->rx_skb_info[index].page; + page =3D rxq->rx_buf[index]; cbd_bufaddr =3D bdp->cbd_bufaddr; if (fec_enet_update_cbd(rxq, bdp, index)) { ndev->stats.rx_dropped++; @@ -3309,7 +3308,8 @@ static void fec_enet_free_buffers(struct net_device *= ndev) for (q =3D 0; q < fep->num_rx_queues; q++) { rxq =3D fep->rx_queue[q]; for (i =3D 0; i < rxq->bd.ring_size; i++) - page_pool_put_full_page(rxq->page_pool, rxq->rx_skb_info[i].page, false= ); + page_pool_put_full_page(rxq->page_pool, rxq->rx_buf[i], + false); =20 for (i =3D 0; i < XDP_STATS_TOTAL; i++) rxq->stats[i] =3D 0; @@ -3443,8 +3443,7 @@ fec_enet_alloc_rxq_buffers(struct net_device *ndev, u= nsigned int queue) phys_addr =3D page_pool_get_dma_addr(page) + FEC_ENET_XDP_HEADROOM; bdp->cbd_bufaddr =3D cpu_to_fec32(phys_addr); =20 - rxq->rx_skb_info[i].page =3D page; - rxq->rx_skb_info[i].offset =3D FEC_ENET_XDP_HEADROOM; + rxq->rx_buf[i] =3D page; bdp->cbd_sc =3D cpu_to_fec16(BD_ENET_RX_EMPTY); =20 if (fep->bufdesc_ex) { --=20 2.34.1 From nobody Sat Feb 7 19:41:20 2026 Received: from GVXPR05CU001.outbound.protection.outlook.com (mail-swedencentralazon11013054.outbound.protection.outlook.com [52.101.83.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 16797348477; Tue, 11 Nov 2025 10:00:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.83.54 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762855248; cv=fail; b=MpjcqnzsYkWvEosF57ZfDwGnCNTH0ox7PiDgl+4Tts3mq7fa1ypgba6GLodkU/f7JEIYswH9lMmU/2DZQ880mn36cOp2enyRrcKywYkNlQzY7Km9cGmowSu2hxBK9KL8V5uaHlqCNEhnxq8dXOvMyCkDU8KPEyiVr0lPdwKIqHQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762855248; c=relaxed/simple; bh=yk28TyT4W8ptk2ldMvpF2aHjRx/tpMCH0iDcQFFLKzE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=t/q8qRH51KwnJMk/ybP3O8ySs3D2tMsFbfUwFHm8xKwZR9uQwSP3LTWiHSAAXQSMuW0DHXWZd6ZRLcsTcRHhD56GTknnYf3AN/ICXdySmjOOsOkJw0jon6PhyVxukRiUQfB989s+3AKNGCBq3TwIHG/UyquCy0GK/F/Rxvm9/+I= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=XDZnGWgb; arc=fail smtp.client-ip=52.101.83.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="XDZnGWgb" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cy4sUnarJGp8HlqAoOXQ9oqiZB0I9PoNVUarFwMCvk0elsoNA1v0wKJgUJu4SkObHHxjlPs78uR/uNwF7Pi0KjThKqrXsJVjDhnDimJRJJatayPOgNlySj0awrj2S0WrVf6F/RQqndtwTlEi2G7cFDjREydbGMrry5+yyU7eJ7F9K0L+pY+nZl6uvn3EiRBEaj8yz55csCiXvDy1TfpxvlQrIoZJYYn4Tu4yrf0e1uOo4/UjbwKtFJgx+2sumfo2ANEkzl8kA9gWUUWT2uc+oF7kpBsjjWK3um4/iOj8wDuUkrQ2MQVMap9O19Hh23fLxc5M8SGXWEKNLFmy2C2wqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kxtGG6Lv2dF37ob+r6gXjcn/p+slzty8An7ppHCBx78=; b=Z7/jhq73awAi+K8lUXv1BWfklrjDcbVaQJwVEmOCoPeGXMMh/All1Cv4NhY4hfmKuC/IvaxeQv6Wh8ZDLAc3i04Uxm5SbKGMaqG7XQGooI3UDx0cC1sCicIr+/r4eHr9//bByywE1GzSjyKgMH7dFV9/x7ZHUluucWvYYag7K8z+lcyDdR5+eMSe1YRd6OHlyIqzAgAaJ+x3Pto1J+KXjuymdUciLtO0eqk5b8uLSmrUy3U/TKBvi81daBqrE/5js/+b51YgThHbRPbpY4eXFLkPZJGbsd9ApQRAVHLF9befMKpDLgaQX4DM0wWXe74YgBe0f56niOeI1QkzsO/Rvw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kxtGG6Lv2dF37ob+r6gXjcn/p+slzty8An7ppHCBx78=; b=XDZnGWgbFcvl0eXJD/qpcG+SQbIsO014R33ZnntpLikBYxKM6kQUmk5LtSz6ui/dexCnzqTK6JHN4FbIyWZUbKdnP2os1XqebZAX/nYl8bVCO1CntuST6TlEFfj8l7/wzTrLzHQ/r9PUInJzhx8VAKLdDvMnr7PiH4prRS3nDLIlj/E8yacZfgKxdbUMEG0eQoVbWVhWIjZW7iFoa2dvORWngTsSFr0YdAKQANSukB+BbukUVLDJi4LbQIcJGvCw7xRQJs3hr+d3DNIgl7fSF+5mH04+uj8PwLK/H0xaKx3bjjE3BShEMwSiD52wlzK90EABEZXsdT93qeX5OZiwYQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) by DBBPR04MB7545.eurprd04.prod.outlook.com (2603:10a6:10:200::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.15; Tue, 11 Nov 2025 10:00:45 +0000 Received: from PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db]) by PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db%4]) with mapi id 15.20.9320.013; Tue, 11 Nov 2025 10:00:45 +0000 From: Wei Fang To: shenwei.wang@nxp.com, xiaoning.wang@nxp.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, eric@nelint.com Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 4/5] net: fec: remove rx_align from fec_enet_private Date: Tue, 11 Nov 2025 18:00:56 +0800 Message-Id: <20251111100057.2660101-5-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251111100057.2660101-1-wei.fang@nxp.com> References: <20251111100057.2660101-1-wei.fang@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:1f6::14) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|DBBPR04MB7545:EE_ X-MS-Office365-Filtering-Correlation-Id: 3ecfd8c1-64d3-4c69-d5f9-08de21092e8c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|19092799006|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?+k60CyFOg3OSaNSLmgon1Dkgrrp+WPZlj5QL85xW1GIEQeccNJT3ZnWwsRgp?= =?us-ascii?Q?jUepZ7U5CdjtzrXz2CBZFI3Lynm1+gnhePobba8t4g3n+37C68dDuqsW7yqr?= =?us-ascii?Q?0DGLkJmyEaJF9jsq1bpB90lunm+xaQHs4a8aG2KTTCwJfoge3IM8Y/7EdJ1J?= =?us-ascii?Q?7mdnz755/WcmZPKpTdxvy91//QZh+m0WHLMrZVL+0HFE0+G5wzMOOTzrPvLv?= =?us-ascii?Q?R3ZEha+lpnWo+n3Xrysr4IsAWTd5852QJif1Rrf4o7mzx1Zo5xyAvxy6PUrW?= =?us-ascii?Q?XQElUpTbAcDCEswuMz956gD3V8ntWZiubIHOOrAhbY9PN/VqQ/8sceGJflZg?= =?us-ascii?Q?UR6pfE2GBQkGNyPoQnmuhg2xHMGzCogn+lZCjdBoaAdAG5uQn/QFF4kJ02c6?= =?us-ascii?Q?EhhSVx5sPMY9mq78p2NFhaOUTRS4qVzrZ2VDBndjxSVi4aIAzKfKi+NP2N3p?= =?us-ascii?Q?Ni28+yCyctmKq+rh2niLUiY3zboQlCqZ5FzE4UOg/9eCUOh8PQRQkxQIhG8D?= =?us-ascii?Q?obzCaFlOgRYBShIz+w3uch498Kr3UR8ATytw31gUJtSwFaZrgifFNz4Ap8i3?= =?us-ascii?Q?ti5igFqaeW+/x292g1fNsSEB2MjA5KWnxcuS9fF6PRrNkuvKbX2Jeb3lovdJ?= =?us-ascii?Q?28pAQPs93u5I74bRybDN8OTlpmmRFT9JHMVgjEZP/mhxl6NAMFGUgZsbZfkx?= =?us-ascii?Q?e4cnoM4LOzXDyp2FfGNMAOJGPL1zKZXL5+G4Eoo2zFWate0IobikU2f2pq6U?= =?us-ascii?Q?V/dUclqY9KGjfQukkY91XGvT+TjWZIKpGST//4p4aO29GUq6Ipbb+ZKmK6jp?= =?us-ascii?Q?a3IWRapBTu57dDnGurDBRuxeJVIUHtFPWGYiW/eZDtEiDJBYFLRT62WZMRY7?= =?us-ascii?Q?w15FP1uqJhDA3MeDVbOTcOdhDjlooRpDzTm4V4My0/AUNk8tAzHPnYZuUd/S?= =?us-ascii?Q?cF3UOb/+YeOcJa04xGnkL7tFKwfxGhLif+rc081KeB17kpKhc4pJYfZNT7/z?= =?us-ascii?Q?I8KyLgBqMdeFTHnRAPZYG9c7YoawEsN4jAccLw01mxKfmfsH3rV2AVIkkBj+?= =?us-ascii?Q?pDn5WeueztXqLGkn2MzpygZYM3mt31JE8CBjbTnf++xE/VEpqmAcaSq2PjpN?= =?us-ascii?Q?d4vjjM8sNa8CBVIaUcPo2ZH+IyEofg3/fKAEs+Xk08c/JbnfMw6C7F9+418t?= =?us-ascii?Q?nbveanWol45T4lyjIa1S72dUTuMTA0qg7ApdCIBX7ZV53kcZS9GGmSX0yln+?= =?us-ascii?Q?Bab6HVzSBj2+UVA7vaLyZk2eah9vxGXWuljcgA4TtACsL5LWk8NkgKj2njVb?= =?us-ascii?Q?gQKdp4TvIXceUzKhTM+zODkhAaE6TnnE7HL84jj5fx5IvIyaoY9KI7DaqRgt?= =?us-ascii?Q?5dtKaDpKCxCEQ2dzSWQrV5V4oFTKf8HQShzrAx9BFlfYVsGujvU9Xvz98oJx?= =?us-ascii?Q?2/foa4XoM/uE7yge6V5KzT2Dw4P1WrAEe2Sw5hNmI3Jb1a9NjFUlkgqGHYoE?= =?us-ascii?Q?QKFHJ25Ebs5AYigyXMtH0T7+tbWRPQIxKaif?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB8510.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(19092799006)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Th1K9haB2HkPMEKSSTR1SptiJLP2mFZ+HLqoDZlawjP+Hg4gidPThs1lWN5p?= =?us-ascii?Q?3UuYsLdY+x3Z3z07sgq/ClTtIHV4JPztQq0gx1gzslBb5jvXuAQeqQDMMP+g?= =?us-ascii?Q?Ep4mpBcXudDoirR0h6T3N/u/YIj0/erKfLC+96l1BuRNYop2qhNOJbjc+EH0?= =?us-ascii?Q?Fwtdo1Y70lJNvUsYFviAIp8L6D3POnaF41k2pXGLhK7Hg3tK5/XuyUbvR4Ui?= =?us-ascii?Q?NRwOfxZItPTMUwlvxaYQyxpYLEmFzxzKxtUXLKcCKHPvVaBNTNZKVonjHY39?= =?us-ascii?Q?XBHttxyD2z23hXK/VZtq9C47KOuigrGYJNS5WldRaTVvanoX+m9oc9lbwKJY?= =?us-ascii?Q?Pp5hBgnHfZK2qMYPDXv7YSOVHdrIrgaFgUZEngG5eyM7dqR4mmtGAGRy65SO?= =?us-ascii?Q?hFribXGKaUtR9BTWzAQw3zzGpJFRm6F75sfPebpIC2EcbWWgV+v6wFifs4gI?= =?us-ascii?Q?srai8lb4saEP3Ez2KcUgJLLas8RjmtFxE63BH0uoBhMVLXUqF7VuOfDs60Mq?= =?us-ascii?Q?NgVK+dr5gXmxEGf2bxf7yY0RXPWmzAChokFO/g6J8gNGmqQShzAdRdc8+zeS?= =?us-ascii?Q?lcce7K+gdBWgDl7ljjPRxF6zZW6h590w2944Ds6U9axuJXgFU8w9rliye5JO?= =?us-ascii?Q?I8kUJRYXhLfqfl9V+kLQIXsc7+FxzULCSzCyr71vkPgw/JQtZqV/bIAk/JS9?= =?us-ascii?Q?Gtznaz72acj3l/92U1Qd2FDPLYFy9hIdxM8AuiK3KJaA2U0bAo0T4XyyovHI?= =?us-ascii?Q?0HlAe0nGeeoMT9A7pMZL0tDIdE0/SezhhWJzjWSl7gdKQ9+ibq2GH8WmcqGZ?= =?us-ascii?Q?K/rtmulgHbq82Z6ZUC2nYsRJn2eoeJLxtyHWBYS1B0maraHCEg5y2REyphl9?= =?us-ascii?Q?MIhfPgiOnGW5zmWOuGMUz/JEXQ4o1GW6BKWjfFv7spDIGL6a+xh4Dhr4+tK0?= =?us-ascii?Q?3Hm4Gmx7KGFoXyOJv2YhKwWCAqaA06V4CNf9sMmw45WpcFDhxwGq55+jJ+44?= =?us-ascii?Q?JCnDYhls1dYWU3XGvdfGgyuxj1hbGYGU+1/eZ4TruugK+RifOhaUHZ+l7r+d?= =?us-ascii?Q?rCHf6iNv8qHkwaS5ibTKb5oiuHvAqzuziqdOa2dkAAIFWclcH1XtaR/GPiSw?= =?us-ascii?Q?w+lCXKH7zV3zfO5TnsgqjwRw06lgIIXU5vRwjvBsbEb06k5lBJ33fp3W70xF?= =?us-ascii?Q?ARif/avnaPiyKvRPcPYrCCe5Gg0FO1r/tLlVw6haJPBqsQOctb/gdX6Qbbwp?= =?us-ascii?Q?pXw9UpMy5OSvyoSM4WXbPpIbskikxO6t80BBmD1QihQ4CX7f5BQ46ZhF1FwK?= =?us-ascii?Q?lKnHPjgVNGtUnyWN2L7T/Bsl73xxD4PqE7nCZMXQ7pmD94VJqDoQKzB4IfNZ?= =?us-ascii?Q?aH7QfNylpxWLHrgZ/XRhMNuNnXoSPNZNVzDB2fkD5A7plnsn+OV7lwyMaj9r?= =?us-ascii?Q?FH43fMaKy7L6nf6iSqqJpoojqJurbEXuiKZ+vQYIckmzUel0/Dv1HbTaP7ft?= =?us-ascii?Q?pHVaJCUD34Rc8EiVzK/9bH19JK45bBiG49WUoW/hUpfACz3zcAA41TkKXA7+?= =?us-ascii?Q?h6HDMzYffAFLS47Y+agVP9mDSJmjJOrH7aZC0vrx?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ecfd8c1-64d3-4c69-d5f9-08de21092e8c X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2025 10:00:45.4185 (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: ghmgOZLXUSG+tAn0GgawkE36qTnAbcYYRa+7XCxHRnVJgf95JdTHgOWE9QuoIb0fCK08kG+63slxqFXUWk6m+A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7545 Content-Type: text/plain; charset="utf-8" The rx_align was introduced by the commit 41ef84ce4c72 ("net: fec: change FEC alignment according to i.mx6 sx requirement"). Because the i.MX6 SX requires RX buffer must be 64 bytes alignment. Since the commit 95698ff6177b ("net: fec: using page pool to manage RX buffers"), the address of the RX buffer is always the page address plus 128 bytes, so RX buffer is always 64-byte aligned. Therefore, rx_align has no effect since that commit, and we can safely remove it. Signed-off-by: Wei Fang --- drivers/net/ethernet/freescale/fec.h | 1 - drivers/net/ethernet/freescale/fec_main.c | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/fr= eescale/fec.h index c5bbc2c16a4f..a25dca9c7d71 100644 --- a/drivers/net/ethernet/freescale/fec.h +++ b/drivers/net/ethernet/freescale/fec.h @@ -660,7 +660,6 @@ struct fec_enet_private { struct pm_qos_request pm_qos_req; =20 unsigned int tx_align; - unsigned int rx_align; =20 /* hw interrupt coalesce */ unsigned int rx_pkts_itr; diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethern= et/freescale/fec_main.c index 5de86c8bc78e..cf598d5260fb 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -4069,10 +4069,8 @@ static int fec_enet_init(struct net_device *ndev) =20 WARN_ON(dsize !=3D (1 << dsize_log2)); #if defined(CONFIG_ARM) || defined(CONFIG_ARM64) - fep->rx_align =3D 0xf; fep->tx_align =3D 0xf; #else - fep->rx_align =3D 0x3; fep->tx_align =3D 0x3; #endif fep->rx_pkts_itr =3D FEC_ITR_ICFT_DEFAULT; @@ -4161,10 +4159,8 @@ static int fec_enet_init(struct net_device *ndev) fep->csum_flags |=3D FLAG_RX_CSUM_ENABLED; } =20 - if (fep->quirks & FEC_QUIRK_HAS_MULTI_QUEUES) { + if (fep->quirks & FEC_QUIRK_HAS_MULTI_QUEUES) fep->tx_align =3D 0; - fep->rx_align =3D 0x3f; - } =20 ndev->hw_features =3D ndev->features; =20 --=20 2.34.1 From nobody Sat Feb 7 19:41:20 2026 Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11010024.outbound.protection.outlook.com [52.101.84.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1866B2FDC50; Tue, 11 Nov 2025 10:02:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.84.24 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762855327; cv=fail; b=sk9m2SNSIy9TD0XkPYry+E2pB/C/BtHjFpn35Ns+IGfqPc5vusXihjBxzDX8PbTiC1b+M1ykhzlqm3NOQ7B74FdAgtaupgvL8C64Vg0w/TlMWJIVwQH/iy5gwQ9OKGg7VfHxCS4pdpuU1F0oYDphiWkpwA6cMd+kSG/oScWTMGs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762855327; c=relaxed/simple; bh=oHRjnwqEsIjDTbt8E/Vin2qdp6SmSqn4cID4iMmmbZ8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=sH9qpTLq5y6P/F4Zx1wpFDknQCqbqaKG1oqEPSMix5ms3+H/xfVE/+hgQJKppOhXuXGIsuw5KsHVlwQuUVAXbLSB70EZj1bAS9uRoohug2/mIYDxgWAJOuultRdnNfMjWbBl0z3ibLMPlH60CoPlhkeQ5RU9v1dHsQKYiXtBT2s= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=ZaQiBOF6; arc=fail smtp.client-ip=52.101.84.24 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="ZaQiBOF6" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FBIuYKQyi/GgujQc3DfMgoabJ1FvBLUnq0chKmY5TxUi3EDD4tsgfuLPxzREbvh16t9VWf12Iybw/2SZsFHWzVu4aH4PjEgeVCKvczEQDBdR9DH22TBrTPZS+jz15nKL9wXSRXfM7NKJUKemfXAGYwRO7sB+Fy4UALOkV2lamFyD5gVD4ahsN1HICzpmtM4WbGHHMkCbokWrcrjRrxOLl9adJHXkSYpgCPUpjj8jYUlQqaDwSQdzAjHjvY8QPce9U6+qRWP9whHF3YQi0q+N3MzcJvwe8N2RLhoyt2KZhgnW6yIast+Wl8dL9Je4QWtaEUCapxV50KqGdYOKHq0fVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=okP+b4RF2lhV5I+n8PwqhfwBxjhzfCIyztFSELWFqsU=; b=LBd0F5j1aoI0tJy96vtGyhQMWQ2LWFKyjLkH2ZJeBotIw6CX7hHB+tL6ReCb5IbT6mgoOksN/H5wacjPxiDC2MqUSHTxTKr8zMjFaxVu6YzATTdZvzIsl2G2/tDRxzkpiNrar08G1leUyIqTGhCknA0s/gHe0pwxc7EnWhBdBqCYIfjK+C9xjU874cKXxFDahxwyU6+s7Zs6ttyaLMnvq4jtzdM7tis//1YTDZ50e5Gei7nxsYLIsvadf3Ew0eU5qaBk5HDtzWbOWknxrWMw+oEC8aI8RKWg3q3pUDySfxlMsois/F20eaWQQB7zZ+zm3o0edlcf37xY/RkjerPGHA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=okP+b4RF2lhV5I+n8PwqhfwBxjhzfCIyztFSELWFqsU=; b=ZaQiBOF6HKBUcVTTzgPxwtVvbzmB5AIKhUm1hlb7VL4792Ect2hDy28ZVKSyNnKWAo8IWu6n7pokon516WiYLffXRsJFeRoDmJJv9IKHabMO8B5Vl5ltkcCsAzk0tfe/splmyr+W0eUCl12nEzs1cZHhWmN1xFV1obDdBt4WrM49TudvAegFObfUilNIeUS1iHsEUO/eOzZkxyPrzma/iE+rnCDUf2UtJNL9retx22hCZ/Cxag8PXgrmb6oiYcToqRmv7C4chMwW5OWa7L5VTuNknNmtfRZvG28PurpEKQtiGGLykIGJwRnaACseWToD5qzythFm4Aw5Lohrhi4BtQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) by DBBPR04MB7545.eurprd04.prod.outlook.com (2603:10a6:10:200::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.15; Tue, 11 Nov 2025 10:00:50 +0000 Received: from PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db]) by PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db%4]) with mapi id 15.20.9320.013; Tue, 11 Nov 2025 10:00:50 +0000 From: Wei Fang To: shenwei.wang@nxp.com, xiaoning.wang@nxp.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, eric@nelint.com Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 5/5] net: fec: remove duplicate macros of the BD status Date: Tue, 11 Nov 2025 18:00:57 +0800 Message-Id: <20251111100057.2660101-6-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251111100057.2660101-1-wei.fang@nxp.com> References: <20251111100057.2660101-1-wei.fang@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:1f6::14) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|DBBPR04MB7545:EE_ X-MS-Office365-Filtering-Correlation-Id: a231d254-0ae9-4b3b-8609-08de210930ee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|19092799006|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?nch3eGtzR/ZN/yLHisqokn71fa5VWCmFFQgxkdLXB70VQ9aaDiNk9qHc0PfB?= =?us-ascii?Q?hbU/Qe3zQZ5EgO/yfEWDG5lH8xW4J7BnbTR93YwI/CIf9PW8fUKssVRIdFL+?= =?us-ascii?Q?M0G3mo+AWbcc8QPg3LAnx0vcCGSrDYVGwcY628JuHSct9TOZPx/7ZMWGAq6f?= =?us-ascii?Q?v4I+6T9IiHdpFygiKD7/MxpmgtY6iBXSz9Af2tIpHJWU6qrubISo+nM5aKqf?= =?us-ascii?Q?izmMZ+GHk76Xf2ywlzG/M4BwKJA/lHlLspXfwysqkgTG7wCRHoBXsWjDidLS?= =?us-ascii?Q?Xz0UzUCvefL1a8EV3ydoWIv0yNn9B2lNxjP2Yc4jk/IQnnUwSMfhPYKalo2r?= =?us-ascii?Q?F3OnXJDwId3c4GgcMB3nLnzeL6biPkU2/5knbF6d/7YYHi2QMZzdcIJ2XCZC?= =?us-ascii?Q?YVLlnsD2Kqr9cjX8Vm6S+wR3iOed+H3qfdvD7lM7t/93dr5mEOBmM1ZVNYbB?= =?us-ascii?Q?6HTFVGTLepQ3planJUUk8ujxGfNP+owxY/LaVCVl9Q7sh1ocqdPCEGYCUIRI?= =?us-ascii?Q?XxnmApG7AuUPT98X2299acL7j1HUzVC5mvvLm6K8ZxUDq05QUTcSD5J3FwoY?= =?us-ascii?Q?ThKLL1JUH4gWrv/iC9e7DHU8Mv2xbJgWHxUlUMRRzxp7RBEhVLe8IgSNxdnm?= =?us-ascii?Q?x3080OL+tN/s7N8BrDp16GAawNaHkjjufzP0fPMAwO2/hO/qUsjKCUI9PpbU?= =?us-ascii?Q?8d1d3grdg6+QKV6IibQbcbGUJjj9N0dkgShukyMg2B4mVVZgIOQjGzC8dNKT?= =?us-ascii?Q?2+lqkaBVGzkwQwLolBAdSYv2xC0L/3NHK0ewN1MxMPCx1vy0yoUwGL6SoxYu?= =?us-ascii?Q?wBcwISWjPP3Smp1CkcBbKWDFMdqAyBY5iQF3QSdAvpb+BzhCekgFYX07gn3d?= =?us-ascii?Q?bKMA08uqXlc8EjNZBg30/JVARj7dl2OIfZiJ6+HTa85bu09tAD4B1UTa88rI?= =?us-ascii?Q?H5k9qvsyCOPCBDIWGm+iSG3aP3x28CtXRDQIDTNEoNlG39jGShY2X+pBOS6M?= =?us-ascii?Q?QnmV/3hHDZNN27FZjmBxHOzlZwhRgs0uvGNRhJ3W33jFRd19gjMz+2vfyja+?= =?us-ascii?Q?A6wkdQEVcr8J7FdHfOrWCnZieGUs4S7KJtrYkDCDiciiG5bOCNZLYGVPt/hh?= =?us-ascii?Q?JyDWI90k+eqaBUaUa7seC2eRXNn6snPdfKGEYmhQQov6DREzI4813zqxRVa7?= =?us-ascii?Q?hXECcZRezrtJ9+ruzEbKhxIQf/7gJ918k2Zy9jMnndcq2yocVp5szpd2kOnQ?= =?us-ascii?Q?pKv7Q3KUVh4gEN0f5skNAkEUwvVQHAe+I0ZM1d/+WOQHo5kJxqkSxFrlQ3kx?= =?us-ascii?Q?WtdRCemNh3YzIn+U1L9sXc4pOMPHe44u6tYnREXe5ZDViHXUDnJl59o1qkAq?= =?us-ascii?Q?V31TdxVrI4InPsUrhIqtYK5daNbcyKquQ/uS1QKmYtrqkWFdWZLthCTXijJ3?= =?us-ascii?Q?QkkP1pzKk7eayl+YeFJwiuv1awjypZzEY5vEhFd8GLwtw933kEb3mJq+v1kN?= =?us-ascii?Q?QwUBbr3+c0nKYpgLis6jVb9oKe5+NEEi71/7?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB8510.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(19092799006)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vWStw0bH41/y/mWF8WPxXQcG7YSgAujiYgTxalNQ8+hdg4belEC7PFVacSAu?= =?us-ascii?Q?TM7qHE1yjT++2chbS0R5KpAefOBQG0ZONSsAWC1SIPdfmwuX9sMITPJtEmWK?= =?us-ascii?Q?hhOYVCMDctLRsuFsBo7oTOfTFO5MYrgE8qlPY0ZWeuC5mj+0m5Y2ZuYz92Dh?= =?us-ascii?Q?6rWk73vFnrpqF0kVLzS2nTsURreMw/kSXna/jmnBHpPATJZcraOH7vAhEnqr?= =?us-ascii?Q?cbcDB6uZmVI74fr/ZFQAuvLQ0mW7+G7D250HXofzcwKTCRG8jjd3VsWFZyh8?= =?us-ascii?Q?Y3yiLzcSX9Zax60CRj1gvo4QjT+7KYuluMmuBlpq3gERwPOOcioHHbcYDcXO?= =?us-ascii?Q?dGWiYCQoLH6fR65z7uh3yNCs+tTB/QOe+WjND6XxRsVHV9Oo1L42q3A5jnRD?= =?us-ascii?Q?lm4ionKibrK4CGncv5d1+lhw6BVMvwsq+EYt6o8qDsZToN0Fk7MtF8PQ16b+?= =?us-ascii?Q?iUxblnI/x1o5WpIJNXrZnYCSfKLePCbBIVi759QxoX05+fkf2+DbrRwlY6nD?= =?us-ascii?Q?xScpuRzAgr7oJxqgY2SygE5KWVyrEDhELUVm3115AznSvOy4PYM6y6NWtjlH?= =?us-ascii?Q?/2AaVs+3dObO00HekPLB8EVuFFvuyaFgr4kbAkbRRBAvaV4tigh/NlMTqmt7?= =?us-ascii?Q?7ikcZbA8elZVrN4nLsuOZruKBoJnegEeI1nnjQXIyZTmzm2aaQx84fPFU1Sb?= =?us-ascii?Q?UEPi9AbF+u9t5RpvOylPqer7BVJG2CsSMa7uYdqtALYfS9Hg9YtV93sNe6rh?= =?us-ascii?Q?x3rAHt+B+VcqyH77C5UauRL9pC0XqoMkyxTy37G5+kEkVUyPvmwMEM3jfhpx?= =?us-ascii?Q?EqC/8vUoqvU4K8ITstmODyHyycSLM5rCp5lePQb7K3IOGqWF/DIXFUe+21qV?= =?us-ascii?Q?bepea2QUrCxrIlR81ULv144+EcnOfWhDtsdP+7A03qYx0GD7sldYWIeUBo9I?= =?us-ascii?Q?eh6h/ZQ3SPuVbPOPE7z+hx39a7Qyc9jHSm05davgmA+agjovqrlrhj4wFGAd?= =?us-ascii?Q?yKjwi72el8YvpteSVMJIksIsAWt0jt3rRDu0eKImWu5Ddt58hyWRNRVoiLIH?= =?us-ascii?Q?oPCiWngHIPRJDp0WF5xvNZeIl50/ab1Tuua+xr/NBo+46Q/GQS4qWV55RNq2?= =?us-ascii?Q?aPPTSzoE3HLR7oPX+1r/9se2Jqccra0v66SbKl2N6iheN20cOPshWVEDIger?= =?us-ascii?Q?1SnWxTgKHNYndvj9W7BTBbIYxVqFf499RQT80VEWM90AuBrN0hHw9xCH2+gb?= =?us-ascii?Q?In2Q5tOVqQI/+Fw16AKXj6B0qQr0Kf68gAKq6oaGgHK5osCwzVzmxmfv2Tt3?= =?us-ascii?Q?5BqhGjTgCY4PxEEMbGSyzZpN2ANy5ux88qTYVp607OKorrgC2fEwgEh79p2t?= =?us-ascii?Q?f8eO6fwzc4UA+x7S18eDhRjhl3OnxJjcV86iC/yaJJROj91oUy7U97EPZqXH?= =?us-ascii?Q?3aMRlyYPsJQR1xQkYDx9ug1BIXcOnZixNzd6KCiEwdbtSrqYtpx1SbxDtdGd?= =?us-ascii?Q?HfNd8iiMb/eXYYIluWGTFRpIJlROh+fl2qCsv7+qJ+RKoXNTSki6EoO9c7fx?= =?us-ascii?Q?vsgHlNMqRaiP/BMzOlVbU2V54T5nG1yIAJzwyLfF?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a231d254-0ae9-4b3b-8609-08de210930ee X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2025 10:00:50.3051 (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: fSKJym2f/TNQEzdOPZ7OKsecCQZ9NbiMLBC3f2hs29NMPVQxU/1Bnqf62kpF5izo8pNYeesrM/pj16ZKEaa5wg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7545 Content-Type: text/plain; charset="utf-8" There are two sets of macros used to define the status bits of TX and RX BDs, one is the BD_SC_xx macros, the other one is the BD_ENET_xx macros. For the BD_SC_xx macros, only BD_SC_WRAP is used in the driver. But the BD_ENET_xx macros are more widely used in the driver, and they define more bits of the BD status. Therefore, let us remove the BD_SC_xx macros from now on. Signed-off-by: Wei Fang Reviewed-by: Frank Li --- drivers/net/ethernet/freescale/fec.h | 17 ----------------- drivers/net/ethernet/freescale/fec_main.c | 8 ++++---- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/fr= eescale/fec.h index a25dca9c7d71..7b4d1fc8e7eb 100644 --- a/drivers/net/ethernet/freescale/fec.h +++ b/drivers/net/ethernet/freescale/fec.h @@ -240,23 +240,6 @@ struct bufdesc_ex { __fec16 res0[4]; }; =20 -/* - * The following definitions courtesy of commproc.h, which where - * Copyright (c) 1997 Dan Malek (dmalek@jlc.net). - */ -#define BD_SC_EMPTY ((ushort)0x8000) /* Receive is empty */ -#define BD_SC_READY ((ushort)0x8000) /* Transmit is ready */ -#define BD_SC_WRAP ((ushort)0x2000) /* Last buffer descriptor */ -#define BD_SC_INTRPT ((ushort)0x1000) /* Interrupt on change */ -#define BD_SC_CM ((ushort)0x0200) /* Continuous mode */ -#define BD_SC_ID ((ushort)0x0100) /* Rec'd too many idles */ -#define BD_SC_P ((ushort)0x0100) /* xmt preamble */ -#define BD_SC_BR ((ushort)0x0020) /* Break received */ -#define BD_SC_FR ((ushort)0x0010) /* Framing error */ -#define BD_SC_PR ((ushort)0x0008) /* Parity error */ -#define BD_SC_OV ((ushort)0x0002) /* Overrun */ -#define BD_SC_CD ((ushort)0x0001) /* ?? */ - /* Buffer descriptor control/status used by Ethernet receive. */ #define BD_ENET_RX_EMPTY ((ushort)0x8000) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethern= et/freescale/fec_main.c index cf598d5260fb..3d227c9c5ba5 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1010,7 +1010,7 @@ static void fec_enet_bd_init(struct net_device *dev) =20 /* Set the last buffer to wrap */ bdp =3D fec_enet_get_prevdesc(bdp, &rxq->bd); - bdp->cbd_sc |=3D cpu_to_fec16(BD_SC_WRAP); + bdp->cbd_sc |=3D cpu_to_fec16(BD_ENET_RX_WRAP); =20 rxq->bd.cur =3D rxq->bd.base; } @@ -1060,7 +1060,7 @@ static void fec_enet_bd_init(struct net_device *dev) =20 /* Set the last buffer to wrap */ bdp =3D fec_enet_get_prevdesc(bdp, &txq->bd); - bdp->cbd_sc |=3D cpu_to_fec16(BD_SC_WRAP); + bdp->cbd_sc |=3D cpu_to_fec16(BD_ENET_TX_WRAP); txq->dirty_tx =3D bdp; } } @@ -3456,7 +3456,7 @@ fec_enet_alloc_rxq_buffers(struct net_device *ndev, u= nsigned int queue) =20 /* Set the last buffer to wrap. */ bdp =3D fec_enet_get_prevdesc(bdp, &rxq->bd); - bdp->cbd_sc |=3D cpu_to_fec16(BD_SC_WRAP); + bdp->cbd_sc |=3D cpu_to_fec16(BD_ENET_RX_WRAP); return 0; =20 err_alloc: @@ -3492,7 +3492,7 @@ fec_enet_alloc_txq_buffers(struct net_device *ndev, u= nsigned int queue) =20 /* Set the last buffer to wrap. */ bdp =3D fec_enet_get_prevdesc(bdp, &txq->bd); - bdp->cbd_sc |=3D cpu_to_fec16(BD_SC_WRAP); + bdp->cbd_sc |=3D cpu_to_fec16(BD_ENET_TX_WRAP); =20 return 0; =20 --=20 2.34.1