From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11012052.outbound.protection.outlook.com [52.101.66.52]) (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 D5D54311C2A; Thu, 2 Jul 2026 03:25:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.66.52 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782962755; cv=fail; b=Htd0oQZCODsbgtbeEe2zGQRSUu+/8LNazn6KgTK+qNdK6/Lka0ZB+jPOjD8pquVNOvsidMN9CnWJKqg0h35bBJPNt0lZvaU7ta+QfG1tXhWKv4VPQdkfHoCEdJFcG1QWDIxbMLdbUZ9fMbCTSMORtn2ckRw8ZwkVO2sofC0plmo= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782962755; c=relaxed/simple; bh=1WEUZAbLKJjs61ZzRIRkH16n7nttUNNlurhuVFAJyZg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=iELnr2usEGldGOuKrI7ydEMd57lPxiLTWRRS59u63MDC2uCjWLp/olXwtrnz2622leya/tL73EuJfa7bvjaUu78sn1f/BeBstI8/Tl7t8nyNjkE1UOby8ME/qme+bKQy5kq/qSeWGgFafh/6a5K/85KlSwdr58kYkMUIP04WLyk= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=DoWQb/CY; arc=fail smtp.client-ip=52.101.66.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="DoWQb/CY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=M8S+H620CYJjTN8zJiFQa6Cx4unZgV9WMM6/Zm3KJkP95mP9sVUD/LG/jCDkUuWqojXVv78g0ThoQOpc0911+aVggaglAYTRL7kVTS57bd6fw2X20TmcOntbMQ5wzKnwG1JhtLTSuiVZCHeqVG2iya/8oM6k3dB0Sxh/6p/RVxpUHIK0zfUji7PFafbkqBUEArELurdYbhR3Jy5elPSVuBJjF2UhMgIGEbzXi4lDseoqQqzKhKtnBXX+WGvNuAoSUVeU1JRq+iK1ZKhvCYn3VJwt8EbQuVODw7T86G2waCRpZaLCucA1oNoFI8R0UlZChe0RAnP3+BsMPxCMReaoxQ== 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=BBckIUPkLfR8cnEtlwmNwqsqpeI4bzf7/E9bl30V9K8=; b=TbJ6VwFHjd+XB2EvpfQOm5rKDZWHQxCXCM/3UV2UkXTs9QOPcN/F4iGfnZUlgqoDSL4J1igH9w7+psYQmokPh/6RM2Onvm2C6NoIYR1OHIPwR8tBzDCyaCkCeCLoQ+hhhDH9ztQhMlBb+gq2EPPQi3dHlGiylFriF5hyKyCBODJQmbDyv11x8y9Yo6NJy+KjspJaHuXaQ76k6ijE9jJlxZIchsRDuGTlu+iWTQWxQeBrIzElMtStBQ9jTf+SfkC8eKMd4iOaBNjJxBbfSdr4VRFozGik4/sUII2IMcJyPFRxE73u7o3VlSzrit+PZ0tfhKhISSqL8ur/y6QpeVGuzw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BBckIUPkLfR8cnEtlwmNwqsqpeI4bzf7/E9bl30V9K8=; b=DoWQb/CYk0r8AxVIYzXCgvLLPW2XnXbeQ8TZI5ZPpG/tATDNWaOCmpWm0t+KoFy0LYqQIrCdRye3QlJVkh0HJWC/kNorwEGzEeMfx8UFFByiLWz+H0ZPpCvOmpVOjtbqYNwseH8ik+/9WxGBgo4n+ASrtY4SP3t0/ff3pYh3AWRUZCQFt39x7JuKBipIj3+2P07a3I4Wdfjpn2C97RkFht9Wyo2sP2ftAmVsd37bEKXf+4PjWq8Rvht/XTFs+T7Fvge5s5lEIGNMDBOXFFpd+whpGmCap5Er6jBKtpHaqF+Z1g14IVPG9xSK4z9NVBQUfn8vntjUW6MMLxfPa48Y9w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from VE1PR04MB7216.eurprd04.prod.outlook.com (2603:10a6:800:1b0::22) by GVXPR04MB10248.eurprd04.prod.outlook.com (2603:10a6:150:1c1::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.181.8; Thu, 2 Jul 2026 03:25:50 +0000 Received: from VE1PR04MB7216.eurprd04.prod.outlook.com ([fe80::a9a5:cf83:dbe8:1f74]) by VE1PR04MB7216.eurprd04.prod.outlook.com ([fe80::a9a5:cf83:dbe8:1f74%3]) with mapi id 15.21.0181.009; Thu, 2 Jul 2026 03:25:50 +0000 From: wei.fang@oss.nxp.com To: claudiu.manoil@nxp.com, vladimir.oltean@nxp.com, xiaoning.wang@nxp.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux@armlinux.org.uk, wei.fang@nxp.com, chleroy@kernel.org Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 net-next 06/14] net: enetc: simplify enetc4_set_port_speed() Date: Thu, 2 Jul 2026 10:57:06 +0800 Message-Id: <20260702025714.456233-7-wei.fang@oss.nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260702025714.456233-1-wei.fang@oss.nxp.com> References: <20260702025714.456233-1-wei.fang@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: MA5P287CA0032.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:17a::10) To VE1PR04MB7216.eurprd04.prod.outlook.com (2603:10a6:800:1b0::22) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB7216:EE_|GVXPR04MB10248:EE_ X-MS-Office365-Filtering-Correlation-Id: 4e058c31-05a6-4173-3593-08ded7e99db7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|19092799006|23010399003|7416014|376014|1800799024|366016|921020|56012099006|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: Fpq82XZbZCcdx2RQyhCV8phw78taGn5Mrbd3sH67OFedoGd3rJIkNtJr6zI39ydmAuGGbcfRdp87qHatOVQ0R9xtpDMqOLv3Mp0dc4hK6G2flXAoEQ50/IsK0qKFQ4j+7uqmLotxow8rahkf3AsPMWMNT5bGM3l+onjjWg51mG9kr4QN0BLt1Tw8G8DKlcmm9V0lIMX5zdB/RYQr4+GbFPZYLloXDK+WONskef95vqy0NxTKphUS04Lw7wcBb95FlmTmkyvHt9d6EL5M5MhyPHBhKZwX/yHyFscFbtW+UthLjxouLl6oTQDzURTWVtDwtkSKner3vW3NBvRVhuJlTIP9948R0Tajc7mEYK55r9tL+au239a5+ccb9fXu9V3HMZaib0SiW6LuYjPhfU/xXBH2Usn0zeYoX0UC6oGa/y+bro+dSQckEi5/7q8LpJa8740wJ+p666tM2fHyQZvlnIbkxl9n9ipEPhPp48oZRb5lCze12gPFEBCuPSW7sXkoX3ZeUkbd1du5r5D+Vqq44UeVSyA1cSF2KG3ce1vKuP7WrKPjViXhLFxx+5phsNU5Y68TftlijUInAVGMxG6kdMC0u9te1GjkLwtYBCEFCqtAZN9vmJcyv4Vrb5jmx1opSuzywqdEI3/jvAgxoxeE4jUV/0dtOGRtkn6u5DcZIj9ZKG8c2LazDGsTEjcFqh1+r+XgT1ybI1xXpLCDnBDnuA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB7216.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(19092799006)(23010399003)(7416014)(376014)(1800799024)(366016)(921020)(56012099006)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VwJ8Ietj0xPpj//M9bdnrJs+miKGVw+KBqHtUDmjGoUmAhK94Yyphn7lzwK5?= =?us-ascii?Q?FgHnugunA27pW7HD0shno5y3OoXu1vWjo8CtLT2hRa4xlxsyi1oPZj5C9p2q?= =?us-ascii?Q?++n7uYjEQBEumlYRsN6Do/qFWK75xu8rkRVDQ9ykv5pptA8/SNYcAbuCmsxR?= =?us-ascii?Q?cVAEUiIQUuJnRGSkGKDKz+g8Lrnw+bx408TQGRBTYBkIlbNAppDZ0mzDM0Cv?= =?us-ascii?Q?yPa3xMzgV73H5Rb1mazgkJHOvzwLld4+N1smBkZutSrJReMfc6Yw1Ao2EJLu?= =?us-ascii?Q?lSrihcHgWrV9G2G0BnGgvJUL8t9mUDk4cLHrFv7l/heOQv+cfk9K8o2eeKs/?= =?us-ascii?Q?N7NYgIXp3DfrLKePTpIZghKMbsONOBnhViaZG0z83FgWDd7w9l61ixQk2x6X?= =?us-ascii?Q?RcA+jceNky5PhLyJG8kS0lxdimYgTbzQ9Eqn62qC6/9lebx3foroqP297Gkc?= =?us-ascii?Q?cU9rIhZjADpMj4am5/x9tBLT/UG4MtSQBbEcLCSjcNoQ5Eum48+H30H/YpM4?= =?us-ascii?Q?QT5H5Aszwr0hppfTDd7kewYMpfMlMolG7gJaNsf0DE+ZJTihZDFLSxAjMv3i?= =?us-ascii?Q?ZvnLuuDQiseBGsJaDTgz8uC3lzGQOWa8he6Uf+yWPdJoW3rlubyQqVJfQLUb?= =?us-ascii?Q?zNXPAB+kyB/qBVUKq2PYnajnBmfsYsfSjQADkxIr1TcKRdDV22tUVr0JiNHT?= =?us-ascii?Q?/bMT7IraTYTk7TfeEJkLkBuPkyWF9GBDVvipEGSIi6JE4DnFuxw3/bBxacxK?= =?us-ascii?Q?E3I4/SI5PkY3v9yTgNWmLYWF3P1zUnW83p8DtscI3GyWuBzY/lJhJ6cZXjRF?= =?us-ascii?Q?jFmMY6H71ZegL4Z3ikMcu9Frx73N3GHDUmCd/m7CL3m39CcxBLPznEf0kzPv?= =?us-ascii?Q?ePTmxYyHnJF/tgfxWJFfkdeMAbPb7KyDyaBePy/RNqZ+kIK0eW49X1Ovl7ds?= =?us-ascii?Q?C59KOz+BKt8VgoJzCVR6L7OajLQ2sOGUKMScLFls1nNaB4UGiIIH3vP9W4Z/?= =?us-ascii?Q?H12s9vaIIHE75F/WCxhhC+ZN7giMD0nceUNRiL102CI7VZygF2UfFqbE8qIG?= =?us-ascii?Q?/AAbmy0l72sSBk17ceJlQaNYIPv8Fd+bqTrV0x4OiJ0jdejeFwAQ1SEXO7LM?= =?us-ascii?Q?q9WKqQdoPMjnOSm84559AethVP+RdVSABoAvlBVgrQmdsI+2E+6EaJ1g2J43?= =?us-ascii?Q?InM34jwQOF4u85Kb9ozyu97hrcfWA3jFoPfQ5Z2IR/kD0fvCdmyHYRWltdbd?= =?us-ascii?Q?xuiDz86mfgqWfpGKfnYMAsM2zhtd3a21KPdJulenfiDu31EoDP06ETU0QVoC?= =?us-ascii?Q?Fys/nn6/cm92OMmLrk3nL48/+LzE3m5NJdBBg9hn2kjU/asJYV7xh2cI12Sq?= =?us-ascii?Q?BJDw9laoWvGCarxWOvwMciDaXVSGuA0f2eA/z17Na3NT0m2WWocnQ17Vzl3Y?= =?us-ascii?Q?Pb8f05buEifrNr+1Mi2Xwtxi5doVVRui1VhlXd4jV/aVcmwkZaqo4WyZQ2xx?= =?us-ascii?Q?c/93C11R6zKL/Ss8Z5pUvNJr+AYki0XUEBphF6wTvau4fjIuNtelVLOPifFn?= =?us-ascii?Q?bkL+7Dw1co0W9ePFS5zUo/4jd5Waq2Dl80fJ6KAIM/RuZ0C6tV+Z8cHXoy+Y?= =?us-ascii?Q?Ijf5Pfl/FMOPyTy45AnwxGaxt3zyKufW396aREY9wac+BTiejreBlUOtVyfV?= =?us-ascii?Q?5iDtuVIPd5UZ9SjqllH9ldPX4bQdY6KQ1GItFcrDgUW5KXWizym52YZCfU/l?= =?us-ascii?Q?VbMMChNBilIt5u3bWEQ3vmuHXchS1WODgGYFAUJ+19Uph4v+AUdi?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e058c31-05a6-4173-3593-08ded7e99db7 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB7216.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jul 2026 03:25:50.7743 (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: XT5xTv2MwcQ+VfEnPCl45bPMTYJJ0EyUlnt79B+3+qHe3NGHPMxLISQtGeitQ4J+SbvQ7awkR/m9WEWWnJb2D5c2sigTQ2+C9bdZyPfzOiHCrxaohKoHrAUS36HTz99E X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR04MB10248 From: Wei Fang Since phylink only passes valid speed values to mac_link_up, the switch statement with its default fallback to SPEED_10 is unnecessary. Replace it with a direct call to PCR_PSPEED_VAL(). Also update PCR_PSPEED_VAL() to use FIELD_PREP() for proper field masking instead of an open-coded shift. Signed-off-by: Wei Fang --- .../net/ethernet/freescale/enetc/enetc4_hw.h | 2 +- .../net/ethernet/freescale/enetc/enetc4_pf.c | 19 +++---------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc4_hw.h b/drivers/net/ethernet/freescale/enetc/enetc4_hw.h index 6a8f2ed56017..dea1fd0b8175 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc4_hw.h +++ b/drivers/net/ethernet/freescale/enetc/enetc4_hw.h @@ -148,7 +148,7 @@ #define PCR_L2DOSE BIT(4) #define PCR_TIMER_CS BIT(8) #define PCR_PSPEED GENMASK(29, 16) -#define PCR_PSPEED_VAL(speed) (((speed) / 10 - 1) << 16) +#define PCR_PSPEED_VAL(s) FIELD_PREP(PCR_PSPEED, ((s) / 10 - 1)) /* Port MAC address register 0/1 */ #define ENETC4_PMAR0 0x4020 diff --git a/drivers/net/ethernet/freescale/enetc/enetc4_pf.c b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c index b966637572a7..db7bad2c3cbd 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc4_pf.c +++ b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c @@ -631,23 +631,10 @@ static void enetc4_set_port_speed(struct enetc_ndev_priv *priv, int speed) if (speed == old_speed) return; - val = enetc_port_rd(&priv->si->hw, ENETC4_PCR); - val &= ~PCR_PSPEED; - - switch (speed) { - case SPEED_100: - case SPEED_1000: - case SPEED_2500: - case SPEED_10000: - val |= (PCR_PSPEED & PCR_PSPEED_VAL(speed)); - break; - case SPEED_10: - default: - val |= (PCR_PSPEED & PCR_PSPEED_VAL(SPEED_10)); - } - - priv->speed = speed; + val = enetc_port_rd(&priv->si->hw, ENETC4_PCR) & (~PCR_PSPEED); + val |= PCR_PSPEED_VAL(speed); enetc_port_wr(&priv->si->hw, ENETC4_PCR, val); + priv->speed = speed; } static void enetc4_set_rgmii_mac(struct enetc_pf *pf, int speed, int duplex) -- 2.34.1