From nobody Thu Oct 2 07:46:34 2025 Received: from MRWPR03CU001.outbound.protection.outlook.com (mail-francesouthazon11011063.outbound.protection.outlook.com [40.107.130.63]) (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 A10832F616F; Fri, 19 Sep 2025 09:07:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.130.63 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758272825; cv=fail; b=TNXk5S0g4Wfi5dZt3CdThaLdkqqA5QfXHXZmHl+hHtzlNhUAMYWtkYlfr/vlwdUs6tIeOBjPwIdkJgm8VDrYioAsJa2TCviUdRC+N2cKt7xSvWxrxcP6ZPosiZdkda6nyrhl3QG39CG0DR4TOm7ABi9oL9mbuwjlE13deksb57U= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758272825; c=relaxed/simple; bh=cvru7PPTsznTacyurxkBFwi0Q6nHJdSaP7t06uTlCq4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=RhU0DMtm1MDpi3AuHmNzjuCzz1FUlQgGp2y4x5dOb/iP+nijGcN9zNQdVHrgrDU/e331XA5Di9Mchm+AaecHGYWRItLxtMqwyb2DvbMrZIOUo+dUbR6GaOVCBekl+JEzUa6V1aWgnKupsOaemwxt4ERtb8dPE8h5WR3FED78C4U= 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=nhRxXXb1; arc=fail smtp.client-ip=40.107.130.63 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="nhRxXXb1" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kyVKo6l5TFtNcdud5DL8den9Hdaf2LVO6FeTgFQ20DDWu0m1XrfrdZSCPDgNa+dokpqe/paZ8hTas/fcuCq2EwUJq6V9SsTdBeLu8wjvZTnQfFRtvJ1YJJZlMYf4OLTs4KORqPbbg8pmvHKcJIn6yO3SehWCmO7Z09je/LCmQYjpPnRJc7bs5PL0gpKI3YRT0tDh4q/S1VOyAOAu8hW6h8AII7B74zO8+VZiULSzsFnV3ChiJbiNejG3GsACZMJ3KNwR5v8zIQE0KsFCu5ERiWVKBhp+uy6OI45XD4YEWalWNPuCgJ3QnX6hIYoogMdhFxWiBl1ww+I0KfvNZTd0bA== 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=KExr4hh4cfW2ao1N4OlIDN1m99Yxbd8N1KbwC6htOl4=; b=i5vT2AMIzjY+s9f022sG/MCAvnTPPVtUyLnclX6vsgZS6Os4meg6AjWbhRwj5TcgiHbMtcO5iYbOcKUoRQU2n8QiKV9tz9JTALYPG9HCo5T8C0A9CVa/PAC//Ijbozma445oJbQ6BuXCUycITO3sbA0J3oBh7pZt3lQ0VUIS7PoaZKnbZ0TBJEiuOgjcGLFqkX8R5X+pGBNHtvIiFxY519nVVz3W/9/Kfvu5EtUwT/y1D4snJxfbciE+xOyScHj9C9SiqqS7rmIymO2obYmqyOtwB9HSCLYporcgY7LlXmRkpsso9oMl9Hv6MyOoiZGxFfCF6jBCA6QRD67kB3KufQ== 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=KExr4hh4cfW2ao1N4OlIDN1m99Yxbd8N1KbwC6htOl4=; b=nhRxXXb1ECs2athhqIfP6Pj0vWVtYxTktY4UF9yjhyci2XOO2oMTcza62Pf4OIxYZvoza1s9g8GLcm23hqCJsGn6X7F0pO7mz32Gad5HKu5wAjiRTLooCbiVdxqHuVBKohsoGxWNIesQx1wSvlz9227dO+t+dGzD3hMWOjPMbvB0wctUozfCHf/FE9SpiccpwmAxov3debCJ/53ZW+mb7Gxcv90fmyGGsCAzwFMDBKNVY85Li+0dWCGfGksOvO4Kxu8JGcfUS04AJtIUbNn6BcbA1V2MDrvjI4dSTmKeoDk8K3TDKKR3RFvQBgw8L1ytUvNlb7/vdE+tyBboOybE4w== 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 AS4PR04MB9713.eurprd04.prod.outlook.com (2603:10a6:20b:4f7::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.13; Fri, 19 Sep 2025 09:07:00 +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.9137.015; Fri, 19 Sep 2025 09:07:00 +0000 From: Wei Fang To: claudiu.manoil@nxp.com, vladimir.oltean@nxp.com, xiaoning.wang@nxp.com, yangbo.lu@nxp.com, richardcochran@gmail.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, Frank.Li@nxp.com Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 net-next 1/2] net: enetc: fix sleeping function called from rcu_read_lock() context Date: Fri, 19 Sep 2025 16:45:08 +0800 Message-Id: <20250919084509.1846513-2-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250919084509.1846513-1-wei.fang@nxp.com> References: <20250919084509.1846513-1-wei.fang@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2P153CA0043.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::12) 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_|AS4PR04MB9713:EE_ X-MS-Office365-Filtering-Correlation-Id: a9d82df1-ddc4-4ead-ae49-08ddf75be441 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|19092799006|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?hloI40m2XV3OUYaFA0ST4+abOSTUMkQmPjTMSqUMe5yRqbhH/BrCanSRJwkx?= =?us-ascii?Q?DQpyTPFvsAMVd1JUpdUxYQDyMqzFBr/U6VGRb9MPaelEhtPwnUP4lIz5g2ha?= =?us-ascii?Q?RRtKrLlLMWQZ0U2RtALUJUBiAYsft2mWePWf5dZQ3iK0xc79CteTeJJoGwKJ?= =?us-ascii?Q?wasOd3JuEcp3lpD1IbvUXJnJrZYdaoIQ6KVqJrRuczm/DPf1NJT+isiIEXpj?= =?us-ascii?Q?sRMBCbmp3XqpDWl0n2hTm9weEdBUmKaB3C74p+cr4BtkA54kfhP/3KJo0vsr?= =?us-ascii?Q?wDnhI++2VK/MFsYoo9l6aO0Zpi/vpth+1ODYHrmCKUPNLqmTiQlDz9VzuuM+?= =?us-ascii?Q?rOXCkhewQ5U/afqPd6rgDqGOjeM+IawX9SfJLYz+XEpRJ4Dtfzga2BEw4ytz?= =?us-ascii?Q?x0VCMK29YZkvun36aLHBXgCT7CXz8n09kWU8SorSsWLAYi/5CJGGF7i2uRqw?= =?us-ascii?Q?dNlxuujMvbAHm8JYczup9hb2VG6vN98uCTSTjTPo5iwm6xh+7pjaVohKGQsy?= =?us-ascii?Q?2aoJuZqGdzBNw0TTCrTRJZXd97QWTS8wum9ls3WmKmEq+tx1k/FsqqYbeHtf?= =?us-ascii?Q?S4bkeXrQVxWwNo/IbvHDjlsc0GeWf8x8soEJB1AzfHJuXjLDTcyRO14dYZlK?= =?us-ascii?Q?uF2hOU1jRiRsYZmEdwYsNdpjkdr24y8Ml68ZXBT/p3XjPEdZ+WRZZnI4Qka6?= =?us-ascii?Q?BECLYAo/ke9cU5ln85LVK5vNWrjT2oeS0tTwPis2eHCAmUwpTFaLuiSJBquW?= =?us-ascii?Q?5JfiTrJHw2SpftT3aG0AIEY5P18I9PFqFloljD0cnc2+leHADH/2OvnH8YB8?= =?us-ascii?Q?Aeiz8y2VyIX11O46BC7r0kDFx+eSzBg2o7BkEK6SxrptShXvpu44SgxQpHib?= =?us-ascii?Q?4w4Yyo4JM/U9Y6N4cge0AFNuBJTadWiAFDVFySN2PWYDTfFYLN/7ITSaqJGk?= =?us-ascii?Q?v8k9yPsHTKvDbd4410lteuFKwiDv9jKEuGPOwytNsl8HLB/Vv0O60rvw8PeV?= =?us-ascii?Q?GbWKC59m9qyqU79epRvZ4Su6FQkqpZfHukIG3ail1QhAoGlBYedA5y9sPGRc?= =?us-ascii?Q?dee6Gk0Zbc8p+0MSwo8RGjffXIXTuJPZB/yFjEuD6NsuXuaLyaf65P6n1MnJ?= =?us-ascii?Q?BTMDxThJ1zZv8Fn5flkG3PwkQBcPVWs2veVpAy8KDGZlJK6YmaPmJwMovGn6?= =?us-ascii?Q?ui4avcPSZs28x0d9ED47iAbtQnc/649LtocDOXZhT5RCvWkwI2ZIWRs9TwQc?= =?us-ascii?Q?0jrvhS6ZWImjXctlBnSGyP92sZpTzL+YXlWjy8mbamHhLkh2ShrmAoP/g4uD?= =?us-ascii?Q?tJc9SkF0/vrYvTiHvm9egoVH1VXEaNXrocDLrOBJmWRyv5TkHezQndmLmYjY?= =?us-ascii?Q?IFYOvtAUzlrJ6QNPqeICo5U+E4Bc4oqpwRjg31IFH3Wo2W5CB4VorvtQup+/?= =?us-ascii?Q?t+0Cq/iji7XjHJug4lJ+OQbRJzlpUV7R?= 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)(1800799024)(366016)(376014)(52116014)(19092799006)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pAZ7oeJgstVMWhtzJf2EeZ3HHG6/LRxDfwKWIiuUMGATwR+gMVw7eFZ6LBPK?= =?us-ascii?Q?3HXiflb+XjPQISUERfKL+V8mJXQ/7L8VT+g4sgddgNoDaZToqA75zMZfKqDz?= =?us-ascii?Q?ffJRxTaRnltWJjUdxrZsjocEPT9u/47zhWrvpIUntMG6cTeMGi00wUknAUVB?= =?us-ascii?Q?t7/yqus9iigCAblpVKbmgl8Zgl1mLCPKDUBZg1DKLmEUYC8zhlovTJW2ucrk?= =?us-ascii?Q?auOvGkbT96/7/xdPYWoDh601C7d5EEpWFkgX63JiblC8+olPiSFc/Fh5NTkK?= =?us-ascii?Q?H3hNM1qy8ncf4flOO+ksufTmvINaN+EYx1MAozC4j0+eIV/p9wG/5jPfFYrE?= =?us-ascii?Q?TWj2CTWdidZkrFPA0w4xgUV2kOzExhKf+uJkbvYgZPN+NAGSKS/bD7ea69OM?= =?us-ascii?Q?KzJg1Tf6SX6LBnIALi3XrqCo0yhJS+QnmjPcC0ay/4cGxMachaXA4yTuUG+h?= =?us-ascii?Q?UJQ65w4FuUMavo7y+HJ4asLDS1OXnyb+Kf3pUFFe698hqG0WkKVtikGw+0gK?= =?us-ascii?Q?m0SQ7FLBestGtBXplLNgk2P9LTVYuIW61nxbFSRIkqg5jXkR8IkjEiVEYoN0?= =?us-ascii?Q?deCMHTOuGlC4r6iQQfseD4TJ21T3B9tIet1sX+dQFlndigyMPR1/JfPwiszx?= =?us-ascii?Q?E33r4Z7sTRJ0IRzcVBaMMt+iYPjMWu7Eae0D/GT5qYSPVnM6zKPGpEimhUe9?= =?us-ascii?Q?WJvgNWP5DqVxH+im64n/awIM/VHrpP0RHPdmvFZEdHtJmhyFEnAEn0ccXBPp?= =?us-ascii?Q?wVdf32plsjFZnqAAnFrQwrFZMoRrJDlRzGUDFktCOy7vPsoFObF6dkjsxTkR?= =?us-ascii?Q?3REAUIvHkEOmJzivIGB3o7tgaf/1TM0XN83RiEr2cUOm+UTzDsLJwkAC4Xhf?= =?us-ascii?Q?3QnUuG1mb9wiKCeG1REGK4LfLigz5RJ71iYWxjN4EP2F2pSRl9h265MX0GzM?= =?us-ascii?Q?OZQDIudtzqsuqaDzQjg72Re5XNO2EYoduylyTEvRtCtEMY6miLYW2WqJOHrr?= =?us-ascii?Q?CGA+pJHL5XzAFhf0bUQgqp1GOCq6vSewpOCtNTvgxT6rGIC4e4uuinNtoqRg?= =?us-ascii?Q?nreuQQ4cCaUO60cVKXN4vVPapmBmLQK/oSAlfpbZSs3u4cQTcnflikdQbhyH?= =?us-ascii?Q?ucNSWx7A7UCs8lbZnl1Jw2zs+yjD5XKtOdPfBED0xASxBrGIbMIU07U6IbXS?= =?us-ascii?Q?7sd679WbR+8V2QtCpR1wOsoo9J3kCKm1dHCJibku7DLX+lYDtkDVIW/bQ/nq?= =?us-ascii?Q?weHuSNIju9OdFKXhQ1Ci0VWq6TVoah1BS5ui6nvqvd/OnvaxBEhvn85Iuwc/?= =?us-ascii?Q?m4yoBR/6lo8vQeBISgLnBE7MCHZYYA9KbrfppmpBxsTg7SH45tFq+O3Sowm4?= =?us-ascii?Q?ookyuoMa3lcjlI+1U8YkRrOE632lTh9ywbY0ZQX0Fk48RGVc++RLtwIVbwrG?= =?us-ascii?Q?u0ajoqPHqNYAn82ZVc5H9ehIN1RzklpoGz6xypgKF23UpZyHV83ccYz3Of2L?= =?us-ascii?Q?ah2kFhcEa/ApoOR56Lbqp8hqwgqHO3+gI8psw1q/gozXX+FMZoIjvbzVUkgI?= =?us-ascii?Q?meZhEmN4LjOWe9EK/BZZgFdv0FKmu5uLYTDe6Bkt?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a9d82df1-ddc4-4ead-ae49-08ddf75be441 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2025 09:07:00.3392 (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: iTGa8dxf1a6MoNu7cDhOph5WPotvErZPOpm0ALCGZ983gVbnbPRF9xKWFJfksHmWU1FUtBotipE3zJ7S4JZx0g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9713 Content-Type: text/plain; charset="utf-8" The rcu_read_lock() has been introduced in __ethtool_get_ts_info() since the commit 4c61d809cf60 ("net: ethtool: Fix suspicious rcu_dereference usage"). Therefore, the device drivers cannot use any sleeping functions when implementing the callback of ethtool_ops::get_ts_info(). Currently, pci_get_slot() is used in enetc_get_ts_info(), but it calls down_read() which might sleep, so this is a potential issue. Therefore, to fix this issue, pci_get_domain_bus_and_slot() is used to replace pci_get_slot() in enetc_get_ts_info(). Reported-by: Vladimir Oltean Closes: https://lore.kernel.org/netdev/20250918124823.t3xlzn7w2glzkhnx@skbu= f/ Fixes: f5b9a1cde0a2 ("net: enetc: add PTP synchronization support for ENETC= v4") Signed-off-by: Wei Fang Reviewed-by: Vladimir Oltean Tested-by: Vladimir Oltean --- drivers/net/ethernet/freescale/enetc/enetc_ethtool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c b/drivers= /net/ethernet/freescale/enetc/enetc_ethtool.c index 6215e9c68fc5..445bfd032e0f 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c +++ b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c @@ -895,7 +895,8 @@ static int enetc4_get_phc_index_by_pdev(struct enetc_si= *si) return -1; } =20 - timer_pdev =3D pci_get_slot(bus, devfn); + timer_pdev =3D pci_get_domain_bus_and_slot(pci_domain_nr(bus), + bus->number, devfn); if (!timer_pdev) return -1; =20 --=20 2.34.1 From nobody Thu Oct 2 07:46:34 2025 Received: from AM0PR02CU008.outbound.protection.outlook.com (mail-westeuropeazon11013035.outbound.protection.outlook.com [52.101.72.35]) (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 AD7452F1FE3; Fri, 19 Sep 2025 09:07:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.72.35 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758272829; cv=fail; b=nOlC5f8mUiC1mx8WtE2D2FtIY6hz+C/3HzmektwHznYyRmS0ISkaQwxm2amRDDDA5C+AbvWlqYbonXfihbcDNHhALa9R0RyLJM664xB7JMaRbqp7iHnPlUQXa6hdFSmSNBXmabEcmGHfrSEb2lrpGwIDeXb0CE833abyA+387Cw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758272829; c=relaxed/simple; bh=7rMngVrKtorlCuw8EWviuClWhCcyUeLQ1O1Q5y83/G4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=qlDBB6kXdBDdPwg9ksn+LAK3PSMp+Zd5o8yt1cpRdjPMvrhSuWq13N11+JYZQlfVwB+3CnAJBNNVQ6rDDWObIvOpNSUT0QZZteFSFQmwIAr6cq+R1FwNUW3cNPLU1CTHPa5Xi3eUZeBv8lFJn0J0ZHpWKhZguyDa73czrmrmVMs= 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=lFTRDnoE; arc=fail smtp.client-ip=52.101.72.35 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="lFTRDnoE" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=m+g7B1eaU/+oiqvir0H7ycJARYiSkxZ3GU9VVCkMmLXGWpc9DaYzfcGCiy+jwIbxbdF9gE3BAuicO3pKMlvSbtkHtQbNI6Pj+VEEdZauuFRWll8tLsEkhSujbEjGnhoHQRkcWr/zltqCDzPUC5EW8+3sTFXvkiJ+AHcWYzvin1/Q4a93tkZenAe4SetaBDtXJs+Z5mwAMKc/LECQL7ugVE0EGFue1HtK2bkav/SmN/7rnTg8VN7lu8wvtUy3LywXoZjsWeuXizzGJb9XfnNFbChFteyn4YQstjbLgUwSA552wwF8yHl85esCZ4AIWYgzRYwTwSSsbsepdwk8vVpVYg== 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=eVAgphrL6HcvhXG0pWEb1CySBVY7GlHdlM3bLp5YxPM=; b=qRD4D4ZaeeDvTfhlBOrzmICKdVu5ucDlttdbbjbSCiTKC7Aj42XHD+MhhxUXZ8PXquq5t5xSdxL1LP70rPJD2ATAl/pQkF73rUGkCqcY0URfO9oc8WMTIHFO6V9JcisIMs3j9M23cZb3FMvMeDLU/aFTd+M9Ruk6AL9arywmqxY2d2fLb4xhs18Vb6EBbKtQCth/iDtE0tigbtk6t/NZo/cvxThwXCmRQSuyhWbcA06OLQnN1uviCh8kwaHSr0Xwlp4sOvHjDQ0O8AXgP79RaKGaUx2EeFZG7K4v1DAz5XkieTogeKM6LvmL5b+6D5Sd56LcFfYkLjt5gBPNoF2UFA== 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=eVAgphrL6HcvhXG0pWEb1CySBVY7GlHdlM3bLp5YxPM=; b=lFTRDnoEsWl94biadYOSs6pUF884Bfq9UwAnk5O4GtcONOGt0IvjJwsm7RywDqZ1Zg4ci7OXqS5VCcLn+86Be29yKAM3pwzLBZVG1+PnGyeqYlWN92hH5YfeEFFLJu4B3WpEP3LJ/yOXWWqY2nnAMpmgs6x9LkiAyIJY3n4KXemD1GBXOzKm5PPgDurpAbpZ7sDVmwM2yLUy6gGVo/Z2/wC22dE5OQNX8FuoGKwSDCECE7AWAdSlAShUvasRwpTkUV/F1Cqbxtv32LMEboKCe2E3KILmTpXrJVa23Im3ZhT4GdFtu86HmdAJ9+x81e14lf+t9PBP26VrJgTn/S5gDg== 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 AS4PR04MB9713.eurprd04.prod.outlook.com (2603:10a6:20b:4f7::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.13; Fri, 19 Sep 2025 09:07:05 +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.9137.015; Fri, 19 Sep 2025 09:07:05 +0000 From: Wei Fang To: claudiu.manoil@nxp.com, vladimir.oltean@nxp.com, xiaoning.wang@nxp.com, yangbo.lu@nxp.com, richardcochran@gmail.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, Frank.Li@nxp.com Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 net-next 2/2] net: enetc: use generic interfaces to get phc_index for ENETC v1 Date: Fri, 19 Sep 2025 16:45:09 +0800 Message-Id: <20250919084509.1846513-3-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250919084509.1846513-1-wei.fang@nxp.com> References: <20250919084509.1846513-1-wei.fang@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2P153CA0043.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::12) 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_|AS4PR04MB9713:EE_ X-MS-Office365-Filtering-Correlation-Id: d12a9993-f0bd-490d-a84d-08ddf75be6d9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|19092799006|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Ic6IWWYdB2HEbOnTtmAxH3JzizbwMR2k+sZyXeBaETuHUGpZthk5WTmAuZU1?= =?us-ascii?Q?b6gFZWskoTVYnSrnUZrVbGZdPSbrQWyE2osWHwL/eZXOZfYfignahymOYVEY?= =?us-ascii?Q?RB2F665nO/b6bB8Il8AWGgzJg5p+fcx8Z33NdDEDrUs14IZUunWLdyGKRfjf?= =?us-ascii?Q?5tyQNGZzNhz2P3IYGSok0QYt//T3Hujzkkw7bL9hPjAA/SwONw5g612qGxvX?= =?us-ascii?Q?mqyMzD2ppd4ufPQHRW8Bvkw1fRkl+2Z1ye4BuXdWuYqc8pbF3TI/3A6WubeX?= =?us-ascii?Q?qpNbXJXu7GSAYbLktwT//l44yG/P0LjcFckpknFz1jhNW8LIGv1L1q20/MX8?= =?us-ascii?Q?RxU2fApsTVbCYWYAt/g8s8ezubq7J1TvsPBHufUV1MTmT55aPQnk853bw1HE?= =?us-ascii?Q?qI9KafFDuAb6U5CFkoOAp4ZdwK5imYGzD6Ce7GJwqeGSPEmiVXEIh9dHSYdC?= =?us-ascii?Q?nBfuPwH5xIVY8/ezBW/JeZvsHG7ctypkhIJ22+C99NMmNqa+Ud60vmqQlpkA?= =?us-ascii?Q?ETuY15Eznh+wc6VQOv1p4aoLcXZTJ5+rXacTy2YiSCazrk7wxKSFCDUq2vBr?= =?us-ascii?Q?3sMXGlc8I1T1KylSRrJEYzjVebvDG6698UFdlq2hH33AYvgH40BLV2j6Ppi3?= =?us-ascii?Q?D++dEy16jUFhQcAI1aLBOX5QgIRLTpIU4HMS2w+tl7u7/aP2DQLIikBksbK3?= =?us-ascii?Q?jMdl1n+5/KoeFVq0WfrgOXkGWLs6xPpV9XAgSfLXjYty8zv9K8Hg4PnvKQrY?= =?us-ascii?Q?LtV2IKtLypD66HtbnEUzU0Jlu7HRmUjU2I/9LEvmF49Qrr1VgVw4QiOIMLgu?= =?us-ascii?Q?PIN1TnLlk9Flsa+qB7IWXfGGuWCmN0dVdoNF5ySRf1uK8AlqHbkLg0c1hcLS?= =?us-ascii?Q?Y5Z+NYrdN7gVerXOfAEewbKaHe2RO0CQePaIbEKNDV02wy0NK8i8bzRxtXtM?= =?us-ascii?Q?stOJkeYBTi9JlzNT4EyJmIYwifeRg527R0tAG2UIUeZoVfO9iD8o0Gr2g/zV?= =?us-ascii?Q?I5luXaccE17+jPN4iuWRPbNgYub5iGpQWLwZQKkrGLn8qNADzgg92AlZti7T?= =?us-ascii?Q?sTQX6jAC1jLnuTx4kgzi7WBkDRyCcPBiknjw6il+D5ClMf9F3G6PTk9FznKo?= =?us-ascii?Q?IhbcZaq7J75otoFvkBjIqqjLazg6FXyILR8JCeM3N0gpqMTIO+xiV0OIcRqX?= =?us-ascii?Q?ee2SiLESr1tZRWoy88byv0Bcv0+Qc0de8Z5Q1bFV4kiZJGaZWmSlDeFnj6BA?= =?us-ascii?Q?0KkhPFo2lZogo7fV9hRPuvExXQa2TbkANDaTmrj0tiuMuxkrjnwHE/O8Q37e?= =?us-ascii?Q?r7CrDW+TJGefZ1f51XoC0iqjpIGHt8W49+AEgbUY1ijdxJQZFfna4xfUbDad?= =?us-ascii?Q?AtdbXA+uqpyju33LOj0uxSFKO6I6PpvgaIxKrPfVNbqapu2OZ6uIophkmsqm?= =?us-ascii?Q?ATKVu+ftEbSHyLMqdsov2kIPN8An6t2BAFnPUl12Fu7wYIXD2UXpEOwK8esg?= =?us-ascii?Q?dcuCIO8PTjaOxTQ=3D?= 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)(1800799024)(366016)(376014)(52116014)(19092799006)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FsXzbalbzmCSAz+D1uAYVZk/+7mEIDT8/UA7McPewL/c5jU92aICcFE7HdkX?= =?us-ascii?Q?q/syn7H+3hRXR9pTf9DJfSW6zUuTcNR8oJ1xToaUdKGPLsTW5b2fAKkaTYk2?= =?us-ascii?Q?21tV/fl2Zz9xXf5jvWikqyOgd8Y9W/FYnYH1pV0toRFaYNZ5n6UsVYxDJwaU?= =?us-ascii?Q?qySStK5ZgHAqYFJgx+oQmK/ymf2gCeo8Kv8G4V8AuANDhg44JH6+I9EdZUib?= =?us-ascii?Q?DdPUs2IhtbAfvCe6w4z9mKm7TvtXaTl1Z8Ia/Ah08slPgt2n1zZwsbIeaG1Q?= =?us-ascii?Q?DoVd/LGPPR8XS3/Q5TJcm9JwbsT1oYNtxy8wsjACeRCQkc5Im+TEWMNq3Cn2?= =?us-ascii?Q?iV+uULhGy+Q8eErKvh0xC9nBvn9ofxA63gzDGyGyRabkXWhfYyyvTX1Oquu8?= =?us-ascii?Q?bw/QfClr1WcXJNicGJ+MVr38q2AfiniV66D26v3V6JndVLmQsd2izAomFWvH?= =?us-ascii?Q?OHkF0VlxLIYgW4pXPoiUIWdIxfage/0p3pLt7VccdCxIz3UtOqzq8TraFJ/d?= =?us-ascii?Q?IWS3uG8WY4VkiifEd0TwcOqb7IHNZv6oIUSVxmuBCaEWa0GfBRe5qDIjhzI3?= =?us-ascii?Q?O3jsHNb3vBCLMTJnzeyS9zKgF6/LBY436g6fgpijtcn5MGPv/g8pzDYnaI65?= =?us-ascii?Q?8l2W/b5ZOUUyeebELNvoebjeIIsFmfp5qehx5p9JlzLu0uAF27SjGD1x3jSf?= =?us-ascii?Q?L3Uxie79nSEHTW6p6+0xvMJAaH4IOe9jdTFLHIRO2ApNKphIS+WlIoip1IDn?= =?us-ascii?Q?KGywnCl45I7Sk/iGSGS1UhmIRAtCaXkVntuwkZUPFVEbgi9Kr5V7fWW5Qs5t?= =?us-ascii?Q?2by2x6WIhrO/hOlMfdpdiB7CXgC8hdaaVShzjTthAN6UJ6oyE7ajMRF1jz+2?= =?us-ascii?Q?x8MOXarR+VEJBc5Qf9WU65Q32wJT5+oPaQrR18s4jK0HEJHfLVWa0SlsGH2v?= =?us-ascii?Q?X6v/KBGA/d/muMX5w8tnTTgOZgbcuRD4XPjLpmiJ5IiEFIVjVQcdXiXKM8QY?= =?us-ascii?Q?L8teWVAjd72i1tf2WNCrofTAjytct72mREv4JfuQ+1lm5wU8+/qsIUeq0l3a?= =?us-ascii?Q?Uqawwr3p8Jtl/nL8sz6msxju36cEli9r/Uzf1rzEXSliU7vXio5L8KsiL+X8?= =?us-ascii?Q?nmLT5uEWapW0FoUfjN/EETl+/dLnuaDD9fCt9CHYdWgNa8M1KdTYx9OK43CV?= =?us-ascii?Q?48HA8W1XDHBa5TVx82yUmSPPg5n/9wzW0OqGRY/TifuxGOMuMZFE12Dw9fXU?= =?us-ascii?Q?gtPUllrK4LAhqDvrVB10sMj/Bo4qSNKmE+x+hjJUb+XqndOVIQR0G3/AC/65?= =?us-ascii?Q?BlXw5wISMIz5XLZ0ogT7jz1mpkz2zUAIHkI6OaLoIVrEijdIfTnkBpOXdqcf?= =?us-ascii?Q?DNiTnfDCYN0pZ42M981oOXUcOj8hh2a8Ct8ReuimOB9Gt1xSh68KxbGi1+Qe?= =?us-ascii?Q?B1UFkRptSfjAlDGC/3GlI1tKp6126yaUCR1lhIz9N/qwdVmfByNLcnSItIPX?= =?us-ascii?Q?dRg8rT7biHlJlaaIvlMnvKYjJyWHoclN0xlkOQ/u8e8vLiHM0U2ug2aAAN/6?= =?us-ascii?Q?KDgOQtzVGeqMeoxIjMWc+AzhyQJImqPEKuL8Udo6?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d12a9993-f0bd-490d-a84d-08ddf75be6d9 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2025 09:07:04.9868 (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: CDcU+9BTa1I/nzA2uePoFNs5TYciLbVC520nkwlLipmzTQG/Anl2s5zvx/nDIgYUxdaH5ao8xgvgPM1IYG0z5w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9713 Content-Type: text/plain; charset="utf-8" The commit 61f132ca8c46 ("ptp: add helpers to get the phc_index by of_node or dev") has added two generic interfaces to get the phc_index of the PTP clock. This eliminates the need for PTP device drivers to provide custom APIs for consumers to retrieve the phc_index. This has already been implemented for ENETC v4 and is also applicable to ENETC v1. Therefore, the global variable enetc_phc_index is removed from the driver. ENETC v1 now uses the same interface as v4 to get phc_index. Signed-off-by: Wei Fang Reviewed-by: Vladimir Oltean Tested-by: Vladimir Oltean --- drivers/net/ethernet/freescale/enetc/enetc.h | 3 --- .../ethernet/freescale/enetc/enetc_ethtool.c | 26 +++++++------------ .../net/ethernet/freescale/enetc/enetc_ptp.c | 5 ---- 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc.h b/drivers/net/eth= ernet/freescale/enetc/enetc.h index 815afdc2ec23..0ec010a7d640 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.h +++ b/drivers/net/ethernet/freescale/enetc/enetc.h @@ -493,9 +493,6 @@ struct enetc_msg_cmd_set_primary_mac { =20 #define ENETC_CBDR_TIMEOUT 1000 /* usecs */ =20 -/* PTP driver exports */ -extern int enetc_phc_index; - /* SI common */ u32 enetc_port_mac_rd(struct enetc_si *si, u32 reg); void enetc_port_mac_wr(struct enetc_si *si, u32 reg, u32 val); diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c b/drivers= /net/ethernet/freescale/enetc/enetc_ethtool.c index 445bfd032e0f..71d052de669a 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c +++ b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c @@ -880,7 +880,7 @@ static int enetc_set_coalesce(struct net_device *ndev, return 0; } =20 -static int enetc4_get_phc_index_by_pdev(struct enetc_si *si) +static int enetc_get_phc_index_by_pdev(struct enetc_si *si) { struct pci_bus *bus =3D si->pdev->bus; struct pci_dev *timer_pdev; @@ -888,6 +888,9 @@ static int enetc4_get_phc_index_by_pdev(struct enetc_si= *si) int phc_index; =20 switch (si->revision) { + case ENETC_REV_1_0: + devfn =3D PCI_DEVFN(0, 4); + break; case ENETC_REV_4_1: devfn =3D PCI_DEVFN(24, 0); break; @@ -906,18 +909,18 @@ static int enetc4_get_phc_index_by_pdev(struct enetc_= si *si) return phc_index; } =20 -static int enetc4_get_phc_index(struct enetc_si *si) +static int enetc_get_phc_index(struct enetc_si *si) { struct device_node *np =3D si->pdev->dev.of_node; struct device_node *timer_np; int phc_index; =20 if (!np) - return enetc4_get_phc_index_by_pdev(si); + return enetc_get_phc_index_by_pdev(si); =20 timer_np =3D of_parse_phandle(np, "ptp-timer", 0); if (!timer_np) - return enetc4_get_phc_index_by_pdev(si); + return enetc_get_phc_index_by_pdev(si); =20 phc_index =3D ptp_clock_index_by_of_node(timer_np); of_node_put(timer_np); @@ -950,22 +953,13 @@ static int enetc_get_ts_info(struct net_device *ndev, { struct enetc_ndev_priv *priv =3D netdev_priv(ndev); struct enetc_si *si =3D priv->si; - int *phc_idx; =20 if (!enetc_ptp_clock_is_enabled(si)) goto timestamp_tx_sw; =20 - if (is_enetc_rev1(si)) { - phc_idx =3D symbol_get(enetc_phc_index); - if (phc_idx) { - info->phc_index =3D *phc_idx; - symbol_put(enetc_phc_index); - } - } else { - info->phc_index =3D enetc4_get_phc_index(si); - if (info->phc_index < 0) - goto timestamp_tx_sw; - } + info->phc_index =3D enetc_get_phc_index(si); + if (info->phc_index < 0) + goto timestamp_tx_sw; =20 enetc_get_ts_generic_info(ndev, info); =20 diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ptp.c b/drivers/net= /ethernet/freescale/enetc/enetc_ptp.c index 5243fc031058..b8413d3b4f16 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_ptp.c +++ b/drivers/net/ethernet/freescale/enetc/enetc_ptp.c @@ -7,9 +7,6 @@ =20 #include "enetc.h" =20 -int enetc_phc_index =3D -1; -EXPORT_SYMBOL_GPL(enetc_phc_index); - static struct ptp_clock_info enetc_ptp_caps =3D { .owner =3D THIS_MODULE, .name =3D "ENETC PTP clock", @@ -92,7 +89,6 @@ static int enetc_ptp_probe(struct pci_dev *pdev, if (err) goto err_no_clock; =20 - enetc_phc_index =3D ptp_qoriq->phc_index; pci_set_drvdata(pdev, ptp_qoriq); =20 return 0; @@ -118,7 +114,6 @@ static void enetc_ptp_remove(struct pci_dev *pdev) { struct ptp_qoriq *ptp_qoriq =3D pci_get_drvdata(pdev); =20 - enetc_phc_index =3D -1; ptp_qoriq_free(ptp_qoriq); pci_free_irq_vectors(pdev); kfree(ptp_qoriq); --=20 2.34.1