From patchwork Mon Feb 17 09:38:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13977420 Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03on2071.outbound.protection.outlook.com [40.107.103.71]) (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 7BBD0217646 for ; Mon, 17 Feb 2025 09:56:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.103.71 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739786185; cv=fail; b=TLtYeC8A9RDb95v73wJkfbjmuE76LISQCxEfRErSmSGCZa/ugAWdf2QpPgfNVTDSGEK4b0nvWSYn5uECOMdqIqJBOJhr96te7HEgS3lhXyMTZp3xovzheHZEbW1p2I1hxgfoG9WwwPhtXALqKr4V+Dn7KurCZUkjAC+gDXYW3yE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739786185; c=relaxed/simple; bh=NC4cD6fXHCZtwwyqBsSHtze5eBF5+SEz0zqFXdLlFoc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=SQmpIeKcFct9r8gT50gY42cGi1adcTAgt8IMkoxD66gHhO85VxSwyRzcqirEGwinhx2t2mIeAI4gRytRPJ/EL78+E7QhVv37y76S2RgmAtO5T5bN5mw+rjVRb64OpxiyqJmA4jjJUnPjL/zbKpFhWeLKZy1q2COJNUqsUouYbMQ= 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=WN/1dAer; arc=fail smtp.client-ip=40.107.103.71 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="WN/1dAer" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bmaUGMcDPX2qxtN0gcNujz/ZWHQmDtZoXNFCXyUWJR05k0Z1O4pHUGLZOpbD68oVxtL8ZwFPSOQ4KtWJL1hOfNoXyNFIh4Wt+ltowo6EjsSpi9tXmIMv6jBtcrMOBB6zZ4nTMhS6nFz7lmAmdfEAolxzzbQZiBQkqkYAVu/PSkeFTRB17w4Sd44ORqmXqjLSvK333jkhZilL7MqVyvmGIoazM6GwzZVvvwmmt6Zp0yxTaybXEjFVGaB5tW8gUhTFe4YvG3ujPMoHqp4Ux/TPIb5J6ICWcC4KZBydIertrjD8VJUIqFRy2dWpYrR5Je041/c+yR3j58y18niDjMe1SA== 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=w+W2qWrp7eBR3WvFbuONn/JjTZywSDRz7TYEXAbTcwU=; b=x4KOtnQkQjHhUYTLYJPnzYe1uGKNPm3B7igkkZByv2V/OABq1c5doNgdoiigZc9oPT/xSF5hKdSIYC/qRO3stP8U+SivBIDpK4URdopW6zEZtMg/k6LwWiAxukRAS70tXMJ47QFqg+0+PaDD+WDk6dF9yGfZHzggi88krg3r/3VYdJWu3sP1hLsKtg42+AhomlSJ9sajkMEGLpK2y+toKDQ8IqGSHKGxjGTTbPj3rI29zwJyyZ5uC/PLJPltJT2uSjCQh7+C/fY89YyUbrw4aScbwzdrRPFzYnTklXbmGaCXjxudbwR0FxYJZe53QFHa2p26pCmHqCLTE8smJuHx8Q== 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=w+W2qWrp7eBR3WvFbuONn/JjTZywSDRz7TYEXAbTcwU=; b=WN/1dAerw0pY1GxPBCJgnyVxHczxJn21syspbWLQPWEZjZVlPTfHYE5bcyoYE69y+gJBZqFwCx1AUyutaYLVHjztgkiZ7nIS+WdrHJyE9TvQKs883QN8mZK5nys7q60GEe4V8YauTITXovWXa9iOb77tQvCgLnN1zJodY5N/y1G6BaAtk/941AtOs2GSNF9wIo3EJ7a4m04OMYlq+WwzHk5bVVdlE+Nvbj0avO1V7uMPPZSVOoh84q4dZlCy/WwPgdMwP1FoYk5X0Fu1W0s8fQdrdD0wjvivrJS1gUENh0sN3KLr3zlTqn3BJ1wR9agOs9IC7IGiXNEZn1rEXaSOJQ== 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 AM9PR04MB7684.eurprd04.prod.outlook.com (2603:10a6:20b:287::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.19; Mon, 17 Feb 2025 09:56:19 +0000 Received: from PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db]) by PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db%5]) with mapi id 15.20.8445.011; Mon, 17 Feb 2025 09:56:19 +0000 From: Wei Fang 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 Cc: ioana.ciornei@nxp.com, yangbo.lu@nxp.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH net 1/8] net: enetc: fix the off-by-one issue in enetc_map_tx_buffs() Date: Mon, 17 Feb 2025 17:38:59 +0800 Message-Id: <20250217093906.506214-2-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250217093906.506214-1-wei.fang@nxp.com> References: <20250217093906.506214-1-wei.fang@nxp.com> X-ClientProxiedBy: SG2PR04CA0196.apcprd04.prod.outlook.com (2603:1096:4:14::34) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|AM9PR04MB7684:EE_ X-MS-Office365-Filtering-Correlation-Id: 9a89c326-333a-44f1-3487-08dd4f39537f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: GqTs8OWR+AZyJE9vS4GEDeJ69rAeJ/foytRMHRBbz6Anx0+GtNSfaS16rg65U0kUIkSoK3DvFWdPet1rQYjRR0RpYRYiCcQzZYCcPo/CvrpOANMQI5kqH2VVYhR4XEbbfHlYHaPULa0PoeBC78oVFGaZN9GZZhfxW902Ir50RhxfC02CBYiegycY7FicolC14cU4x/Z5Z3DdHtHSPBoOzgdnwps089OUxfbgI9dI91+mWS68zImh/Z7vqeZXbujqQ+qV5zpAGDAn4fehV2VCIDIl6n3+sapMltMGiw4WiSqZH9fFfrkdj+XL3kkePdCX7Xlof0q5nsLnvOXtR/PhkjnMkWBdaBQCfj1cRNSm5v3+j1+k28WA/GICVvM7Iz0KMB+1X0a2v8khuABhY1HioGm6Cn9vguaKG/WHmW/CM9VYmI9DKWccze+XMjKXBeVYwXgd2xPbNyfEI+Q0Q69kVV3WkHT3NgEiuDJ/jN49Q3MvVM+IvgEEBey7yYhThYF6FD5bnDLgrmY53l/3QUM6rYkDiuAgLbPGY2lHZYiejWH69xPd5rmChui8NNha8GjDMjRmdusgO1/OVMDZPC7wuXQIwzuMX28yCbQ2ga6OZJd6F4A3KKMMUEZztuT8byrydL3FFmcqNaxK8NqleN+sVunZl1Xwmsdodj3BOfBohijA3HV0+QaRlHGrWq/AoyIPX21jebiGp/li91yB9eqQkAnc+WB9WDGFdnT0IjOCzRux0UeunQOPt18Ris7zXA0PpA9UBwH92LPlPCYeD5sJ22LubDOgLSO/nAryo5tHVS00ngr/QDNOnCCvREPLVYW5D3XMoUXI19rQYkCBuVgM/C6EpoZLVxQLlaOlJL5Fw2zEwV0YhfVBD4GHdcRb3KTELC6dPVA6mnlaGwhyoFMeTCtBsBkMmYzAjqQebRgfa5U/Pk71WBDZdLXUwwR4HPZlNfSQxV8pFLuvhUdiablbbdA/UYVUg07+xFAXs0dcOWbx1USCIQCClOzJ5+R9W8/oT5dHrFpbbIHu0I8xnlZ8hj76SSCZP3z3TCdXUkKtCxfMgf64lWB2ugn1H2foXG2WA9j5OcfotlmtvFkZq66Hm58xBh1zLzd9SNuX/PIKjyaK1hTToStU/1Hmaq9vnkHcv5kefXJnZBew3un1G3GwqFQpsyH97m5PyR+GcFavRY4x8rXdhXpGxIcG24xhvIlmftk096QHJ6lPw8cIy7qXiR0ZZdkYM23NCgvf3USjc+NYbFeCcrwMQj/is7DV0ogPOMpSq4JR2mvhvSl1D6soiVaEvm6GN6tfFxsGDs1bYF4jnFb5XWptcG1iYtBBJryXJhjfgoMU93QbqhxPHqa0Wm1baNh2Qy2KSzFJq++6yqeBBqXxa8TnClih2GD1a1g7Cc36QImW1UcxWzt4k3E1l6yh1btY02m0PqYnqsu8mD4dd1KMoaJV3QNF5FAnodNl 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)(52116014)(376014)(1800799024)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: g/byT601fNuKZGxe3m7nOMOuizpaGGeUSJeUoIjSqKvxpJEr+nzp4vyRUDqvtfKZCJmlCEDIRC6u+cm47b3tNqfvJNMoSHG/Xt0Nx9VmNw8Q4cPwhOdxANKpWhjcD/qZw5BdYPsbtUNbQJePeQ+vNc1z9lEvdnVhJunOqrnpLG6OSy6cKe+ZQ3/w4xxTWBkOglULaGKF40Gz3s4LrrNDE825YjwQ7/bZk4DDhIvz3zYRp3gjblBZd4GWkpy8pcQZH6yHBtdDlfbG+aTeGm2n77DY051tUyuGCGzLuT3JlKfSQ0pufXViNceDcRc0v1nthBtuSKOR7RROfvnjevizTurd27gmtRUSVLfUg/jPA4VwiGcY2sekHi4prMfIrHUDhH6n33vZqGpMSpALvq4CTDtyAe8VhhHaLQu/9BhVwN7TIWJABIggaBsUK8jlGnE5r037eQjhz7o8pPdRY1jU3v7sAdbnxrHMy5L+0+7h1gjDDC/u2hH71xI/bWDQRWf5mXEh4H8Q2IhQupjhvPHjPOm0gO2nO6q6FDc+c3WSgUC4DgKO4z+q0e83OWLhv38fD96dnIwZCV/pF1J0hyC+3qeH74g1kPZSojfqezboBMsnwQXg/DVXLoXfOA9S0Si6XyMAsaHvNDCZl1m4QAy8tZ2qmLcA3VLIrcoJtBk4z9hU//WaUngXO5aaUERAvHNXEuPjZKbyNrMblcHPmVPJwoiHniulPCg19b7X3xbUSCCqAFvluhKVl6tBCYux7X5lCCvmDudIIrbOeRz0sHDbO0cOMKDNO+QCJr3bq/8jyeH96VjqDoBgpIvD15coL9WIaCiexGVfvm8cp5PZ2KHPm8IyfBVAjmiPqhwzQ3Rf91qjC7A+pbcJF4y2+63ttKY7k/X3wjBU5iViMYdqRG7fXjDUD/QdGF81w2S3cb8u5v+qnlbNV8LFDZW1KOKUnq9Jckz/GWK00vda4BqXxKq8L70OA2Ete+CUHVFCXOnPWggD1JBuInhKZsOZU43I3bV2M2PX8cwQqa/K+Ui8nSv1/DEYk0xnRybYVjI/tgurpP/vTRbR22ScqUwM+9DE1295/mIM5HNeryI1Uoj+MViEPCDxuDVknQkCMnUIIQYf1LsaiBVBjYOHmHRVpo10F8FdF0L/IWP5IkpVvJmAqyLtntsPXoSzk+7nIu3aXx144c2cdfFYPp3soxmFWHSQFTVutJSepnpUzXyPsUBTYTne5Pg7P8Yq0GPfeU+mW2YEjhLvH8iZIfxIN1a5DOE2Wc7bkGwsjRP+iM4l4DT4nazkDxhdmVASYN1iIwORsGUdgmbpeRD96n4l3RUBH43279I4HgHNKCkW064kEyqO0iUyj5JxoRpe4uWvjCTzd/mB4KB21EgIt+cvX+zM5IY4V/DiJikCgDCNi3F52HRI/nFakv9EHbpcRal2kh/tOYtc3/wZ4jTkzrwZvuNxUuRojvT1wXNDyve3wszU8z1yhwf0bqFYsw7p+bq/n/GX6fyJCgQ6G3ysNwDAIwrje+kaQkZu4NltKg1CqqCGNzSlcv8SgHN2L+X/alyoUgrVM8PZzfZWpeAnd4q2IogKZYrlj/Wu X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9a89c326-333a-44f1-3487-08dd4f39537f X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2025 09:56:19.3161 (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: kfcu5r8D6cH8itBVjMMlsnbe5ZuufVFHqL36mTYKT09T7hkYuRpl3AYqbmRUAhwIDFdXkLyT6zgnLcml4ZPU/g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7684 When the DMA mapping error occurs, it will attempt to free 'count + 1' tx_swbd instead of 'count', so fix this off-by-one issue. Fixes: d4fd0404c1c9 ("enetc: Introduce basic PF and VF ENETC ethernet drivers") Cc: stable@vger.kernel.org Signed-off-by: Wei Fang --- drivers/net/ethernet/freescale/enetc/enetc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c index 6a6fc819dfde..f7bc2fc33a76 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.c +++ b/drivers/net/ethernet/freescale/enetc/enetc.c @@ -372,13 +372,13 @@ static int enetc_map_tx_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb) dma_err: dev_err(tx_ring->dev, "DMA map error"); - do { + while (count--) { tx_swbd = &tx_ring->tx_swbd[i]; enetc_free_tx_frame(tx_ring, tx_swbd); if (i == 0) i = tx_ring->bd_count; i--; - } while (count--); + }; return 0; } From patchwork Mon Feb 17 09:39:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13977421 Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11013020.outbound.protection.outlook.com [52.101.67.20]) (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 8EB4921766B for ; Mon, 17 Feb 2025 09:56:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.67.20 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739786188; cv=fail; b=crIsuMoRUC9V+l2lakHglVMqNoMUDKnWeWtOdJ0JvNA6UOAmxFR2Pd1okwqobIQhnaAgMlib19ETResrZBdpXAff3h128ecTGo+qQw02eIIc2zeyiE/UVHz0CB+C2wslkdsbVbgoKQcdOynxhl86CtcJUKctTyAR4dVDSChuOd0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739786188; c=relaxed/simple; bh=Z5MLH+FRnOZi/8gfSUJIPu/ziRJyoqyDeDTH88SWovM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=nk9KFNHDl3BI74TTA5IgQDSGwZbihlfFOJ/1sqNc9hhI29kyG06h6eAhaZIq3Sfh+X6+cSj+N56OKEvzrKMxPEXnfWQYgvimLoAC5cFa6oVJEr0FGLlh+h7CALmqRR129PI2UQdpYISEGjJHhH6P/tL9VhpwP3mnq6c4WS4hXys= 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=j8ZBHNPD; arc=fail smtp.client-ip=52.101.67.20 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="j8ZBHNPD" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GNXiKGF6p/jOFNKGXs+8JMc6xkv+LSvFdjiKsLIjKnZrs8+D/jOpY5Dx5I0yNgev46IdfsUALD/Cd1h7N4gkP9ebUOrfidChao9ogzpuJqLV8dbv9Q2e/tyHY2wVJHdQnD6s3V1sxpDmyzUgcsAQZ++EgnLubndN4sPGTpZNo727+nmmtjQQRrGze8I9Xr4UicqYkoU0cB+XNTjQM24EnmFPQ4vWI+wGq3bgOZgrBdzwMHNJUkG6QvDpCFcuJMTUCdsoSw5E7G0QuS/My30Cecsuot3rXMK+nWOXI7z8jY/axNmkdNBEH3zGEvBksp5nasZQQxF45JaI2Ya4MMKwNg== 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=8V5bxYjuiFZc0YoMYFLe4abEuLcZOtZuN1nUb32Hos4=; b=zQp1lH1B6qSLBJUwiqUFGCkk5/gXPoaaqCFwOepLRDV/ANeClDnXqT7AIC1EI3NLnOs5fR8jeMzRbLuNBU8vLiij0ahP5bPqdmj7Vs+GACm1I9FgGUgZU1d4i1sGmQr2WmJ4s2DuQA44uRGGCDvtaR2az8Guoc6oiX9jj7WLDXXCqDBxzrWFjeimIgkde84jNntcw47o/rbvDMR2/h2EKCGHMi3eZN5ov/nFaeqPsh+PjpQijsLjZuWuYkLZCrAyBBBg3K6h5iq7ezts4Hd2SFyE6e8x0BZnu9FkImY19RSVWZqCQ/9IxyRRjqEx8zgC+f12PSQirj0Sm4Jzrjsz+Q== 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=8V5bxYjuiFZc0YoMYFLe4abEuLcZOtZuN1nUb32Hos4=; b=j8ZBHNPDlsje5+PVIjmEGZV1Mz7DLbpSpYZyWejqMERFa+GJwlRGNaaqUc4SYIWP1fLkIqGTTIEZIJgYW1YPpy4/LEBJG984+b5KKhed01BL+hlaAyZEqMFfOx1Z4Iu2NUcJqlufn0zLxAMW1ZXJ3uOChic7AKXl+fEgIwaBycJxuAxQwEt9pbrOW4QomyIbWUQFGb156XqhNtHXsFYf3ahT0ATTdhO6sDkzDFMfhNAzqWGjWryoWzIkFPqwkym/gCVNTZHjR2Ve+nKZcoJKxxAAxBSIdVL7C+cW40vAYT5K91SNj43pYIvSal5FQoCSZ9NimIJXGBpjTXYv+ZauPg== 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 DBAPR04MB7287.eurprd04.prod.outlook.com (2603:10a6:10:1a4::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.18; Mon, 17 Feb 2025 09:56:24 +0000 Received: from PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db]) by PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db%5]) with mapi id 15.20.8445.011; Mon, 17 Feb 2025 09:56:23 +0000 From: Wei Fang 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 Cc: ioana.ciornei@nxp.com, yangbo.lu@nxp.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH net 2/8] net: enetc: correct the tx_swbd statistics Date: Mon, 17 Feb 2025 17:39:00 +0800 Message-Id: <20250217093906.506214-3-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250217093906.506214-1-wei.fang@nxp.com> References: <20250217093906.506214-1-wei.fang@nxp.com> X-ClientProxiedBy: SG2PR04CA0196.apcprd04.prod.outlook.com (2603:1096:4:14::34) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|DBAPR04MB7287:EE_ X-MS-Office365-Filtering-Correlation-Id: fdf92d99-1215-4413-f61f-08dd4f395634 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: h7afctV5AkP2PYAuQRmf3K5w4d24cNG2F5ir/B+e4ReDpcrnLooVJUol79/iygray5ImNREVoyBY41uq6unb4zcPORgdV05aUk6tzJ8ShcndOhUqGY1OFesXsXumlevC5ed+o8X3/jxWPFZauyyVohd7VF9AFSm9wce/SwfvOILs/pKkHmxNceAZCotnyKGsHeO374rpv1QM2Py89iaOPW5TXTI5BoU3s6aJrGdjODZuSK+JCUOAHkyUTVbV4/ZBK/X2QY+qyxzs6gPGYTCSZvIBLDswSKZNtKo4OrMd6C1E1DpYpaMc9OILE62bol9z+qyUsNZA9iQAwG2y97vFcahT/eRM4AlsxIr4w+l+qMXqT0/OlNsrNR6lBvTYwRTJbaNwMYg9x10nCKoQE56vcZ6C71yyU0JgmEjs0TPF4D5KaaG9YOjATzz7g60gspUNvyllncSFTkXeaP7BMIbikwnKx4rBPoaFFClm//bVe8Iu3LnAsP113Dlmx7fbQrKnuAUmPkngY2pyeMMJs9SNYpP6a+yBwHlNEWnEGQxn0lV0+g9HxdZJ+ZRayw4T5TqT6SMVe7wNxhfg8l+vTkA7kXccQ2UF7aqc156abzmLEtjFUSTOIeAIYSdK8embU9rgSIQaCqm2g87GWzPhYSv3LA1t4rfzeLlSAtNAqNZdYVl/dKWeDvVaTh76KPYFw6daM7/W9239Dm9k/XyY0hjtti5y8UBzs0kyM0guhQVdb71jMeWWnr0GTE2NpYVybGLOMTiERwKg4U8yoXEmShFRsjIb854ZQw7EXAhJjhXZnwMvBUMhRGgQCZDDJ4RLJA0zUTFZQsW8EDqCMkmLs0Bql+3OoAcGkd9Luow0a4GNt8c9658iBX2Kwq1z8t51gBNOPjc+oLBYfQf2gwvjKvsuyVv4qi3vzIVYDlzAlv/7eEPu6UXDjx0v7t0PzrpnkMS5g8Ev2baeuV4wWLxmChyj520P1m+5l2e5lc2ztZQBfZh0Sb9WF6s2MV+nXIOVsdZrn15SHlhtjJgEIAe/9I7AJiFZIAQsujXf2pXHL2yCUITS/+QxBSqLLBGWAJS7thivf7vwkLJXrTcwgIpiVSiOIPTGVAh0WDlICdrUyW/C64Kx/tqL8chu6VgO23nF0kQUon/ekGsBJXVmuWaHTNF9uHquR6z2hrQ03T5cjKlMJCNGl3rTHdwBokYlOR2gPpBYX4/wHocTv8JE4lt0xTcT0JYGJuD1gnFhyvBbrZc3ntFU/fuwqAJZcRgouvgEM5A487DyCvaJpJ3Rz5BpnPekYcLnPJoNG9GWJ02V7hVPDMzS4WRCR6DZnzhkR2ipoVtMpSs1KqMI4qkz93tceUVsgegqvAnWqcYbgikhs33mX/bUkpq6C+MfiEQpaEnKXpGVpwUJ0vmHir8Rqq077t7agyP5r62v89k4R/A7xa0OFIGntKWjcE11KhnEftEOBSks 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)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AuykpByE1q7bOxuTHq2LDxr+XeEG6Aqj2CUhiXXFtgUsXTaU9e8W44Qzbe1oiRSjA05lOCQMZ7lBPiW8HMsP1PslMNGUPKYw8kqBlMIY0UAlKKMMo5+r2IKi8o3qV1aNJJ7koJA/DaWlsTx8DI249bKfm3l0/XhFk08uVFBL6AT9Phi7LrbMFqBnQDxo+OG9T2vot2YJ9PIyWaU3go+uCKwxutkuWkt2yf9OchuIARC9vDK4yOsDPN1BD72GdTNrGiKHtJ+EBOTNLTh2+41P4IajkrpTHXX7tEK1Zg8SZEr2OToHHax3av3+QsyRJIkB8yDJTKyzugMux3CmPYm+BjltbGOoPgSnE9pCqbsOI9fcc68p6Udy+kQ/mvpOw1P8yDVD34cSdnpv+Cmas6RdrEqha0ZaNXIfi5sEoY6+1UmJsWFr5mVJQkwZW84faY0xOgzWg23DJKSspMZsi1pSdMpfGXDajkIWT4Gk6cniMOsG1Kh5EZ0YB5Cle/8bix6sad2vXXdHuSOBrETZsN+jxEYltnOo7Lh2GFmMuUKDyllvDhBmGFz4N7TNX84KVb6oO8Eo7WFUNlJn5PDl0ZfKJxEUaMny3s4Qjf7V8mDVG2sa0KycBCXHet18ZVp55Haa8Re8PuLeGjQ8XRwP4umxojYCxKArTHR1ryDW4lqUlfAkcmxymZv0lYxn7IvUFbsysmMr06e35GYbo+Bg3XsWVbxTdsvN6tHvXInQ85YU+bn4Nd9JY6ZHbgzYWDdXAj1mWaL/P6kBjsDpdnp8n9SLbIcP2YgGq63ZFomWSmF8iTQ8wl+B5evpiXimEEWvE+OFFnzJSbwqLm598LgSD+eFmlE42bq1D9oQR9LcvssGSj/I0w8ybf7CoN5nhUl2y0elXso7cVrYbRb0TxA09skkY9HZXg2+kc1bCdFyMfvN1jyv3MbmH/iieGcFJtWh7zL8iioZg5qHe+gKoJc/UJBcAWE/aG8oIde/izwdMluJJRmpKbpot7//nPVwexWFIgDnEITQh3pYvxeyl+kEuIa6YVDpOSoDpvWWeNLSh5jDOaiNdijf1pwp3KD7fa5liNGt0pQWqTQxh686P7jrbWSBqYjokWYAMkI7cifxAsJHa8Zt9vIuV65xODn8SZPQ8asu6V0h5TsP7bXVUAEa4J3WIMXhBXKznXPLXLa8eL64NEDfGXRCXF86KhbTxUSWjU9Q4DMGw6YOdou9gfM6lQ8L21hakpYWTXY3hG4SLRCQttE1uFwdlfUhYO/zHDew7cm6H1frIyyIjsJXKw7HOMIfb1lOoaAen64GO+w/yfLJvhN8K9TooKW2E+lJ7DBI7iyZTTgxZoIz5M0oGv6SsE6afSnstJPl6QuG8i2CB8xB/BM1wA8pbXoDo+bs0Y3h1K5VTOB5QlZ+MZy8ZNQl0WBwSDTljRFew6VzoefH3wWnHA88XUrhdKPpsWquIWsUEDWB2U71yW73v2zP/Iw1cLZ0G6UScVb57ONeDyjOS3tR6Te4WfATfcoRYrM5pXVjMyRqfyzajKA7WT59AIDK6Y/bNAZcw2G0JU1rr+IkbjQBBi1wytr5B4a+VCR30jCN9qYL X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: fdf92d99-1215-4413-f61f-08dd4f395634 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2025 09:56:23.8186 (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: spdCMnOeQeadlc1nnfHjW5siTFQGAR0Hw6GkFB9Xbjda9NxILMu7Oxf9zu1QeNLY7alULxZHnEDgM/QSta4PHQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7287 When creating a TSO header, if the skb is VLAN tagged, the extended BD will be used and the 'count' should be increased by 2 instead of 1. Otherwise, when an error occurs, less tx_swbd will be freed than the actual number. Fixes: fb8629e2cbfc ("net: enetc: add support for software TSO") Cc: stable@vger.kernel.org Signed-off-by: Wei Fang Reviewed-by: Michal Swiatkowski --- drivers/net/ethernet/freescale/enetc/enetc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c index f7bc2fc33a76..0a1cea368280 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.c +++ b/drivers/net/ethernet/freescale/enetc/enetc.c @@ -759,6 +759,7 @@ static int enetc_lso_hw_offload(struct enetc_bdr *tx_ring, struct sk_buff *skb) static int enetc_map_tx_tso_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb) { struct enetc_ndev_priv *priv = netdev_priv(tx_ring->ndev); + bool ext_bd = skb_vlan_tag_present(skb); int hdr_len, total_len, data_len; struct enetc_tx_swbd *tx_swbd; union enetc_tx_bd *txbd; @@ -792,7 +793,7 @@ static int enetc_map_tx_tso_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb csum = enetc_tso_hdr_csum(&tso, skb, hdr, hdr_len, &pos); enetc_map_tx_tso_hdr(tx_ring, skb, tx_swbd, txbd, &i, hdr_len, data_len); bd_data_num = 0; - count++; + count += ext_bd ? 2 : 1; while (data_len > 0) { int size; From patchwork Mon Feb 17 09:39:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13977422 Received: from AS8PR03CU001.outbound.protection.outlook.com (mail-westeuropeazon11012032.outbound.protection.outlook.com [52.101.71.32]) (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 0C9B221771E for ; Mon, 17 Feb 2025 09:56:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.71.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739786192; cv=fail; b=YbICp3o4CxTn3sXcoggZDBhpQFASK2xIS5G1Qb0g6CTE2xh5ezSNniew0RDbQnRJcV6LA6XVV61otK4zvCAQVQ+ag5pbc2TfLu14NdN8oDIMWWyW0f/xt0X0nKE04pTVbM69rZfgWGcxFAXtHpxjeEw5kuXFx3XopHhUAuSwBvQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739786192; c=relaxed/simple; bh=hKwQx6KsnX5ScMV+IrlAN1VXIe4DME1oWyBxbt1acNQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=C1A6tPxPSHyy+3pELdggcOYyE3+VItNiVV1ufQ1pbji+19FtXzEm8b9SR3YUEZvm6XRrB/hskXQA1Z0G9po32eHMrQmH/da2Po60ODveAEOSB3zPOA27pz6oCmKqRRb5ntbYWDwaac9reoAIodqoD84N6V3+MdQ1iDa2Bp1XYV4= 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=gDrFI34Q; arc=fail smtp.client-ip=52.101.71.32 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="gDrFI34Q" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rgK1A1nZTBOKL5Qr4Pb84gjZ5N+0jiVtP/LxaJMK6QHGHfgd7O3jVcTwPJaiQzpI+3OtM5AfLm6xXhwmyUZVZ7Hl8710zJ8P0x+x9FGzNX6YNHgdt4+FvATw++rk7x2Z8//fg9ARTu4pqHKREeizNWqRAKebGxUii6VdcaTpRvtzgloRpU7ntwQq8pmuuaV+PLDF2hYJ8lb19Z1QOmyOWj0MvfOP72gU06bp+oGZs+z7gV2iqL/pLdibHvj4Eq40lBRiyBbjO1W+Bq9oaI3+gUvsHGsI8vhvnvfK20OxNpQbmkVMfDzc1aDX1aWrx9IEmggtnhKWsc4Y68AtCrZUxQ== 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=b30Jg8Wx5so82uohEZTVnAOZXjaPrd4dE9ClQlMhuSg=; b=cec/TgPuFl589p/rF4/wXFX0Nt9sX8C6hM7fmimlW1BcA0xR5Ek50pxc8+mO6b/qwED00aBYEHDkVxITlA9BBnjnROesBmSDLXXogISrMCawKa/zfQQeu/d444esDzOxksjCrzM9pNjJUYertFoGuzriRitH8xS3aIJ+y9s5KcvADWR5ogwYL/b2cDhLADVZw6J4m1z/zIra28+nI5aztkL7h7TISFn8MBNinY1QFfZRkhR1IjXw8xDg2jjbshCQT5KVM9Y3/R10nEf3UvemtPPJlVKGHt7rMRtu+WBDbiQrHFB6zRieC7qyCnvMxfB4OhLkpkeMxb6Pj5o5t7Af8A== 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=b30Jg8Wx5so82uohEZTVnAOZXjaPrd4dE9ClQlMhuSg=; b=gDrFI34QTGDTCKc+GBAVIbQ1/DZAxA8zKBIi/5IhOXfhQpxyS4YWYiMyBh9mtWXz50xfoj2eyxNVN43awj0q0rLEd6OF7n2AhFVxXB+2ZvxUTeaWMIExRvzwsAJmitcaT/HYiukX0K+h9WDEEEgy/n6wpHrZmM2ux2iPoi1GPm7aQLn6nJ14ZwSlL8l6LlvK9cRmvE/5LVoWzqVBRXcVBhDrasecZBo9MD2IZQUAdF+Yn/3L+sTDipswt0gaPhw3dxkH8OvAVI1M2LqCM3mjq31oM6gCJ7nRuyEM0Wi/IUKY2qfcgUDd8uG7DB85jNUIDuKQTKqoWgODVS4ygpVZUQ== 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 DBAPR04MB7287.eurprd04.prod.outlook.com (2603:10a6:10:1a4::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.18; Mon, 17 Feb 2025 09:56:28 +0000 Received: from PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db]) by PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db%5]) with mapi id 15.20.8445.011; Mon, 17 Feb 2025 09:56:28 +0000 From: Wei Fang 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 Cc: ioana.ciornei@nxp.com, yangbo.lu@nxp.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH net 3/8] net: enetc: correct the xdp_tx statistics Date: Mon, 17 Feb 2025 17:39:01 +0800 Message-Id: <20250217093906.506214-4-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250217093906.506214-1-wei.fang@nxp.com> References: <20250217093906.506214-1-wei.fang@nxp.com> X-ClientProxiedBy: SG2PR04CA0196.apcprd04.prod.outlook.com (2603:1096:4:14::34) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|DBAPR04MB7287:EE_ X-MS-Office365-Filtering-Correlation-Id: a1f4bf87-8f42-4097-7f54-08dd4f3958df X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: 3lpZKLAV5sGe/aWPK+DR8IjNewfODJf4zCK5DokPuVsMwcCEAnDa3zxpFwrUa8g80cCTXjSxsrpp8NNyLmkWmmAy7l4WzET44He48/lcylgAUMFdmcaa0pimeH8zq89P9+lu99H0RlGUMKuBlBBDB95yXsr7/ZfBXtGN1nRBqi1hMsJuxgiwJi5wHKD5joiV+8iLURbDYz82G6A1SWRqWkdeaqSOcNMsf6GabmP4zzCsYR0ehxmunN0LAkY+uuTRz98N8/y+jKnyptbLF5VIDxrkWuESxgRHwldZ8EY1k/wQ5cBTlJRm6pIPANHRX1TRR90vFfMYlFCiEoB3cVfuJpR5ZpwaW/+C5MqFWTGcuGoURH4l81y77Pmg+pmkoZTjwVb/5yTzBm51RSRizXesnrs9440R+L80/ibSo/qRGRciZenWkieeUGHHyfBQx8GRAHQ6SGskpcbCBQoWJ/KKGNf0UmVYho/LrJa2/ZovTcoIroGSdoL1wyNtKzA/cfWQp/JDU6ElMie1qCpWDM4tQ6C06f7kE01MnpeQKcGaab41PexJfArhU1b6LXcrHOwfNL0ZcQBLGN/9Io07/DIEWm6c0T5c7KPfBolex/FYFbjialv+3Qc/F8h3GO/92orZHouII5KZyiIFZjtzxWdMDwi+neeXpm+j0m20QaT4MaVIB9rrRxQjufB/3Ss3QeKQveqi+9s8Jy4fESaoyeUamX4kYPI2kTcqsH1f6moHY7XVKKS8HybC3S2aylE2ekxpk4biOc1BXHoDG00cIEEmnpiaSzCi8VvO6qlvXiUZZQdU1J8DUgKTBxo1ssp6Jvspfgcb6bgliuDhqJPDWAX7KDksnL7vEKnMs2CI+IIpBPPvwb2PF1ivJsUOU1XRbXAjissbjumjYAIkqumMnnJmL+EkIxUdyCuCVJh1AiM8FcroMjS1DV/McRJPUIXZ6N2Q0vW9KJv0nNWQT/4EaPLctA+v0KFrsr1Aas8/OuoCQMmk8P23+RtVd9I0mPgY4US8XEfnsZhCDPXhWEr+U5JYe9dAEU8cBvVJkA3KSxQVmf2WniolizL8dmx753XqSIKPHpRmm8Vd5U1TNjTGg6WL5aXq9radEs+yr/XICuYq/i69DhU2kAs+KL1xG+bfOBvFIKEO0f5Z+dq/YkLeZ0Y7nhKiiwthrHxouToOst7RDjCJHbvMRjdbWI0/34kB+aIc3BvaFlCnVbkAEMkEYpJQMoxnwtdvQK/Q9cL8P5lNMKi6ldudKxLpjkiWw2SuX6qMDTD+oXoR+A8diSwaS1SoQIhznOV9TU3/FVLppCjf2uIAy2po3UNh5gmEQjUSnWpjoPMK7Z+fD2Tw2vJZQl8iwZGqpc8kqF0Xkp+o4awxqn0A7NObH30a7P0aBOiUrjMKPBlTcgmEjshobMRXYA5wRLd20G2GCvPxzkPfouNgSfOuDmvFPmb9k7wtfVbVaHSQ 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)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JT5QjdYRxKHgsl+SZ2NGZlAYhPPJpzX7AyhZmEaOjbEcozVNCMS1mC3Iwb0LNOjkxdirzKWWxulYUOaXAQQ9oyXgYRO9tl7bOfFA+YnPBp3F6pt4Opsj3jLfe3NNQWZx3yd0eHoeIQuTK105SQ96Ovt+aFy2hpA85Pq5x2fWuzeVNOu41NcQrPoiwTSOyCcXTPQvJy0Huc1DQWdUg41NjvFGuVTgDyIH53nYReIZiY7uxyuPH955Dh9jn/rLdz+ueoQ8F3/41U/mpsmtgFL75eG4xU+RSme1H7CUUD/DZL9NS1ErpLvR5AY/tPsKikqv4+wKTYMjN5ycXP4c7cuo6WwuXtifEqz+BL9ApvmxPaWX+j3JA2lIZj8fK3UoKBhekmYzPFVVBfF/LD5sNSfyu0S+vDwAiTip5MF+y09C7X1OvpfeyckAXCMRSeiE1y+PqXjlJqRg0qnbNboFTAg6LCvvsrURqS45mXAvylOlFRMbX8kEJi34gn0OVE8faNO0HIgwJCRELIwXKQlj8Oq4OzBAkNWLS2z4rBAWRIjRNo6TBfMnmNitIsP4ZdFL8lk+hPNPZXEVqIrB2g6y8Nh1fEGhJxmYATJcqkXArRRrnVxTGCDjTjZNE/lHGVY+rUoDd7MrOJDLNu8QH6iSKWB27OGNmUi1Kqi/zK8+MKWmK2StMYvdMLfobtA+euMrkKhNa/z++UfXighGQCju+Yc9rDIRDvD/0s+uFvxBNKGBcOW8s9anbyCKJV3PjY+W8mSKPbN9t4XGQ8vpOm9gKyrQRl0tojguloBMSW/OofCEUXZavaq993d+DPRjRIht3SAFGyb3D1jpK+E+SpXXfdLb9C6ETgV/lyvzIvUSyq1CHsraIxe/gZp4yOljDBiwT48kORNkyALY6JL7vselfPpOq5hCtLqls0k3LnaG22XVze1KGNsI46MYCj6KehVKgl4vHh6fyI0uV1vyxZwqM355zub+AIKW1tAEb84uSUninvYjUS6bxS6kbaYJE8oSv+UYhQ0nT8DUwtGovRgPKcroUkzNvbOp/x7bNYqBA4JDLunCKWlkiF+iejNY+siXsKu9zwvLhIqpEjFzLKbw6kqaQOYM6xLuI3HG/ONe+j9PUWcUuN2XDhaAEbfTX35G3+fqvq5EYIf5xtPEpplowe+2GbOEmWCx92FyMbBo182sJxTlLkuYemcs9INvO1TP1dfxBwgFPuzycOK8LbXBNOrM1HaUBBx3ugaTRA1NJLH41uzQC9dWOcdB95Bics9dCvu4RooTpMCdgi6HdJg88/BOMB7Zw5T9hrxrtQ1MXJoy3no5AHkyZup0Vu2ZVGHIminNIOEtz9X6VlcB1QC8pYIpiwDPcfczZPvD+9VVCsgsQkKHUveeA6UrPA3vTsIxoujUqeieBEs7wFsmhuGDBSg2lbxfeCHvdENRbAt6zO+JvyGeGhVKVZ92d1B8VP/l9+u7Gb2s1UmDxynU+pP/EEMBNv3TS73TZXCXPXri/UCBVnigEUsA7Phn15jS9VLqW50LiuGyFPOGkCr5NaRUjAUChCGfbDWFm5+tK01/fhMc1HDwFR34vROplUDfPQVzWV82 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a1f4bf87-8f42-4097-7f54-08dd4f3958df X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2025 09:56:28.2514 (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: AIZtp9/0X3497WwcwDwU415ysMQL7Q6Q01gQJ7/gL6BYcWY3H2DmG3KxyrjuQZ7Mlft4CMU4Uqj3okbn48d9QQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7287 The 'xdp_tx' is used to count the number of XDP_TX frames sent, not the number of Tx BDs. Fixes: 7ed2bc80074e ("net: enetc: add support for XDP_TX") Cc: stable@vger.kernel.org Signed-off-by: Wei Fang --- drivers/net/ethernet/freescale/enetc/enetc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c index 0a1cea368280..eb0d7ef73303 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.c +++ b/drivers/net/ethernet/freescale/enetc/enetc.c @@ -1902,7 +1902,7 @@ static int enetc_clean_rx_ring_xdp(struct enetc_bdr *rx_ring, enetc_xdp_drop(rx_ring, orig_i, i); tx_ring->stats.xdp_tx_drops++; } else { - tx_ring->stats.xdp_tx += xdp_tx_bd_cnt; + tx_ring->stats.xdp_tx++; rx_ring->xdp.xdp_tx_in_flight += xdp_tx_bd_cnt; xdp_tx_frm_cnt++; /* The XDP_TX enqueue was successful, so we From patchwork Mon Feb 17 09:39:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13977423 Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11012024.outbound.protection.outlook.com [52.101.66.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A7F7C217F40 for ; Mon, 17 Feb 2025 09:56:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.66.24 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739786197; cv=fail; b=iFkS9Rmy9pwQs2Zk++h3McNWpktEb1A6sFOdHctUfl36nJzvh12ynzhFtz+gs3Csl/molw80tKavOcN+O7u9qC0R2jP55JBAZi6m+D1E5risIhVShR6Od/l9qHGb28PBLzpQP0a5X2EW0eraEpIrbkOFvdF9KTZiL2N8Y9m01Sg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739786197; c=relaxed/simple; bh=eyI6QkeblL0Pel7K+fpqzy0LLVyNZQCiZ7I4Zdf83jk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=VXh2EFZ8GBj25ot3BO4D1fFSIyHrdLYw+jEPt7FvWwPmEoclmfPalnIXT3r9lBsdprDJ9OR9dgx9IARVvUxNTCF9umtTcxv5vziFq/DUspLYYPNuWk5ktjIM35ObPBbVGkhhOQWctShQln7TJFfVlVrzB0g2CZiNwE+8jredkOg= 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=YIVCoaXe; arc=fail smtp.client-ip=52.101.66.24 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="YIVCoaXe" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=q4RArU5d9jyG7ptm4GqW5rCaDMZCxilW4ILbLnT815HVR20BZTbyCSwo0YAMpRmiHNoIwJ+bGMkJhpiXlYwwtsfI9xt0+xdm1tKxewkPG6lmVMblIfMoNK9TJmmPb53X/ZZQEV6q9/DSyA4pqhNR61xpcxrF2IpNt2O/O2coZDZCP/dagTIMydah9w19RZQaQTq3TVCfexByl8A8sZOtvoDFqp6Vg/ZotMv80dKvmqXGDlegh1GiNNQi7Zio/KpLhlxFVnu6mknKy/DnNX5qYhJy5wmbRuWpXAlxqV9q6qM5JNV5P7h3AUmxmeeZTKrmuNpQsj2Pov+jXarJs8GHvQ== 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=wcH8L6+luCg0WBinBX432f26+Rxp6BL9WR1EKPLEWXo=; b=GJstj2Cy7e7iKvoU8Os85VJEOOitc5QmW6Tvb8BK15WgzGx5dv0XID+VuDM8xej6lUseBMGNG1qb7vuvBRID3Iusc771p7ftG1gXmklMzgZlWbToBGSI0uNtDFEufYU8K/DWHrHwAxyEhUSFpojv7qa+At4QHtk1fmtuM+Gw+NhYc5v1rfluqFIyU+QIgf1m1l8mIH/LmGlCqXGokHUrdVElFcEvJxdEJ7dd68qitYjqGNJCalB2kAGvW0GcooVWM5ABTOPF2NS7nC8Pe5UgWvptE+1OzUaVggrvZI/PcITOWoy5S4yivkEQ1XOdQFEgoCSNRLABppIkPHuuy2C9KA== 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=wcH8L6+luCg0WBinBX432f26+Rxp6BL9WR1EKPLEWXo=; b=YIVCoaXe6+cfmWP8+d1H5D7MGvRYkxRAO2gcMvdPVOJokGac1gLMOFRMUOC3NpcBnNoqmHCUWm1LDgrpVn31nrebgqrDl0FyUUvj3PMJ70BhAM6y5Q8RalFDUw1YttxBWjBB3r2t2T0NusDpKbPIvbWP2jdu8qic6veoBSyuNjFWWHng6ZPC9E1W+ZRFu0aMOVtf89RcQJRSGKhilO2VkL9+8mDackbXrT0BdBnmUiHrrArr5cuZq5ThsDiFMv25DdOV76MEd7WJ8nkF18ZZQqWmoHl0EgltFrQECI+sMxRU1LiquM0a+3kg+gEcoiKvTt8lygxXTC+8eMxXcdBaAg== 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 DBAPR04MB7287.eurprd04.prod.outlook.com (2603:10a6:10:1a4::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.18; Mon, 17 Feb 2025 09:56:32 +0000 Received: from PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db]) by PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db%5]) with mapi id 15.20.8445.011; Mon, 17 Feb 2025 09:56:32 +0000 From: Wei Fang 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 Cc: ioana.ciornei@nxp.com, yangbo.lu@nxp.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH net 4/8] net: enetc: VFs do not support HWTSTAMP_TX_ONESTEP_SYNC Date: Mon, 17 Feb 2025 17:39:02 +0800 Message-Id: <20250217093906.506214-5-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250217093906.506214-1-wei.fang@nxp.com> References: <20250217093906.506214-1-wei.fang@nxp.com> X-ClientProxiedBy: SG2PR04CA0196.apcprd04.prod.outlook.com (2603:1096:4:14::34) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|DBAPR04MB7287:EE_ X-MS-Office365-Filtering-Correlation-Id: 9d9df4ed-8543-4c74-b221-08dd4f395b80 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: 49u+Tz68GTLJDp3GjjWzodmEsIrOvo9uXRJx8RdcNQygcDdohMCMwsQnRNBZ/4Qzp02mReryz4IGGTg3B+nD9x8mijLpQ83chx7nrhnU3Gcan3FnOMOOilCSLf045ChV+FuqqvDKDIalJrIJd6LIqCI6Pj5ivZ5S77oIVZbQIaePJPKfXwyT9aLJc7d3u8xS17fJzh3uVJppSFdERSZ+/t2mFssECvGmLG7Lnc+N9atpiu5Bby/x9QR7NhngflZwvVSXiSZat+5h9pfBJtzS55ryjXIq1hrzCPm+8DUdhN2u7zgjuv00Z922NV5wlbGGLXUgbNU4mmUBHpHY8ikLmR+DpdHij7AmGCj67vO4cZp/hI/1sxcC1YfMuvrsWWN6tFM6UCiFJsDXI2nmxnZLarxkSbDF25XVHZhLh3tlBSEEWBnvV5T8sZCXxaYe38reN6tV+Nhr7Xdr6shYMmzcUTFEzvHTBl/regiak14n1i1gJUfP+w1FM3sPv14rjK9d4r4zD32CfVnHo8j5TXpurcZEXe1TCGOF9xcLMBtyycYPksDW84ITI48ciOYOgqEuNVNk66amyCVEmUxu3HhOhrsJTceurw5CmhQ/wqQwzgdZhmcKPXVEQLGiwaVHU0jKymZA7QGcyihjJWxdMUqqohKCd8SCd025npRru/GdMP1FBk0ap/HI9//G4LKNeVM3XFH56Ehkuf6yfGFZObL5wM0MCuWbLSz9UxHIgxdQPxSnpegqtwjC+CDKKo+yH3q2ipJ0LvQAwSpqYl4Lj+n8N1Kxi0OS0nyFtfYvRdwonJEXwEAMahaUmjmb+2xh0DxDiZPvayVKILJUCe42f3qWnwZ2rkjgGZk4mh/k4DXUqGGafFy3u1H5bfvDLIlpgHjU2XEYp2T7rjbye2f5UatyXl7kFi6F07pToJVEK5nd09p1PwvXjqT5DtrQmgnq3uoukwP69FCMHVjctn1bJNSVUbvOhzJVNXSmh70IYRYyexjxg4CQPjRsTWcy0h9GJzQL13XNI2vX+AKSv/YykEboagnACAaw2nPdr1qIdd75j+40ZwYfgN4Wv0o2UP/qgr5FADflr40yCEosYHqVVesBsMq+NjEyqZyNU/hvBhAlkQIpu6NZ5TwOssdgLL1+C9dxnpZEXGTeKBSxFCnpIoehmDJ8Ey0WqUhUtb8tO1WoRihWgSBeTcAzxPKFxkvncykJcHmQyoB94/6yDWmyX4/MBa7S0lowHuVfSndMhOtW/hNoUmSM0Eyo+l1a5MPVtVkn1d+A3f2o9eBT34OD1fAD8rULUSj2MS6sxCnB3M6/+2xLt0/ZQTHo/DAOmPoi5CQY8Y6FT3e79hEg3SIQsGDm93nJywaoL1TqdjkCOWwUeBBLDgpecoGWguI80ksHB1NnUOAUvH/tt8QzIVnz7qKSYqswTrKeKr+/aIh6kEtEAg1nrl6qrhpjCsDbobMbfdNb 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)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HDMq7Ftfc5TJUBThTAl8cPgi/jL5eGfE/Me393NBXmvwOEeFOM310dWzVrSh3UoIBBLl1zq7ERLVIDC8ETKeJbG8x/8TWTwnAAkIDSNPZG5ecqiE4vw8dK5VagyXx+SC+S/N6rqzAkkhPw7R4Kv/HBThygHQeAqg/aJ5OPL1kHJGRmrHH0zgjbgUNV86lcD72NIjPAHCLQPNYSlzDbJhvZTxA7NumcpnH1sR3xNK1+mIo15/m0tSAJYnVfEDY1MoVJuK0+WnOFWAmnI+YLSJVxB/HqroCU+TLUIRDzXcW0piadfjThQk/DwX/W1heA6kqmsKoypzqIM+ulBFs9DCKyaaH8Si8N4reoj8IUd8KmkQTlbwHa1eB6YCYC0/fbSXlbXUmVJFIgq45R4TKQIJobvmw+4fb7KKzbiugHp9Jlv1/1eDpHSNMch0l5jjetJY8f0U0ylhQRxZBtn/qHtDkGIm2UjMrMyuslt9MEnY7ySqaKYJvI4+J1SDhVx6N79j+C7BeJ4FXQIT6bFTFh081qU2FHDqGlBJKZYMMkaTuZ6RFlLsp0irRjl8Zw9pQuWF8a8Yv/2Fw3Lx9Sbohbcvu65ZM37zdvQTrlGxR6cfUxUP+AW4DakunebSSvcqB9EPx9wcbnHdM+pWR7PJzQe8yFpmbWlcuiCMChESpzknDtvmHmoLNXlRkNl0l4QxtauWiXGfUin2chM6lkBAKFyCNSKyQ53QtAPa2ojqh3TT4wG+UTUqn4fl18v95CwC1+CLFSJuDoi/eNUoRDSfuwXR3a4OIUSOW4RGPC/wCP4Uh3XsfnJmHszZJeRBNA/og2y0GFgrpNoh3oAqcYJ6AkYCYGZ6RYmD2E+zzxPiaidcEHLg2jCTs3WRuQOidi2qQeQEU2ijbOVZFP0nlGLVJLnoPl6YuFHUHAANcY9qCgu7Kklz0jk/F7kDOd+UbBTDG+wehU+zUbcjKz3PtXqYhDSJhtYDkPIGx6rmj62uwoERBq3798byBHKeod518UDJxVRifRQswhrQR6/GHthmnBKyHOljuwkP1rmoai1aFWc6X7p69TvSjo12i6PSX5qGPQ510UYCXJCDW2++hP4SpYaDng60PRRP6wr3DWuDMbT6rWpM/qrzLKu+U65FhT+h2heSJooDmxBnBKWvYd0Ia0wbf2kvo6Tr63VFhYPpOhnkZ+TapYJZ3tI30UUphLYCrNhkJc552TrfmTsoD9v7qpFqsld05S6czPPQdfhlaSKVzF0tOA6lUHK041P9Wr21dIhRSn21D2yRCcT4LIwSuwy6wipx+3+C3ICLaEf+NL/MSBegDfUYHMWmo/5TN1ubSKY7T9UErm+CKOeeDrbDdctUbD9yDz2rA7yI7bfsWzWivNLE1ru2s4SzG+RKR5V8dOUJ8D6AfXczrgPpYjwP+VGY+NLntInJDTFahKgivfBOvMvdd49pburT0vR5c0J0GtvjXD6OF5YdEcBCJDdEunYUfkbI8T/XtAVav3/GLveqCFEKEfhfPKB7FG/fF+6doo4PtpV+L22oH3rl1GHr97OG+5GiNlBCDfDlQdWHU39bo02EBr5KvhLoMtfRL7dLoxvD X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d9df4ed-8543-4c74-b221-08dd4f395b80 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2025 09:56:32.5606 (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: UP3MEiKV0sOZZ9SR2WJCCrKa5/T/xfpuceOR45u8pWl3+CX8jks+HUGGupdgH4x+JT1SktdRjCuQKKBEwb1V4Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7287 Actually ENETC VFs do not support HWTSTAMP_TX_ONESTEP_SYNC because only ENETC PF can access PMa_SINGLE_STEP registers. And there will be a crash if VFs are used to test one-step timestamp, the crash log as follows. [ 129.110909] Unable to handle kernel paging request at virtual address 00000000000080c0 [ 129.287769] Call trace: [ 129.290219] enetc_port_mac_wr+0x30/0xec (P) [ 129.294504] enetc_start_xmit+0xda4/0xe74 [ 129.298525] enetc_xmit+0x70/0xec [ 129.301848] dev_hard_start_xmit+0x98/0x118 Fixes: 41514737ecaa ("enetc: add get_ts_info interface for ethtool") Cc: stable@vger.kernel.org Signed-off-by: Wei Fang --- drivers/net/ethernet/freescale/enetc/enetc.c | 3 +++ drivers/net/ethernet/freescale/enetc/enetc_ethtool.c | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c index eb0d7ef73303..6b84c5ac7c36 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.c +++ b/drivers/net/ethernet/freescale/enetc/enetc.c @@ -3229,6 +3229,9 @@ static int enetc_hwtstamp_set(struct net_device *ndev, struct ifreq *ifr) new_offloads |= ENETC_F_TX_TSTAMP; break; case HWTSTAMP_TX_ONESTEP_SYNC: + if (!enetc_si_is_pf(priv->si)) + return -EOPNOTSUPP; + new_offloads &= ~ENETC_F_TX_TSTAMP_MASK; new_offloads |= ENETC_F_TX_ONESTEP_SYNC_TSTAMP; break; diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c index bf34b5bb1e35..ece3ae28ba82 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c +++ b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c @@ -832,6 +832,7 @@ static int enetc_set_coalesce(struct net_device *ndev, static int enetc_get_ts_info(struct net_device *ndev, struct kernel_ethtool_ts_info *info) { + struct enetc_ndev_priv *priv = netdev_priv(ndev); int *phc_idx; phc_idx = symbol_get(enetc_phc_index); @@ -852,8 +853,10 @@ static int enetc_get_ts_info(struct net_device *ndev, SOF_TIMESTAMPING_TX_SOFTWARE; info->tx_types = (1 << HWTSTAMP_TX_OFF) | - (1 << HWTSTAMP_TX_ON) | - (1 << HWTSTAMP_TX_ONESTEP_SYNC); + (1 << HWTSTAMP_TX_ON); + + if (enetc_si_is_pf(priv->si)) + info->tx_types |= (1 << HWTSTAMP_TX_ONESTEP_SYNC); info->rx_filters = (1 << HWTSTAMP_FILTER_NONE) | (1 << HWTSTAMP_FILTER_ALL); From patchwork Mon Feb 17 09:39:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13977424 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011071.outbound.protection.outlook.com [52.101.70.71]) (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 073742163B9 for ; Mon, 17 Feb 2025 09:56:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.71 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739786203; cv=fail; b=OAanmEQ19pswSi17ohkIM46e4n2+oMcGAs6/GUOTsulCQUKdUmsgJSo+W8LCbvZarJiWnPcWahA4fXBJxJ5sVYna/EhCdoLuXjcp21eehjveSnjY0NXkYBtAPeQAxykjIao32D3ilznj5JYnoNH8Rs+0Y6gyoGU1EyW4NA0zihk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739786203; c=relaxed/simple; bh=4UEml9V10zq569n2YVtXPrX26vzb/0pXGmxTyNTI8MY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=YN4ureFk452fRO+eCYpE6HBKLDHaR6coTrbOiY+S3gJWDOvi1DZXTNmttTSbwjg5vpnPPudJjVRu3KZjMr0t5v9fysmSd1HlxoV5zYlN5linPTIsSlHd4mWb83BHl8o6mVYghUZ0zp715SENdWC/6eTV8/ohSqDeVe4Wiiu/Tw4= 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=Y+R5hjhz; arc=fail smtp.client-ip=52.101.70.71 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="Y+R5hjhz" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GF8cA617iER1OW1EoYtszR8g6OcLvpxJMGQ917bn51VbJumIpl7ziJt2UH2S2PNGEbHrVpVH2hT5P3ZAWqPmc4kDJQhEnBjZYP+tPz+PgZjGgIBOrJz7F2R/PJsxFwcpH7EZtJhGBctfa38ZixR3gASv494Q030UzKBimk3c2Hn2he4V+Km1hgOGZBMlWIQZ8fyEZYcG+jTm/cxEk0Vd4R6oxCfbzLuzrY2sRDmmwdfpgM+MfRQr7YNakNQoy2fY0e5QJVnUmL409ZsVyWZ5D/wd9mcz4NgHzSlPRF/Zrkp0Z2VVdVHQ7VrnCcHPkQ59Lyvl09q+D0Ib/PB9Ym5InA== 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=MpGXal+/+Yw9GDtNm1NHJ1ZWB9nXd9OBCCkAux62czE=; b=LLeZmEpZsAntR/V//HcyP9erWusCyxCevXRar5FKq3QRPIppvaaYv+zJUxEQue+oE5mgmizushCsMeVQ3BoEj7dG4kIqIBjdc+ZJZRxrjB1zwjmreO7sVghsbedoeJWRqdwYJDoTpE0cxaTH5tHkTFmMlexlzy1DRb40GbGeLui7OeKVywx09/DGsmAYfOBJBMw72DVPoTTlTFtowWjX/xkUjMvXrbwS6amSxeqJOPolbT0AcosDfXOT5qbFsFwc7qeIdYjBjHGIGCoFShfe+L77gallyFdfZXDdqWYpmZtY1i3yVhLa9tKGTacnyWc9U9sQXp9Px2rQni14wnoRYg== 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=MpGXal+/+Yw9GDtNm1NHJ1ZWB9nXd9OBCCkAux62czE=; b=Y+R5hjhzApDbHUXA2Ip1eZd5BDuXezhTUShcs1sn7WUW80Fa8tl5HLte3DivoSOZO37c85y42HZ5FamL1ahHgVjEtyjepKL4Sb3EC1PiRxZq0GDi7c+RZxZQMo387HmNGViKx70BONe2htgri0jtAfHRVZIeJlzNZO2Hpj+FY+Sl9wXhUHbZwaD6yq/s0UQNUqD9VNgLRRxJZeQvNxdKA4VNpiYY0H/oBTl8hwEAEtzSjSxxJszpK91wKCZVHVLjl50be/lXpDnUXDrO45r8JibD+Cr4Lgm+dDdTS6RX8exK/tdmT4k3r3W1HRI/DrnDiwLxl6dHPuYZjSjQUPGB4g== 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 DBAPR04MB7287.eurprd04.prod.outlook.com (2603:10a6:10:1a4::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.18; Mon, 17 Feb 2025 09:56:37 +0000 Received: from PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db]) by PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db%5]) with mapi id 15.20.8445.011; Mon, 17 Feb 2025 09:56:37 +0000 From: Wei Fang 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 Cc: ioana.ciornei@nxp.com, yangbo.lu@nxp.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH net 5/8] net: enetc: update UDP checksum when updating originTimestamp field Date: Mon, 17 Feb 2025 17:39:03 +0800 Message-Id: <20250217093906.506214-6-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250217093906.506214-1-wei.fang@nxp.com> References: <20250217093906.506214-1-wei.fang@nxp.com> X-ClientProxiedBy: SG2PR04CA0196.apcprd04.prod.outlook.com (2603:1096:4:14::34) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|DBAPR04MB7287:EE_ X-MS-Office365-Filtering-Correlation-Id: affeb771-68fe-4248-af19-08dd4f395e2a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: oV1ofucBaYYUvKhFymu9dHTRvUvJiCwvEzQZy72jnBUBI0JtwR8lZwQAHGccdklr0SFgCl1ihB8Zco7AA9rASMAMlK0A9btUwx2fxTdPLwqFyHSxJbE+Fg4cm4y8uU8kGq2aUX/WEELs3RxvpPF9UbqL9V/6i+mbLFkkNFI4hX6Iut/60cdLngGd36LxePLhAPYqiL6UoSERrOpxY7Pfe2LywLDloSrbUBEOxqk/DVlpi32ipsx4aPPikjR4wLOGZnVP8HksA0FqHD287N3sU6A8pjfT3Ov07jt7RiJJGxlxbnMSWZJ6icMl4+m3mt9KmRqWKQATZHi+4CnGgwMT6T0/1aNdysN0vUpyRa4T/3qyNhT5ISmQNvme2AVEjGxu/J/2UTs6d9gt9Y/HDIcZpy0jZRwf8pUpZPr+MQ4I+v9JHxc3QaLvUf2xDpJU3Oos8GzGcsV0mZv8mdCNoZMQ1jym4rw4kOffU1Qybj1PnjL+XqCEqIpmbiFpVcTSPks3yHT0HD5pHuKDoAgRq2N6C1YoUjPplhDP3obLUxwTqQkvJWDpH8ZtRa4oBVO6Iel+C771yM9mAJDYARmz4nNY3oZ9Ny0pZsE2b40KftcRBoujIbh3QKHSXnygy3tQlxHZ/Yho+yaCqUoNMJ2rD2BI0SBG5qIH8JwPRELAU2rajbbYPdM/nAvyme24f/gNeloO/eGLODwmmnj44agIH2a1dzTYXL7QBhP7IYtHRMun7+Hix9S4zImYJji6qfH3zVUPZ1C1zd9ZWjnt0tmAlJUDA4AR6NtzQT3c+e39QyuweEnzfFxv+2WNEElgwViG1ZwfMv6/5JPH042CwMkq4G7p66E/qsA4ZYuc3381vagsNWm2I9GhRKOF014KSojwW3kAkft8HU+Roocc0mkmgdxQAO51KzcClnOdHlFKW4h7sL97r/6al6S9x8L+umMEWpEAJEerWw+WKGcnm/OBxYVILhVtbiwpiM0mtnbscV8F3hxSO+jbR9r6rcl2LbiWDcF4viPL0d8UFFrPElmG2JuahKAI3m6jdSJSIGlzKaFOBXBuIy3rQ2hCK8jzfezczEcn9fTjfNSrt+/hvbudxZjrfmURL5VMo9/9q7OlEuJN3M1Sh706ioWhqEk++QIfuklFg9Ey7fcBKs7xk10xwh+PCDzI1Ft6Vf/sQPz9yRjdAeS93Jb9QwugaWLZDUJwk20Q12ysWXMS9mB670YAiVCNSN/Gh9GfnVhbT79MegFiyOZXfZypBBIz1e53f8plawKfrIg3j3ydR0FJihHXX7hzjJXcxcNoLW0NAqD61LmQN9GmEAKsYPgPqfPvvu9qA6zrbQ68LFSX5dxFzTYDsi0r1gBoZQbYmW9ssd5+2cxUwQZVtD6o3OU5YtRyWRTwHiaNR+/7uVmQ/8nBo4M4xqYNQ6PC6cQm0OMQ5KrLt31JutUZYWcB5AQ3x6we6dQsmF+d 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)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YBDpJD+aYmz+mqmYCdfmFaVLDjkR+CUs7c2x//U2BV/zlGtutAdIyj8rJ1Al2tDdy3fvfw80fwEQVx94h91lIFHyq43iH3c+eSSMit0EmCal0vurjJzgfZ7HzQP5y6A/d7VEBdWZBX2iRaU1EhTSdaTOxUDH0FCjhE9Job6H0R1uJHH5pj3Suf/PO+YOwUPHJDuu1TfMwdh5W3s8pQl66JPciqpPq/+NJ0+CS56IHUMxmTgbILXa+CIfvgEs9EFjohhr8d1Cjr64XXVbN/WgzwQU939bBofY0oGjRU15vQGjbASAIJTh0zGU0/Rxk6is7PjnhLvTGvGqcrFWOJpQT0+aMpwf30mrsDs2vo3SZRQbtuVeLaOr4mF+TDX0T8fmNSRAhVv59aOda8Od78ALdtZWiUox5L8hgGX2GUbmkjPksyWOZt1RaCCtQE4eBEjfelDsY1T1AUyDRBuM6EQSh/82ykGkrng94foF6AbVTAXWIJoW4pn5nYoz4v/i/hmGnQsfMZTXWNx7Hw+V6SJRU3kuW6pue/sYBG3UKq6L0IqJ8ZEJ/4d4a30fLHfHKDqTk3unz9sMr05zR9cEbndYzL2vitXHLQZPLBDCAiSAzFl5Ctu9ShL8S1voxZkPYTkiZKHzb1BmDqwutClEJY9laknOr68yJkbuLNOcM4QgDpINbN9MiSAgikZwVJkGo6EETprX5aGMP1eBKkGO4s/KYg8Ekq3oiwiemDQUMlty5WMAsK3AXdhaEZSYI/Euf85OOvdqUaRQYdUHGOupYmlmTMF/gBZH3jqUDbzWiUCjYEoZHb2SbTR7j0bPSSqlXjUTYKqli+2/P+fN8ksYxFWJ3SmO3dCLOn+tuKO2VsGMOOT0EHrPZA08HmeKcyxV6bCJcWsSTuwSEb8O+1WJ0B8psyrLc79ubcrnsa0rQ/gyq1u9dmAHjywYD8pOvlcAg1U6SkiTytOKqIaZdwcHRQgSaZz1jqg0HHYNUPs92PGL64yrWwYVVjnVTB/5Ne+FWEMP+lBt7xxvqSKw4TR5WgS8h6azjqwEWStfxnKOtlnG5+A7pBWqTQxKnEJpfDnWt4xXImk/SNInktOyO+06WiRDotCTIxVxD4Mu1GdhcOED0Huzxdw5XhxJTj3mXSc6yFe8NmZ3ayxkW8jFGnahKxcrsMMamtIECgMk3OIhufu5f+N7p9eu5GrEk2rbH1ZdfY409OM2BOH8ouASlTnKW7mBL9kWx+PMoTezFjzBF7GNC/hedIRC3gRLCTtedAK+pzmPSGzzU4Wa0j+K9vfTFgExgAoRTceko0MXBkhfj9MGM5+BozFEldwsQRx3PrAkzJtayc0PY2I0+kNftDZLSkZBTvMCOrHmDonpLjdQcP7cLY9mXG0KftaTzWem2lp51JFSdQgJAuAYmbfi5CwfWT1+8EbrbBs9XakE1mISUy513vehTBUEXnYNvHGC35xH+UsMo1MCJSsztgOKiREIy/7jPcbhHmFvk4RbbsNnLs8wt8Q5oJHmTMECaEEpqCnP5FEaPtjZqJ1XZD7hpRRbn8ZP9u+nvim+Cm8WSP5SYP6fZekNMV0ADbuFXrmfrtv3BYzQ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: affeb771-68fe-4248-af19-08dd4f395e2a X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2025 09:56:37.0533 (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: +iBPgynMP0dTeLnblQwtnpoNXtAXpYdKu6DBjWRrIe4qw+Qa71wMbrvIdnXQtUBvHiwfgrR+Jjl6+suQzFeT1Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7287 There is an issue with one-step timestamp based on UDP/IP. The peer will discard the sync packet because of the wrong UDP checksum. For ENETC v1, the software needs to update the UDP checksum when updating the originTimestamp field, so that the hardware can correctly update the UDP checksum when updating the correction field. Otherwise, the UDP checksum in the sync packet will be wrong. Fixes: 7294380c5211 ("enetc: support PTP Sync packet one-step timestamping") Cc: stable@vger.kernel.org Signed-off-by: Wei Fang --- drivers/net/ethernet/freescale/enetc/enetc.c | 41 ++++++++++++++++---- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c index 6b84c5ac7c36..cb05b881ba66 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.c +++ b/drivers/net/ethernet/freescale/enetc/enetc.c @@ -279,9 +279,11 @@ static int enetc_map_tx_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb) } if (do_onestep_tstamp) { - u32 lo, hi, val; - u64 sec, nsec; + __be32 new_sec_l, new_nsec; + u32 lo, hi, nsec, val; + __be16 new_sec_h; u8 *data; + u64 sec; lo = enetc_rd_hot(hw, ENETC_SICTR0); hi = enetc_rd_hot(hw, ENETC_SICTR1); @@ -295,13 +297,38 @@ static int enetc_map_tx_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb) /* Update originTimestamp field of Sync packet * - 48 bits seconds field * - 32 bits nanseconds field + * + * In addition, the UDP checksum needs to be updated + * by software after updating originTimestamp field, + * otherwise the hardware will calculate the wrong + * checksum when updating the correction field and + * update it to the packet. */ data = skb_mac_header(skb); - *(__be16 *)(data + offset2) = - htons((sec >> 32) & 0xffff); - *(__be32 *)(data + offset2 + 2) = - htonl(sec & 0xffffffff); - *(__be32 *)(data + offset2 + 6) = htonl(nsec); + new_sec_h = htons((sec >> 32) & 0xffff); + new_sec_l = htonl(sec & 0xffffffff); + new_nsec = htonl(nsec); + if (udp) { + struct udphdr *uh = udp_hdr(skb); + __be32 old_sec_l, old_nsec; + __be16 old_sec_h; + + old_sec_h = *(__be16 *)(data + offset2); + inet_proto_csum_replace2(&uh->check, skb, old_sec_h, + new_sec_h, false); + + old_sec_l = *(__be32 *)(data + offset2 + 2); + inet_proto_csum_replace4(&uh->check, skb, old_sec_l, + new_sec_l, false); + + old_nsec = *(__be32 *)(data + offset2 + 6); + inet_proto_csum_replace4(&uh->check, skb, old_nsec, + new_nsec, false); + } + + *(__be16 *)(data + offset2) = new_sec_h; + *(__be32 *)(data + offset2 + 2) = new_sec_l; + *(__be32 *)(data + offset2 + 6) = new_nsec; /* Configure single-step register */ val = ENETC_PM0_SINGLE_STEP_EN; From patchwork Mon Feb 17 09:39:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13977425 Received: from OSPPR02CU001.outbound.protection.outlook.com (mail-norwayeastazon11013054.outbound.protection.outlook.com [40.107.159.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 403692185BC for ; Mon, 17 Feb 2025 09:56:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.159.54 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739786206; cv=fail; b=NNT5bdO2+kAuMrKF53mRi9GpkvZB7IEqeGpICf0x5v61/C3EFNE0z5my5b/lS1HRtbb4+t2nwq5lHEZAWz7/sp79vV2OjwuabcBZXzNSddO8jmLLo8uUNVcmEAuVCp97NsTKc0ViDz7BpZZyqElk5cVc0+eYvUEVWws1sZa2rmc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739786206; c=relaxed/simple; bh=DMiOOiAtmShOkFZj8EkZvDqHtnacJDvRRcqJ5XMGTZ8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=KIMrzHBehSN0NfEjok8pIg28S6cVrveEYoJ0qsuDgAtwFpk9MErGSdlmyaUSqGsBo1NSxdDonv3RLoVbgqRNIZZ7sCL17Y0J+ZdmxR1K/QCDZdVUWNXDX/2PZ43x/RKPkQXUUOaHFHUu+wZkWh6Pkfyduf/HzEh0T20jsAnQfrs= 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=GVnDIyKa; arc=fail smtp.client-ip=40.107.159.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="GVnDIyKa" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FL+92HGS9F1W+ecsVBy+CDYwObYEMAvotquO15nt6DKelV3L1pCsD/OAwcyBz1w9TiFR6ueoIDgMjbdbkWJuObvEeWBmQ/gLHpXGeQvnKsaN5nZ6W2P8Rlw2aqVaGOiWcFXm4Mp2102U2rU6cm9oTsg8+39LZg589SKdyoEx/6nfhrQwow2sk7G0Ka81c239zCNvmUwOQxRYxwgqGX1GQVKDfCIcFSPefQFWxki97vTx5T5CMhPwYjfVQw22xbiEXmBDjxpPpkVzp5tuIhs3ij7COvx6MI+Jg1EfZaOznlQVRikyFfvSo4moslTbBjg5B9KVuomMUUiAwqWcn6re4w== 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=Md4iT8uDmV1FgPKEe2IVNAh9iF53foUzVdVmDoC0GMg=; b=KVEnvsZuhNRz1Vm0IjJHR/qujNylMpn72w/9PmnzpRPqml+o3XX7teC96UfKH9lQnub9OBUDdscS3Hx03OA1tlOJ3PwOxlJaizGRWyHI7neZnIJH+MB6hwwfs1tCnYbYu3K0RO872E5EsG1vzUhZmF0BtvClsUO8IpxO1oRY3I4p9hMNNlAjV+5harSV0pmh9NFdo/Eq3Z3Qz3/CYWfwXRIOPIALHkVHbIWfzbOwzgYgawhy04SGLhMm4ISzZmPetAEUXkqoEKCyR37Y0bL6aOo3203+APGAJgAhOXVSdhcMEOfbsIPm/VM6iOSXZiRqSoVALitMBWHA+uc8sfPd0w== 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=Md4iT8uDmV1FgPKEe2IVNAh9iF53foUzVdVmDoC0GMg=; b=GVnDIyKaGBAuO1C3KR4RR0skWsv9c/MjayiNFud7KErHqHDGNM81OEJNMDOSAwUS4ohqYaKNCAKOk6TJ8ul6DxMMjxmo53i4ThHt4oGNTP16DfwtuKMm9zQpXIA32KdsKRsji7NndnEFmrHTZzcGfXJL9etLW7si0ycVpJB0Wp6GJsBUNF6LQDHJs7do0PvDfd5/TKokw9ElK6XtaDDnI0/U63CVaVX2GtoOhMda7FFrkqXBKWKMKY69b0WqJ7wnKzvz6fTuaj73ykjU91w8lIsxqfhCHlcdGRYRa9m/6VQRi0MTakkV8FTRTKyFvw3WIHcpZpq8HR57cF0IJqvWCw== 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 PA2PR04MB10240.eurprd04.prod.outlook.com (2603:10a6:102:410::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.18; Mon, 17 Feb 2025 09:56:41 +0000 Received: from PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db]) by PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db%5]) with mapi id 15.20.8445.011; Mon, 17 Feb 2025 09:56:41 +0000 From: Wei Fang 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 Cc: ioana.ciornei@nxp.com, yangbo.lu@nxp.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH net 6/8] net: enetc: add missing enetc4_link_deinit() Date: Mon, 17 Feb 2025 17:39:04 +0800 Message-Id: <20250217093906.506214-7-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250217093906.506214-1-wei.fang@nxp.com> References: <20250217093906.506214-1-wei.fang@nxp.com> X-ClientProxiedBy: SG2PR04CA0196.apcprd04.prod.outlook.com (2603:1096:4:14::34) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|PA2PR04MB10240:EE_ X-MS-Office365-Filtering-Correlation-Id: ff3593be-542a-4875-94f9-08dd4f3960bf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: DIFWxGh3NLWNpvM2xt762EQZTmaPChCPpwr7qKineh4PvV8qFURrNHTLYpSvT53ZbyyYg+ts5jo8P0ck3ar6cw6/ELkwV1j8t9e9lm+memTWnBsygJdJJNsFf2pfO45INjrHmZ5BfZS7Det6Ju6gdkpK61wIEoJRbx9D8Nb7yG0Ul9ibD+JCFJjjkcA0eCGheyhLnVPpIauAgKla1isu47zy9qd+UXU8m7Wcx1qAHAkwLslpeblV+TpahhWt5no4Zwehjz0nu/z/jLDPQOA+nQKMF/23Mv4G1vzPVOHNWIbYsuxYwBIEYMQVBq8ak3OwnjSZvdDYPlrDzmP5hZ5KZwLxj6BDprQNddGzmvdd75frZBnivOXmUG0xByGEWs7IyPOq7d0QK0GAoykpR3xL3lVOseLf/sPyKemnYqsCClHcQGddqLlBhYfrS9XXBc0suL0iXXudeERihGs64WHQY5tR2cpZYGagE+3MpfQ3u0L35eTKbYLdtRWLHqYA1krWIwwMQBKL7lQRMigx3SOk4cSYE3FDJR64x7n8oQC+x7/YYLRhXL9Fwh8moBO5hNrvCy9q8z/w3zgxhu+dIPU30UYEvo66h+U8ag2bfzc7TbcFIQMYhJVLxPQXqTkXjOga/WN0YhNLG/dH7CpWxLYvU3jbAJr0naX8qcRu2a/IVjbnb0VkpZM3nMiwWQPTDEyezFjj4WOFrvKXxoAh/M71jK7+M5Fg1t2xFX2PcIEKh6CiGMXEYuOa3EH5neiIelRHBIOjxDPxfj5Sy6hnMARx8tr9w6OhhDqz9BexxTrMmCEvDolUIwvDveaEdl2L6oqYmq7B+jrUUGIkZ8JZh14Qflt1FR3Xwf3RTCG5Xjq57IJwrkNYNEBf04GW1b/mpoeVbi407pjyeTLM3EGJSNzgECdyporO+xy1eMyoZsZXxvjPfIo203t6nFou67pIy4TjHzojXeemYBg2++EQWBY7ugEjyS02MCVT1QXqbsIJ+/xPl9H8UUDeFqxdjHLWpeXQrRZiP4/UR03Uu+Uje37nVeqKLuGc/HC/eUN1VL50neT7GgpKCBx0nlCgbXSC2vxVJ1OuH18sGImLY6kH7QChRTgBKL4eDmIjcFNQT0uwm3IZcaLZDU7F1Pg39cuY/a/L3sUtuucUW6bzRmOuMrUbHzJa7KX5i3xBCavlA1l9rIv2Uv/VOCxGtWRCSiQ/9Xn5eUcLvC7RHh7cWlNOO+PXPsY8NxzEuqTi7SUyskCNH2F6ZgCAZBsgxbPX/GU79kJnB1sIYCF5ZscbilwPkzEGd9+Mcx3PrxwJDKus/uIqAEubFOqBFsTXiVCxCS4OoT2EhR7r1Q70EEwGkx+Diq9krMaJ3Fp2obWbajvXMe+g0o3UFAErgd5zVFUQA+ZjIVEDZbJPjuuqlxcGs0FANnxVA51Ym/xGTJ15MthwE0lSxucsyQMqufYMz0Xb5xUHKr/i X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB8510.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BDkp6Jy0NHnOENI4CJ5F2aPcjHOsKIllRaZV7qVDd6cVDhE0daL4sv2rLQlg7OU/N8R5KIzgnTE2MBNBzk6RSpmlCRU366Jsrcm3JY4GDCuUd313mH6PSg4Hv4dXTh/GByWpiU6ayufqjMwTLpEpDa8yIRmCTmNkLz9y9EKuP5Yje0dAIrI6yh5ID3FsMIMZVWE9OJczR06P5sy2oYfZRGHRrN1JmYB9gdjCwLOEndWQ8so87lMobO8zVEBtfpbLo0sfp7RrdUHUajDwed2Rtn3iv8zXNZGWchswH3p+tseNU8r4cM0Zcu0rUS6fszZxZo5chYLAigYLXoBetDrsNX5pDhLmuryse19dL9NDhP5HzGcHwYtpfgpbviHT5n+pMEA4ZO2YQQM60qK3ogCPE/jRaJy1vL1XvNrBdTHRUM7LLc5jyMklVR/DoBQXH3bQ0tWl1OX8HBwUTOt/L64JmI1dTM4xBK1jcrQ5PxSdGq0Elsc/KJPwBwT6ZF389FNvr0cY33LX64akzvWgrb9mNw5laAvKtuj5VPc6TE3nb25tLybDM1uKw2dYXSqKfoI/fJiTd5ZcUuRHfHHvxaqJw1oDjYs9nJfZT/EQ5g5paHUyDnxPbJJj5PVm8WsAOQiyBgXyB53YCK+xZ4jAyMIJc2bPIG/6T+kdiRMznnqk5y+czkEuo0aXeEjI4cfQ/xoucd3USclm3m09vsolMhN1ic2Busu8ALYes465uA0KzP9XiT28XpxvyrJPkibuuK0GeKz5G3GFLSNbCa8Nbu00UHZdyeCXinnHXOj3zQcoqyBT414cHtugSFaswXm54shVmLlM2640tk5og9wD0aSTbBMDAW0tI/2Uqf2C7uKIKu84VPgxH7wZZQvxdwgpk4fYFEU3N0xLkDM1//MSvcqb6EHLmXTkojq3UyqTVaZ274359o8jS+ordjlaVmJoG1tEbzwjlMTbsxTPJKbjgj3+4V+81vAXA9S8QbX1+Cw/VtBg3sosOS5Uj8dAh7TE8xzapZ4c8yk45+SQoKxgJqi18cDAfwZiwx2IA5g0xMsTnuNjitAg3oQy2mtgvEKLBV4GCjgj7EY95F0A8YJ8rozTnIw0047YYmvorSdegdX8ivCZam/+atWDf5IWOrCj3dIg0ITP53RV6adqPurkaGRas6xUuk9WsJkzNO4w3UD1+kV1BHBWkwgypVgs5Fzo42VDUbZKUfzm+HGrL0KPDWeoFRFlycj3aA2SV4Uu/1bQggdjtO1Z0/1oyzq+S6F9iwjfKew6Eg4TjB7orFcxYfnbngbfkklMB4bi98AOENp4EZgRThyBB6Lyw8Mur1KBGaJB4K0Az+isHwZDHTEBUqFoP2i+N7bLBClT8uy6PozTh+VVq0AvPFdfcn0rmMVi02pD4gxJZNPopYBZRpPBXzooUrjbvmCikfUcYqZo0geWUgLB5w6evvm0itfUuq6dzlKPnzqsZx0skNDkM1n4WlmD7hjOLYVTaYqLXZBzpXT/XwAoj30/BeK43YgNSttOqG41WZEuj70E14hy0v+EDibGiaPGogtxLwmw9+PEuN4+FkFdVJn8kk905lQXQFAN+Tme X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff3593be-542a-4875-94f9-08dd4f3960bf X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2025 09:56:41.4673 (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: cc/gDMDkin1tNmvbxv43N4jpaI9nyPCsETHInDcYhIxj08Ri8PYyYk+4YWsIdtrYpUs/LMW+6RJelPWwv/vLlQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA2PR04MB10240 The enetc4_link_init() is called when the PF driver probes to create phylink and MDIO bus, but we forgot to call enetc4_link_deinit() to free the phylink and MDIO bus when the driver was unbound. so add missing enetc4_link_deinit() to enetc4_pf_netdev_destroy(). Fixes: 99100d0d9922 ("net: enetc: add preliminary support for i.MX95 ENETC PF") Cc: stable@vger.kernel.org Signed-off-by: Wei Fang --- drivers/net/ethernet/freescale/enetc/enetc4_pf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/freescale/enetc/enetc4_pf.c b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c index fc41078c4f5d..48861c8b499a 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc4_pf.c +++ b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c @@ -684,6 +684,7 @@ static void enetc4_pf_netdev_destroy(struct enetc_si *si) struct net_device *ndev = si->ndev; unregister_netdev(ndev); + enetc4_link_deinit(priv); enetc_free_msix(priv); free_netdev(ndev); } From patchwork Mon Feb 17 09:39:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13977426 Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11012015.outbound.protection.outlook.com [52.101.66.15]) (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 95C06218AD2 for ; Mon, 17 Feb 2025 09:56:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.66.15 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739786210; cv=fail; b=V59EkgWEhh6vkqIz+uG3o77CTC8XZxn+rwRE5aGUBdIo8CibxFAl54yNQkKjToQDlF3uoj0vM6rQugTGPyFdoA71Qx3Hv5k3EQxUsz4tXKPt+usjDxZ6JxCUHdJZKp5rW99wO8NZA/n8GK45hvVKuBx0zbVeXCfob30DaSXMSUc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739786210; c=relaxed/simple; bh=TK8zzb6lcx/7EwiJ6LgbkUB1e++wKy3OMXfT4gTWDT8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=NpbNNho0DMQf9Uvd3Rb3Q6oSkB66+zuw0UNjha8aIvmUPswpPnfpqFxVtG+KSiTgv9Ud8IKz+PjZ4igJYk9v8VZKVlNCHI+ptzzw77W71aVUVZhDgbuXDQ5QE7B5XV7LrKqfWAT3MUiNVtor3mHssAlTe28fyXXS7+kqwyWVETE= 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=ntk5eibK; arc=fail smtp.client-ip=52.101.66.15 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="ntk5eibK" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dH4T4zrUWQBOkOPncukbebq8JwnoeYUmYRKVFAEbKa1CYNu3Bjj3CTFZ0ag738c+SkJG9rQovo4KOcB+PfWwPR//P0VwZXirDw2U32AmD4+5PGl2yuh0bD6GGl4Qrla6PhyPXPtYqTqub1BOkqPfehMII2mp1i2Y8SfzFHpQVOrvctaHIKW7kgBFa9H3qjiKYAbX0Wee/3pu5r1ll9SKJrf8gkTpM5PcZ437cIL0f+L1gTDDkQSwX57bK//EJAw4czL7L66eWDLxOFybQi+G0Xb37dwy6l67R3sxD2D50khcy9oUyermx7E9NHoc5neMGcAEuCKISJWSIY0DIYInqA== 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=fhIb1Li+AuFtuyXvissZeJNMe2D6w6MVfz0Fj6OzTZw=; b=Oud2W056Awd7GWjBGscA9VwYiAmf7BPGZLVamZBu2WOgdinD5Eo0UvXUlh9OI+JRgEDtrF9YaznOQJy81sYrDL4M4leH2+in86vxw3+Ndyz8lW3YyUvRq8exLRfmvMqDORh9RVA/YX8iWp6oaBdJgHTKSE0vMfvZGiZzkCWoEI8xNO1CiBGwUuaGoc9KvoruGW8/EPBU8HoI5/9jQjl0JgD2c2KrveHTGAM9aJcalaquje2LqEg9aA1gx1oTqTobOx4ebf+ppUzPFSeqQQwhvYLfjVm8h0ktN8Az7090jgggiN5Fo6e8bS9mhpOLLP4E6YlGrSRRCvTb0adDM9Pi0A== 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=fhIb1Li+AuFtuyXvissZeJNMe2D6w6MVfz0Fj6OzTZw=; b=ntk5eibKIDKXu/XGfVsEtvFhMeH7FTpYcRwtSViHzMaJA4tPnNdE3/tNHTsjkVsBeGuGjxhqkr7J2UwLPx22E1irrWc4+IUFT2gRZaMS4xgD87ISmreOV2PTWpB3lW39Z2ISR5WND8R1dWmA8fX2g72S0nTMhzvgkeCfw7QOPMD69gfBzbohsp/kCISW+3mF6mNblP1+eIFaXcoZ8j7DhyThVRuwv23K3T9ZzV0h5iLJUIi5H1PiJlXGh3h289xNTboGhPjKU4HCRbwmXHhMRTZbkEn1Yn2Mg0qZ7wtLkW5cPa7DNMWzDWYiUIwkMTMBFXmfbyJzNuHGZff+omcDWA== 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 PA2PR04MB10240.eurprd04.prod.outlook.com (2603:10a6:102:410::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.18; Mon, 17 Feb 2025 09:56:45 +0000 Received: from PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db]) by PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db%5]) with mapi id 15.20.8445.011; Mon, 17 Feb 2025 09:56:45 +0000 From: Wei Fang 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 Cc: ioana.ciornei@nxp.com, yangbo.lu@nxp.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH net 7/8] net: enetc: remove the mm_lock from the ENETC v4 driver Date: Mon, 17 Feb 2025 17:39:05 +0800 Message-Id: <20250217093906.506214-8-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250217093906.506214-1-wei.fang@nxp.com> References: <20250217093906.506214-1-wei.fang@nxp.com> X-ClientProxiedBy: SG2PR04CA0196.apcprd04.prod.outlook.com (2603:1096:4:14::34) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|PA2PR04MB10240:EE_ X-MS-Office365-Filtering-Correlation-Id: 2cbf49ea-f964-4b32-492d-08dd4f39635f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: emMPMpEaOR85xQuWtHeZkeccwddCJIHY6U2tkUTzk6XmfbRKFRdb6PhXi/J9nAb2kb6PYSxaVmxlF9amnXNu6yo63CYkay/ihDAowicvmYIfd49dX1Rlxg8cmGQMtEhJiRNvGh190MlZLiMR4dtcghAtyuNsiDTXzJdOG9Jkcon1uVMKC7Q4vY1ZcFOfSmussbz1vnJXACMqNdEoFtDROwY16fPlC3FWDPfwUTsk3XeUMSmH9DO3ke5vhZth+Ll/2NaSE2zaOhc8Hk6liUdj/cP0oWwrU03UR6QmAhQzqY37yaQukbl30HWbzmBB3NvcFGapD9ihP/40oeRhNKFwx+l/ry2Nuteu9lIXOk/1EB//Zji1Eb5Z9gvbBTS2k0rzlL33zDCcSk23cwcekBrCY3fk0g3p05JSsvbQe7LPLkx947otjA+2jQyxYiM1AUsv05sPL9tkIuD7k376BY5+q2K7u79SVeWGvhbgLck9iIOMa/sTynSGW8kzt0ORFZZbP3tSdxAdqMcgNeZ1P3dKR+drVNLt1hnzeElXWNoLhz7nh9rbR23aeWt+53c7I1BfoLiovlVsS0aMTq9yHUFGREOirP9bZWiDXOQzrx9BBDZC8+Cj5Y6cH352Vnv58/GpWQ1rkHCAJt+Q9sMcH36Z5q9NfYIldtGLY6S+4YqIj3eEYOajuufV7JDGxHzqfmY1Cy05cgVoSRO0V6AdWLLo7Tytc/BxyiMoWtgCd8+5qkdo+beLyqVlnlXA3z6nh+rcuEogABOliZfOHbfFOpPpJjWbL4l+4N5b5xbtIn+mn4+koZYEehaFoSP45cBK1cbaNKhyE0kIlCjXOhrg0lYT6zMk1VWDSGo7ndZx1DXbag6pV/M+2zoXb3aG7YXp9AKUWmo9kLM6OORq8aVu7ASqoe2JV6eGdiSGX+kFC9AK9YO298Shd1KITn3vy7pW5aopBpgc1x1q0FZhIWZCTSlFMP5HCq2gRaZ7LGYJz1alDqNMl/DL3AyPuqmBvvZALP+szP1yKNoYqOhiGmKfWQ3mPM+RDRw5yMm9Xzyfb7xbc2+ZRw/EgvAesrNL7HuwNZ590oPn4wUQ1SDyafaSpsQdD4x3Y9btRSoYkM9dLt/WNR1kxqpo3IgdYoDGVUzIs+2ECN7TzihSZnIHIx9ZCwjw1LXefMTIt6ZCY8MtZzH/ZZjgOGVd29X+U/smNQLhTYIzBzyc9UH7+UL1vsTRMkDTNZE/H4x19TQb0E2uYDur6aQakF3HS1A3T1b/9KfX1gYsHxzyR4/c+OWaD1aSQAzttVx0sON9qtj0dlrpF05bhaVUMD6IScJHmbFLLF0pHBhiLWJdy8J6z3T5IdWM8ZitNY81khRs3jicNEY/ZLEHg9QBX9F7JgdQMP4ib/DwGodW5Qk3vWnnYxlK4J+w90QtQP3AMWp3jyrIozY92mE5xJwZY9HIDq4P3CTrSqMJDQzK X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB8510.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9cq07yCRnchWk94gqeUmH0JWkrwO/hGq5EPs7Kf5zw9y6uI/Q2t2iCuEj4mpPkdnL9GSPd4X1fhe7/DNw69e+PwpTZ1Etpx8V5u/L4FhUregnEKfnIRMJGYY+ur7DgPYMPSE4P1aeKPxT45xgsFJSHWeGPIGG3bNj7u6wRyV8asGlB5NVBZXkgta8A6zbeEygv6zdVaweebJn1T04qqQIkVAew9yZ2UpUWjzARA5OT2xOUcUI+cQFcEgTCBmAgwQijLpoMXPM5Et6OcIEUexbpCaAKFBvJWLI7IBlWqIuBlCKoLYRvW/c9c0YUjMy0CMMpqd0uN4lEsMqAksOxnATKQGlRqhRuJ74rfjvIQaS7Kc/PfHf9U+6D3lBImqCK8XpqoFi8jHSWIJJ1gET9HXtVsIETH5p8AIY6TVcCxPVdRUr8VZYHkTYzu0tPCaR4kcoeXFzQQ+6pyw1nKHWG2gi89nwhL07H/P5F8YJgUsAwZXqvPnrVNy/YeoOGJgKDOB63rScQWANpxDtsTqZ+PyI1afSyR4Y3mWxfucFMVv1IbctDs0mEjmFh7EVdCIPVfHmKA0Lsa02n5rasSo6TVWtRE6NvUYQ7kMzBfi6qpFlR9Ed5EdqMlng+iki3KIiuLHTV6e/bJvU/gPnY7NkBh7Q+dquJX4iTGBREyNTDp5oOpjRPCCjb9gbi5c8gFWkDuyGeMZstPtfakpQQzNCpx4PtI2RviiQI3fAQYmTVgMvMay2LNPlWfeGbiBhpSu8gOHsG9H69jMADZ/m/OFrgDgIiUiJAhT7r7ECDSmMf6ZD9/C7KL4ZfMFFBobaUFglHs2CscOEUbYajMo+8AQDiKeJC/fww8dHpEH2UNLtOSFHje9glgP4sO+VjkQL7jFb3XLFHuD15ANjYbOuz0d/jDdGKhsOrCvXjvRh50nKvsNluOd4WyHV7nesuurFZVFIWt6BXMBpv5FlErvxesrJz75tnv9oiJ2KejFBH3p0yyWDvlkhDM1g9vzbSfIK+hQOiRPkW49eMV0BpYqHVmeuLjcueXvKIxu/BKO1SE3ySdJAx3FS+FcBPy7C+i7OTxaDW//HQvazjnvx/9Edlx3oD1x3WRjzyeYCXVY7cqkXczb9/9yLiApqjBG+pvrOrkm/HBB/QFzg12WpZUDGXslXh/6lribW9RjS5HJ9BU+o4nbkEL8EEHg8zYHm/6QLlrdSypeiSEfFsk7xPbblrcXTYku4vxkCRjnaDerVOH9Dbph8WtFkqxXlCcYad4gPby7W+ni3/CIJPuyFoW7tZ2rU7vWXxv++oIceqlRVcI7R7HEMod+TkAGR2KIDu6uWn5gXLNFhuZ11D2Z6Iy2xxByTtmi/UmoeCcvWLzHyHQJZAWiaDS00uV3+ZWQ278QflRflbA7NHjMUDjLK6OTomSTd4VXHQKS6tYeozu/IpwC688vFBupfaLww3NcJ7oWvN4A768znQ78lqT29V2gvhvl9fi3KV0h9BY0FfqVkTBN1IZFG3hZ8UH1OyEddFngojj1qGuDRGzQi5V/87HoLY723zwRE6y6hsnzb0dqWGnG9+cvwkk9aRAwpZhd3MBAfPUt8twq X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2cbf49ea-f964-4b32-492d-08dd4f39635f X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2025 09:56:45.8789 (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: mgqESh7ny5tOmEdMN4xSYuyTEoWZWhC6GpwSK2siLtQ9P6tOWV/mVp4zIeguE4El3zW/L2XDEqti4KXWakNWEg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA2PR04MB10240 Currently, the ENETC v4 driver has not added the MAC merge layer support in the upstream, so the mm_lock is not initialized and used, so remove the mm_lock from the driver. Fixes: 99100d0d9922 ("net: enetc: add preliminary support for i.MX95 ENETC PF") Cc: stable@vger.kernel.org Signed-off-by: Wei Fang --- drivers/net/ethernet/freescale/enetc/enetc4_pf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc4_pf.c b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c index 48861c8b499a..73ac8c6afb3a 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc4_pf.c +++ b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c @@ -672,7 +672,6 @@ static int enetc4_pf_netdev_create(struct enetc_si *si) err_alloc_msix: err_config_si: err_clk_get: - mutex_destroy(&priv->mm_lock); free_netdev(ndev); return err; From patchwork Mon Feb 17 09:39:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13977427 Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11012009.outbound.protection.outlook.com [52.101.66.9]) (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 A5FC4218EB9 for ; Mon, 17 Feb 2025 09:56:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.66.9 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739786214; cv=fail; b=hChkL5fFg7saE6jkY8jR43PdmPJAm3Gu1vQgUdhRU5815JkHioe012kb2sDMlUaXt/1gS6WOaYOD8GUnA6aHWFlje9RHbkOe+O+DwdBuAa94Jt/q6AlCHDRk/PP0ANPeN80DWXtPnI8PZX3m0RCfFfaejyVQ8B47yahDrVN++JA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739786214; c=relaxed/simple; bh=SP6TZxIaEhEMo8C+P9H7M5EREttzZB+jbLAdg8+f7Rk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=Vb/wC3EepwwMcIz8RHqyTos5LLaUNaS2yrUFR/DS3tsBu3P7nhAgvBRHjXxC4Q/+iPRgl9JGWn5vtUdI1BfRapRsb298q9KpF3AaTU0l2ggVL/0jmS8IhtH8NocgZDge/pj5ACvRgWd8bQIgIipob6o6kaRz+k7vdI32Civ/Z7c= 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=X7yXEPP4; arc=fail smtp.client-ip=52.101.66.9 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="X7yXEPP4" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RsWhb2WLSonD2kopP4dvStC1FsbPkCRk3/gmU0HF15ryd19I8GI2pAVZOYm7qOycTRIMoIoqrPy6wpEdQqAaulb6wpbIflT6WDoCs9lfIGiDy4+98IjXWTl7BorqupGEbHFe4Z5ftbJybPPLNUyzhCpOawfKm0KD8/RZacRId1EPzfBSfFHMHbwmVWOZkjst+axzM5hVCzZHZ6xKoRmPpw5ucsiohdyL5oe2lwCKh11SO6PQmUpBthc0z6sWtx5EKZRSm23fwoQ5ORL5dCFis2lXAyNgN9/yYcn+JwJcATP+Y2fSsshwWPMQWFWougr5e5pPXz3obYnsNlHjgAxolw== 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=H9yx1YaYWjAy1qn5fIAa3JB/XfXPGsDihJy7IjQF4Ss=; b=eVEWdJS8qvJXGx4RBkyzycbhcy/y0Qz8y32GEgBC3b64lszLZuW1WwXVc/UcHh/ms5lFuUpPBJRKd64505VSZ+CArUb+uzow/J05+mZ2UGoZN3s5mYDt4NeXz6JYkOidzhAhEDpRt00nyjBAIcqcUUwtr55M6cCoTKQ52oIMzt9AvXJHYHWMwQLLHBPwy/d6h/DpojtkdhzgcV1qsFAKHd7ppa7wy6FdlLUw02ne+zHrfRxxez32vbTosVbTlR5qTYWkOtJgQ+jGWB/OnCzGGZaVt04CijdUeWEhDMEeZvHHXgo8mya600dYIKZl7BRw6PRyNR7uZNfaR4eXX430iA== 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=H9yx1YaYWjAy1qn5fIAa3JB/XfXPGsDihJy7IjQF4Ss=; b=X7yXEPP4JOqJa+E2dRMtlk9vc/fhq/EYwqcsVDOlDDforHFVOOCh3OLggyswB023sgivl5RrRCtWkPWl6acXJQPzHSiyI2z5guEgV3x1T98BnTaoqvtUb1SkJ03yTXe64NQA21duRBBWwjiSxSj5GZNP6G4r86R6N9d4W1TcPaLLU3AKY+NQQH7TaA0oZlDtHHPWGj+Xp7rJki1ayCpDTssI1/s0SOw2XZCVTI/F6l5aPDXbyr2LSlma0E08h8GlPkp6ohfwLrwH211qCbv3q6OTDlwBlZcvZ9F7Vf8JC+q0nslWfB/C7bRHHA3+udXzzX0cKasNdscoNtRwqWFe7A== 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 DBAPR04MB7287.eurprd04.prod.outlook.com (2603:10a6:10:1a4::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.18; Mon, 17 Feb 2025 09:56:50 +0000 Received: from PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db]) by PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db%5]) with mapi id 15.20.8445.011; Mon, 17 Feb 2025 09:56:50 +0000 From: Wei Fang 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 Cc: ioana.ciornei@nxp.com, yangbo.lu@nxp.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH net 8/8] net: enetc: correct the EMDIO base offset for ENETC v4 Date: Mon, 17 Feb 2025 17:39:06 +0800 Message-Id: <20250217093906.506214-9-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250217093906.506214-1-wei.fang@nxp.com> References: <20250217093906.506214-1-wei.fang@nxp.com> X-ClientProxiedBy: SG2PR04CA0196.apcprd04.prod.outlook.com (2603:1096:4:14::34) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|DBAPR04MB7287:EE_ X-MS-Office365-Filtering-Correlation-Id: f48c892a-ae23-4c06-d89f-08dd4f396603 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: ryTWGu25H77wa7Vt+3plXQUE1gSkKEBIF/269oBtDpYmzPOkvnVgZ6SGJoULuyU2RkS4NQw7ZRdoQ8zF9uSIgY/MqnVezvmuqh32kCaf6hsKW+zHCqzq4nvPOGTCsHVCKlyhc5xwmZpwTRSl0qLS2bW9VaPdyPBnn2JQWVVWoKAIaOZCFxoY69kOoSMC7Gi/Ece7KmVBKUEWbhvJ8PiSwI3n3F6H2UEUwFN8Ix3kXKiP8UHTrSAIizQkgU+EV82TQxhwyp45ia105E/MG9VKo8cn07DzrPZi8aqz8fLDWpjhDZjZBm6EOnK7e6YCs6fL8pMWnkQe9s8wsxoJh0dzg7/rHWWN6X4X6YWBGmfRpeqe+sFVJ5wo+xzYTQY+fzQ6xvoVXzf7N7rER8KlpyjUXymzvlWmWRyd8b2EdjInrLRXsIWW0ZGT71WCKUERgqJ7YwCkVlWztK6diKY1XNgMTNPjNc7x9kccIj+lRsTUzv+5/y3YfjI5I695V90VJtFSwV9i39D+pY+Pj62VZSgJtxo1D+DmCHE2BKL6SgVXrur12PbxIXMN3lwJcMUQ6A7+yzzqNNQH2dYg7tE3UviRfFpDlh1JAzxPONi1MdkN+asvgXIdbit6e1fFSgGOHYhpAggFtomi64I6SJfuG7f49RA1MvGRJMMzJ9xk2NbDVEL49j2v61VMmWY16WbFBuS3HsIvE/EZ/KncVxOqkAfRmo9k+GXHzDGZN5Fu1PeU+1gUOhOTSUX5zR2u8Vqa81EceJAI5MjEdGxpkD7/pJ69sGznj7YkghtLHmLOCJq0lblqjVfiyfOmiMt2norAD2eCLKTMSeHbhXnhCohUB3R7QtKkENa49nEQvcuL3bByubHpI+82GEEgFvcT87rGIFMw0MJsyz9YRj0gF5pgBN1KiLix34Jb4Ac0flCHGBpbxy2xN64+28SONNhR/zAtaZmziBsuRnYTmHN3FcuLwrH0C4M72dBcxL0RVoxKURzUC5/M2OrnE3wfJaz7fCyW7f0fX1jOK43sTKgsIEv3Y5w2NFT7+Nr6nPDb+EFM9clOdvyzcf7bSy18khhxYPREXhlDLszrzfBzMdD6DqYCHoOCnmfvfdLl61yIESU09ROQRnN6MiTqMzyfyoKqsmoAdMIyKlPKsuCnX+vrEDrlOEs3QcyZf2uSRpCjV1wHXL7L434NiXj4znfZjzGYU7ud5LVwzVYdH3IBX/xctTk7y02knWzUyCYTV9yxcRC/7QJS8n+9QQJEdIw98mFrWUp/0OeqEV//d3r2YgyGGvN6OedCdAh17s7Sst5MWaxK756yZLdPkbycjWYvcP1NBk93oq53FX3DntkDTwoZmxEDUTLmB7eKgskgh9v66rD5P7gXgegKdNO2ngenIRDEzg2VWNrZ2Mujiub4Lj9KbKbmAxwDtKqEeweMmgJm3zSZhMGsnO6QmtF0x/eJTP/Raz1ty8hc 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)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dWHwX9LSJ2nSlE2zE9ss7Kw9FyRuq1tNpE21cj+Y9JIzQ6fSQu7s8BMoGmbVJSBP8la+mQ0/sVMsYxAIqwhDDscsFdvc5PgHrokAQ1R951pCZO5112p76ffAB0p0olf1Xda9K3xe8jaBkdqGON5sguV2ZpqhCfLDJy5+eJV1wW7HcogaTW8skw8TLP5qsX/sy8ZRUxwlBbD1HgDKwRbnC/ABCTqdf0vgaeMHVYrSpYyPoqBH1DnXq5osoZ29QGQMCsysY5vZtJL2AaUcMV/jcXfFrd8FnAOO0mtY1vD4zBgcPi+FKKHwRsKjYHdRc6/CCFG8xmis4LPGNHCZMQ/6Ipt//Dey04mV73RwF7d/m88J/5p9WUMMWQ/6sZ/AaQ6TiqtrBd0WHyGU7qsyEVteSZXa+1LDbunl/nW84XmhYDdH4Gpa+My1Q4yl7KIseP7pf8gnXxnMc4pEcppxzMWv+H8Gq/GEer+U2rZ6zq0s/cOeHwa5m+EeQATHw51ypbyEiO4e8Syenduj85QKGYCq4315NXWnUhPURQcIdqLK+h3EdApEoM70ZzFu0uZUSQgXQ0MUtcnM7U78BWqM3YzRHFBOvvZgedY5qmf9ioJTCo+4dBVs0gsr42kquNRr9wzxAbxiXQ9FHsLlH6QUsfWLyFXwEVB29ZRmWLIrGRwNqvq/yMV6YsQ0g4t08TqHfsKX0ykpvonLID3eZSTx4f/3pJr2AYaCOtXam4GTXF+SHHBrSH2QWBY2pJDm/sNiSolwn8WLUruonFWWmeaotb77osWn02o/ZkpoRd3Fj9IC4qZccdX0cU4AaPx8nfQ58nGAbUu+UyR9god+rRSbwLXWKTTXLnjDFw/i26n8tqOJjowDWQr+V25ArDfgqprdwhysiQujpebeeAyHQ5d7UjbLL7IK/hfnHlv89udjCqLC4zsrGbxXhwg4HlinJsIVNeynF47t0RCrDjwBkwTP8HaW5I8TeyC13xsDEEWiqWcHNcImk13XnzMD59ILYCHy2Q3HF7N9kICrur8CMtbkIxE3v/JOIlFqOs9fpctvW3MpZF6FuxsefYTJS2bpgc+wTwUMg2WnU2bfBCtTE3SdtN6A/AjRVdpqeS9WwuKbt6hs0moWMAt02OAumgbz+tWiHlgEyRwj6+L6Q6AFrXZz2Dh2nNnPWzWHWIQqhoYdS4BfAdDLf598JoJwrQXK/W6JCQUJQ0hKiNbcELihYnZcTUBP07tL6YY0BGPmduZ7Dx2HrQmM5smbQ+SuMTcqMavi2SG+gWoXG05pqWeuYnMrETlx98Pz3t1xTMqlVA1UiI81lNOjZqRVKJQA1yj+Hts1dUFn+Ox/xQfBRTZfQupZhiwLCy6LHVJTqm851ce1u6AtPcpXLP+QhN81K+3nFUZ0cN7739eJgt8m45ipaPs5P0r5czEychbV2vI1v1SuJ3LyxWm2xBi6KdfT5sXnRpWwPeMhmYS6b2RyMAyCRJg37Z5ZOVaNS3yX+EUDNewRD/GXAUzRNljp8ul0wgqViku6RoQ24K51XWpCcDo8TxC3GAQidICRlcG1aYE0idnBQVvCerLMAYfFWWcrpggY+pudifam X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f48c892a-ae23-4c06-d89f-08dd4f396603 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2025 09:56:50.1952 (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: u59Mk5QIyOkUQMqbmfY6lV2yqDJa1NqOIfWfDRjVMAghAKurIgAam/SbHQAxfRoUTYR1hKhhiZQxZBTh25M4lw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7287 In addition to centrally managing external PHYs through EMIDO device, each ENETC has a set of EMDIO registers to access and manage its own external PHY. When adding i.MX95 ENETC support, the EMDIO base offset was forgot to be updated, which will result in ENETC being unable to manage its external PHY through its own EMDIO registers. Fixes: 99100d0d9922 ("net: enetc: add preliminary support for i.MX95 ENETC PF") Cc: stable@vger.kernel.org Signed-off-by: Wei Fang --- drivers/net/ethernet/freescale/enetc/enetc4_hw.h | 3 +++ drivers/net/ethernet/freescale/enetc/enetc_pf_common.c | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc4_hw.h b/drivers/net/ethernet/freescale/enetc/enetc4_hw.h index 695cb07c74bc..02d627e2cca6 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc4_hw.h +++ b/drivers/net/ethernet/freescale/enetc/enetc4_hw.h @@ -175,4 +175,7 @@ #define SSP_1G 2 #define PM_IF_MODE_ENA BIT(15) +/* Port external MDIO Base address, use to access off-chip PHY */ +#define ENETC4_EMDIO_BASE 0x5c00 + #endif diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c b/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c index 3fd9b0727875..13e2db561c22 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c +++ b/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c @@ -154,6 +154,14 @@ void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev, } EXPORT_SYMBOL_GPL(enetc_pf_netdev_setup); +static int enetc_get_mdio_base(struct enetc_si *si) +{ + if (is_enetc_rev1(si)) + return ENETC_EMDIO_BASE; + + return ENETC4_EMDIO_BASE; +} + static int enetc_mdio_probe(struct enetc_pf *pf, struct device_node *np) { struct device *dev = &pf->si->pdev->dev; @@ -173,7 +181,7 @@ static int enetc_mdio_probe(struct enetc_pf *pf, struct device_node *np) bus->parent = dev; mdio_priv = bus->priv; mdio_priv->hw = &pf->si->hw; - mdio_priv->mdio_base = ENETC_EMDIO_BASE; + mdio_priv->mdio_base = enetc_get_mdio_base(pf->si); snprintf(bus->id, MII_BUS_ID_SIZE, "%s", dev_name(dev)); err = of_mdiobus_register(bus, np);