From nobody Tue Dec 2 02:34:21 2025 Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11010058.outbound.protection.outlook.com [52.101.69.58]) (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 87BDC2DE6F4; Wed, 19 Nov 2025 02:51:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.69.58 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763520674; cv=fail; b=KlHe9FWJHfPuvw1wnZWOg4n4pAF+BWTF+UAcmjQ1ekDzCPaDo1cNcUSh2BH8xDuI8tLMKS5kxbuUARcPZ0/3P6MrndgTtyyTyE12+/fbIEsqqP42d6HhIjWhCjEJ5owJhohnvbyPrgy/7U1RSmmzUiZviHnyXd9wpfYlLHFNGqI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763520674; c=relaxed/simple; bh=h2NRGz8OE/4vBaC4QDgkBZvFnpJkohggw3ErfIAwrIo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=miRZ0qlJh1xZNam1ArR0jUjB5reEZ93CW0tJe3jlD7SwKpPq48zUtV3Ep1DwJyX2vZ6ifdvT399riW5cszxdCjpqn4jEfYfEzSv2wDqhHTAlwq7zaibW4lFu4AUNEKFS1Gv2ukPjXZ32lbw0d3lAT5COsVP2olnCtJLLC8Nt15E= 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=em0FqOvW; arc=fail smtp.client-ip=52.101.69.58 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="em0FqOvW" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DGY+jpdtviAEfUR/MpQ7pSh9mFhH7KnLfcwOElkqqeetSy4CCoZUd6ixzVHQUlLusfcMveElmXMYYJqzEEVFw8jG3GFMmb5O4Q/vQNZHTZ0Ua8bq7PnetfURUMBEKCF61VV5qnewnejUnWJKTRLuwKswhleHO53jqCMQah9WSSC31pVAcsQ884ilo0mtDekGh3yqL+YOIGd5cLOYpseWWj+0Mu95AIDlDXU9GuhwbC82+x/Brrh2g5Hc9/Qv1J8Ioa9+i+Amiy0olPgjcd1l9bKEtzTuL+viYrhB51t1oT9dEx/IX+RXHpm9i5MGzL8a0kLjZDVJvCnGWoos8v2MZQ== 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=YGCpYWKDlCqMpkFxcOCIMLWXKFA5C3ajtbGREWQDZ+A=; b=qdq9vOFmuuExE0jAv64VYYhwSOqu9CiVyaOr9wMAEPit0IwQ1J6bS1Mg55aqywnvDnYBETSWG+RdkfUB4ACZjOw6TxHMKliMAOLIw8ylrEF7we6wG7+B8vktV/HMJrSHIkhzkUHSJ5aLVoGKtnnp2RSpQkZ6DNiqRYRhYntfjcoWVM9Ux1LGAIydwwD0Nelq7xOBSxhXtw3wJw6z7LNE931j4X2ziMA7XS1r/1YmcqyW0EFVwbNkfnfzR6hnamDOU4OE7qfAmzREaRBCTSrHRI3M9R/N2EkGu+2iccT4lCTqAhvK3wFafbeePNpZdhEyCPoz7GVamCRjcR1B3hryjg== 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=YGCpYWKDlCqMpkFxcOCIMLWXKFA5C3ajtbGREWQDZ+A=; b=em0FqOvWWi0UlP4ji9zVrv7wY0co2gMAqIcMnK7Sfihb4dsTXYExF4USYmSyKEIC8ONiOKW70Pv1k3ebBoFlMs5gt5X3VpovC1sZhSAHayClvSsyDX0jLrGWzwypKHsaIVBCshZHp/I/Z2/WPehhamA8qWHIGfMWVGWQmNAKtV2WB+zosqFaWc/B1Fn5W+Uy+A+CicOt8A45HgWtATBShI1lpva3abHoAo16Vhli33d/hQIBpbgiFMAYG0XQXx3BUNgGlI5Guh6UAtc9M3dBi0udgnne5rl0thl5nQOdv/yd81XVyn8zdeXdKqV6TuV1DUzxlmyPiXKWbzip3EbqJQ== 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 OSKPR04MB11439.eurprd04.prod.outlook.com (2603:10a6:e10:9d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Wed, 19 Nov 2025 02:51:10 +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.9343.009; Wed, 19 Nov 2025 02:51:10 +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, Frank.Li@nxp.com Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 net-next 1/5] net: fec: remove useless conditional preprocessor directives Date: Wed, 19 Nov 2025 10:51:44 +0800 Message-Id: <20251119025148.2817602-2-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251119025148.2817602-1-wei.fang@nxp.com> References: <20251119025148.2817602-1-wei.fang@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2P153CA0031.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::7) 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_|OSKPR04MB11439:EE_ X-MS-Office365-Filtering-Correlation-Id: a54c86c4-dc8a-4111-8f67-08de27167e83 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|19092799006|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?1LNoaDTcjS6NnzWIKkXZL7aMHj0hktHVG8wfjRcngTsAJ3n2EVM4bOfxnnCK?= =?us-ascii?Q?Q2gYm0+QuwXubPnPS1rbqzEYOcQM1O9h2vX6Ly+B161jr7lsmoePOr+71o2k?= =?us-ascii?Q?IMayTnnUZEZA5Hq8A7AJs2+J9yiobdVGIptmJI1ZBhP1PBHKwze7MSx7HdVV?= =?us-ascii?Q?30iLfOLzV1pXCO72Q8NI1CF+EhOP8R4c9yvWCQocuUd/iPPE4wQLWT4edUao?= =?us-ascii?Q?RFuKTm0+9E44c8lN44XaVY6WDbe8kmQzf1zqRYtny+8gO7BLc7if2xXO3N7T?= =?us-ascii?Q?EcK5AT0dPG84pyLBC+aJiCCsGNjS3UhRrn08GMU2LeIYvBiB/Ir281ETGZYo?= =?us-ascii?Q?VqJ/FDxnwv+vlrW0wbd6eKrSoe9o6jianWLm4G9CG/K4G6X9DGNcA+O5pSq3?= =?us-ascii?Q?L2tcp9fJ7E88R1w/i67PRMjxFP13TLClzPj8AOkmJYYdWVsSpx8AmeRH8nn4?= =?us-ascii?Q?4ekhlaPBenspIp3aGphiJTJmxrC1+8hbJp4smisg3IBjYjvjGA7Xa+gfb+9r?= =?us-ascii?Q?SCVjlfG/wMjIawNQxzmW5ptSIpJoGWO/koSXNKQoLzsUhdWnpf0QXSG64+Vk?= =?us-ascii?Q?E40OIkSvmtI2sJcyEbgg31KXlroLVNJ3LSWuaBKmP9NRve/aC7xdus6WTp9f?= =?us-ascii?Q?Ubw68YUg7SQwuVsJEf8+ummhxmRxYbJbrGkXyW1RysKTH3++EDdHyiMMlasT?= =?us-ascii?Q?P2zGhRIYsNfvqx6C03mci+u5Z+IGe70tI09ao/IDXM0rgfP/VKHACM7k6DhH?= =?us-ascii?Q?fPHsAjJZGaN+P+PHlv6hGTO+t7YC4i4b2w7P+q7r7r7A9PjB7CVDJSGfX9v9?= =?us-ascii?Q?JVgwySvNimPZWt3tdMZ5cizPnK/A1Rfj+84UaOd4x7Utu/rEppRSduqpe8RT?= =?us-ascii?Q?z8z5/Y0erbdGlChSCox+3qdEoPTNAetwHa7hNfhzAowDKQ+INP/8lyLDg1lu?= =?us-ascii?Q?EBrICl0/D734rZUeCrCr2eUyNSNT/zdJ02A0ex71Geq2t0D5buDbQR6Jprg7?= =?us-ascii?Q?aaRMhzgce52catthgbt4WQNgRMBBh8UYCUc0GmpIhBH86kv1sR4MqsiaFAYK?= =?us-ascii?Q?+5Z5UPX91YjFjhlSJ52ftjpWvx2FBZC/6mrg8EnL3w18rTPjM81nWq5tiVb9?= =?us-ascii?Q?/QCdZlCU6WvaGmo//LF+bzDgrpiIPwBG1CCZJCSUB1KQpeK8H8wJtokmxnMS?= =?us-ascii?Q?ij27VGIQg9Kg7AZj8cR2CANhOZzP3sktewbltPx+wmw6Y9m5dvNgGZvyY6VX?= =?us-ascii?Q?Ce/mhseDgJQ/OG9x/Y7jSU2luWNy51VHhFgQRh5LH6yKS1HlmNXqmty73e3x?= =?us-ascii?Q?Zjug4DIyRzSqpJ30HrwJp/0Ae7oEBslr26dBLYyfAGF1Pp1xpxA46ibPp7Bu?= =?us-ascii?Q?hJs4tsbalh/myVIbyKNkZKE6dd9Xk4rnYeQ7ke4hhEanlhw7RFRstzKCeOti?= =?us-ascii?Q?qgS7fWMKncEitWsxFIMBzzrBF5mmmVdzEMHY/Yow69f4XWBj9lTkOC1pXK3P?= =?us-ascii?Q?OBkg+CQ8p5IVuBsRhdvraXtxnTs047RJNceY?= 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)(19092799006)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mTaU13qLBVTZSAqv0bD/Bost7ij0s++aUP+RZRJoEoKtXCbctp3h44Sx4iMz?= =?us-ascii?Q?hPJnO4fwXVdZKXKTS7BvdytyoTHsyTouNDSSeesu0sGkzbr4M7b34Ic14LxP?= =?us-ascii?Q?SHjyjqmDlBdZYqRxu59GbPnWZLPwY4rzJn6NDXe3ytvF8v55Jx4aHfcvg6Dh?= =?us-ascii?Q?A8BBf050vGPJd6hYwmKGAD8wEYNs0R+JcJNseVnJaNcQSYGWP5TlaeK2qdBH?= =?us-ascii?Q?AG7Jdtdqu/sUCKU7vR4otCz5+ey2IFDlZL6Oh0ZsenCPKJXCJDiZKZbKeTk4?= =?us-ascii?Q?9Fls8R9BHJrZ4jbHc4Tun1glKPQjW55jIwUUQ+CWCPz8NvhVioU1cgCLHTsD?= =?us-ascii?Q?ejFlsL6TmzQOgxPb84vqpDCupWnnsax36JCjgaBoRtTL/+8UogmRX2dUUQB2?= =?us-ascii?Q?t9N6a+wSOpmauzSbGXH0i0DpwWSEmJ/4Wbs3l7C5BWrxdpVdh63xYxaNtZga?= =?us-ascii?Q?HEPtFf1eU6PM5EoWp9Xdh7WJjQGW1LMk0YYRlEQpGg38dp5XtlrMu0TNgv0H?= =?us-ascii?Q?fjIX8ZVe+CDdLeZ0ge51R24YVBu5VeqlCAdb/mXCSy1XPsj95SpqbY/s1s/+?= =?us-ascii?Q?rkkMNXV6oBFCazyvKNKVreRm8FkzNS1ffxm6/ARZ8J1pS+98Ap3YlGUbAGis?= =?us-ascii?Q?6P2lQUwtXfCbtCpEId5z5FIZ6o4hiHG6XS9k9NGd4y3sWr4Vx9X6pqOlSGus?= =?us-ascii?Q?fs1TCh86LrHl7L0MkcK90ahgTriUKfLqzWbYbF1mWG16EGWmM+UJ3oymwtmB?= =?us-ascii?Q?vaLm+MABdKLD1shWY9hSaV9O3LdWQJwGxiLPcc9Jcay5ulWmIGsFDTv41fw3?= =?us-ascii?Q?Ko+7TgIX55s6rGl89uFUmaoEM1Be+YbTtqoSbcl406XRCcfGlEKxn+xK0SY9?= =?us-ascii?Q?qdZEUxEWQlgnFlMuo+GAOmCO3k0OLvKlUD6J+HQZ0SNJP6MkSeyhhUzM72ii?= =?us-ascii?Q?L3CO0OYZXzfkpztruygTYd45kH8TCMmlvk4FFENLh+jOUPaXDzCbq8pwb9a8?= =?us-ascii?Q?0xEfXJdkKD/QdgUMfyw6BWvd1wFQSKrp8A/vexxWdiuftKy6CCjDBo4l5zWs?= =?us-ascii?Q?LuSsOQvh+tpqXYprBXaYyHBm7crQ5ljkTD6oF8RqzpMxndDELUggJWKyGvMw?= =?us-ascii?Q?jp2ftsSGVdoDtb40pGK3dBQ8ulOhCjFOLdGM9S+4NZL/8ra0EXQxgk/KuiFK?= =?us-ascii?Q?7d46JcJhXfGViIdZXew4ebh5Lzs/kdINZexjFvAZOsNGuL7fmiClVnm98XwU?= =?us-ascii?Q?2V5jZj6Mufc1Cg7XPZUTPakEhObZBjscHhYqVOodtkTM2SVeiISE5YyZk8cF?= =?us-ascii?Q?FEdimm6PmjB2L891lJF9s+qutpXkywuAkk8EDaN3vv4QfYP3o1KN9kEl/Gbo?= =?us-ascii?Q?7J6Jq667RZlMSxe+ZgrGOEdtfXbRrQKwFEtZBJ9kb96XiPMrVZY/nVxOl7S3?= =?us-ascii?Q?ruO5C2wqSB0zgVS0VfNmccv9zWqt3Fave/xpQAehi7XCVQJ5MJWhVO16C2Om?= =?us-ascii?Q?DK0SHkaM/72dTaYM5GWk19wCot415HHJiMDyvyIYWtGJnmWfuDtuNfbhpVp4?= =?us-ascii?Q?AFTeJqC+HZoGOaBMSnq7ZuKr/FfdXQ1KHvlXryzE?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a54c86c4-dc8a-4111-8f67-08de27167e83 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2025 02:51:10.1658 (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: qnXEMC64561JCfUDTvP9dCZcTgphb6GiITisdgbd+18mzl6rOmftDJkhm0PMusAqKNW5XE0a274wx8HFlx0bUg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSKPR04MB11439 Content-Type: text/plain; charset="utf-8" The conditional preprocessor directive was added to fix build errors on the MCF5272 platform, see commit d13919301d9a ("net: fec: Fix build for MCF5272"). The compilation errors were originally caused by some register macros not being defined on that platform. The driver now uses quirks to dynamically handle platform differences, and for MCF5272, its quirks is 0, so it does not support RACC and GBIT Ethernet. So these preprocessor directives are no longer required and can be safely removed without causing build or functional issue. 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 b6fbb84cfb06..c2a307c6e774 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) /* @@ -2517,9 +2515,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); @@ -4402,11 +4398,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 Tue Dec 2 02:34:21 2025 Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11010049.outbound.protection.outlook.com [52.101.69.49]) (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 7E38B2E5B09; Wed, 19 Nov 2025 02:51:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.69.49 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763520678; cv=fail; b=c+mZXkwM0gQ+8RL9/nGQ06R/xpuLomgRlxYWrGG5p3HR30ozf9/lFZUFDEIWs4iO5RlhD3twt8cTp4Pg8GlOH9TwiE8JYZDRb1+Xeb5PEx07D/y1RwcZr0MOrLEVaKvLAb5wBSDFEE2+jONOSE8EaSj7lpIMPe5qLgWr+CmR7Qw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763520678; c=relaxed/simple; bh=ffkfmGj7qT2xswVxlU2BF7F5zxtpqGnybn8ea7iDSEo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=S+MCVRicQHNhvQb2ue20BiZ1evRd4mKpW+SvZ38Du/qyfX3UPVpuHovGfdjN1nKj/8ZM09so82ajWRT21bxSocuOyj/M9Sjp7DkiMU8NYX5NeJlS1+w7jrXmp2PTKq/zJPd9sKfr3rgqfw6uzRtHEP0734eUqOeAr1T8Uljp4VU= 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=M6KNYDJK; arc=fail smtp.client-ip=52.101.69.49 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="M6KNYDJK" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wACqfksKIjAFnE/rxpipyitGFSNPQJmx+sc7rRpojbvsj9SoATFRvvYwN1f2PDv2yIJJadcf1Jh/7Ra1E1/447cA8jreaCogsuLN/Y5O1uR1Moqsg9STiqIoDDt4iL1nCnI4GsVXTcXvdJrBcZp1KFn5pvsptGFd3KX9MFLMW3r1/7MmWA2w9xWq0e9dpeS/uk3y1kGkNDVF8z4tFe1KUITDXs18TVE1edfF/26raVokhCHo8cWoT6KOTQiiCrRUzivkr6NDRfUT/O6U0jZ5ZxhjVOK9vjKcfuay72eVlbfZEG9INsp+mJYo882UxMHDKdeFMf2Cv2Qehv/eSTSrWQ== 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=GU/J4QnK0iIgDDXSLf3eYnChnHzLfeUayZ4ZtQN1PgA=; b=Nlo3/jfwavudpkbZt/yK6jQQHjVJTjf35pk5YMrN/G0wIinlo+rw2uDUMfqpNClpgRmWOg/dYGgEw+hQhg3BzjpvxnnpBfkcNy5mpnJU02Bg5qXZ4FuKCHTBSNg2ZqruwgtdZrWzXcVseK2X/uuBVWXBjDuc4jht/Rzyhu93eMv7lZ/6vwyrNUIRwECYpylEaW/5F5gOXSqEpflm5AFekDVUk2lmYSAE9h8uwnW5cFcEV/LUG1bIXR7FGEx2dsijR6TuubvyHMUkHU4zMRmjS0PS6Euk8TrCqEUYjARF4jnds2fpn4gH4D5jgNDat+chkxmC2lMG+5Jk3JfKMOdBlQ== 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=GU/J4QnK0iIgDDXSLf3eYnChnHzLfeUayZ4ZtQN1PgA=; b=M6KNYDJKIbw5NPXFjB0NiWbVzL6BX3BDNos7EL2zI5KY1G3ddNXZvUDJj8x1h/c4eEk0oRjAdIsjnKTA8FjV6FwSPJTp+/0f3m4dgmQUZkSg5aXIz9T6BD9UybksWeXQvIlr9B/xzb7co5a9tPVCx1J+eCw/6CiyEyGYZBuUeI4lg9syfiD5arPe5rqSeypVfkOhuCIR2lb147V+gRtRwj7cfSlafBbt4FhtR2fWJNPXE6YpDwi79XetoFaustLDcMhgph58MiL+X8lyqcWvLi5t9KZ3A47sXeMW1FmDSaIcY6iiE5QTBEvcfEfoJNJCCGsliRx3Qyfa4qdVQ7P3nA== 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 OSKPR04MB11439.eurprd04.prod.outlook.com (2603:10a6:e10:9d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Wed, 19 Nov 2025 02:51:14 +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.9343.009; Wed, 19 Nov 2025 02:51:14 +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, Frank.Li@nxp.com Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 net-next 2/5] net: fec: simplify the conditional preprocessor directives Date: Wed, 19 Nov 2025 10:51:45 +0800 Message-Id: <20251119025148.2817602-3-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251119025148.2817602-1-wei.fang@nxp.com> References: <20251119025148.2817602-1-wei.fang@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2P153CA0031.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::7) 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_|OSKPR04MB11439:EE_ X-MS-Office365-Filtering-Correlation-Id: f5ce1d3b-089b-4de3-f8ef-08de271680d0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|19092799006|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?/veSzqV/2ZHikw2eiabNV5wuWeUmU6OdCMVv60EOjN9+XQBm/rKFuw52KKHU?= =?us-ascii?Q?amzewCpa6QeSMxF5P3H3pU1gtDwzC23FqhQMIsKQmqqS6KL2irJ8XN6upZTb?= =?us-ascii?Q?AoVJSLoZFi0n0owul35XGVpx94G77mlbI1zHtXRdSbbOGzmJLUZbyVWwOnn3?= =?us-ascii?Q?wMLSRcZdPVfaES6nX5a6L+s5l5erBZPJxCTtjKgVxdINkA1/mDkeBV9FniUF?= =?us-ascii?Q?zX9Um00goskF4Uau1EEg+8PCfhWNQmuTlf4CygaKjg5AGQKlZ4VG0MDmAeY4?= =?us-ascii?Q?+N2vL2SQkS3poxX/8r9cFBmRIrIZshZWQ5p30ZrpMJkY9/Jd2OxIvL/qUk+m?= =?us-ascii?Q?GxAB38L2c87Vub3VJVFGt16bulb69LMMiNKYgpbtneDNRiuMpSt5c+72LpuP?= =?us-ascii?Q?4N6DFW4XEafAjjvZ2MZmJ7FkYmImQtPvEBDGt0N0gRf/vE9lF9JLLRecqHvb?= =?us-ascii?Q?zNIVOod1Sl/ZEQRL+6cTm+PGInQM0rwSl9YesEIKP/hazHhKtdysnk0ivITd?= =?us-ascii?Q?uBCTfzTWbqztq1AsnYHL8/t4srSWXV1VtZT2P1NTWFAdRZ/QIzXlt4O3fmcy?= =?us-ascii?Q?wz6Y1soV1wLL+W/YPIufa1V0GxgkAZTBCSlZOHrklzXOeM8u7yp54ffXJm8B?= =?us-ascii?Q?mAeH6ylKJPzCXZbeffNc6xes1pqsaAgU7lh9gZDu7fzBUtuwuBZDyiHt0+qq?= =?us-ascii?Q?BqSKAvoVn4LCthzq6hRzq/mgWrZ6RZc3qvv/AUMh/j0l3OEmDlEeM/DCX7uh?= =?us-ascii?Q?GcmEDKjyuzXnT2qC3ffdU9wYJC8jgpRFYxv+RLiekIOjfehwfNrhOsG+RKFD?= =?us-ascii?Q?sn4//R9ZM6UePSN8Wh8uGMuV642WUMzGFy/Tz3yS0gKRJwtWRpqpZfAj9wuG?= =?us-ascii?Q?5Eu3HVbxSodIEoFyKNhSL1CQmhZCacs/56pQsW7jW3Tn0ODj5Z3YkQtchJWc?= =?us-ascii?Q?YZyQqZgaUeLKp5G/fD/JbHLwPiEb+2yhNdSd9v6wY12MFuwan9t7ak1doGyS?= =?us-ascii?Q?MPEfUbqT7ue5yJovlqUz+UcNXbje1suu5NX96CXvqUtXyyxMWoq3+mZ0OOff?= =?us-ascii?Q?Ts6RFEtJk9KSdZ71V5OFBw/Jbxmo4mVv+E5XO3XfQKBce5KUQlboFjsAAupg?= =?us-ascii?Q?nOF+TMypgl5FQ28aZCCgoNGuLyu0aWmmPSlv7PzAhS1msLl+OXB9kjAEU7au?= =?us-ascii?Q?/yoVYz45UETsppGeyclzA6B4wNF9eTHXVlF2u8CIPpGe7ttDPNUo3jpdTs1b?= =?us-ascii?Q?hAhD82ptYOLUYWbRu6E0pB+wDmlKA5buKOAoo5aoCwLDo6V9/KIN+e9vecni?= =?us-ascii?Q?1nbJ3wEJtwJH8Ipohc5v0jIa11hE/rnIIRUl9hfPw1ugY8MB9wqd8nI/ML+E?= =?us-ascii?Q?k1hmD4PF9pnhO5FOY9Z+QVXCHKAXzG8JP1kM2N9vWn/molfDzvsR9viVfVzs?= =?us-ascii?Q?5zhXvZnHr6XCTxI4QssO3xR3jpKT110zSugplzo7NllYUWU5I/wqqB9tFJeu?= =?us-ascii?Q?3OMkpeU9qb0KkJbjHXV90CmsDj11ZwCdNmLs?= 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)(19092799006)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?daEO5m0zkTEE7la5jMvy7Rld/y0LkQzDx6NXksf35MSPte9mK+d9ljaLCNsR?= =?us-ascii?Q?jPuboP4liy16e0EQERALqe0TpRAmPpEP5t/w20r+chc4HhvJ2o1htNTebZvg?= =?us-ascii?Q?FsEjd+Frsf6SphNwa0GvowAuAAJGTlR/peM6vXflK3YUaiLQUowgMtLMhzKR?= =?us-ascii?Q?vx869leApqDHu7XNqJU7WYj5+JU3EJJR633DJmoPS68h5m24JK7ie9Osp0AZ?= =?us-ascii?Q?OGA9NuqhgO++iGOy/I9b2MOFbSS1VLuz1zY02dBfIIfeCAFLGpz8xg3F3Vii?= =?us-ascii?Q?6ngBcdOKAv9U6NymgUyQ0iUNaukKjnGWJgYQo7M/2Ktu6elbfQwQhCxkO32c?= =?us-ascii?Q?lhvz7XYarBLeHm/FSGxGA7xmQljaXncmDGNkDYlRx+oCDqbtd8PKlevyw9Ei?= =?us-ascii?Q?APcz6T6MhgxhheiRHshVJi5v2owYvgPnExXS9ZWgyUmUCVr3/JvzlhmBAeo7?= =?us-ascii?Q?g9pNgbVgcI9TKknBOmQyACbSmmGjEh0yTngBRe7QkSothykBZUNj8aRj2xBZ?= =?us-ascii?Q?0OO1EnneM1lpvp4Pv3xSOSWtJg6nQdK3jMeKECuhuaAlaO80VN9y2dxuqbPd?= =?us-ascii?Q?SREpJGLJvEO+zE/6duj1OqAtXxbpr8U8FtrM7h2/ZLWWccoFOF+J97JcL+dG?= =?us-ascii?Q?Q53ABQj5LP+EUaiGS7euXOcsGQyLfzMxczvVeeiahjS4+nrLnGRxGAzx1VqP?= =?us-ascii?Q?PUFxtmgGsRP2UxHCOeASK/vQ97XZO3Zru0SEwLn2PUNmbgSiPTb4fYZtQSwd?= =?us-ascii?Q?tpSwlwbD0TXnZqyzYcm5XXuZilpeSl+DVy9kUeoc3LRXuzbRZPZJw9vVAPcQ?= =?us-ascii?Q?moSvjdOFkJnYh1erFVn73Rlv2j+dGj4XPSARKJldp3OXu4i6uLnST/bpYyzU?= =?us-ascii?Q?kZNUxASTVYKqgS2M/ILZ/osTeh66QZh1sytKrl+TyQ4zzjE5neabXlxbV4Vb?= =?us-ascii?Q?TLij/GE+tD1PqSSaIjNMID2hdsS063chXEIoSs5ZEEjQtMFITc4i4iuQzNGD?= =?us-ascii?Q?hCNoErFiVsRlg53zkyd1VMM21PQ/7QhRz1o9r7P4MPh0jcivjDP3zxp3ueYy?= =?us-ascii?Q?JwuTV24C9tV6L+0IVuJpiEBdTK0O4V5m2twxT6/AgmVc3UazO5GjxKDQE5R6?= =?us-ascii?Q?gSck/MBAjTOO114AKlr/rKu6TJjnBLRtFYahjuvZhzWQ/heT+Z+ylGtX07vB?= =?us-ascii?Q?lw7uBMDw90nEkzMhBcRqDbzZB7k9NEJzIbotfebJdft7x7zBvCTJeyvcQHBg?= =?us-ascii?Q?6w7/giuwU7hF6GvqwSKE9qdQlXZ3r+G9uGu+JkTbasMIM5Dr0/GDfsuue5nQ?= =?us-ascii?Q?rNEn2UCPMZb4ltNM+SPZjj6F1bsLr7d63JgV0wUyqhj3bpYWo8jsz7NykGm7?= =?us-ascii?Q?KwvnXaJGYivhMDfkmBacxSFND3/HsgWPdqoz23JNZEeOlMozLTPgnou1FKEf?= =?us-ascii?Q?2d8yVwqoOTQZBJBFD4YIMlysjZHcLA89PgMl/3eDEAyPluL704wODuRTc4ka?= =?us-ascii?Q?uVX4vdIyzOILQ6Op2MTAZWQhJk2P0kepsRoe97YWlbC5CuViVY6rxHNf9iwD?= =?us-ascii?Q?db3Iz9tpwo2G0X4rT/qi4pQeqL5dGeq+DC2uainJ?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f5ce1d3b-089b-4de3-f8ef-08de271680d0 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2025 02:51:13.9569 (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: ebUM4SQT18O0P8vP3qLJyG9nf0I/9xHOpJnwabUpDmTj0FQImHFaKPPRXLCQYo33ibJpDG4/KQqGgHaCr8Gy6A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSKPR04MB11439 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 | 28 +++++++---------------- 2 files changed, 9 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 c2a307c6e774..4193559c6b9c 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 @@ -2706,9 +2704,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, @@ -2782,30 +2778,22 @@ 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) return; --=20 2.34.1 From nobody Tue Dec 2 02:34:21 2025 Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11010049.outbound.protection.outlook.com [52.101.69.49]) (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 270232E62D0; Wed, 19 Nov 2025 02:51:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.69.49 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763520681; cv=fail; b=Mn2szB06RmnO3wduyD+/Un+n9DbU+B1cnE/8VTl++/veiQFHxdQ0QcKkHFExidlaB6Rc0yXS/7fgXzRT599TopwjuZvKXfjR+mbMsf3p+8g83eYjJQfA6KGIlez85uK3qphJ2ZAgTOG9YJOI7aFfgdnnv3vUN/E/4J29tHyMxBE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763520681; c=relaxed/simple; bh=uGvjL08Ane/Np0ICOzDD+9niig84XWlRbR5mZj4RRf8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=T4g/TPN20gPUx9PtZViWfGTjGq0+zIBqP3qAhfM5/5pl8BoHd7DnEdjDklX4N5lhnrq3fk5XlIsDHP6o6VDOCVHX0QAcysDdQSrKbzDXhO11LvNG2MKSsFw7NzF4WLPI1VxDcz+gr2c7jESiUNWPg0Bv5Zn/HhdY+uiJWwzxA00= 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=C2cSHOi0; arc=fail smtp.client-ip=52.101.69.49 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="C2cSHOi0" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eBk49ZyrtzrAeLYiKr2wS58HzpiOSpkrnEiTuRC807m7JL4600jcjn2vvpeYJBRhJQ9Zd2JFM3rlyxa5B50qKiIyLziSdBlvPb2kunidi1nqNfn7TzN+YdM7UW4zhNT5gc1gbDV7ZYDDKK5LVgJyUoaBSMyAzR9KyKdYrWO/X4o1OJwwcaO335UZcYxGcjuFVd7dcRGA5lrWN5PzXOI0lVAhtQICLbVngdOIHE1/GMwON7hSf7oJykFghcC0NHdJeZM3ZuRKmtMLHnDKA4WnpORXbHKnL5HgF2vk3edyPKZlgF9coDqYSHqxb1g+y0ktvYea3oCeZtS6mj/oTSeEbA== 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=L7bBaNV6RlRbfGbdt7edhtGcfEE3i7EggOkjKZky4cA=; b=NE3PfCBLZVJYk+j4lEPhLbaJbDQ+VquSUR7QkLZhz6P9TIdnekwvbeDHbEalAMV3zCqaBDqUmviJX5s//INYh41N4iFUKB2YwAjSc23dAAqCXXdGQH0/8T3YdVByQEZ0XrE/yypiD5dHLskNU658AtumDqel2VaW8uPQfScBj6tS7GU/oTl5f30sZCzdnLPwxuS4ZRTVAjPWdN/dxNEVhiZ7BzPiIG9oa8YM9Q2DIBIEf3iprmQesgNRNuKfI3ihQCHsRnpUWd37iy6FBBjmSiyt4vLRv9tCJHdKtz+mIguz7w231g3IkD3zCpUqO5C3oNHiP1ambbRSOewiZBv0iA== 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=L7bBaNV6RlRbfGbdt7edhtGcfEE3i7EggOkjKZky4cA=; b=C2cSHOi0lYFQZWwi2uUj8Nb9YuzpfZ1sdprT/F9wk0d56awCVwk7wQLMCRpaelMlAfyuubQQNLvp2JN/MfsbzhtJQ001kR4h1AaBqzWou2K6IKSx7IfmLWUfCRG8TyJf3fgxreKZ441NfTDJhVhNqUEJ240TRiyJxscUpK5vC82b/orrJU7K598CdG53zVwlX2YKSMq4H8eBb4mJ8ZOXd8LmbHYIfezkk+/XkJQmCUAB3nZogjMGjuCj/BTjjCzhkyDTEzo1u1gST/7CmT96RJITmzRc91D3eqs4t/jPV/u8yJEr13QAKmPtPJA4eHaQbowuY8lh6cfMrBbLi6mnQg== 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 OSKPR04MB11439.eurprd04.prod.outlook.com (2603:10a6:e10:9d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Wed, 19 Nov 2025 02:51:17 +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.9343.009; Wed, 19 Nov 2025 02:51:17 +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, Frank.Li@nxp.com Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 net-next 3/5] net: fec: remove struct fec_enet_priv_txrx_info Date: Wed, 19 Nov 2025 10:51:46 +0800 Message-Id: <20251119025148.2817602-4-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251119025148.2817602-1-wei.fang@nxp.com> References: <20251119025148.2817602-1-wei.fang@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2P153CA0031.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::7) 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_|OSKPR04MB11439:EE_ X-MS-Office365-Filtering-Correlation-Id: abebc83c-87ee-41b0-5aff-08de27168314 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|19092799006|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Mg2L7Ghes8lyCFvf42XSaQZC3W9375s212dFTsBzxCWBonT5nWHSeo2iaumn?= =?us-ascii?Q?6GJQlEQ1hReDRnNdiueCTvJBg8sA5dL0jr0iOyQuh1cCD5NfhKdR98qLQvya?= =?us-ascii?Q?oVVy9nn/kBA95I3bRCwHGVztE1DT0si39uKOt7KAis6EM6URdpQ4QxmAti5v?= =?us-ascii?Q?rdeBPDy2sNhAAJeIfPQvQBxEuAuro3sHKeQDIKodfErgZ0A3Hha9MreqQGua?= =?us-ascii?Q?xjoKyiIMquODg0SwwkXEz7a1GqCP3h55wyPxG+RCGtypAD096WKQEOQaKX+W?= =?us-ascii?Q?N+MBGMuqcLqHg+ZkQOm41TAYddrQBHCz5lf4cdF4pBktkVti33n+ty61wmP0?= =?us-ascii?Q?nl2ICRVIPdgZHwbZCAEuR0l1bFx0lABrijLADkxO5DXpXSMZqRwEHL+aC8/j?= =?us-ascii?Q?hdlmecFDnTqHwYcEVGMKzM6TCppWjjXrFPK/HUVR6NwqfFNhzPUfGv67haRz?= =?us-ascii?Q?c9w9VcJJOQBipDnse5upyKKENPApZeXKfxjoPIOsxmfX/5zKR20c8h3X/iJF?= =?us-ascii?Q?a6pK06l62mR9KAAYvYeGn96RqQx+LidDP99oO0GyHD/EX8GJ0WmiiWvgUOWK?= =?us-ascii?Q?iExKXNjUHKhF2r7n/5kqpfOgrm5jb9aZeYd6vmVUisS1Sx6ZNStpho7HnT1B?= =?us-ascii?Q?Ly3WVS+7wqL6wYGrHLLKuCTKg3KEnY7vuPnnjQ5vpJpDWdr1mJoI7DnROIIn?= =?us-ascii?Q?Wv7w4AHzv7BVhVqs5RjH6YCiNxaOAuVgvn4gxbB7PN/+whlX4n2bWxW+3SC/?= =?us-ascii?Q?nyzjXvl7A3kw7zFiX5vE1T/5Hd6YMBI2HbBJZ+P1beEGyROqQz+YROce0lvj?= =?us-ascii?Q?iFFkFVSWODm1K4Mz8/RjWNWrQX/dDcpH7bNtXSXkFqew0NO5qCEG+Ef4aN4M?= =?us-ascii?Q?Mmotd8m23aJ2rcKlkNiVxmSR2BZE9m1hA4xj/rcWEm371O4h6Ju7aRwI2IlK?= =?us-ascii?Q?AVXu/cDMPhkBdF5tOYNMgOXE8OuM/WgTVYjXF0UoOEsHSpR5M4XLzuTNgMmc?= =?us-ascii?Q?B+nZ5l9VVl2SgVskVdyRQCA9Qw+vx7Ld15ZVeKAumEJ4AK4qRgs8QhC0Ppsv?= =?us-ascii?Q?+KGOIGxFsx0dIsJnHicmaC9vJKlVCEXOikw/gbo8BR+EOYN8mIkvu8Mncu0D?= =?us-ascii?Q?3dDAqE8iJvf9pCdR5lhq1Fqffna5f3ZS3+jsdFOCokcp4XLKcecbnoS/+Hti?= =?us-ascii?Q?CA4y1vxa2lHY/vgk/qsjhH4p7bcLDuKgjc+gGwksxy0hoAUFvcQOtQW6qi40?= =?us-ascii?Q?8+9F6L0Y+c7+WsPKC5XMyiOcv8lAkIhm8r7ZJRNRiqXzjFuV8wq62UgEKxyV?= =?us-ascii?Q?fTV8dcfCjofnCXmFGZzMDFqSmUm1vpNqArerE/S+B+iW7fmGPwSOZkjYm4Mm?= =?us-ascii?Q?D0oXLZiI7pa3Qh5ZEMjXrY0bzsr1PyYFMwEvBw9AABH3H1DWEFUxbrFgtq0B?= =?us-ascii?Q?n8iIxpTBB+Mtx262GRdOM04yPQN03UiVsA6X2KrGIqUqq6uryXCOGI2xJgGs?= =?us-ascii?Q?wQUcJ9q6ugMnQkhWl4yBa6kxaQPDwHnzMYGA?= 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)(19092799006)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?J0S+xNXN0jAtFVL8HXlTfek48HlNp//s5Xydu+3MJcpdbEe1zf4bmU1u9agU?= =?us-ascii?Q?ddUllghGanbiRr1EmLhRLdkV+QbQwu7vClOk3vVBwlorIcxCjpbw30oZ2IcG?= =?us-ascii?Q?0vTVB7CJsBtS/fC63DfltUTd3yOt6VTTwhtmCBAfmx0PvI3fJL10lkLd+8Jr?= =?us-ascii?Q?gMFIL4+0i7z4VO0x8tMeWDH5XIJewSfod9Q5I617Z35yM7Y/3zbxLfJ+il0F?= =?us-ascii?Q?eMb0W6fSBOSk8n/OlSNo+E93CqleqQckYW+R7vbQbrI/f/XbEonbigJShcyQ?= =?us-ascii?Q?1IckoQc0QvrEdj0u3han+gjsBtdbZkxO6txBOAw8wvUvfKSCUOulOIK299KX?= =?us-ascii?Q?GwIQX4LXGPfULFLR7YVnR/wjxnSU/QVvUcKoxDBevtJ/HWPCdjNsGhgjcFhv?= =?us-ascii?Q?qjCnLu/Q9lqJQssl5HwyChirGiq8daNJJ681Wl5ICLglG6hQzykmJpDQINFp?= =?us-ascii?Q?mbVQhY4phCKIB0rXUabKUmpUQgCvnqw9hhM2rBjfGa6RehE8zLDE0CG9erUo?= =?us-ascii?Q?aDCPbUpIdBIW/XLy18y4yjndDHf19yeGQHoxyX1S6b2n4DcBddSCsOIuS/Nc?= =?us-ascii?Q?++W2OTPj0NcHJYNcvNVhOVp4d3Jt0nV7fzRsmmxViLE/zu74tUf4LAPucUo7?= =?us-ascii?Q?aXrzIRD65ExfPZu3J68CK6fH038aWJlSd3Lo/aRmWft77o5rbdWkQVgtPVaN?= =?us-ascii?Q?u0QZEN84mJ6lpPhgRZGwbtiIp6Z1YGYsjd+LI1tgheiY3hJ39Y/ysGz3we0S?= =?us-ascii?Q?jG5yfZg3ClcvSWEVbocWEv64P1kZXdTrAapi5IUa1TUQfh3eqw81YAPtX8wP?= =?us-ascii?Q?QIm8jW8tnWYebVUrWo8oQ8P+2lKSsbSt8mk8BMv3MRNRyRvwHa9mO0vYEAmA?= =?us-ascii?Q?IP5j+Z/KpyGH6HzheC6uZJr2gCANUoWooU3pTruoaA+Jj5P80RC9Q0xaBT4W?= =?us-ascii?Q?V+rbE2/sBWYuBMT6/Gor1urn+6WoAk4yTCKM3MX4fqVQDBRvzgD2RE9JJjq3?= =?us-ascii?Q?Ls4E+ui+M8Fk34efsMDExTyMHclb19fQ26cngUUw2xR6KIVw3ta9clP/QsHh?= =?us-ascii?Q?y6lOSYMMlUmCv0IqrHPX5bZsar7fSXAeAqE5iwqGq/ZLtu0lnIoKklq5EWZP?= =?us-ascii?Q?UNRGvqb+dnRL3MRy/2hRqVEQ/yHgKi2nhThMeJiuE8S5ia756NE4hvrJmBHe?= =?us-ascii?Q?W7vPQZXKFxxopoyWnfE8cEZflQBcBcgTkB3rAOlHisQuve8jtHJXZXSZML4C?= =?us-ascii?Q?PWdubgmyoG0ECFlHb31SIlGD7l3lVeqbOB+WlIxgQpG4yCKlrpJo7Ym3mCyx?= =?us-ascii?Q?Ku38npzDIrA3QxC5HI60m1QaX5uQ0MYVJaeahEjBhjY+1IOzHkiHgJmTEe3Q?= =?us-ascii?Q?hRwmF0a0WunAVVSL+Pa2XXN/+StBbg9Z6Kr4nwEz0Volt1wNcen3xxuGaLIN?= =?us-ascii?Q?NkpYbkWfxjIwA20UQtGfEwWFQEbpxSY2zaEAi4d0iAH7BGKcRSkoc8XvU85x?= =?us-ascii?Q?X8aP2Rkv9LlvyA5RtBFR2rBkRbg+R82Fd3yDN0BPY5rznskm1LGvhFAE4Cmz?= =?us-ascii?Q?MuPmX3wVUvhM4eyhaVjirodblwsYyxpWIIoQBOrg?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: abebc83c-87ee-41b0-5aff-08de27168314 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2025 02:51:17.6713 (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: jOScUwsU7Fp8i2dmjQUwwmM2D76pIMTqlqMeAnIBAjEVBpQNWHmRVxBgiY+kn2bkRj7wrlQrRFJH5PljhYfwKg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSKPR04MB11439 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, the skb is never initialized and used in the driver. The both will not be used in the future. Therefore, replace struct fec_enet_priv_txrx_info directly with struct page. Signed-off-by: Wei Fang Reviewed-by: Frank Li --- 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 4193559c6b9c..6c19be0618ae 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 @@ -1836,7 +1835,7 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_= id, int budget) ndev->stats.rx_bytes -=3D 2; =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++; @@ -3312,7 +3311,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; @@ -3446,8 +3446,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 Tue Dec 2 02:34:21 2025 Received: from OSPPR02CU001.outbound.protection.outlook.com (mail-norwayeastazon11013057.outbound.protection.outlook.com [40.107.159.57]) (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 4B1712E8B76; Wed, 19 Nov 2025 02:51:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.159.57 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763520686; cv=fail; b=N/ck0Uiyrq1ArrRFu9LhT5jgnoSet6xmCN2IKQQUXvJxJ9Ss18pcm1vTLX8qScMptccqjEw0zDge6X2cuSkz6STQ1TFc2c+CnZaC22ksjYi9YGgP0KX1Nj9dW/AwdNVkZ5oH/Gi4TJRO+B9BaiX01D7sFLLsJh30vV5d9Seg5Ks= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763520686; c=relaxed/simple; bh=qtbsfzhyaet+jrQK1QaFxqn4uexkRX/Tdb42byQ4+ys=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=Fu/2YfQ/0wdnUHdyin0cH6CGAVKVnARsGDkjqWVmiewnk8Ur5UkBXC+YzO/mhv6p0oCjlr+onlJ6XzF5/IuLYpDBUYRYPxuo+7wUnefZzOZk7J4MeDJmhXS6ctc0OfzrmMydkDosDoPSJ1jYbCf3jGLHkSy44XTuzbNl7YPnKUY= 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=OI/lCJ57; arc=fail smtp.client-ip=40.107.159.57 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="OI/lCJ57" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=U9/WwvtB3gZd8rsUmC7E8bb6lLWlM9g/8zIe/zwiNJL50P/ZKkH8lKNqr28PSWxnKH/tKQsWvU/emJ5klyhqTVptdUsnx2/EnH/vjp1PS1b7lpuAheJZIMordmYUmx5DhapvjcSQqyQ1Jgszzs6DwZTGDKKV9bCuhRvJRK1bawJMPTMcmg/PMjhkrJ/oKAcwsLQa3w9ayQxLsaqrJbrO0HjEiTcsWJFVMGlgvROxEvoxibEk9yUP62INn09wnUtTwCyF98S6cA8TqhACSAT0kkEocfcW8apmhP1ULMpxHpxBFfhEV92yc9Ix0c1e8aoICHEdzHnq/t5Fjcir5AwyKg== 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=ssM5g/aQJOd4Fp8lpsveJm+LhJ2oO+GwfGci/Nz+QDE=; b=DtL9YSyV0URBzUM6/7fHRq6EYTv5fPI/HCHIsaWWsxIEk+TD/lpbaGnlZEYCNJSi66GU36XP3Yb8fvmSY3hZAwSgt72vNhCgwjeVOs2Y5npRabm/AHJXt+j1sfx5rep6QLi3fpgs85chM5xaK3Z7s+jGegIL1Pzgrh8uiRwW4qOnRlSpp3lvqO9ceEeR37vtc9EdGuYPrWquTnauJSOIuzT+4sg3e3BYghQljrPkTi+alJWxjIWg5N2bpp3UVmhx40scxlnZAae2s+HYKfF91Y9MsSz+a6KOMPT8XU89CNQV/Aivt6Ogpd3GzvC13DErjyPXkzQRau6O5ClvfVHq7A== 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=ssM5g/aQJOd4Fp8lpsveJm+LhJ2oO+GwfGci/Nz+QDE=; b=OI/lCJ576lHGAEw6dL+6I9DRsh3md/PSn+DzXG/8Gj7V0gm9IQtJcFOj+FIW/13dfmVhUQ4ytl48UekI49jM5ew2taShZL3OKVGBZ77vAPAe4wliGn1/5J1y/wfkxxnGH37iWfbK7LciFj95mn9g0XTZfOj6RZu/GhApAV+xsmRz0PYgDPFJylvZqxO49BTtDE/RLWhzqNAfmpw1zA0jxY1yqeqGQjoRcFlxGRyV/TJbOlTMpYd9Sr0EdpSAhSjlNO3Oy6C3zfZWUWs02Eni/wILNM2+WwsdgF1SAVUvqy6+EBxeA+Il6s98s7mV3UYZ1+omEgddl7QzeUPWV9lEpQ== 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 OSKPR04MB11439.eurprd04.prod.outlook.com (2603:10a6:e10:9d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Wed, 19 Nov 2025 02:51:21 +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.9343.009; Wed, 19 Nov 2025 02:51:21 +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, Frank.Li@nxp.com Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 net-next 4/5] net: fec: remove rx_align from fec_enet_private Date: Wed, 19 Nov 2025 10:51:47 +0800 Message-Id: <20251119025148.2817602-5-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251119025148.2817602-1-wei.fang@nxp.com> References: <20251119025148.2817602-1-wei.fang@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2P153CA0031.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::7) 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_|OSKPR04MB11439:EE_ X-MS-Office365-Filtering-Correlation-Id: 623b3728-c29a-44b4-883f-08de27168557 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|19092799006|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?BvH1lIYxPRWwoZDoIHuj1XttFnvjkirsO6/kh5mR/DIRWlf2GPLj2dEC+b67?= =?us-ascii?Q?Q4NkxX1eKcCZPUijiwEe3MT6sckY7dncJmRqRXx4fl+YhaT4Csmr8AEuRixs?= =?us-ascii?Q?WgbaDcqL+QoVGA0m1stgEm2eEcE2gszltzqmqGtMDxvKdb7LfstvnbXIo8ez?= =?us-ascii?Q?Xg1Emzev/RczxIbNm0mzsQGcTsJ1SbCgMyBTumZvsp8pmr5YhWkIiqMVqDn9?= =?us-ascii?Q?2T6jGjCCs0DtapXcGY9tdi1uAFbKucIJJIrvWQO/Gu3Kpw9COHbJ9qCrbc2N?= =?us-ascii?Q?dPWGf8JG8DJ6pha6s0q+c/qTwJK9tGunkDiD6WQDSM0UACwzzQRfZR4MZPxr?= =?us-ascii?Q?A/GiSxm/vgd9y4M/y92XkA00q+tM1yQdB+IlAHPpMXXK/lib0JpIRUS4Ufa1?= =?us-ascii?Q?5VR6MselitBcPp54pj4gJsqfUX2ugApjMc9CTiAFul98TK/Lo995L49S5CY3?= =?us-ascii?Q?+tQ6A1EnonOUoga/vjMGGfDOcEAXhWIwY5GK6Me+XJP9Eo3BNlMZszfp6uBs?= =?us-ascii?Q?rifdqPcrIe1EJ4l2vYm8+23+pYx7ntBSMPXNGwB1AO6epg1fBAHEfUlWsXa6?= =?us-ascii?Q?nphdVOX0bwhpWuULNxSTDzFlIGHRgB+mrQvF9XSO4cDc0Ciy1ub6p1qHNPr4?= =?us-ascii?Q?BOqzCzn7fmcPalgVFTSJlE8mvEgO5U2bV4+w5coKpoA1SJTFbijMYa1oxjrS?= =?us-ascii?Q?OqWqlvqyz5RRyzyr8Tu6d80FohJY/e9+3BVsSSf0bqBmqUtnfZDpKAG7y7ns?= =?us-ascii?Q?0GacLOb0Ao7avXovJDDnrLhrkvGYpYZQjLXvT5fE6Y3kVxBTdf04Y6QIfquJ?= =?us-ascii?Q?DWNXmJDEDOT18KFtdKIvFFypHV541WqY1NZPIbOyBT6GcLZXc0poaauCz9f4?= =?us-ascii?Q?im6CIyoWDzB5VAP2K1sLgGQsZmKZ2mYArHEZ/Ss/G9rWaQMQdi0TeRnUb5/6?= =?us-ascii?Q?ZfxfZS/1PKkXGczveuNKCB+O2JVbjMUXURssIK+xHZ8EOR+8113DUE/5N6vx?= =?us-ascii?Q?6xSG4BW42IOgyMyeJaIkOuuFQewPYrRuzAUxDm/2S6sSStLL1sVlUt42V3Tv?= =?us-ascii?Q?lbpl8d3VE41YFEY7EXTfpRLHZCuRBVAyBZLWtr0Q3uC6AqpxlywF71VSO/eu?= =?us-ascii?Q?UkFMWO1SmbE96of5UClTY6yu2eUoWcZw2L5KncP8ryvxtZJW63QaXgtXKn8f?= =?us-ascii?Q?1+eGY9Hbo+5Duk2+IWlDCoMW1MZlnBs6nKfWGw4xTO/e1fGYC3sEUrqj6KEu?= =?us-ascii?Q?e7cjhIC7pMvgPjpRcc9PA6kq9x/bB9IZWuc8UfzwVL5dcVey90qRgaGlosBH?= =?us-ascii?Q?h0qluXKfzWw8bOo8h5GW3vzSwJm5hZVI1h9efILSKq8fQ+gJ9CSep6xJ/P7v?= =?us-ascii?Q?k4G+Rok9zkkHiDyHZlTMKVo3PcV4KCxLbY1x4TofrIcDThfYMLUbuK88Zcbt?= =?us-ascii?Q?SxCtYTGqlOm1nkdWKP12kLfcKg2sEY9qnwSEbG/La2GubMgOswqfKOoLJqzy?= =?us-ascii?Q?R2+kbCvWsE3efSaTQUTxaC+FS4deFkrqZecC?= 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)(19092799006)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?IYYtmpa22t33+NrFwsF4AITIaAPNBsI2M25OP/8/LAgx4edb4/7Y61lqlKKR?= =?us-ascii?Q?l1psVnEHQIvIcEe27rUAVUFfApwcuDKwnR0RuPKp0Pr1mQKoa4poD/c12orN?= =?us-ascii?Q?5o/37agnVTFx2/X5vySm+Xi/S1R+k8+elywYPxW8/DeS2IZUmOay9FdECkyj?= =?us-ascii?Q?fTenoO2uMBqHJNMwUpCcR5uxtxs6UhlL4xkMuI/ok1W1HXptB2lUE0/57A20?= =?us-ascii?Q?hZVRf0ZwUq+BIhS/bTuaEmTH9csxZoRvj0+LUBd9aTTt4+ArARhDe+EVkI8d?= =?us-ascii?Q?OywujB9qqpCYM5qHeDeG5Dhvd4Ir9N+7jdX53O6mY8KJQJkuavCt/g7RH3zb?= =?us-ascii?Q?+ZvswDKl6kAXmxyh8oriDb0OU7z0FccfqxzM8E1j736WnY8K/1F3p7xWXvb9?= =?us-ascii?Q?ohwRSGy4FjcyRJRyG54tv3UGPefEFfO3U2QMN63S3Ipt47a179/JJPxMIE8Z?= =?us-ascii?Q?VNYl77u3yMLY8EBaxlyILTFgLBpmwUVWF/x8fFP4/UZvbW0vzuL87cpBQXnG?= =?us-ascii?Q?jJAyzMpyvVhi1Y02ILXJWP1iVo2a1aAmJOtrP3lbHH52PBBf4n/MqjGmVvrd?= =?us-ascii?Q?8gj5oaQ+OoNYYF2T5b5QyPNI+FmAAgqGxDAy3Jw4AL8vO1zrbhlWZq+EkZ3g?= =?us-ascii?Q?TN/O2OaH3KJ+S991wLuN70nk0VQjkzJKEFvrs8Qa21TpBiLv2knlmrsxw6bo?= =?us-ascii?Q?8LAShQIYffvia5wbPo+j+uPAIdbMEdGWQ2dMlWkIgkq64NJWs9qcGWIuvGv7?= =?us-ascii?Q?IksrLN5KGzL1MQqhLy4F+WJOnZuxzvyDcZ7Jolnpi6zKoYX02mXvIKsvAVfp?= =?us-ascii?Q?eyTIaIn4DygHTnUcosv9/M4rpkTxQ0IcHXMlz9JawsFgas8+tkGtv1vEt5FM?= =?us-ascii?Q?Ht7c6LtRcJaIBRVfWIBFzYy8vL3aUfqe6jo8p13ZrWownLEafwTNavyqPhGQ?= =?us-ascii?Q?h2H4aB6wVS1lSsyt+4oMphx2j1QkutM39nX/xrR/fsB24Ug/KCdobnNv21Jh?= =?us-ascii?Q?ynTLkKITmFzex8sN9EfwBc3VMDnW6+oj+vXuy8RTOUkMBsvF4/gZe04klat8?= =?us-ascii?Q?MLz13NKQPrVdo7OmCae5sMnQj/ounTBJDPHCrj4tyx6tLzNEdrg7CkKqHg6z?= =?us-ascii?Q?Bl4WWRSh7iYc26dlEA3YkKU6iGSGYC6EsXVU5zFn0xtM+V9R08yuZGKkRbuE?= =?us-ascii?Q?8euDhcAa3Hkw4X9iMoeyCiRBU71PIheEjOJ4UX+VExd01Yz8raxg1gIn4eA+?= =?us-ascii?Q?NENmG2ht47SrxWL2AdEm64WGd/ZxCW6BWEe9ZmnUNkvyahyh9SafLi/TWoul?= =?us-ascii?Q?7eNNLy6d06TsRNVIKTqpcCUlsXSIzfZoLuNss62YC6Lj0n3cLI01Csa5lb/Z?= =?us-ascii?Q?BEemN5yppn/5f3ZzPmcBSWKFeirA9NBXWsGBTH8B2QTR7s7SlbIVTrVku/Hw?= =?us-ascii?Q?VSuxHKVuJlklGuOgfOa2mz8fhjxLo7fOUShDq/5Zy3iGHa7IeLMBj21eCZk2?= =?us-ascii?Q?f3ydPovz4vGQqdMFuWD7ZyHXnLFeA5lz1XE9xv+ll8Bg+vfqxvimICrMU/cY?= =?us-ascii?Q?VFIgSj06Uyp+5Ul7sXDAax1uRSNS7MEVVXv4cV5x?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 623b3728-c29a-44b4-883f-08de27168557 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2025 02:51:21.5976 (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: 3ejy2Tw0Wsw27aKUd9FuTOcfDoh6B9xtRAjFnSt4gTVCL5HY/Wc1exHkd7Xee3AoQ95lEyGZmAFTL41faQNXDg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSKPR04MB11439 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 FEC_ENET_XDP_HEADROOM which is 256 bytes, so the RX buffer is always 64-byte aligned. Therefore, rx_align has no effect since that commit, and we can safely remove it. In addition, to prevent future modifications to FEC_ENET_XDP_HEADROOM, a BUILD_BUG_ON() test has been added to the driver, which ensures that FEC_ENET_XDP_HEADROOM provides the required alignment. Signed-off-by: Wei Fang --- drivers/net/ethernet/freescale/fec.h | 1 - drivers/net/ethernet/freescale/fec_main.c | 19 ++++++++++++++----- 2 files changed, 14 insertions(+), 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 6c19be0618ae..c82be43b19ab 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -3438,6 +3438,19 @@ fec_enet_alloc_rxq_buffers(struct net_device *ndev, = unsigned int queue) return err; } =20 + /* Some platforms require the RX buffer must be 64 bytes alignment. + * Some platforms require 16 bytes alignment. And some platforms + * require 4 bytes alignment. But since the page pool have been + * introduced into the driver, the address of RX buffer is always + * the page address plus FEC_ENET_XDP_HEADROOM, and + * FEC_ENET_XDP_HEADROOM is 256 bytes. Therefore, this address can + * satisfy all platforms. To prevent future modifications to + * FEC_ENET_XDP_HEADROOM from ignoring this hardware limitation, a + * BUILD_BUG_ON() test has been added, which ensures that + * FEC_ENET_XDP_HEADROOM provides the required alignment. + */ + BUILD_BUG_ON(FEC_ENET_XDP_HEADROOM & 0x3f); + for (i =3D 0; i < rxq->bd.ring_size; i++) { page =3D page_pool_dev_alloc_pages(rxq->page_pool); if (!page) @@ -4072,10 +4085,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; @@ -4164,10 +4175,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 Tue Dec 2 02:34:21 2025 Received: from AM0PR02CU008.outbound.protection.outlook.com (mail-westeuropeazon11013056.outbound.protection.outlook.com [52.101.72.56]) (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 B65CD2E92B3; Wed, 19 Nov 2025 02:51:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.72.56 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763520691; cv=fail; b=AYvm2xhmHDXvCupcQF4wh6fD5JHsHo6rTGw6xGFdcraxngxWoxzAdd+pbTzeIRkGLNAlWlBrazDdno9qqgvEOPpdp6QFKsRFwplYCjEhYaQ+Td1tgxz/sz96i/ZKo0c69FxjUX4HYpP1qesJflmsp0GalG9L5SV8r+6ltFqoStk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763520691; c=relaxed/simple; bh=2TaOIx0isLSzPsr3AgKeS1qkiKMLXV4YK3yxquxbdfw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=TsYSP3pT8QtvRZHCsgTntd4zsrcqT8hVH8Gx545QiHSSnq/2KA+JOFUAGI0KlojdqTMcaus5DmdeKjy1mB3jEtMGNCAdDtQyrcVj1JHGM7LiSSQTpacKc5jitdA+G6UgDZk7jxGFtaNTek2GIk4+yEERvhndgXntmsok2fNEMU8= 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=HkGy027+; arc=fail smtp.client-ip=52.101.72.56 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="HkGy027+" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QTqA5KJjtJh2/+e1frcrPEnfPBNX4cyZbGKKUYlFdBZ1HKxddcimfgPylmEmnp5EOgf/FWrsMZNzZCuQIZFqo7Q8p/9uPTTV/D+rnLmx9byfeJW6kVm31SYkH6ktOt7qic8j+fCE45QS68gFZefWlt3GWKPp0mOTzTah07AyB51GbdB+Sk6TyopGb8mznnkQWKuWD02vSC3zCiLXa6/DKo9EHCx1hzPy5ddbfdZVK0ZH569rNxhk7DdNXV9LWrnJ7WdYuIMF5unNVLn41OduppXuBY34WUYLBYM9RJFtTxaRPIqAw2P1VUGVUfvLluwMeaw04MsPmmd4dm9anj1sSQ== 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=fdOxRiNhXu9KPbgGJkZQhjFW0k6VUvginV88qo99rr4=; b=r6/8ipmJDoN0wFrmjjkeXb733R2LIW+0RZSdS6P5oVR04joMawPzpeblAKUYbzyxGcl+ahnYJgTVkYH1lnNShXnLnAi/32NPgJE46owk6+bPZdtEgmNb1nrDwqyulyvRW+cCkewZYuxll7MHARQ9ue9jdNfWMKXKHWj9cq/WXGONBp/VmFBXaHDKESjZ13ytEL5COBzHFR/xRJveSpCSR2AOKHAdK8R6u/kFWwuBnkTaovtE6VJ8A6S80bUuRSt7lbQzzBSn5tiMagmw/NiRlbumMtCQK7yYFF6qxCPnF4vXEfgJ3+u6GCCfeFczebkCYycGcRODU1WYOKhYkED9sw== 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=fdOxRiNhXu9KPbgGJkZQhjFW0k6VUvginV88qo99rr4=; b=HkGy027+TMQAYSwCFcgZkOl39jIa4bYTkHhnI3lUdjF3VxDi5Y725lpsZz1NCYbX8k8uld6rX1EI9ZTGX5gZViMCFzD6i7mpnv5r4L1GFQQTaZtVp16zsNfs/OjlvDD6T9qo5wtanVCye01MQDzRS0OHTJf5MCiiEto3QLL3qrXEKAAJ+TamhRCSb5UuXA9PfoFeNfkGrsRiHq0j2sIx2NuEJU2UirP5POl3sSEgX2ye78EhPP/4GoxdZ9RRJ/sDDNeDStb+Kraujbq7Otgmw7ua5n1FusjjdCBd57iUhcRfErLPx/uzqrzCx5j9ZEiHYMUqQrC7UwkrVqyFCP3YtA== 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 OSKPR04MB11439.eurprd04.prod.outlook.com (2603:10a6:e10:9d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Wed, 19 Nov 2025 02:51:26 +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.9343.009; Wed, 19 Nov 2025 02:51:25 +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, Frank.Li@nxp.com Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 net-next 5/5] net: fec: remove duplicate macros of the BD status Date: Wed, 19 Nov 2025 10:51:48 +0800 Message-Id: <20251119025148.2817602-6-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251119025148.2817602-1-wei.fang@nxp.com> References: <20251119025148.2817602-1-wei.fang@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2P153CA0031.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::7) 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_|OSKPR04MB11439:EE_ X-MS-Office365-Filtering-Correlation-Id: 47656d08-7e19-4dc8-7fd4-08de271687af X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|19092799006|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ZvqjVXjkZ0yeWVMYXWadSWImhKT4RDszlcv0+11o179TRI79eLSKu7FauMzh?= =?us-ascii?Q?IPslX66WXTIZwX9RI1DrwdTd7ZMaUN2qToAZP3N7JXM+Ys4mOPkmHZTmfBFY?= =?us-ascii?Q?ze24EfbPTiY2JewjXBq4uRMiP+8YPFuVopEAaLO4VKX2fPmRo1EG5Wew776i?= =?us-ascii?Q?g3D3pyXJXW88zdSPVTIkoagR7lbfYAGfF1CQYc76A74hA6z1CbxqPudXGDzv?= =?us-ascii?Q?B6NhhSTXr0SxLsxe78/2SCWGys+2qqOtAZuwXIFjYtMyQ82junBI6lFQREf0?= =?us-ascii?Q?w9ZDJl3WDviuY412qrLTRxMYtnVdiP1RAUM4UQ4OPXADSINrH+0uKCW6i2uo?= =?us-ascii?Q?XDWRH2Mjb/0fgnbCf9VceEUIVPK0V16OtVA+jtx0DFW5dPL/U3WF+BF4cJkX?= =?us-ascii?Q?7wX4dXnOH6HVsISyL8pyVValhmhndF3DgVosMzPpPxrMQ3VXDHKrV10F/w3T?= =?us-ascii?Q?4E3wR+I3PJaaYH8nNCCAerrTPJV6COvzeUzm0JCctoCfdaixxLZhMbdsuvL9?= =?us-ascii?Q?EAbAg5c2nuVVyAkrcUXEyvLwBq7G4RVyFg0wUbrt//cj5hC0luHKA/snmkdP?= =?us-ascii?Q?WA/R3CNsE9cAIaAH1nfBfWZcTjhQX1Z8E8PtQhLuXj6yqUY4WTJkczLufIEe?= =?us-ascii?Q?SSyym0T/OiJFlUI8bDtBnX4wSRoMsYqCwnrCE5mydQFjlhXgIaX7uZrYYLHQ?= =?us-ascii?Q?vvYmPC3xrAutXgvI1ktMSP55Wdrfe7SGCRqjYk0uU61dfNP4ul7TA8xh3jkX?= =?us-ascii?Q?JdzCv0xna+sNP1wpLcRQca5X3xSc1thTTp1PdZ5XeuTNfy58sITmPkwV0EGA?= =?us-ascii?Q?xhMjRt385lXGYR6A1w6RvL5CfP98aerNpLLqaJpn/YNO8xSo+VggZfs2EC5V?= =?us-ascii?Q?/A17Y1alEuiG8LtA95hmYEgjqZm4mV9wLKkcRGdiD2plCy5dWgfj9gdCsSxM?= =?us-ascii?Q?EvxlevHFKDmJ9VD8jSG1NApLKyBcecV1/dlj1Wj9CSNG2KN78kV6/55VvTpS?= =?us-ascii?Q?NA2vlzaRagD+fJFO+MEdJgEC3FYXqeqDHn3/VKhJ3wvNALVZMPcSofdgbGIi?= =?us-ascii?Q?3JjTW3jnu0Wfq8ZmNzPPWMrJN5U+RFjT+HSS8Sw3d3MamSPy0MpCiJ1UWwRV?= =?us-ascii?Q?+H180C9Kii4qYzsUrknlYBwlPqvAIcIou4iLtVL8zxv+/8lZySMaclbI4sqJ?= =?us-ascii?Q?tINF8VGSgQjT0iSvHw9WC9HG220TTDVnHrDoF/dUu2Z/tl0KhJLW4e+xWoPH?= =?us-ascii?Q?oq1P68gAFE6BWlEeDJNX3aA4+dzaNdogzAt4VpcrkX6R0Nh513ZaP2L293bc?= =?us-ascii?Q?fkmwMLfvLwVXjq+9RyI0Dlkhy6bESIc2s9BQWI4FMLVJXjOXjxn6kv+JoJKO?= =?us-ascii?Q?zVse3VxAsN2HH3rfqwY1vs4XC+o+kMUcEiiK6lPy27YX9VkQMxm9nV7VdBJo?= =?us-ascii?Q?WYWbi5Knlt/066aMNpc8EX5JN+AxRL3pq2CCCdepaUQQyuzJkBGk/yLTkKmi?= =?us-ascii?Q?cWWgPlGFTP2dDFRQC5YMLO4k3rLRkq1pRlZm?= 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)(19092799006)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7bymHqTOcu/Mb0ij0xZCSGLWuQDIvGpWLIsbehpxb9zCkaUhdpDMbipBgBeT?= =?us-ascii?Q?r959DAcZ8tM24PR0jK8555ksAgA+sDKOdbWzxiHzVrs5CzCcJSAZRx5ai8k0?= =?us-ascii?Q?KomFNxX9HdiiOl0j36sR1h/2Ozx/+Dzy3msw4bRPDsX7VjIHmQ+4PZGKgD63?= =?us-ascii?Q?986AcLI6TQvJIkQS1/4jY2kzM/oSAPhatxXWB/RSpjXBuT8o01j1Qjvu28hY?= =?us-ascii?Q?lgZUWlrrTheegiKkhvpkIO+JTUwcqJ/0GmpZt5zK/tV6KYdqW/lw/cvOjk1o?= =?us-ascii?Q?QnGhMCcRg3V8fZmTW932IZeEnd8oIUmLkbz0MKM6OAqQ1OgfH0BQJFX5YEg+?= =?us-ascii?Q?xNH5HCqLxhbqH1BnzZ/N9n7RVivFnjnkAdQwbgnlBI8ZhUL0DmuVqMR4G1nt?= =?us-ascii?Q?82WoNkYzZ0tw0jgjLFhqwPXMgySsGofBfVDZTqxqTaax/sAC5T4eMGsQMCZb?= =?us-ascii?Q?XUKVD1j0JwWY+7tqyzTAbX5SrNYX7MoMXpMUbArz15TImHl97YOEHgJkwIB9?= =?us-ascii?Q?EKQG2DSpnphA/HGmlGS2fLHkGX6oggin+DI+ESqez5avEcLETyL8TrD7fjEr?= =?us-ascii?Q?TPrTLUzowWQKh2/2qXGluMv98O0ZDSLLN+XOHEoBWAl8m9AcYUKB3MUcmuOr?= =?us-ascii?Q?UZtSwW6upVfdqHMP1FBJi6MjlEh7GtXu5D0Tj0nPzeaq2yK8uXZtQrWFA/Pq?= =?us-ascii?Q?BcZQ7BDCd2muLMqsF/nkpk2+6/kFEC8OcT6pqLyzZPeMHgPzFVIxkTG2d1HK?= =?us-ascii?Q?+Zq3+6S6hFwxzkCON6oriOyyomUqYK90UD/ihrl9Y2aP8AF4TlCNjCEIQxzF?= =?us-ascii?Q?9Lnb4QmEdC0F3meVrQc1c9KrAuzeG2KLFZzaOecNpUplcVikk+M6Gb+oz5qU?= =?us-ascii?Q?lWpWn2mbDgEs3wM6Tt82gj4mWwZclE9BmjvQ+KRSi21zhOjLkowDHwf0WTJ8?= =?us-ascii?Q?57yoLAwmU4LLZ1eqnTekrz+eYbOH0mZVmvn24XRawQGO75V7Omtc8ucVM+qd?= =?us-ascii?Q?TbqnW+VSqQiTpFshqGu06uKtQ2x6qkYS3aLH1d+j71tDiwP8uBVxG83HzSTA?= =?us-ascii?Q?TvOEINx9FkgpTQYJXhSpAsJ7C1lYeV0FMzs9uiMJaRUaOQjvFNsztTjiWvOe?= =?us-ascii?Q?Cm0T3u2Qz6JBOcUBqJoBCI8ixdGDTizVgJ12Nm94orTfkgYo46Cbl1CqF1dy?= =?us-ascii?Q?fo1XrTgnb8vyjW6aFDIIvqqEhEaqggBGPKDnJjljaxj1gOhbxjlxeNG//NvT?= =?us-ascii?Q?6HVPSWbswn+slGP6jVZKPKBcYiRVzCO6eQd0LQ+XG2eoKz1qSb3xpyINo5ez?= =?us-ascii?Q?dPGl7V3w93MpiDNFnkVOP3mG++jcjoRE89moVhYMNotnxZ3QFYFq2FrgAnHi?= =?us-ascii?Q?aHIaKN2b3zoBxiS2d29HXbTz2PJ8c42IkJpaKUPmVTD1DffZPHq7D5CXxNlx?= =?us-ascii?Q?rEys6qlp9sB4SPPnLW0IcrLaylVq435T83lt2e1xZuQbvi4IvpBAFVT+okIz?= =?us-ascii?Q?mP78JqimcZMKasrGs6dG+5T9EHOmNsAySxmjc6o5XZmGr1jLaqZaWqBIvD9f?= =?us-ascii?Q?s0LJMEbkuNhESsHektSZ9wz0z8icNuOOBf99fGc0?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 47656d08-7e19-4dc8-7fd4-08de271687af X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2025 02:51:25.4859 (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: JTQjfcYV/CShuQlQmKMNMfhsO0zHwTBs2hIW8V/Qyr6r8Bc0ciIqzrMPx/OllTMvzIpI9boGneNbMz4USsi+Ew== X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSKPR04MB11439 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, 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 c82be43b19ab..c685a5c0cc51 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; } } @@ -3472,7 +3472,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: @@ -3508,7 +3508,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