From patchwork Wed Feb 19 05:42:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13981536 X-Patchwork-Delegate: kuba@kernel.org Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11013007.outbound.protection.outlook.com [52.101.67.7]) (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 74F641BEF76; Wed, 19 Feb 2025 05:59:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.67.7 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739944795; cv=fail; b=CrPdJTf2sRx+ppo14/CfeAADX/M7vjXeOWnL5WSqWmlm3lqHaBs2NsgnIO+EOQjxF2/ZNFIlkN6p6d95gDTlTnsa3xsTZfxWrORhBJShqTRmgfuZlpRZNrnPga3dn2bN0M6pldE3/WelAo6iVjocclS0krXZcpSb0G6UtVLsvyQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739944795; c=relaxed/simple; bh=TQuIRlq1Nj6/oHXYWspIHKuFmnBNnYUGFP81mds72+A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=pr5hPxNHsCC18LUBVP4XQC/oAULYU38ZSA6mpzkR+/Eqtg3P5s32jXMnYBnvYck99dauJzIAvd8dd2i0TW0o2CS73POv0CF1fODyRGa7ZW7RhUVIk6Uw3dtBHZ/uPgVkLazJbwC2/CFyEFa+tNM4ner+hvwCYsFp6dAwy17o9ik= 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=mce1Xxpg; arc=fail smtp.client-ip=52.101.67.7 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="mce1Xxpg" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XHO2PXYDhCPVLfq2aJIA5g5yifN3iKM2wmWacpAePUoyijOVy52xnopnoZdiIoVUBHxIxJjcaYmUPbh4MyqdbXtshI+csY63Klj2BFRv6+oK4bZCrfkOz3tDatcqjHQxH40dJRWZ8vORxeXwr8WZ3amPJwu0qen6zNxQq7LJtyZo7bgkTpMpIPyrL9T5XjTN7SPw7RxBM1cE1NenyeCe/e6Ds85mXDPVp3Nl+WLSu6KV8ksR/uKZXrALTDdrtFA4C+zdREezNPOggRoalMX9OXfOfrZ9IP/2Euf8rXLP6qbu/z134fVk+IMt3/PZAYNkvVpcM6fonF2IJyQ6h4IGOQ== 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=5apxbpH2LLAyJYAD3j8rB05rKBH8emX0VENqmwVaxOo=; b=qrzOU2FhFXLNs7t7MNaGmIU2sP9EnRu+jjxM4VUr7FwbwkzWWPQ9vJhGmMuePEnzEhysshq0Lu8s8VALnYkXtG+KozavWliGdWe4j2+qYzyo4O2HRbkqOKCNDESQLHSsvV9nFXzxu4rmZlLujULLgs74dfPyxxZFvOGRGIt/Ze4heHyjIrBybIJFDcmS/aGHc+6XHBXJMJ9zbxfRoYmo011RrpO9KuasbN+ziU6JzsVotSYZOcbcai14TpADPwsZuWKV+E3aP0NHluV0HLtnVg4KBOmhe4hOLhjqEK2AETkhuoA4WyM5shqluAyS/8x5UDiAiEPLnyFlc26nP++6EQ== 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=5apxbpH2LLAyJYAD3j8rB05rKBH8emX0VENqmwVaxOo=; b=mce1XxpgrnkWzyIr/+F1kCon1l3QfLUS8ah2Gy8yxOQ7GsmIRT48r8aA2tSzQQfGnOZbmo9sD2Ni+55UBYIKwrS5SKlo3GQbwMilLjMMo0N9SeqU9w2tPLddnaXvner8VmgWTWcAyIZ93/7D9QDPHSL0n+bZAHxDypAch5K46jDSDNjYaMRrp8Trj33LAukwWumNOHmzIAoLij4KvWMxTalE9LcpDP6RZWKRFLLvlpezMEVv0dq3Y70ReKE4z3qLHPfBrXT6dAg8VmFJHha+0ISWlQ4R6Yt8R0kE2oO+Pl9YecTz0FL1fFhScye33ZK26lW5g2sg/upQa2zIGaEf9w== 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 AS4PR04MB9409.eurprd04.prod.outlook.com (2603:10a6:20b:4e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.15; Wed, 19 Feb 2025 05:59: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; Wed, 19 Feb 2025 05:59: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, michal.swiatkowski@linux.intel.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH v2 net 1/9] net: enetc: fix the off-by-one issue in enetc_map_tx_buffs() Date: Wed, 19 Feb 2025 13:42:39 +0800 Message-Id: <20250219054247.733243-2-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250219054247.733243-1-wei.fang@nxp.com> References: <20250219054247.733243-1-wei.fang@nxp.com> X-ClientProxiedBy: SGBP274CA0023.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::35) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|AS4PR04MB9409:EE_ X-MS-Office365-Filtering-Correlation-Id: a2b722db-fff1-456c-6be5-08dd50aa9ed4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: /SiYZYJ6LL924Ffwv3Yw2SRcMgswCChykKEGjdnSSon0RT4bxjvQYnpjOLz7Ajqo+1qiFz3w2HtEDJX2Zn/VHnX44qG3OfNYDefd3FxsCDjNp9pJImhN7E/viAVVFAOd0px19MARuoUgNnE7bCaE8aqzPEIRK2HuHsFWh9UNMahG83P6ImsCz8fklnwVqYd+vaMKixZzE2U6qc8Cr7+hM7H8hSySzOM7mRFAeIChsJ8liYqSM9PCo4vLpX62N1tAI0Lretu/PK5A3LZT+qbgxyWoxq+Bs29t4yT2bn9o2AdNo6C8bcWDeI3sj6VbofCMmtXhHOiBP96ylA90F0rEIj5yg2wZBI1vZ/Pl7s9qWCrVkWmf5I1SDMdQuS0wMijwrwcPynVsuSRJYWIC1nYa29kgjgR9T7hb6XTlCrHC2kQzBkm2E0a4mLohUnf0GIZMacp2SytxfBRMJs3EnOdxvSNX7ln7b/cNy27az22oRPZjiDPJHV9PL5CjxeOpur2lQnNhoAxB79WM2HklQ32L0yyLdsyvPrqDZjMrfc681h3nZ1ykQynWyl28fjIJdvtJDJUYfTsUTgLi0IxLeY1MBq5cIB2pMQ9ciVo3Rio/ZAE8kerC4w4HuMkvcWHKSYiimXRciQpSfzJhCxGpiKNC5cQsqbEPh/A+eYRXpCXfwfbNWhgJ2dBJruus7vU5e1zkJixmejqiEFqecKBeMLgQ2NfUhO7EXXYdjVf29smaA/6aTV4VNrjZ9QA832PTZhRW4RVxH/b25IypsK96INDv9T3lU02CmWyTGH/VoEuzCRQe4qF7YblkVvlxuePObRCqFjZovfwXlFR+zuPpZK9ZKcB+1H95huVSJ4+7Nc7VA8kQUAC2cNbdHwszx3ARQ707RPjS+y/YNeasfJLDvCO9YRgIrjnBpQsdUghIC49wIGcSdkQwnRMDPUplzXv8Q2E96fxLNRYLL76TfY6YwUMKUnhhN+HIJbXeUfC7/TYnd56iS1QR+7obDtWWs8MTdx2D/KKmajdrAqAnqyfmVlRZ2lUgXvivqO0YvTYr0RZUNdWQIQhKQks8JBNk15esDcl2B5rgh58YDQR50+NqJUwuWI3hy+jkk7GGm1o5VRH70NpAkVVECGuUVAQQYbSe89nao1FzU0jkmLU80xooXVQyT/WPNMjJGG1KgOJyxjDjxhdxySdRDPoxxRNc/u8+/GjbrJDNYaxLj2iS+p9MbY/gAEW5atC2CUI5L6skOo+HvQtphINhY6eBjGbQjAw5AfyGHeHzUR8HU1jssqDfSzZ65Xo17qkGAD82En6DJaLnP8LwkpRL7a3WUaWWlJz4+G3CPPbLTfrDbfyVjaXVT0CJiFSvTdARKrlRVC2/wvjNeR3PXPwJuWilgwRODE7tRPy8mSj3z4/NI+mGgnV+1S+xV7VX0v/H4nPBAhmBGbGbZMB8HmenSKrLQQDBJ5F+HDkg 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)(366016)(1800799024)(376014)(7416014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Jyh96k3N9feOn4B4/C2vImXlRjNC/vtHwt8UG7AChaVZp+HLAjdwCm9UjDL2Rn6UzJF3mkumaLKTojAkPV8CQA8VLoREiVR+JMm8JoO70btfxIkuBHCVSqPtTEeXU6Ysp9+m623eTCslnC3WFTEGCiicsvL4JWs0bGuGsTFix5WYGQmBgba1z+P28JIgAbzgwpHvsGKFr2dQiPdndNxmk2w1cAYnlAGfWAWHmUbEJ9/mGE4TVubsqxb1qdcAGP77xCuhYEScahVh1S2cMylMqBazTFMEaIa+IgMLzjX0S9DM/PMaSjmBxjOSTRaq15Fqjbn7QOr5GAJSicHn4PgyefkN3kDCfkyzzhHuqozmS77WnbG+BHLNZ/VhjstcEmwglmevK6wxtCVElEA9m+9766XmzZdTLxyY5AIP6AtEXT1cRp5Skb3q1R9MYc8TA2X7o7U2j889fvKg2gvWTQnb9kJ8Tfwg3H22isHsjPFbIy4ZYkvLO+0m0q2olmGLF5Bk6OQPOekU0c/aBdxvBc+TOG4kv36cIDK3CRI+l4+8duWPzqt6ofpTiDUpdWyPpBa1G1nQTiL6lScCa1tPRo4gc/66iBUVkIsbBoh21aYIyq+V2Sb9mGWF2Ks3uv9hYCjcHWedcapCInDAprWmdfLMe6McMTn2SmgPKTtRazf8AAWRUOtkcxuvE3LoYFwbn9Fp33nyCo0IwE2QyyAmmKTD8mnlz6paapl488dajBNhwjbbjiQ1Mi8sgIwER+3QRnFe/ErEqD0RmqgXgNU9KlXWcINRTbcW9elN48tOc/Fp4t9CmOBrK9HXZj/rl82OldKg0DA6oiUDL15uoaO7Pm7OAzoHh4vbqljYoynO+qirUUXlJ33IV4GjAVI/VvPJcoSOO7Nq7Fv7u7r9BjrI5uvZGilGeE1WrrS8p9fzx/PKx1C0XWQHeQfEKHkNxebpftzikauVG67jHTHTGy8i7JSIaAEDoooGkUhwuwAnJOBX32pjMrcz3BxmJGp1UW1ZD48OYku527DfV9gu5HsiPzmaR5hinG3yzZMPOYTE1uBUcwFpZ+d9//ySq3mUkV5l1BUHLAOVctNkqQfkgRQMIEDou9AX3OwiBiJSEkbqvJhVgYPchk9OwEl85q/de6So5Q8ccG6gINSFnkHreB16kyRD+Q9HDvXlBIKM5esmaxjx8ZOUK9b9Q5YxeHrXVFrbj025EgRm1oCfy4jI2UKmk/rAr/nWdnvkk208USlq2IkfQnM3aw8V4BocmL/KW+ofDmjz9tcV/cMA7DTTrS5ljogTRXQZbNyiaxGufeG2beBMguUU9GB9CKBv61BDlZwSm6ydnERsKfmX0mnMg2+uXCDaDYUIcZ9Hxjx6TD9oKYYElNyXLzp+lUvctmruQNgr+BIuERXb+03dpRPAjw0mC6uz+3KuJLPIw1m/9Gga7vuDAfzfMp9o/zTChkStG6ZieZ6HjXzOKrpoIW8pTwmN8bd/ZUuHxjDmhqWQJVfV1/G3p9pHev5njeMuEPJUhDl9py/2jLm01PAuPe03WRm/gnGHN7ESk4+RBQhTRkeUl1NgwdiGsNzHFXVqwu9RQYo7fyTb X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a2b722db-fff1-456c-6be5-08dd50aa9ed4 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2025 05:59:50.0709 (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: 9m2AlB9NYZkLMjI/5VJKMNZOb40iYWBLhUq4i0k/JDHw/zqH7inC95+/8Y9dewi0pXtWksHsX8/LO/rRDDOItw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9409 X-Patchwork-Delegate: kuba@kernel.org When a DMA mapping error occurs while processing skb frags, it will free one more tx_swbd than expected, 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 Reviewed-by: Claudiu Manoil Reviewed-by: Vladimir Oltean --- 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..01c09fd26f9f 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 Wed Feb 19 05:42:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13981537 X-Patchwork-Delegate: kuba@kernel.org Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11013007.outbound.protection.outlook.com [52.101.67.7]) (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 9C5F01BFDFC; Wed, 19 Feb 2025 05:59:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.67.7 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739944797; cv=fail; b=V8TmIFOattaZWQ+5oQjeHFjjGBE4XsiDg035vRjmsHwBUd9WFJ8/RAM3Z+EXBgq1g9B2xA+4B1lL3TNLyZU8SH/Duoum1luJ6DquIeiRtRTLd2hrauF8XWFk0Tq+J60XpfJusjTBVD75szcn9M3vr+bFmWmxkkqBK8+lZWHkvmg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739944797; c=relaxed/simple; bh=9BL2G3E8UqnQEtOj/Orzb2xv5RxUh9YT1EiH/AkkNmY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=R5UWc9SXetHZu+e8sdfV/E5VoR5QfWhqNCtwd87W65GdMoZZHvM6l7i/Fn+Fox99+iax2AXGpWfQcNtW1LB9D8QjoB16vcC0j9GVzK0o1CuXIW93c+7+U4np+1a+lWOTRG3gjGpmuWZkPIuMZM0eGTrgNGmjq1cJ2d1fG+9LGlE= 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=SuXC5DVr; arc=fail smtp.client-ip=52.101.67.7 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="SuXC5DVr" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XpSPw8rKwB+0U3HVEr14labNIcGZsmlHbBdPULT7FkYCRAvvcGVm/aIBGThORlqwGf5ohgHuUpc2SkZa8aLslb9xMOnp585TGEoURnx/yXaqs/MZl9c+7AmQ0igHe4eC05TJe3NNvmU1slzTpm9troAIjoNtzvUL9FvuUmL1eItEdHxICzf7mN1F/ebhn9s3NZiWiSIM2xD5X3jnpNFaiit28T5sdSsPBVFP8ZKQu6XcsOHxjfHQTIOfdtbnWgIUTH60q2NqrbP+uCmF6nmDy+wc7KA3ZIIfLT0P9B3Jx82F+1745s5ZA+HERe2C5rRCN5JUoh0NDLI8qztYqskF0g== 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=7n3wcYp2XOkjCupQLVpXrM//xX1NZCMsSvlSk7sq/mg=; b=K5MWtJFrGj8yARml3uJPU0cgPhq9N8GB1EB8uq7PN+X28QsEE0KJyIlFq5y5Ruz0b8jJwo7hwv2UXRHHRLIstUnTsIIdzZ6tWIbcYI/7EOCK1TIo3GzD/M/bvOi5Buo23TyjkP86CXN01dFrWPRgLMZYBHEtvM7zXIEdWEl2hI5DwMsLhibrKxR5XaKZVbIJ7ODv+2tM8wEWRJutCGLvAP4tTHVwrxBP1rIUTTOUmXvQ3Cvg7k8/h5cr0KuyaHIk2tiLkCaLKWc+EMiRJKUH0hVPajSP/8zSd1+mrf61+Gl4hkaCPV2kVJgFLqv6+awz6NK54TS6smPTHMDxGZEHSQ== 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=7n3wcYp2XOkjCupQLVpXrM//xX1NZCMsSvlSk7sq/mg=; b=SuXC5DVrz043H3jFg8cufjti/95qaucXx/Fp0c47T+qlsS38X5xRuyPlRpAeJmvWZnzzeWfOSsOps9gsr8Tl+Ao8IQ2d0NHyMKtA7PNMr6HxDxLrKtZfuxDcMzNFW2bxP6cHREU+jztKBfsEu7Nj+UI0gRAFSdGn1k74e3rYwUtc1j0HiFEm4xkLRZn0Y9ttSzSUU011PzGVUbOGbRkEjXlDy5mdrhCL0PGCdcq2CYFW1QsmMxGKOuFID/ZqynaA+tzsc/D3NJiXymUjpmfbh1wHymK6LmqnNQ8uLRt2WWcYCJdPt720WrOayNGt25jkBYZRLRIHfz9bf2msTXDCjw== 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 AS4PR04MB9409.eurprd04.prod.outlook.com (2603:10a6:20b:4e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.15; Wed, 19 Feb 2025 05:59:54 +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; Wed, 19 Feb 2025 05:59:54 +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, michal.swiatkowski@linux.intel.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH v2 net 2/9] net: enetc: correct the tx_swbd statistics Date: Wed, 19 Feb 2025 13:42:40 +0800 Message-Id: <20250219054247.733243-3-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250219054247.733243-1-wei.fang@nxp.com> References: <20250219054247.733243-1-wei.fang@nxp.com> X-ClientProxiedBy: SGBP274CA0023.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::35) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|AS4PR04MB9409:EE_ X-MS-Office365-Filtering-Correlation-Id: e5645940-7284-4f4a-36c9-08dd50aaa1ba X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: wkWw5X7UThqKk/FT7Ym1is17G/waHGCwEhRvPjAyEPUQnUIcFvwRLzN5d56nIzpgd7Gl6TVuYg/zQh1G/mMDg4Me6zbrcza06djh1hZ2tZpGhU96N7fRR9gT7EcZw87AwH54xZy7fqD7/v8zd1NJ1kvd//+VBSyCn8c1vHm/C4x021q82Amb/6FUoVKy6hCTtqMcyKf6xVGEE0BLoYOKTSBhgbjCG3HccSEnKbj7Mz+0fZ/T5G/CflQXhwgl4IH4HWIg5xiwbws8nc4mI/GMaXbU1o70rhY7Tmcy1xDtXUJepEgJJtJG78qgrzWv4adg5xm/nXJ9H7WSY2zK8kIRF1i59obt34bM2zHdEqwnpLONYIsF1KeAloyaOYUT39m0D+Qc/Y+DRPzpN+aNLtUNIvzinQgBXbyaig8WlEYIb3iNw+QjSNqAtjd4YI0eetQuB8yIWOsXdY6oYMVPN7IPJzoaQYmWAjrucMzR5fnEvteZlLEz9npzbrxo8egydq5LnTRZ05WVTq10SoNfW4ub80W9BwU0CCx4NWq7/guCitV/RfN4Zib/FiAYewCv5u17oaHK+l3m4ayIbRLPAJC8V89GsxwGbmZtTVaQ5OaWvjErytHchlk1DdkLJ3+J/c21DWXaZCFtfgpdFFKbyGGEDByQHU6TLW5ATMYg+a5iyJunxkIi2h+3OYr4YCyA/K0iWl9Q6+/n/0ODLB6XaQp6tukEZpnJD6vV5z6hjw7PT3nt0AzES8ww7fs/TbdpYTwZr7hysE7iwF+8+Kd2FpU3iIlky3Ipn5ntaxn3/YJFtGu7anMV/t1OoH98nSqfNj9shzh4bSCI4da5GOhb9xxsoyRCZU9k6d/nVpC4+qxUUqxRfEKrfSB6dR/Vcs9/VvdbzttHOCsuTYnlKJAsW0ejpChZMhlhcwpN3n0/faOw6Ro2EPtf8j/YYlokTx7Ra7Dfwe35XqJfn2rWTVTuDUfxnxUg9ykTlAv1BVjef9Q53fLtFCq9EuGGmvksZ+Rw2Cu/rJiPUtuix+2dFXvnCSjzWyygpJvq/rbdb+5S5Yj39NBvPVsGiJ0gCRraJ5WuExq3wsAaarHVHt3xNWNncKGMZEZUWykJoTaOo6TGqhl9ibIh0i0fcKoE4Al9vfOVNsqdml3EpWM22Zn5vWbHakoyA6v7OIzTSzizCP04tsMjzq29QbZ0aQJltRdNP00HM08Mmfutk+cM/Qj2Vc4BoNDRkF4MLEv+X+oj4d2t2aCA9sOcdg7K+ZEPwtA8NK+wjGwkbT0B2SVRgvEW++L5OFyABto6buJPl4Ze3Rv+RCIXDl2HV/hWi2c3r5NE09fqdjVcT6p6h80xSlS2ppJRTJMqHFOUJrRSQbWxCfPg+Scd8C2Hv9kRuNG2FKZDaF72cbKHIRLfiXhzmv70D/YXG4rEkui0H2dqBX8YoxTTGxR1glALEyL/bsRIwzZp0qeBOQnr 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)(366016)(1800799024)(376014)(7416014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HbwEhccY7fCZBH1dlvSrPJ5pOBT3NHgqMPn8csBAEfYNuhIt0FIVDumk3lF6OxZnNgfC4uqEf7gc28VkKy2dIytk5tWXtkMRE317Lh89uA552T3OX313AXr4aU01tFGeU39GfafvBxIACGqTTvoFLd8O5BTTbKttG0ZC+j1WJHmZoz5An9/7sdi88IkPT+Kdqu4wnaIjn8j1vQaXf7wbGkYPimyP+usIOba0KuniSGUymZh+PD9TauroezJDMO2U5n/OYOVyh3iJ4gq8wUdYq+Mf3fZDAozX4nnR+m5ZVyXcqT3vXgiN8WDwy9FvyfjrXQ8vRR+tjD6th3FERIsZnP4reTkwaGrZ9OUUoU6QJluRsLJX7d0JYVVuKSupBH3+U+HtL0+zbS/sWyn+rJPbxqOtHlrpJWRnAzC9jitBJfFCNPc138CGSVJwlfyqI9qrP0zy8ds8mOp5bTSdEmh1cm07HJ8/SkE//KPlONTbQE3uM+aMEZxSe7w7SGa267EamzTSx+jYmB+7vs4psBnw/ghAYS+i/aMpMizcgHbJNoYaWwJL9Ee7kvTYZ14WwpwGauOXi6rWQEf7Wmgir+k+1XHoMeNR87mhbMYL1ZbpMlI23CAOHjCi+fimaBwyj7C+YMHlrPfuC3DjAY1bftf5TEQV7ISlrGZIcxWEPRs3Iy4lp/xNy2zRApgSQVXcEAUcceDiegHwL2zDEh8pSKdyrtQr50wk8gS381bNA+5WY+rsn6b45FMjddbCnwT4xWlDSAA7Noi/OFIb1H+JbqYidoXue+FH8QwQG7tkgy5UTnDGGyK/r6TYKyDiicq8hpbsESbRLgpG0SaEzbeDAyoqcug026rc0xUWC8QuE5epE7RUV4Pi096rUOQKkZ3pK3coV/owB84ZYGBYidGpczrb7QX96xSfaNdCDwwNfu7B1ZgP7/mKSYsg4BrdMQfS2L9qPpeMF6Fu80U9Ten0fxAY0NikGE8hpYVeIPNmJOGvfYZgvr1/0RkcDtjQQhAdP2kY6SHsLgiL4aZ2RmG5iKXDubu5SFs4alecYDuJIiD81EeEQN8MfLpUFuaa03tK82lHydopnj/W2LrhZU5V5EkytU/g578SbccOXuil1cACUQeKtDQOR6EJMsoc+Rvtg0jTpl4pD2JYYqMdQm7YVOEUySh9sJ0PPcGCeBwPZqmtzMsln2T/aOppu2q6b6D28bvDKh6/q1Ago6LfFNMTVyMazvIKbbrYNxEhRKOhkTNU0GqC2iE8PvZS+GsjWjdlwK4KitNnzdPsUncA/yyU7vEf/7u31pi3yuc3rxKa736MyCaYb4HKWgssLqnsHECDQhTOV5nS3tXE8HC4negpHlmsrH8YR3mUJl5LPSEFKfqD+9EynVTLhjjsSEKlA6awcUv/5va0w1IlO5wr8rw72BQwwNLfKSFGLlUPHNchCTPQYW/ZxIu2Y+Nmr1vcjYXsrpVVQ6R2CbtaDYVcQMqoXdvf8I3aE+X4y3Z/VV8GZnUh+H2cXaDvjomvYlGb2ksKn+ed7piGRdjelh6LHSszL0ZLqFyvbJWOczel8DSpKoHiSj2mT0AGsR5e6Li3DcxBsXPP X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5645940-7284-4f4a-36c9-08dd50aaa1ba X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2025 05:59:54.7054 (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: QF1Ri0qEA1ouV5hdFJmoBv9l15x3d3XwSZfxnO4HMiWw3VdvXoofIOdCidC6QI3Wgj4xwJ+QB2O/GoHm7XstMQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9409 X-Patchwork-Delegate: kuba@kernel.org 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 Reviewed-by: Ioana Ciornei --- 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 01c09fd26f9f..0658c06a23c1 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 Wed Feb 19 05:42:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13981538 X-Patchwork-Delegate: kuba@kernel.org Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11012000.outbound.protection.outlook.com [52.101.66.0]) (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 D00C815C15C; Wed, 19 Feb 2025 06:00:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.66.0 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739944804; cv=fail; b=oC+j58E608xCeKPszK0OtZU1DQrUqW/lhQG5JdRzy5wXKIyiJqrtROYpVIKCVvB7DmwOjYSN/sRMfbF6phcdU4xrcZIl+cer/PnCk9T4W7XPHavY0EaxZnrdUOAOEuQ4ky1vniQr8a7DEt1pNDXujs7XBEHlh6U+bzuM25UEOyw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739944804; c=relaxed/simple; bh=OdVj99klIA5mM4vclnK+hAyraHydf1HzySYdNydS2BA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=CiuwogSLzUecjWg6T+6Q8bibIbX4GpLZlsiE2vdBtqI8mDOpjsM1BbqdZsKDxXynr0lXZR7I4PXhIYVGvP9dz3kBFL+7WfwlBkm7TtwsFNvRDZAjE+FATPWc4cL63ahD2GtjwuqiXawj+lHNp4oboTsvdNlQY/ZWRoDNQx8itDA= 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=RagZwzfw; arc=fail smtp.client-ip=52.101.66.0 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="RagZwzfw" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=v45sb1bAhUYwYpnoux1cdhA3aMNd4mq6PcqiHW0CWrSgy7cf1sZ7s4tFGt12jhsHEYGoP9uoOKihDuaNDRWkSyYZ8D6cFDOgho0+i5pB8fgJydu1G738/ueCBWwzXoDQyQGS9rFQNX4IAKE57C5yAl3hEPlNLwryg3enRce2S+ZoHnUredntFoZkcissG5Xwx4sEX/6fNKil8K8bPcyicoZBgFSXokLXNAKejIhSY8YtIdbrG2H0I9Xk5OKyhNUSqEE7A2DB2xCubHcKrMbmMjYk1YQucUeCazJmmCQ42MaymAWc77OQd8oOv53BSy8ReUhAlzG8XZn1wmqnWtbe8g== 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=/QoAiCKudVYspUiTuQuBMj+zdN91YEUKaXuj+KNb/2A=; b=Il7oF2ofRUpH9Ov0vPodmFntxJQdGItfwEq+gMAb2+MaVt03UHGW51gI+Bfw/jlilvW9O3k5qn6/CcxobKjj/XoQOo8JWHqGH1EeWcr/yq9GxUhO/w+/c/2y02XDoc4eb91cWFHHyQ4EJeuGDye5qUfKzz8Y28ZjnOyPCy1dAFSjuWA+qG8gTQ4l98r0OKeqG9QM7yXVMXXn13icZ9VMYcv37uv10b5pCkBmg4BwI7A3ufxIyKeDFCGKRXVzVdp2cgd3n7mQpJOr/x9ouDquXLwDqrkPlu4U0hOpt6e0DUycc6oWGiWw+b1pjO3EzuCoVr8QVw9bpEm/yig+iAhzQw== 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=/QoAiCKudVYspUiTuQuBMj+zdN91YEUKaXuj+KNb/2A=; b=RagZwzfwO4o3FOYUQ626MxcsqjTSmmMkXkTAOyOK8ngE/f2f0v01Z/ZqbQzJa7s0m7feX59IFhWvn+B2MgpqkfNdZG/zLcqwTJOPtOlhQ1t7uwxRdGilJfuKA1cbTjTRSSyHLLGGLdWhPmhoJLxEVOwBGPzQwe9NGlxFtBxwJ4zouagcRErX+7m1rB6qvVCf9JwNeGPpGYwN119dDadSB6x7ZBoUhOgXwLMICRhebWSytO8YSg8LWWI7hKW7UxmQdxWt8ckTyQfLiP6LfTG0VVV3B/Fd7jVTEgkkNCO0+fIIGkxHTDlXZES1GQFnHbYsZxiP8pEs+EX93O+PZYuVTg== 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 AS4PR04MB9409.eurprd04.prod.outlook.com (2603:10a6:20b:4e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.15; Wed, 19 Feb 2025 05:59:59 +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; Wed, 19 Feb 2025 05:59:59 +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, michal.swiatkowski@linux.intel.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH v2 net 3/9] net: enetc: correct the xdp_tx statistics Date: Wed, 19 Feb 2025 13:42:41 +0800 Message-Id: <20250219054247.733243-4-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250219054247.733243-1-wei.fang@nxp.com> References: <20250219054247.733243-1-wei.fang@nxp.com> X-ClientProxiedBy: SGBP274CA0023.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::35) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|AS4PR04MB9409:EE_ X-MS-Office365-Filtering-Correlation-Id: f2b8619c-93b9-499d-628d-08dd50aaa486 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: F3mTAPT+z3r19zTUj7yfsmqpOVeHgzQezX1+2e0shoelOm26Iein4ELhMgO7bUrm1MmE1nFR4FqCzjW2HlZ0QCah3q5ulGsy3pZdA58y6+MJ0tx021A+BjYWubL1maR41hWOVmhHQD7gEenFKcWJEoZkpHv95nr3vLk2a/jP73BJdKXfk4H+l7OEXqATLei4WeGub1qzwM7bb+143Ecy+wuSAswoHaZEb/g+yz+mUbo0mwPdMsxfD8Bnf5Kb2OFdgXA/tfXMKa9udKML6jy8bi6iNhUF5FFCZmh2t2KTDu4zXUtbJqaV9Keu9G8nyvTkxDLhDIXwaNHOt8Xwuib8ILTRu+1iWYKkzVCmurLY6WgGZaOuhGg0llx1Y+losPQ6wZzUMnx6jq/HN1+N562PmyKIP2JOtjbGBO0egNzlW8nf0HJjr9enVj7FtZFsg2jRu/uxWPmt4C0Olvha+q4hI3yoRdlgWAqj6qT6tWcw2MJcCr99tp4bGtvevvlNTYG4RTBvCstKY9gwMRL7be5roJHAIafZY50ktcuE39lY4in7ydTyu1E7NI+orNGtZBfYMqrcwrxjb8t4xQ7Tg6q9MMn0aWKoSgdGeIaCfY99YRSTffwtgeEfq0XFAmK0at7iRXBstLSkUklz7o/+YVwXXJmQrjFa4NQW8Vpw5c6bXgMExvv1VfCrWe6VRB2Vhk8q+wIWSLnawW/y2oKoLQU1SEkLqmDBlgqWnM/7SGbzUAyVQNUhxqBDVpXnp+1Rj1bFIqG6lGJ6+aPIWBWlBxW0YaYrJUS/VY0vX/C+TIBYteS2y2eOk6xAQ86iMdES9w0ocz9aaICYr4hvrFI1byA2LkfsxlZVkpMcDmZbB0ddTv/57nATv6q/8kffmCxMmioFvk2/3DrzkOMRr7iinISIi2Lbzn9C//172Pw6uHymv/5oJJ2W5UtM5z6yhLSmxBHGsaikZ9ma18dvxkrIY1HsfDk+nyl7cZW+8zJBFe2RfLT81fXiuApBEd82Hcpc4hvm/1XV/+K9O1j2ZK2hXjbP6oPG9ZOrbeKlme/lSaUMsZW44PsPvCDQfztX2mS6CEbxak79C6Thrhz6pyHtjX1QXfl652KyCU4Z7WSg26k+3N2qS7xgTaX+uYFUex5j3iEBppAXJXgYu2B6kDqqZNpjoB02Xs4lw2Bz9eSdbtz8jNjlFhTAzMaT8tvTh4cbshGiR2gX+2z7elh3SooZrn0WnbFSJkfDRkp+ypKYll/ixIGoS4t06LizvwiyrSdvI55FWHC+BqFXwkVCyj4HqeprpXdrnlx5SKYHN15GpqC5MGkhCVKQOvcSeYUkutnUIjSsWV/zikkjUC5n90RWGNZI0DIcYAIvHRTeuu7vfadelcIZJPpp0eIJHR+X15OpVK/GjFgPAHjVGjS4XivvsIlY5Wg0123DuRpZQgC4+dQYfSxp5AJEqzcMuukNDOydDfwp 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)(366016)(1800799024)(376014)(7416014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Vd3FypH8gEAgnz/Xa4WMXxvMacG2P8J/IpQySAH+kWtqXCX5lxwR53IBSEkuE6FuTLLXH/aA+uAEyioojgAfPzByHfwK95Mqqz2Aceaso6WnsUEaOm6K3U5uyjZ4D1TAMwqguqHuUDVBiZp8Wrz12AMtNyspd+pDphj/jfWM7YyvNthquQVwozpTOErfhlu/vtmYljSyKcgvIF9WDqgTKLk8UQzffbBfLfZG5z0f3kOQRhVSM7C4cpU5u+JtA+Wxs3RUDLu27QNejEs/XcKy0fgNfEhDIX/DVtqCFrSRhfG/xORcpCP3yJqT1+eFPCdeM9SF08bI01bvI1BDfH6x4uBfqjPJ0xOcGJkQhk1J9Q2cPS+QD7WAk014ysNJeQxgf422WiCMbr9FmmFpXQZMD2zZohVskS1pLtFe3Ty9x8XMEHlwU6Uj7CfCE4N7DS7ujCdLBwLuTWxLn4HfqapzXhoPFg3PesB5u6XMJqlNT5YXlBB9yha0lOA3uBjRHi9fzhLKFRHchJ+QEGLFMUPQU71bOFFrHVt3RikHvLYm6dzJQZR711t2TpVINcjDwaj4eh/7S6rYaR8odo5U94LtyNoZ+PReVUG8K3jotRCWEaWSvzBiR9gQngHvFNWkCTQe5pJ4yzzkoKvrEPEWueHG/BuVzbbxSHagG2UoHQXt7PKpYzIJVj/MEnl8tQ8/ZEvCMCI9FH9REJLB7LmGMyJuDeCVJ1lFX175QHgoc2DjD0e+PQB6Ivv6+AlscXV8gnSLqU1otuaQh18AXHWOaFZiZ26P3xyztptW7OBuJDwS/bDFs0sGdhz5+m2Tb0WKmLbGdt4Gt7pqKQ6o+VWMbEaktS1O9RzfuUZBSk29AtMxebmyOiSu1tmUuONOkx+bcSkSgO7wR20elKHKfgDnEZ2OMGTwd0yiubCJy+GRiFfCaXtXOOsCvxKyRVmmxG9tGNioarm0OGVbUnVpXsaIMHCDkMEASY4az+0+Fj5AWmLUt+sZzu2uop3UV7vJQiGtLNXIduNreNgOZcVcM5QVsZ0Ieg6bNk5pdTVlezjwKOIhzaDvI4++1Xqkn1jx/7dExEF8GEZlPUMxmqY5ZVPWi3B8K1bXw9EYG1c5Z/L2MEUpLvgv2ntabSQ3VFz800AJgB68/+yg/UQjg5Jwh3If2HPUyem3THcs9DAprTbroDJRJ/gSUAYLpfd1ixipZ1a2xmcWXOjNDhV0KkMH+95MQtiBOaIlcBEXHvtqqIBPo0S05OdcdeC266HItLZ76mUrEwjfIzmGb2fnq3ukXKzSi2ixBXK+vq4AoGwKjH7+MED2yTLh7eEJoQMJUFjVxkLHLwEZFiWwRWhZJYuxxBvXABXf8nw9uNJTCcYqG30v24JLjfCEnkmUjgL2o1WV7Hv/2u0NrQfw9peeG8o/fjgmd/ZIpNcCU65V5rupZJZx1iWl/mrQIVuAN65TFilvO6C3GkXyX+hcFH4H3eO2TB1bbsVttCK2/RyTj+bVa9zkryUd9ozxroUSQuys1pQ3or0XLXdvat0EdvZETBO9Z0hHppA4K/6k9aKsNnN61+jxn7h/KsZbSB1YEf/TfZnz1oJKAFj0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f2b8619c-93b9-499d-628d-08dd50aaa486 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2025 05:59:59.4609 (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: I1f6QXr8qR5lJMYxQfZltXcGsxPJ9zZ3Wzr08+pcPCD587UNVFs+LOT/I3e1ZXFXv+yDR+rcyjsVFtiEPAUzUQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9409 X-Patchwork-Delegate: kuba@kernel.org 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 Reviewed-by: Ioana Ciornei Reviewed-by: Vladimir Oltean --- 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 0658c06a23c1..83f9e8a9ab2b 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 Wed Feb 19 05:42:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13981539 X-Patchwork-Delegate: kuba@kernel.org Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11011010.outbound.protection.outlook.com [52.101.65.10]) (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 DF2451C4A10; Wed, 19 Feb 2025 06:00:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.65.10 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739944808; cv=fail; b=sSo+jCwwCroLxyHdQ2QXgeVop81vNInWtjimra0ha55rBFHFKTbrnMB5FkHJ1J988+QnaujVOx8k2YmnJDHAAjbKDRV+Bqu1jQB1jSyQkXTO3a84pj/wivypB2MJBF6DnG4i5b9m4mDuQM1Bt0ARKc4/hPltF9w7yEm47k6n6Dg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739944808; c=relaxed/simple; bh=MO9hvzWqfzCrjYwrLcrjV2v96AHU8EhBqUKmkHcoap8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=AQ+kr+/d49oLqW/E8M8tJzOCbcpr8ZHJqzPh3cemb7FBYLBYDdq2s5n75tcsd30bdcd0U7zOCYOsUbSNxhxYtDbRRJUH2/lvEN7Vbql5z6LcLBVIt6d/EpJqB930TMRPZhPVo6pveK7Fk5PmNGvczkyzCMeg3xlm3vQWLGojAAw= 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=lC8SagnP; arc=fail smtp.client-ip=52.101.65.10 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="lC8SagnP" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ROFmuz1Qmj4xn0K0O/7Q2qWVBX88FsQx9uGS2mwVQdC+MZx4sj07/Ldm1WenQpPqddEYYLiEaiYVRJ+iO+QHCyrvQC0uLQq4U3bE3l/no4Um526GaBQkI2wqzR4AfJ/Lh8X95SsjSoigJrIKybrmbqtkJmva8BQVwl+bm1hBet4XbYzOMxOuL3sQ/y1RrTXN3Y1K27msLAE2XUtX9FBD8k3LNt6F92fXeWkicjFTwGGrMGLhPU//u9/XAvXBOI4EPJcDX/OiF9uWOM1CsDmWe8atoBfh3iHVx0TypM57nv3BzZCN99Da88rO4bVycKbAuX/imkoLtmqYjq7glbS+yg== 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=VFNi+GepQ8WXhAHAlaVWMRFdDn1I6sogJ/sqK8KRNHU=; b=STamLn8QwUirc8Wb5Qq4/EfIH7/pMXDw/3FKqsStlVT31sjcWBhkkJXHnZq7l/tte99pevnGb3uLJnqS3rYaU4j7EjX9ccPMkQ4BdOokl2HIYsrxk7hcbr9v/TjUYhDd8uZW4521XXXdku8mWa7CzlwjZKNj6sUkW6rYzjqaXUVm0z7VimdRoVDIr57i3cb8CfelzqAjcbLQm2FcX7dM+JzoAWBTyY59xdXh3CM92l3qqq8NGALvayt2616JX4rhwqWtoHCr1koQbxC3ANECXMSI36xrZDxNmTS7xEdJnMwWDSQHViykQETjBP7EdUvqcWexL/wbl1xaL5N8fXEWpg== 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=VFNi+GepQ8WXhAHAlaVWMRFdDn1I6sogJ/sqK8KRNHU=; b=lC8SagnP5xXxgKVndyk+xpqrfuB9lSCKpzbc06Bpwja919ignyN4NvEUxX3K4DYqhoMqyyx9uKPpatEjIFDsrIUlTm46X5UpCmLlsE4E/lL6FPeVSdnVn8H/mML6T1Gb9d+HErfL3R1YWSHJW0bPY++gtuHAcIzHqjhsY8PO6/8XHjDBOWZemLXkwghwSACzjJs7V+nj8DQjzASDjrICbQPwFmSU54czFjvWzTYHWn1WTbthOCDUPkyMLf/qIrvjxiJ3GEct3mAIt7MVCpG39k4nLwAB+7PH0letcT12rq8WYp2xx+TK/KRjVmwhy54q7FYTyp0dV2fI+lhMdEsdyg== 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 AS4PR04MB9409.eurprd04.prod.outlook.com (2603:10a6:20b:4e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.15; Wed, 19 Feb 2025 06:00:04 +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; Wed, 19 Feb 2025 06:00:04 +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, michal.swiatkowski@linux.intel.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH v2 net 4/9] net: enetc: VFs do not support HWTSTAMP_TX_ONESTEP_SYNC Date: Wed, 19 Feb 2025 13:42:42 +0800 Message-Id: <20250219054247.733243-5-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250219054247.733243-1-wei.fang@nxp.com> References: <20250219054247.733243-1-wei.fang@nxp.com> X-ClientProxiedBy: SGBP274CA0023.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::35) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|AS4PR04MB9409:EE_ X-MS-Office365-Filtering-Correlation-Id: 5e1ad161-44ec-4feb-8d5f-08dd50aaa74a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: 9zcjrZu3D5q3yp8lyRuqHiqesSBdzo0nGFeAFysy/weggRDac8Ihvd+BJITjUM/D23zVolNowerf+7wsD5jCpUEuDbXJxXuyhsV+JzMIM6ib0xUBAvvHPC1sqAnpiQh9c0+WQC+i/m1eIRVBqSchiVf5MSaT3afPVNy/td2dphCzTOdhUQ0F4hh1P8GBTuVx3L+DE/uKUxLTUjrTdEDhfvLKAN7GxO2oBrW/+jg95Sq/6HMvaHUYis6fhzVVR3Co74soRFyXYmscQkuiRgz6Cd1qLj9KoTR0xjk1S0G8BeFeHg1sizqQQCWnKNHuXv0ks/u3i783A5r8Jf94ZZG2ftsKA6dAYqWQjJUtuIc/aG472Pr53h16rBv/1Y+gUk1UbYIff9ZjnlTtg/Ecp64Br8zON0loyY29Bk3ChqnPSNUnZTEI8CI6j7tzSRoFXZBsd+5lYSkhIrT8x00w55NaJqvKc3u60lA4oENYkhw9ixUX6FHN3ogmRVJ+EZROGFbX6LfUx0vlzhewwuZEXjlCxXW3uY1jwQYoCpwl1jUFuVmbFzVN7JzByOrIg6yiLqoA36FTayQxdrq6oNJyahTCoC8lVPZkACjb1LGvwfqsztDcqGeDZ8/l6NtaC1dV/K+/nBvOoxmY0WmYov9lrPnr0MpmPDqlR6avQt7rfp2kFXKdLKI91z+HMGMoi75WGmhYG2UNK0/J6pW1kwSEMhFdXwMaRI+RfAlLsP6PeqWleLGBip2JooovO07xPQ3tzyy0KDui4FbEn0TAmAWBaMJPYwv4nMteV82Y3a4GtJnAdO+lXnHc69Pu8Y+55T2ivKVduyLuK0VNCVHbTsFQYJWoKSs++3J83OYR5dSnSnrzVuMpXFR4y963GeP0AJpSwq6fMGcQS0O9vu661Jw70udCIEARq+m3GFxKRops0dizxNygsxU1/Res3w67754wYFsJvXfmGUSObZh82IDMSo+vkE5IBub99Prrhyb13D/dfAWJYR/AajhDIjfqN/GT2+znCv4ubk9ggFGKeK2GafJn5193zXTu6YM9LWAClsQAGHZDfLU8Da7mnusjXB2563PhKXV5PZWu/sglYRkAHcsS3pMbZa654yjVyCr6b+3Qe/1ZCj2dj8P1Se5kV+layy0K2iIYtjLjOXU9MoWVFS1TLUmzl4J8CZDQgpsH0b9rCAs3kHTrnL8yHWlGXB28iqxACsdjhMiRd1xXx15tyKdV9yggifIDs0hpatt7JV9+55Phn7JM06fa8Ts4izLizFcIrXIAMfShofeI4cLpklIAOf513CtDUufnYoLtNn3ww0uTbEVH4PaY1RWjypDStFjPPpeCyzn2SLCFbynTPBb+vQKubIhZPooA/V6lRlPxuuBdJpQ6+fbvDHQXFOO6Fck/uIov6J1DJ5yCujV2MWbBE2clf2+WsMvofRiiqhobgSJJjUudXcZVwREf4V6TdR1L 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)(366016)(1800799024)(376014)(7416014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fxdIM6wELFwrGTMgEVOWA7r/S1vvhwtN2FHOpB7ebJTyn04A9kIKwdKil60bIi5dRrM6/byQR+BTgn39yR1Xne5L3Rk81UQdEYbhVOonnx8c4QsRh4ERyW9cLPZW1I6vN1tCsFg+9Hf55yjfyDq+4JD2HxaTEkQwTYblJcKiUpdE8Ujdi6q/Lq+/40QEDBrMMAc+RJjwgFOjkOjz79cu89zEiqruBtAW6UbAHC3fE2OTmSR2gkO5hzD45pT+6in80/47NSH+HL7FQcbaclYkMTi1SRliyW6cJWQOp39AMF1mEitX4QWW0MZALoZDcMDbaRI/1QPi1XRBjHJz4rH+iwP4ysntpGlvNXOsWFRHRBbOAnhYyUriwTFhm0NGBIfIkVfF5lKpkIIpwD8rKP5hXKYUOE0K1qGenKJlT9r6B4qlLCRITUqj5y60HEFA0Fp1+WlgRAjoPA5p+V4ZZftngKIdWAWu/xrni/dXNPzB/G2PSjH7e0shNNiKsUAd6eXnO6JOT9Z5fKk/ScuKqyqphst/8itcsN1csliv7ILjRtAMAZfh+cp+n8Q0d/aKa9Ej9MnF0Ha1/Obd5L3KCjCadqXvrFRvq12o9dI28JC6OaQuH9PoH9MWQkQKjvfNjarFBd3hUs0HbdiwbPz0b9bvLlbgExQAqi9tF1Z33GyR/IphqJCQT+X0FeVf5DklbNGJ/kI1EipRYXEeqmpt5QA63aBKvkf9mEqccjWS1KffCif0GUSJUcHz2XFIOuUC/t9VojLOSo2oAsSW7pKe0j3grWYZiK5O2ntXAD3z/2rIWl+D94/83VcGCXjl/bGF4p1rUzO8OaW4zFmHDZ7Z/CXrO7uuJFNqAxZ0LTYwk97B/ny+jSiraVTCevsqXtJjwUGkGn40cBrRx3PGHPhrQ7inDwDSoc/DHS+eF+kK1V8+BPNyCdgif5Ew/2AuH/N+xY3lMm+WMVAM3mt1CBHw2g8zt4rPqmr058n/kyit5i6h6fAhnqS1ZwXoqnIjEe4aR0JGj4rWvSdoznuehWMGmLHPvORbE8spSIV1LaQNKk5BAustLLFjGpXLTwbmoPAXN37PpWC4gMMq9tUowj3SWHcMhxhULFPdtkVMbgFn/9Ew5I7Og79g1nPSShf/SvjLb70MQn4MUBCiz5Yr4p+jbtEjF5uuOsDchWJ8EeGExmKZTwc8y31V/iYpcvFkIpAN4nuhN90iS20Bz93n6hz4EqQqQefiK5ZtUEHHSB/8VAVlRgbzDU9tIYrJYk2PDWHuThUbBnWXhLH0iTYg+EuaZc1vovSncOcOKKQ+i7JVzDAqJ5j12vbFTt4VwAjIDhIaSZHACZzdZES7XpywqhMPOEHGfdxzmr29wpCZzb4c/zCAR7rplgqLQHoA7TVPH5+dZlJwuqDr2QZH1L4BlsTGBPBjeRW/zXbUQZm7ky6gsJ1Z5cnue+YSW0g56djlowGj98QBsH9o5SX+JMlz2Y+r/s/sXHdQ2y93TfM5YhuetjWk+5YdqcBZ6ufIG/6vdiCVQbgyJqvEkt1aoWm1UZrE76PyvVnIpdnnrVxbOxvlrLmtUI5/+703jr2IyH0RFwS36JUF X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5e1ad161-44ec-4feb-8d5f-08dd50aaa74a X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2025 06:00:04.5139 (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: Ecw5VgMzXmEpD/AHzyae9y/t5/SionNmtn3rgYVqecHAUdqgd/R/gjk0nt7wYAiBPkajIh5+tqrs6TwQkRxQEQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9409 X-Patchwork-Delegate: kuba@kernel.org 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 Reviewed-by: Vladimir Oltean Tested-by: Vladimir Oltean --- 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 83f9e8a9ab2b..77f8ef5358b6 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 Wed Feb 19 05:42:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13981540 X-Patchwork-Delegate: kuba@kernel.org Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11013055.outbound.protection.outlook.com [52.101.67.55]) (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 848D11C57B2; Wed, 19 Feb 2025 06:00:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.67.55 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739944813; cv=fail; b=UE7T7JcQRSUGKzEf8zQZXEGrng4BI8Oyi2pOaz1pUH6zLLZ7oa/O0vkWEn92tCldQWGjIJAT+QQIhHloMdNSbBu+x7JaQSHU/+U2/cB8v07pdARCSmh6wEV4XH1a5ETbmnnAL0vbSQc3IhGs4TUGOwmP3r0g+LmW46+FMFX5EQg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739944813; c=relaxed/simple; bh=5MnM/6kY39xfyQfR88shuGDgRKevii//WFJWT4riTmY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=mehIr+seEo9RUtzeDGWrHtKtWt1guQgXM0OPh5KFa5n271frBLLDVsXRGNdkvIlkSIqsyDYD58tL0V4m3Jx2kUozwRxm2RsbCWyCTJxX+qkaM9cOLtUk9SCMt97MX4MFec6bLLTJbsT/Y9dUkkgYwLaN2SVLszmUqLGaoPv8oRU= 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=dpUmCS5R; arc=fail smtp.client-ip=52.101.67.55 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="dpUmCS5R" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oJyvnsNiUmhjQZEGoSnvRKD+mM6k4EoV0SIU2oIzYYTcIR2X9m76Au9jCFczXXPlaUw+ni1h0l7jT7sSTrDYUKAmiuxbmgCJGf0eex2AQygKN++tp21HYLoajCRvrwI/gLakSUC+lWJBnbpvIjrK+/ZnsB9eyleNfnF4iFxuyqfZkE0fV8klwI4JVNFuYc/KQm7WymAJ4sI9b7/4rWEHXYmdot1/8ujbs5dlD3yndG05XfXHCUD+Eodlg1B7Box6DEZtAz7rs5GS4OGgRukdsZ4pgprfXZQpU8Ty0xf/fuADBEWJz4w0etx8GrSttDXFPmXts6cMfExH75WCB1cQFQ== 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=Mts7h/NE85NxW0BUBEO7sI2ocZVGTZ87AHxJVV1pqmY=; b=B42JYkI3+7US2+2alIfSPbTxyDIcZemwONti9f3SbO0NqaqLQboIfmMW656ioDxmuHoXWsCmJz50PlnhLfMdxupTRpNsjdl1EYSMuDwApneIXQ2X1yyaAoPK7jcv3xF8iZhI6Sjlz2uOIF9bOy9D4RKJF49IcssqyqsfMJR3aVZs5zAoZBQIDwr1e/igPyIUt8zClzT3BVz7gY9/ENHISpZGvvayrcsnPLWlzhFUZgfZX7gj/RbxTtlWbaFDydk/ZMA8EeBNyQN3nXvHkiJeunukdyCgeUoG/SvoomhOQ97M0P6s7Tz3jFCVT7WOGYOlQENVxHEeYdJZrkDxt4ZYiA== 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=Mts7h/NE85NxW0BUBEO7sI2ocZVGTZ87AHxJVV1pqmY=; b=dpUmCS5RjEgqDknkd1nZZRKWuItn0fsCrGNRcN/5UFxz861qsAuefnTyw/+uS79zK/eImbi32XXN7h6zeCuAhiajCWb/jZ27lK0cdkWE3TTVUv3qm+XaJ4ikovPE2fcq1WXUP/NdYjUyarLzqNXHS0MTgDsHp50mn7xevXjrF4l1/yvQE7JAe/5OWL3YCKOYMH36MJ5LKQfFV3BEZRBdLZqhHT8YJ4xfQVHkRmNfgl1nRXRypOXdb66fwDPAGQw2Gc6DmP/COWYzEmg5bt6Rynjkm8j+z6K3qYVaQC888w9Jg7OA7upRa12R4lJE3uQWIUmIjKS1PHNYGHGvtlIyYQ== 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 AS4PR04MB9409.eurprd04.prod.outlook.com (2603:10a6:20b:4e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.15; Wed, 19 Feb 2025 06:00:09 +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; Wed, 19 Feb 2025 06:00:09 +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, michal.swiatkowski@linux.intel.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH v2 net 5/9] net: enetc: update UDP checksum when updating originTimestamp field Date: Wed, 19 Feb 2025 13:42:43 +0800 Message-Id: <20250219054247.733243-6-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250219054247.733243-1-wei.fang@nxp.com> References: <20250219054247.733243-1-wei.fang@nxp.com> X-ClientProxiedBy: SGBP274CA0023.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::35) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|AS4PR04MB9409:EE_ X-MS-Office365-Filtering-Correlation-Id: 14760c2b-be06-4afe-ca56-08dd50aaaa51 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: C9l0CZjPZ0QmOAb/DihMs7g2mBdWxWzWTOl44DJPWMg2tcW0lbC7/5LaUpsOvduyVDVDPckKhNDoOhah+d87oPmM+OnF5S9jTh4BXSk0CTjaCd0ZiWx8jLQji4xZqxTTJHLtLTmTHfOjc+avehWS7odMxpsmb/0zxZrtBu2awObO7dRbBrnWm4NJmvF7qYx8/q6JTdtWEnmJ/HKZPJ5jFjb5KLS50ceF+MBMGz5Rf2couBeLIZbvnKX9kfIETtcMctAaigSAuuCn4Esx2Z62lsf714yVCTc/xaPY4ynfZflcq7hvtQnW9qJgVRRNz2tOpN/sFGWHQhJg2LtyO30aX8tyiQ+X93fW/gq4unul4sWBYenLEKVT0/DBV0Za0wrgVkILZ3ARcI3CykRQVwhS1YnmYdW8Kb6iK5xygw4FNKRMotHWROeAEKEOykH3shkFM4cGGI4/Bfrr4FYSo79d8dudY+K2y9PsmyIv+qtvnoXEQTL5OT/205DZup/RKAks3cfF7ANXbzTSweRuZuLPOsIp4HDtJyRWt9KdtuRXYC7SSl9JGmvmGc21IiRNtYRO0iVDR/XUBiZtcdIwDg1c8LfPlkNfr/i3uYmZdQNdfCtuDbbCnJFuzE6EAz3xLTjOoybISob1GO+sDikWcM0KVc6Bf0OZp//EP0R7j6Ml5GQVHty/v55cyCcCIx3AAaMPztxrJyKr1E63JEAtNTFNu7l2LffpN6IVbvg/4kv2dqRDm63O/9iVk/OhySplLl2a6bAbnbtaU5myBZQG0clfy8kLNFIjWHO6OZ7YzdMmmDhOo0KLt6+jFvOWXrSnu7X2vvX33wAXYzZvaPalxwDKXBazFpwZYdy5OK0TF6TG+CerL3dyQC8SgINL/Di8bi2TML/y2OM/QFppuW0hDsbpgSSV0jJ15KFbJ/kWx0f6pOLTTH4RYz+g8NbDGtrQUFR6/Anq/1clsBMwHIXBmn4KzoZYoZ46Uczevz9sI1Z16Xr0xOJ1ApgstGzBmdZjL3RI5Y+HVo/TJFENlsGkInAC6b27wEmc7UdL+j8/ZA4b5waud3Ma1GKoRucPWxRtPJx6mUh+hiChMc2nTJrWh+rOr1YYPgEue+wTCQdwjUwoVyMRrfwLOlr7MkqZuE2mOfec2Gw1zpeXepbl4j4QlEVmQi6lJumAYOALsY610H4lXSc6HEGi+9nS/EAcJ7Ns09xhbPngzQF3zVSqFSMK+SLU/jmbHzSj3UWbeOwtqHNawUPLYKFpjNQZK2iE3nok4JgOedCTNqw0DpeB2D96kO3X/+ab2GMpbCKTp35Nebge77TglgaQIdGywAc/eiXioBNaiUGY4phE0hQpyMGMZ38rBcBp2iAtOU1jiJRAHFnDiQ7oGz2bIdzSHWF93VTNRCqiZ09OcrVZKQdDLBzIBPjFnYhfxKDdYXFFeXQrzkC+OpCnlpNdMp2F1u4D/OPnhjLJ 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)(366016)(1800799024)(376014)(7416014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +pSy10byADmMBRJByVznYZBrlUpNXCwtJ6WZWMOA1nHaThl41fJhOOaVcyjKBJ1wju25mCAD2NYrgbX4MnedDdohXcFaj5UzEQM5sh0W5JvywrQvrcWRf5t433MhsGDZds+W2By6lCqXXU4nm7FLpCE89YIMLbJedGZP/1o476ORxY2zhKpjWTT0HenrV+6LHtuyWpObVmE/hbywuV4ctm6GzYRvLLike2juW9DcwEY5rUZAdxli9x69x6lCTKDKWCH6zFvEt76t2duX9j/REhKCxj5BzRWwzrMl1MPk+HlsaI9keeiwqvGzYVb9SJ2xypxssOB0ewafdj02cSUYIgiaG/42R2YuIWiJUobFnL1LAYRz0st0kvV1QPKaVYqlJl4EOlklb4KpywCy5zwb4tgVPJIgLOOTQ8lqUEBDmVA8bWMKrt+tTzj3yLM6mxxN1PGY2ub17ItN/AlVVK1x/G5S6fcZ0HLooW8QOCc8EKpi2ol8bk3cpx/j0LcejEdHnGvpjHbIgH1uNicUZ2uiO8FUncYP/KagkmcuN+j3YzXsY+mB0yeDcmlbjWfSDENe6XnRlcM0RHr8EGiJi14Z3+bihYD052TfOHRDnrXl0aCI9HeJL/tAe6HPV5HhoKCeZY7tskxkg40PYhQrWvxQAeFcb2DvtRn6XMQYdt1RiJ2hqnw96VpDBtra1kww06Ug/ZEyWLrs2zkEjlsjloqVTtGbs8lvVS9GYCd4LTNq/ZPb/tmw9HiZ7n1WsEZui5tCHMWp/L6EX6/8ZJ2PDMz9zLcS0oYa6d8vchgTq9w8+BLsQdscg/9pSPKX2HBgt4gSQn5yOisILFQloK1eZOQW4OWExrhc/8v8h6EoxcNpckwUIEZxA5rmehMs/xK73wend/zj+GDYZNS5bG3zKiUl8uP0hamlwUEkzH5ps7rXERDAlemZ+EB12vE+dEUJl7UPmr+XeIEx3g03Zhz/gxYA3NV6JNfFoyeUWdqh3QbTOEn+oFM45hz6l7dybEmmPOEfDrgcRi3Lkhwaf14yUh6HvUpvyLvS4+kYXZl6k6yK6Z6p1qrkzUNt406RzzJt6zzd619/3tUNntUN9EUc0k6VUDO0dQwdrHuTWmjie93TXoPuvzkWCQcMFQGZnKAbQkglb6dvukwM+X0YllsnbmaimHxEKcNxqdNqwvn8Bnt7LRnl5L1QhizhIXDDxP/siObeEkWMR7ZHfLXbsuQ+q8PdIW9aqYtWJ3YMlViPMtwXulUbTfw/JY96krIkTjAe8oA7OqL19gjsS/vBLbZLMi7GdYyLEfrhLGMELhHQvqyjcTYJnMKPp8TIDUqIGmcVoTZq6oLASLaDZa76okjEW/mPGrArsUDb6Vd9pK0znmggdM+RD+d5Q4a/OhOI2+BC6tPRzvDTzyIcROg2WqZM4zEofIa3ZFcqNhNWSIkkYZDZC2thEbIoMSyjgK0F0lUU7xX5vUjWxzsWfk1pI+zqQu1bHfEPRalgFMF0BhsNLwYlnRdVxyc6yMHDLxCtQCWHTnX4bth+DWKNHR5puWcabIfx7N5SPPEQ1Z2ZTOI7l3kXO/ejvv1UhvcPHTr/15r0Uolj X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14760c2b-be06-4afe-ca56-08dd50aaaa51 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2025 06:00:09.1415 (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: x0brZ66XEOGCF0tfw8E/Qxe4SjBGVdg7sYA5qZkked9WyXuJ6V5p9E/vTnaLqrinJrThxta3BYPTiZhTq0uFSA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9409 X-Patchwork-Delegate: kuba@kernel.org 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 Reviewed-by: Vladimir Oltean Tested-by: Vladimir Oltean --- 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 77f8ef5358b6..9a24d1176479 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 Wed Feb 19 05:42:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13981541 X-Patchwork-Delegate: kuba@kernel.org Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11012006.outbound.protection.outlook.com [52.101.66.6]) (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 5D6EE1C5D7B; Wed, 19 Feb 2025 06:00:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.66.6 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739944818; cv=fail; b=WqfYWzYlBD2hK6iMn6vbLif1qNtK0roy8vl77S6foJdg4RamlWk5D+T8uXdGwEJ82THceASusemWhJhpi5jRBFGnvTwqhHV2QuGDbn8CR8SokIVIfceFRorSfovDvnz2YHYqxFbCr+ze+FQCDiXT4uwunlkTfNhcmSRNCXBMmV8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739944818; c=relaxed/simple; bh=DMiOOiAtmShOkFZj8EkZvDqHtnacJDvRRcqJ5XMGTZ8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=C+awfcByX0JKprWSeZfyHIPO5LMI1p5E6LH0S8C/6YbEvUWHXbvzn55iKsRU1vPayRjhzL0Sm9EjkUSggwyXKz/qGbMGsSCw74Bf5cormsJBMZzT0SZQTWL/9I9hMaWE2uua1s3g9jKOuqZbzHxSeXWlt6QoDAKgZTpKNB3wNJE= 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=mP4I0k2V; arc=fail smtp.client-ip=52.101.66.6 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="mP4I0k2V" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vQ6xaM21gVBvJh8OePlCpMszE+l8WBkbY9HWMgUbV0LWPfi2Ww+1WhLXAuH+ctav+mFQu3kcnMiNrEZtN77WKLZaPgk/zquXJFdelB32NdQoZm6meL/sRoytmswe2Ui0dCdISQdQDte32d0BQNJ20QIHI1ItvqQHLzs0nbVi1c1+sxciimkIcJiubS82LXd+xkn/spMiO1627rYic2uIaIyhAXrLhCwXgBRr1Gti+S9PVXDl2ECkkkVFkr+isw0HGAB08I3Z1SKNCwyktdqBMYUXKpmP1pjRkt/IN7j8izzKSNeM3CNjtoMdymLBsCV2mDx7z1eyevfgXU3VNN1DBg== 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=I2MRcFM9ry8lBrDow2MGMwKef371irjBhD76uES702+J+L+nLgQFFD0O4zxF1y+sqsS1e7B0h76G/cEI0kwdbTr44+EM8dXFdx+/gIzyW3Z+t1k7GVT/PGL8c6nkV2z2zuT/aFDjp8sKPlo7pDdraJT40MeFhpHNUj+kj0rSQdJo9mDImwq4iC4BN88G6gOTHfDHCPl3p5Aq4INuDpot5eAkF1z9Gt+ouM+CCDYf3PRWG2b9a54Tt7OfAFooQ/2PUOpe+8nsIG6QDY3z0/EeJ7o8kP+fLMJF7NDYAx/ngWtYZKErEKoWCKsYg4TftyYRJC7gHboP4bEqgoTToZFh0A== 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=mP4I0k2VOKUikHzt8qnXiZyOEpKg6o3zFaEC8u2zRBnCRq+8SyRxF5WsQC4TULHoXutN4kPzDU0ZZo3GSonrPHscgRBldPoywBuImrQhfvbb5qm4WGn1nsjHnpHbwOKsCjWpIhz8TWHNAMuiqPhBlZRUsGBiGqDSTjmFMnJ18r1QH3eS1TYggNKGlwr8+mfHxFpDwXPMCTl90If0xEKODs0ILddD2zhI9XpUeoveVr3BnziATW9SxP57w4SCSJ/ZY6gh7tuqziVODvM6+lmYeFSIcqK4zR1iKofzJjTJsmYw0jevChtO8HompHuAS/Sa1gt9cEB4L1p1ocNjocQNuQ== 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 AS4PR04MB9409.eurprd04.prod.outlook.com (2603:10a6:20b:4e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.15; Wed, 19 Feb 2025 06:00:13 +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; Wed, 19 Feb 2025 06:00:13 +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, michal.swiatkowski@linux.intel.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH v2 net 6/9] net: enetc: add missing enetc4_link_deinit() Date: Wed, 19 Feb 2025 13:42:44 +0800 Message-Id: <20250219054247.733243-7-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250219054247.733243-1-wei.fang@nxp.com> References: <20250219054247.733243-1-wei.fang@nxp.com> X-ClientProxiedBy: SGBP274CA0023.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::35) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|AS4PR04MB9409:EE_ X-MS-Office365-Filtering-Correlation-Id: 1480f572-891d-423e-bc3a-08dd50aaad16 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: nWFfuqVY0ScC9sCwJJK6jPAscmEC6vqcRScvdH40B95kSE8Ak8WRzolecStiFWaEZwhaWUFpfb5m6W0hAE22HgnvrkFEv72Qbeca2eWh37RtIRwq50swr7kG21rO9fGbX0WWumtrxZ9JHsLyvWz9X9uUv75mSo1ugh14MHJN0DI0iNLqgxVuVJpciByfV014CCq377ZcrnFTVbUk34mna8cK8IOfsQpIwJAlkpE+tDUMutIi1LZW03djC7jdhRiLRjTaaxzQ5Uc3S85qNYtk0/agQOYjlF7DnZMReHRZgAvJ9batLXDaVuLwkwbL8aHfdOiRc0OgH0y73HdXVfykazKCHnpwWcBbmHrTPjHbei2Yae/iItIKbdBg4oOznzIIYvl90fJo4zSNKPGPrtkzQEUB1cyRjWmKcOorvHiBD8M1YNJ3f8PzK/mRHCvLmZk+uHCCwnlfhgpTVgUi3PGLkBw/f3ke94UEZiNa3T1MSgHv2AM4RDiwuszVrephdrT1ixlxTq4GhEnS5pTqWzsoHOP963Zl6a+fUNcT7R3MVzs0H6bL15snFy4LVHDdmV1gtFj+eyy2dmu9onWS5/3WMa2sdtqNwiIzU8dbxgKpDRASS6pn9v84LXDYq+1Q0H33RaOG4mp6/z0EelUGuKv34rYgLKyA/TAyBCSGzzMOMFjWm19zUWlzcPTGf9+xH2Atchxd93GlXmBWOgmdtxkuIEk8Wh/VVrawRwEX0MmkXmnv6Ylc4aTAMm9MNpZII5inp/MivxoobBe5r0f+Q0n8Bto7ZdjZuHKdmvOuWBwgNjejEORrmO4z0L5i7mN+2AMSMwryRF1idOQmqEVOfBUFe4NsLMCpkfC4gcZVfrLxYyda2GxTn/xCYI9+7FHQnYR3Fl754Nrdu5OXlbIJxw0amFQjgGP7Mx0GlXUJAH6nOf9u2XB3vLCr2OwJXR3q5D7gh4tKWof5RQIMHmyQDfrq4ls6llIYItxq6kZR36fhVUaFaMU812CvL3fvf7zxzshFJIR95tSoJG3VLNZOqL56csfQakyDg70LvUKYYRCV6TpPJKbaQLyc2uSM3pVuJpTn0qV3lES/o3y/6z4DHlPJi6odFr3Xvn+XXJe2+sO0iftfq7T0YZBPrKnjNPl8p7i1D7lEvjdp1WSOS5oetNd4PuR+oqFSMlkKfTLzYsJKlfSQmmeumVr4dsfL211oCMK8+c3yaVs64ow0bR0tHXbWoXWN3D7+dZarmHOF7hBu3cbhK16HxNne7DXWRv/4vOANF+gurwM1XSJqxQhD5iZ0e5nL6KeemxU1G+ol9WpBQBPHPd3pY+79mU7AqTK+b16L2SGE82kFk/MVKCZWCJh+YbXVLwoOCm1YmhcQTWILWvsn8JmclmABL3dHFPNXV04yNAscK4gScsHPdEWKYzZtrkcMvDuakKETpLjDtn0jAtvq8Pp74XiBnn2bCFvO5s/h 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)(366016)(1800799024)(376014)(7416014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: j2Vzlw4DBM7sQXXhszddyQLJ1wAlwGF899k2UVE8FgzhzGHiyBEzn+LGNQzEah9y7kRrkht+JSW3Y4SjnVhn+swb0+/8QtJXVBrp2F7loGYM4xcI6+DJ57w3yvkKbfqGalyX3J9Btb09Bj+ELuDbuzVlIAp+9HD52Ym8w3MBn7Fq2gwYe1EDZJ2pyawL5NDrscdt1V8LTqWgHT/zG5x0eDUNoBYezil4aVSOigJ9gdIHf261AwQ1bjoTcH4J5VXmvj5SjGLhR9hvofG9OJUJzVUOpuHJkCb8Z9wK05RJS2CP817zNJX5cuN5+97JdvBKG1irs4Li9kW7yPYKhFzdWK0E14PZjaLJiFvo7lYE5yGu0szXfJEm1YrfwB1oej6yK9lAGDtwrxY4QzL3OECbpjTmayK1GYIlbOssr6XlkwkyveD1UoaptvyuyMkNbPeP4SxcH1/YIXbvo+miR/RrGG5XoxbFUF5rfNdCqXYDXyJdMUSo3kZ00KDxCCQyjGCntI+DUyJlzHRdrlKoFscjXri/mRGL9joF4n694WKsmJQ4j2XwZqEtGpWpehS1WOhliszeizgYBm2J0fCAEccy318Q1qg1EoUQlBJPipFOX2EXoGinuxAKmauPVR62ndS5KUFchnlFX3YkR+vnXwJTwTIEWIt59ejxePaMnx8PdvUb+PxBz7XQJ+SApnlsOyxMlRdtULa7vvufpxs5aLxGNKSzJT7hhHWnn7y74QQCrTf7QvDB/MrOFMrw4+soRtmV1gQzIJ8qVK4IrZRFa0hptPr1nHQBCV340Pcq0woikG6Qqdcp/JxZ+Kt40NsuAnFYld2GtElYdAnxFLcXmZ0+9udJzMoTU3L2qxi04KGzOsgY2KDJ8WLT8OWO3pBxooH+Wc74MAa4NfMa1twbNq7qYF/WtrUo/jYaOgbGABr2x9YqVAjrjjxXRDuKR27a3XoGtTIEI7vaFfyD8fENvzG0wMJvbPXx6VXT9SlAWjZ2GvRv75TupxleUQMDb031nJEYIJLhSWh3GYB59uimF6OFHvLrQC/vqjEVrKHnrWKALMhkzDjwHptkn4z/L/XsuFS0tT0J7HwcdK2JVrzMo00jVlA+GuSaK+t+hqiIjfLJEifi0IM1DhLeHZFtU+aBNsxULJ7v/eNfzSsHAca9LX6ZkXTT7GET4iYPyrXj21kEN1l9bl2GH8RVCaZ4zjlNBBytZbqPquLcZXlUEnpt1xFRijDe3ikPeI898b7x75bqc2HvGGYQ6VsRordCD6jPA+l9e1nK/dp+YVXgxZQZ0K8JbBjZBckV1GdqaOJIzaA59mIgFuI2/oLyfEBAk0iXmwD3htQQVmgLZZp8Zx/rRihxhr7oRLYt6NF07AEVCa3/IA2wXtdPSLlMlR7YD/fGn179Aa2qogEdpryuu50D9+Tp7Mo6kKECKO0rRNL0G3xDAYAzEYyWsa0DXDBvm4fjYSI50ZGP7AnHaqRIKGKPmM3lIb1+rZ4bPsBPBsXAX6D88AhXECNDNRzcwPiePUblnpLX3aMStV+EuTewiIjpQhrf9JmzYF3wyTru3P4GeNF6G2opjkh0nsvPVQ2vFvx9jaPR X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1480f572-891d-423e-bc3a-08dd50aaad16 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2025 06:00:13.8516 (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: JsgSFdqElQSVTDZ3TMWibUfJCZAUU4RdzCk5qYMzsO9Cp9sBQELU9GgqBmjG2X0zh7hn51PQynlholhvwbihkA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9409 X-Patchwork-Delegate: kuba@kernel.org 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 Reviewed-by: Vladimir Oltean --- 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 Wed Feb 19 05:42:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13981542 X-Patchwork-Delegate: kuba@kernel.org Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11012005.outbound.protection.outlook.com [52.101.66.5]) (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 4A8C81C726D; Wed, 19 Feb 2025 06:00:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.66.5 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739944823; cv=fail; b=uPE7i0RDHFsiOfMy6WMYGlKCGWFaJ4RKfaG3Wa6+j7ia+2TdXdUeN6YnQb5zM9A0pyDfWQ7hzyGZLbykmZAOAAnzCKV/deyeGn3SOpEvphxq+GJi44pMtX+KhS/Iiz9j1K9DI+cWSxHH8/MmpQ0qyFNqRTMCgCP3VCNY+jTOPkk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739944823; c=relaxed/simple; bh=TK8zzb6lcx/7EwiJ6LgbkUB1e++wKy3OMXfT4gTWDT8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=j77KY2UYC/bHrcCmUt1WDwUiCMGVpJU5QUHLnrWtr/oGosaLR4F+88Nv2i7k9ZQ1cmp9q+zok+aETw9bzwjRWraPNG5mCeKYaxpJc6kXQGpGKz+LJIynSBk23NU18SK8G9JebaQGph0IaiKadKBHJ+pbdnPzddLbkaqKJmskYm4= 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=UVpAb7pk; arc=fail smtp.client-ip=52.101.66.5 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="UVpAb7pk" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QFH5/uTAcBO3o2xB7Fn9GjGg4EJm1b0vGfrjeetkiOZb8s6fbX2XkBRtWBfbUuNtomdHsOqmm35r6nW03X3zkIEpPQhlHvVDrBilVxqVDqpzetPp4l5A07jbRTyNlY/ExV/NDjFCHgzUgdT+NdOuXPNyaG3H5kbqonJRRDTdjQv7DasCk3mE871YGAVGAHpu+XWahnH5EdCWsc932+oYKH5e3uS7o1b5KmFeHYexADbx20XGEx5M8KPe2zdMpmNbhd5xNc9lwAuHPQVQVHahlomUIEMnMjOpEl2pkrhhM7SOREu9gusogW3dbmr4HjHbMZoYA0kqaiOSdavpqfepwQ== 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=XV6bL3AAjij0Pb0jwx8xdp5Hcitc+pornmXOkJltkaq8t9LxAt9RyciE4qb7Ic0A6WChx1diNEeVmgjJxDoNGmGkwqn8xzBZsHaeLOQ0cJQkn4QMhyFKjjyUzuAecXfzgCTMuG2zF+N1ESEH5o8xmqHNtT5FDdjA5ZPxVOcEzrFov0dxqtg3CX3zt5ba34HxzsvZ/A4YM89spoliz94IEyc8TkefFCmGdXtv03VawfJfYU+KXbzk++FWpqtaadvLdGrb3edbiEqrBT4aasuE/IYnVkRTyx4kC5aqYtcIsBJ8ctTeg9Qxr9n/Zk0hlZGb3daXdRYQzy/2aMQrmSMAIw== 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=UVpAb7pkDOXtxaTg6unYD+XUOCWcNvn5M96cpk1dHrOpxHKwZ0qrfdT+cq1a6j/c1gC5KdHg7rhZJXGCPKO7P8/InB9fLzolXjLcuXAjHWzqaW00pq+4kt3+r0Gcu+Xyqh6B6vlGAmMkCfVQ8ovTsjZuQSv8aih787ZeV5YlR1JWQUe+y3lf+wpOXdxiq05VpQjD0+aegX4F2jHodxTlYGG8OyOH+1t/d5CqpD6pZCbCH3CxLUqnISB4aXjDeQb1TVRWSz0c5aA9VEU3KUSaN0rF6kPyCziErny45XTW03V2g+wfFlY1jofx0TJuGQ0+dKUUT/qI+2EBxAqL5XjQJg== 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 AS4PR04MB9409.eurprd04.prod.outlook.com (2603:10a6:20b:4e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.15; Wed, 19 Feb 2025 06:00: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; Wed, 19 Feb 2025 06:00: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, michal.swiatkowski@linux.intel.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH v2 net 7/9] net: enetc: remove the mm_lock from the ENETC v4 driver Date: Wed, 19 Feb 2025 13:42:45 +0800 Message-Id: <20250219054247.733243-8-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250219054247.733243-1-wei.fang@nxp.com> References: <20250219054247.733243-1-wei.fang@nxp.com> X-ClientProxiedBy: SGBP274CA0023.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::35) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|AS4PR04MB9409:EE_ X-MS-Office365-Filtering-Correlation-Id: cbb710b1-5132-4adc-1a2c-08dd50aab01f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: RweNm2m37S3UBf2Du7GIoM5CJGzDKz4TJnce0T81WpR/bFVRbdtfyeUqlLgJAXL4Cqmfz5DaV0VBkel8dDzao4qshBdoOT2qHG+EPedUN5REAvf0q46gZ6lLT+IBv2uglrqxLfQI1oWeKBMyqiVEwa0RW843w/nkBZC/Shs/cpkvsjwXqMp/BIZZ8bIvESYuBMelLBJfNbkKYQBeenjQgXrF+EqG6maYV2CIldfs9WvrBFtodQoosD2HOvZvdZZrneBD3r+UqFLvVTveYFo3kMJcqwW6qmtgx0J5xqrSCgGAO+uZbPqXKJh5GljUCRc45eXGYA3WWj45ojUGYOz7OjGGquf03SQ7BNC4Iv00jU91gatAHq0XULtHEvpWJAw8ZMwX+LLniQoX8FgoCzswjSxjsd6YsGwaGwlHoSX2zQnjsIGNw5Thn4/1citoYl3X6RVvxzLmG0Ly6hhJimLCG+Lv+2luSBjp+59UyZJ+1Mx+NdWhCpsv5l4FmneGUiCwiyEQJICSNeLkEP6kA+/Jd/Witt23l1yY1rd0ssp/UEZA3aaISJQZRyuxFlW3KXggtiHTVyBhjo+6sBVpmZWPS2tvBquAP6DTUrD81cjkTZ7soYbLP6FqRW5JpLRIwlIso1nYXQZfsf2x5f6iU3VwD23/N6zpy/eHqQKDbK2bqI/NXcoOCuZ5bRNctMQPJPtf/MhvnQ4fQSRluIyp5sPym93lC0tqaEBdqv9+bqpvKxHCF/X6FV8vImQGD+88r5Jv+nW7uDCx05sVst00j+Lyvr8KU0xMaO6QU+VAyDHQWehn6kS3OSWAC1pv3G4dZGalzFjh5XKXd0fWSt6tfdNe3D4G/yebt/lzqG2ZoUF+rAmP9p8wxSw5Rf5W2MbKXmRzSiWyWIhYPR9mSXtMTLrqbk6oJ+J5M5GSgX5YHdFxfRWW/qfMBQPaoTHcBRUSglUonG1Q1k+gsmHFVFeBv9vDUohnreWjHzOt09IX1ooVnVSiQclUwT1ArdN9O6RdzXKLaxMqJ/TSpNpnLb/Ezx+4Nz0AfXLlgPW7NAfOTCWgY92fQtmG/IL0ZfJuQyDnOXnj1Wfe8se2aYqZOhViGzJ58W/d2H/urV21x2ewsQfIx5UGKiIp2IBHPN2bsU19Vqkb6bzKHyXCPfO+h5u1gO3ecw+DijMqLsbnYAGG3Js23J54UEcrD+bAn/TbaqnI6NPkKAOIVA8FGE9k83nYqlMHKMyND5h8JKDE9MabVhkWXuGcwTY15Mirb8ZxYgPKCuS7BPra4VwfCgtMZlLPBd1xdOJTm2hfT9hARRLzb/qSs3Msfn/BDkGCUTq2KVMTzNnvQCIuvJQmEblsS0hTQgVvkuOPZxZtN7aYIwHPKuShgtqiWHClrl8BRVqGa3YN9E0A41jroRQi3PvbNVWiwLBGHT8AlEgJKm7DL+X3QmibOXqWV5bn4hJuNu6TPExa12Be 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)(366016)(1800799024)(376014)(7416014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TEbycySUGuFNcWjU1a1NoO2UPIgWmVZASjQPvBI+fau0aPRV5k1EhT/Gf0SQjO1hRgvIDQkU3wAwTfUHLMnZrVXndETWYCshSUpblDpFWoRWL69J1nBNa9+3vzG92dXoYgBHujqFrFZCwAfYjr8zIkzrUX4cJij2Zrg+R17veJN+vsBE7RudizccJylNl7biHdobtZZ/vgbLgRYN4oc1nGuwaiDHP/V5VjiNJzCnGqJ813m5UeTYNGaOCeDXHT/bkEvtP9mxhh2dgjNLQRneNk3VSyUkDplKKPhcAjGatHHfYddffHka0/q1pKQL9xd0BeufSVSnbrrlwR0nlGRC45WmCYtzO618mcJ4CbHacJC4NlkHS1TFGqlG19wX7owHAyZhqsHoiw54sTMW4s+KNlmdLbqjDeRq0eGnh+fHyrUJnmILZLQBvQVGDM5TnVG6u+VOmxR0QRPJTugD0fVJx17AMI8TJoFvqzIVstPvpS8Vw9XQ2c6CdcD3ZzXfRDQDu0JNkRlU9o4/bEmTsYolm0N7zwGAPYOLD2wItEHT7pg8nplvKEFLi7FHk33ZAHx+Ozmo85Td6DnDlq1nFgQeL8hoP8Ggo96v+IRlJgSz4RwnYbH4CYl5msK5HdTxkl5zmvur9/7rFOKFNGehns+PHUYSohIsfxMcYV4yrguzh48MeEFHxdYr+Fws+aqYYFWLJU5y6lGF0oaL09OX2xisn2gx27DcvFWAEKq9UwwK2m0gmy+d1L2x0Rih/oP9Q02m59bAjqxFF3HjpldHq2HUh+iWIovNDTtzgjU/0bVXY4X/d0dlz1FyoL2tghscDB6HJ4NGVKCh+xpSpJ/l4fSJ27XCezV5qWUk54OOMVmu42+NaZW9AM+F7xu3BADqHoh705kGvS8a3EcH+JTosHPu+7m7ulKZo7/DRnmQp58uyOMv19laSJkGxHptQTZc29muRiCJ6jtG9Pwb9UUYXFnXG4/LH0Z7Y9Crz18Uwxf3mbZQSAZWw5AeaT55I+HModmuEF01bTheO9Ljzm6ZCh+7GbPxI+0OIffUATIcq5LYDA1AiD+WxU7oFh9n0rIK8N18spq0wDP0FWYNEv1nvlsdyqvgMbcLhnQKZXMTHgoFyfaYaKl1bObSQuyjWL4smU2X3OXUH+t6W5/broUv4ZhbB4jnbdda/64gcMEqkPyi8FM0KH3WjV/7qqlYZ8FUxA3gM7LeFHI3V0ZlJ0oUrlSRmHJhY1iTKzyB9CvECo+enHR9uS89njF2hzPg3eCSWf1IQ0M/ERd26iJgbvbG1pJ3DpQipsfDqREPHEPcTaMrN9uHARse/TDRhptPz8LmUVwNeZvFOYtVjquNypDAgYz1DC/YedNUo3wGJw12RzyNmsclNLu+A2q9KzfTZ7EkYSm3EBEXRCtt3TTZB7W5UcVrnqDnbwmS4az1Lnh+5V845ixQPTiB14qu27fID4tmhG4vkkBT3K5kiufu48BN2QgeqJNfX2zeMTy5EZbyE+3bduGwZsGGtebMM3cKEKZ2SsCC5pvmAQ5SwRACH9O9iMEMEZjNQpHRHpTmXIvIAD3JSsHIdeHDZZHb1+8fX91DNgyj X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: cbb710b1-5132-4adc-1a2c-08dd50aab01f X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2025 06:00:18.9600 (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: u7Gs3FfX3/cfNiiEPKeakBxuHVVldh4KvWmdyOmSkzKCj9+EVECtsnUKt1NtWF1K68SSks347WD5pMvSrNKlNQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9409 X-Patchwork-Delegate: kuba@kernel.org 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 Reviewed-by: Vladimir Oltean --- 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 Wed Feb 19 05:42:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13981543 X-Patchwork-Delegate: kuba@kernel.org Received: from AS8PR03CU001.outbound.protection.outlook.com (mail-westeuropeazon11012012.outbound.protection.outlook.com [52.101.71.12]) (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 AE43F1CAA76; Wed, 19 Feb 2025 06:00:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.71.12 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739944828; cv=fail; b=MpFs5RJdbOhdoo2XUusz3MtgJsT1iullMydK01yoiM6RfFPpZIk6eSurZ/tcE3/nsMsomIja+nsslDhZw62nN6614uNwSLjZOwHN994MWBksBp93T7XBouzdVkpJO4GN+NtnFibvCH2yRJXujQiYetr8pbDNczCH4C8Xscsole8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739944828; 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=KBXbJEhKc8FXrvZtVkiM2WiKrolKqxgfNSH2pwjq7LZOUr7TTXGMC2QfmsXiienFLzMQPOQBfbyC9rECG2C+pWAQ2V7gEyyCC7zoAhZcsX+/DDwG8cjQzorP2VVn3Y+KdrW+LKY9osCUKqBD/V30UeXvMmI4YvE0uYWoz3E05TU= 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=TN4Y3rIh; arc=fail smtp.client-ip=52.101.71.12 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="TN4Y3rIh" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UUNu2d5bI7MMW0Dbb1AnR+UyOhgFNpkqbqLtQhpiQSSXc6d0+pPGmkyoCcxTw1oFLG1JT3fPTVK1Ti/xPPxHMT3mHSk5HmRFNxayphG8lPLIr2mNCtdeLOePjJAbETnGqt1kvJUsBirbN6rn2f7VKXtuEA1YIza04DsUXuPjB8/ib70T8y2nGi1xoiaSSadObMeR4ewwTjurMpB5Z+uDdIA9OZIO/SqFJSLH5ww2GBAUJHN34ngEO0RVjSHbQt9YdwH1594wkEp/vC5aKKtNs+Mc6g5yU+korzTVI/bhjgAcIblkqPHJAVuDg5r39loeUAdI5qI3kQShnPAcF7A1YA== 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=lEhcTK7LOVHHVxKyiDYwNzCHDSEjqq1R4WTb9yS+NuwBPDySHD7KXsk6/H3TwMLZcpoEBC9Qt3udCoL1AtSf3tjGov8YMOzx1dGAT4tQBgqAUOFCcXFaXcN95fMjk54LqTF6sn5tcK5IOeLc12FJEc2Lb4oaB+bpaEFTJqh6IMvFdJeLtvY6aGj2GWnJK/N7UA6ye04hmOjzrUtlz/aEYw8tSOQwkbulYVeTVkJlJVjFLIlbhygBzMPz/EkHb15T/qgFcOn4vSJuMrbUbiWOMMxi/IyTp23sFI2AJiM1bEi2hJBBP2LS2RTCCvpum3zMAtz+y32aRrjDmKZyKLHOBg== 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=TN4Y3rIh1SeeRj6hXZZNygUfFQLfQzK4tphSDrIRm0vNkXWmR2pKEd+uciuBdRSkOCj8KNtO27VJfqc531K+PHr4LYTVmsrLY0OMfWXZsdya7BVjs7E0MH6ZfFpu1UcVU7E8B41RMCDddfR/3I6F+DC0QeRpir4iDHD4UXChmSVHHcnNwZj7IvF5+1sGaV+HpQBl1XdSwk5lxHgpMLC5i44wDapWQYl9R7IDldAUutKJCldr/LC9+NR1pcxBaB9OcXPVSWWavOo8m5g/FMOHl+YY/PBs5/nYCnxcouyttonPZuBUzy1TD50FLmocxdeiDJ9v0kBc0Dt0pUI9QQ55oQ== 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 AS4PR04MB9409.eurprd04.prod.outlook.com (2603:10a6:20b:4e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.15; Wed, 19 Feb 2025 06:00: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; Wed, 19 Feb 2025 06:00:24 +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, michal.swiatkowski@linux.intel.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH v2 net 8/9] net: enetc: correct the EMDIO base offset for ENETC v4 Date: Wed, 19 Feb 2025 13:42:46 +0800 Message-Id: <20250219054247.733243-9-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250219054247.733243-1-wei.fang@nxp.com> References: <20250219054247.733243-1-wei.fang@nxp.com> X-ClientProxiedBy: SGBP274CA0023.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::35) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|AS4PR04MB9409:EE_ X-MS-Office365-Filtering-Correlation-Id: 53675095-f76b-404f-dbb6-08dd50aab32d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: hHbOxxXM6D5wWABCfP/qANLHp/2+ahEXewN/ib8epueLyJG2INKwQmbZsqjK1yvKG1MAtA5/6EIs0z+RQ6AatKwuayU5JLouISyshYpfu+iBGQNEhzOvn/i4PF+wQrG+aPIZkugfrT8eI+jikUBNI0Cc8tY81Z4NBMIA3+X1nX+PAXb3rr9RoJGuYTIFX23jHp3Dhp7tkaG37YOa85v5qhtAxIkW3OZW8xiPw8jXIaxx1qtsx+TM/kSswzkDW/gtPb5XbLxId+SSfJh6MG28maU9Sm32hlCBPOQ4mxxUyqI4ExR0QLLG2kMdUCWhwzZeCycQc8th8cAq6+vVSaKwjs1JYe6GqmT0nZ30a7GG/e9pwa5/vN934HZC5BCTfXyO+8CccuAhbmfsBz6H0fR2vZRnmEJmpwJsRQqQIH4qUbzuCiLUdGU+uRcHxfT6sRMBFkEqAk4Ux0bTxKedItXiSsJ9W26JhzZ3awVcUN1mwYokOwDyr3xEyh5aHpULqGiyzV88SC53QFYZhJ2e/r9zPQ/NamwNemGPlUG2hTnclR3XOBrn12dk96fXmPu875GhmSTvro//wGgb12YvvroZ+pS8V0IQnvJIPnhqHANH/2O2gs2MF6HUMYklwxw+QIaaH7N/OCEKxMiPvjJiq5oHKRJIjwqzwitecdG6kQeVLCQMPrOASiJA19Jb/fRUmP3uI7ouGanLQP/m7Kl5UhzdDcIqMDJDYyHYFeWg6Dpcy/5ltkLaBzDEMRMYdd+DndUEDI3rDCuQsVsJq4McTJngwUuJ22N06wEabZ+RHNH4SItu5Dr6iOIPBpfvFTLGSs+MVxG1DcTDSRaq+vy3ONka1hjCqhsuMc4OH1feJ66aiYv0qp4OwinPR/Bym71jDg4ghH/QMHJX8Fze0/yEtaUq/K5Be5lA3VHR49aTxLO69HNi+1oo81ZGhO8SzPgCHgbrA2lQ6ti/8Tl8KNspgChlp21ODQZiplH0gdtk05TZOXf0zs1tyxeILdnXTe728W98FoQNItA7fGPRPMx6txJEna37IwJZnBIjT7XB7f2MGfQK4ocAMjY41st0swWcyuppdK/hiHBkCXTsCxINcXORD1kl4+Vag28JyW3YYzSsYfqFyCQvDGFjNl4OR1vsgCuo8FF161RBHZopWgAeckk4n04YOttQu7qpreZvMglzcyi00XM9aNihh3hk+rNN6h1hSWixIyXpFiR8B7vuR4Ma4WZK9trscOJ5DcPM8I/RCYQem9Y6vPMRfT74d7q/s5ZaJv0wmEAh53ZMlNAWld6h2xLWxOZJHev5g8xxSY+h+3g/DJSkbmTMblKdWgPtwOk+N7t3uQw7zduAh4Rhcku3lANl5zv8zZLM6xp67N1TA795LfzzHaQOVT2fv2DCUO6+GzziS5mD16ydTDZ0ojO0ANmqyb2a5rgQ8tuf82W/M4v9EdzuJ2nol3NiQejoA3yS 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)(366016)(1800799024)(376014)(7416014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OHc2tEFHCKXX/V4OIvSNrftH2tXCMVAVs1Isu2phtz3OCIx8anU+x4AiapOmUzNrq4jAECVgmm3eUYXCuSQaEtU+ULYS2I9GxR+BRwSjshH5Q/MpZK5IhS5f9Q5oMO76EwB87kftVcFLL1kIo0o9KNHC82COAGerZDQqNEY1DBd+4BzwGgrwEEsaK3RqfAv6km5gc/7x/u6IaHoaMNVlP3cT7wmGHXQauT/CDJwNQp/YMB9QmM2qf4ZmczaLrTOHjtHI8QYLE/mAcTKuavS7Lc3Ht68aVrCfbzlpSlylWmvQRsF3U8Cubeb+5zbilAskXKXFbUULudpakGxd+k3FY/BnO35Hh+ZCSUhUXwU/6E/+CNope4ZVDxJ4uh6PHJoFAulnO0sX+bIi5GFY7ol93DW7T7UwHtM0FXo9jrPLR0zgzSov5vkkG7GAQtP0Gk3t3JknwBVlHajgg7AMqp91EhSM4LroE/19mkKfPHkMslhiVjAKSyRnns9Mrr0jaZ7fOmTYDeBSmAYYMfWT8I2vwtWCf8hcJeJ/9zhHkkwYuqbae8hlztr/65pAiUNfo3XVj6osiTchReToS3LLU32FJDiKguEg0PQHyFnozVMgMu9+/eO7tDTbouGRwtxrbWBrJ/mnlGNbFdu6jzIbEgk+VjW91sPsAefofknK9npLyQ0yi+D3rbNVPTXUnfXVWHkUW3OV3H4PuCZxs4aQyVqpXKg7yh+IL41PE6yOZJxwTqhEVWuEM/G2tha51pLsD2lzzT/Z8Wgxs4uk3CZEu/7YL9ky1QkZxJcQfqyPz3qQxDI+kaSWYdFNnmDZejKY9KVtMCEl1/gS145FQStUsr+pyZNJfOc2QAqu25aOA2gflo4VEifWMycbzUZP56CSQkEXM0FciLZ3OoKQWhwCx48zDZEpySf6qGG9O8jKgJAKW1OSSlJ7L/aTQ+pPY7qsqWGvU7IZ3xj7T8bEyblWRPCPCPj5KbuFcTYV3Mq2qrZ9RRNOUixefDxyZRuaz4dmFPGTgpbFssfO/MmEqHRgxqA1alY/q42JTjJ/dw6U/v+0HTqN9APQA0cGcjz0Rpv9Hm0bx0Tfy9mcma+aidL5Pr33QeJQ4p3ZYgI2TL2g94qO4NpojlBzkmObqc6v7Px+iMloj9Xcj7TGPnDgbLiHKpoePYaV/zzKlt027W7SWoor119JpDbKKuRvu/5zGiBCHdcBmxOcUYI/veQs6PZ/OL5bhKzy3A8VLmsW3ooLzqtMjMpBYW2kovzHn+BbcOWNNCf/KCya06LpMfi7JlJQnJpR5HGwQ8Il7ktnK1PQHPHpZgzQHjaeRng3iuSHypMZIv8Otsy+YIyK889eadBLv3QzAZ2dlOdoAEJtDuFUySrpG7rNwQWr5FNysos80/i6/+aA58ygjqgapYF72ZJeAJMKyU5Lin3zXoi546PdZKnB5NAm1mlGtfmlLd4NsksuGjxdHjExqOog7XuDnwBaaFG1SwulNPS6vaWajt4tbZW+G2QnlPWk61RrMzTwnNHXhrn6RdN4T7r+62t/xtEoW5eC2a8PD700RVaTPPlEdKcn9xD8Q5WrcBDwtx7Ei7kPzawR X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53675095-f76b-404f-dbb6-08dd50aab32d X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2025 06:00:24.0715 (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: XZrDEukjoU63txE2L5C/0e42xcqiF4yIB6AECXMiryiyLdHoAcf/fRPLRqM1w0g6Nqu3bh89OzIibDUwa3deAw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9409 X-Patchwork-Delegate: kuba@kernel.org 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); From patchwork Wed Feb 19 05:42:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13981544 X-Patchwork-Delegate: kuba@kernel.org Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11012002.outbound.protection.outlook.com [52.101.66.2]) (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 09BFC1CCEE7; Wed, 19 Feb 2025 06:00:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.66.2 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739944832; cv=fail; b=Swd4B5obFlp4tOURNX9w8wRy9byizePbW3ik4KDJE1tcXp73sw2gWXkIzf5+McnarVMtBd5F5XIR2nFTFYtWngg35M8x1ONbdPJ6mAhRCbGfoPXHZWxUd+Y2o9dPSNMLHkaN/In8peD3PNnaIWLehhksjvh7QvN+A+nzKaSNVaM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739944832; c=relaxed/simple; bh=d5syhM+1/mG1CwjQgg4EJoAooeiENcpIOC6WIXxW0Q8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=N00mzadojSrXxee/h9N4Q3l9qSuHWkLEqXpKhOBmU03D9E6wEp+1Y3xhWtCWoAk/nSALcZqlDDa+4NrWukY8S5rZHQcydD9EB+6CrQ821OosTnJWyhO1YdKC35sOa8V05Czirg7ALu6dg6YSQyj6YuqLj3QYg3K0uAWwc00cQ7I= 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=OunjxoqR; arc=fail smtp.client-ip=52.101.66.2 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="OunjxoqR" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=SyD74ugDMNxRmgURjk45lgRKXiLCMraQSF1fQSCkgni0wtFmuKf6l6ylyB3kSqdpK87qBubOMjCObkVNIpq+p40mNDtXFDch739OdeUQk6Oqj4uaO9miRRyuW73RPWqSsuj8nlirUZrv7DAOXoRTRfA6ig0/6nYMeTz3WSwzvjKimWLOQlcOV9ZWsKo9qDmbyMF9HLFdPfmdnEOYFu0JzBgLNLOONM/WvbkxQTz+X54kAlff6DxUHzKFJe0y1cnA+K0iB+2PhTGOpSnhsFCgZvMW+tsThXg557/BEe8exD/lCbgTAdiBZvAKCgKxMRyd4f0n95MkyG92loqA3qu1sg== 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=Zv0EF12VetJkAtI6zvtFQaruFyXr2djdYe7DShCNJk0=; b=v71SaQQa1gfTOiumK/MlcQX23hmaxv3M7eY8XDHEcjxBDh8GyJSm9g7YyCrAzYb2ogMFK1sCDmjEYxUHHVUrtmK8AKPehhLZP9dOcFWKzKTsmE0tNRX7e+40WBreJs0fLBfLBCdE8kloCAlkS3kNIiSObmqUVm2f6miXEqQlDOIr8M5unBut8LhjQ4Bsx8L2gVTZXgE1bnwEwCEqE+WRa1DodpywUVw2CRitgNMbFbOds+fx+dKzc/KhZxe04ENVOOU/jGDZ10F3XlJVg9X1GacTTrG4fv68K795Fh+zAGsO6BJNkjyaPAhx2agIAj+aP59xU0MlB7zlZtaUSuRz7A== 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=Zv0EF12VetJkAtI6zvtFQaruFyXr2djdYe7DShCNJk0=; b=OunjxoqR46i1uSKCgXgLF8RiHgY1XmTKjC+w25drfSzxpgZogpTnu+TiHu+HaGpS1nCT0/qVhkCg89T0w+vpiImxt+tV/qhVb7WBPq6sD84oNkhXfUwAWu1xV9DpNDf8dSH5OvYBzHuyjE3XdhRcNgExI/PRtjS4caG+uCPctSGNwDFm8nAkX8rK8aj2MQjhBRZ/I9b227SiBfmvP0l4TUjOpf9pKRLdN8WHYSAG+hvn6V8zk3P8p8EPEDwYdM1ucYH42IC8fyV0wGVziNr9RwTsUA8yv0B1M0wbMIgSVlbWZrAN8Ynk3xMvpwLyONHGGUY4jtnQQ5kMKPtCYcgQDg== 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 AS4PR04MB9409.eurprd04.prod.outlook.com (2603:10a6:20b:4e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.15; Wed, 19 Feb 2025 06:00: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; Wed, 19 Feb 2025 06:00: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, michal.swiatkowski@linux.intel.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH v2 net 9/9] net: enetc: fix the off-by-one issue in enetc_map_tx_tso_buffs() Date: Wed, 19 Feb 2025 13:42:47 +0800 Message-Id: <20250219054247.733243-10-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250219054247.733243-1-wei.fang@nxp.com> References: <20250219054247.733243-1-wei.fang@nxp.com> X-ClientProxiedBy: SGBP274CA0023.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::35) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|AS4PR04MB9409:EE_ X-MS-Office365-Filtering-Correlation-Id: ec3903d2-99f7-4252-a971-08dd50aab605 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: xZyGhHcv8yhEJbmEx8EmyG37zVNQFkTtJVtC4twss5UZttg8Z6ACgLk+Vk2oY4n41AM6QCxzFhHisMx3XQOM/wtXnwx4DmJy2kcUqCrM8364Kps6zM+RSQ40yxfXcLQwRrHqU+j3Vx5kXk2yDjz2gm915Tj+jyW5GEE/8kBygJiPaN3BhgD6Aw46uzX1YhBIqru6R13Evq+emfUcAp0zbMTmiMXIhsdNyWepk4WRgAp1usUUZ89uviWKEMhXtQDnoQRUmUeMPaOsONEPbNOjCndokxV0GT5ZqpGyAKzOid2bLUB/SZbBqIPOrLXsM7yavEeq/hh46ApnZ957QVNGQo79Cve/83N3UN5HHh/iDeVdJM64Ue8gZOWxfPexBN7HrJwEA7pJHg94I2+QL0+zjxOYNQ0+9474Mp86+iZJEVf9+jPawZ6vbF4OD0igFKSSUtQtdTVOA6ZlbrqkurJX+JruNWAJL3DqBpB2nAT4Er/uO4xoR0PBVEpzEYyettCWg3L6Zqy3218KjJRQ0sriRyU6pkxcnUtwlP1OI8/zKvApyU2lYyrTdwM/JDiOnK8ehNJl2WFwDZqmIrKS8MeIJIREA133fwKOmLCHbgaPOBnYRHiJpUdXejqtB/4p2Ix8pPWxWGJTQsSP0Qlp0wEB80LzH1t7UeQrVK6nAmUFFY6cWwRkHiBqSiPzKeT1QCByE+yIRd5PMmds+V5LaemHomb6n7e1S1oxD3YfUzRQW5hJzsDmFPJk2UOVXFsTkPJEzj0kXhMGpPIzloqMN2hCrYYJXY6E9eqEXH19dwW5FiAVf1tHvMxVnWW3oUsyabJb0xQLn3pueG7iDTDbtVuKBPHXC+B4BDRpRnHpv+VnhzfiPrncIDoZ41w6LsO1kaJ0o8QVs6ux9W/6LfN94hp6F5znpNIPoYqTejfghvftHZdXTSvd+iGAsZ1k7ZP/lL40/ezxYNcJkdbPcEgiii2dXuxj1lSsN4dd8GyXx4/eiv3l3sN8YtpavZN09Jt5BioDU+Tq5P9gHGCjvXkX3DHFaAgvJ9arr2ge5Q5CLsZWXGTmGd6LT9wVxNxooBqQWuqneeC1zKr3Sn/Wepu1GtavAxKqG8Fi5IBUH26RizrPuFUX7wP3miGk1BPlMMsMJKamYfLL7nnkVGP2oh39hc+TNhR8H4ZmciKhBYPyW4cyOKnYglJK6AQTdZJkVa/yeVWUR6xgNiG5g7MD4hNbS5CpSkgCLMXEDVbCAgEa2X1fwNPWx8PUeFuW3GcYzHN41urKhRE/luAKWUhOampukNvCe377PjNrtJAvvOBMCz2xICMTQbRSDtxEl5kfl92gXxnVLZEuFVJgeDjXBfgeMLCJF/dDDu9NbcUUqRDbyfSC/J/w1sSqKF6MLiQqs8psa3vHRee6g8/wzMbibT3il9E4/Pj85QeHN78rNmyOfX0SD2wDmbsKpxU6c8cl+LEaWOzZ 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)(366016)(1800799024)(376014)(7416014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1Vca9qcNYBTO+eKS9uCcAPuOWRdDV5mVrEnViadzSsTGqycSoxVNWS0ey3vjx4EagF/zwDwHz46OrKZN3TNlBbWfHvZs9jQzxuy7SLBD9zt9qqF6lMW+VWj1+0LskTCn6/Cw8sN5jY0K+wRzIbzUnPlVtugm3ug3I25R1UT4SEONdJUs+YamBnhpvIHeRa3khOwaFdcmu8Bu8EFCdiZCjbQFDisBSWEpQGxaVBHmiz/QMxJY5kGbUYXa8LSJcky5gKYQuhft8gqXlzHcxT9fQM1xc8FA2TI+BG49yLnY07iNRTomPNSOsUT2IHzT/ZauMPVNsLm55xOLo2EJHV7KtxDRmfku/2OPTSJMYIHOZOpIuMmGi3HqWN/awnECqTfcK3DksL24GWrBy3OYT/8AbmJ2k+sV9x9SoLMr8yL/+BNvD9ZiRvB4JMtrn5G47VMTRpohqEtTZNr6NMdgeZswyhtO0WzqPLNVDJ/6KkzdLW8T8XtYTkftjU++zSeqJI0Z+l+ABL3MTmCHWc4HsIBwb8G6nz5SCmzp95gEIzniDzZAXRsqhLIbTvhqbJ4Bg8fRp/VZ+aiuN/26s2Wk68jlRl+wH2HunxZnZ7sPmW9gI3fKOfzmplMQbMIXQEt2uMUJVF7EkJ/HbFwcTmenTOK/SsUNHlm+otVF3mDR88sdFzp3LwYBbdqkTIcODeuBZh56R8BFMZlsbA0aztF3pkk7+aM1zeP2fYoMk0AimHJI/3rEDmLGWzv0lwq0UjY4RtVBz9+fg8QtbXcQPsmuEuUl7e7a+bjHWxWsaq3/tdFJa/wlh60eSu8aAkzbeLHb8dXddSpev23cco3u1oF5ub9fC07VO/865z2GoQzcqFMwUcrTI34gkyf3Bcvy72/Fwl5dPcju7u4iyYKhroXiglRqqv2d0yjVY7emlz52bugdGp9wY8QmhUQKsPsxajSPHebgku/PJuQkHS8mPF2EvGsXY0qWWo1PkBszHlw+oF9aBGZh7P4coCXtxizrr75AqOyx7YpaaIQGTArOlhLH9a3FAjLlI6zHa5kZWtoa4zFrf+wgf9DkFNlEhvIdje/yJc+eiA6aN1G/movL6ipl9y9rcr8PkcRoY+RBPqjljuyzgRngiyaQXm6zVcMLKaReIZKVz7ttvQsxJMVf5ts2f7Z92GyWbC/wnu4EdL6PFjAQ2BhFTZKwosx2Jg95QU/lttmGryT6S6Cwi8gzWzmGdM2P6n2tle7T5QNdiIDM7V0mqtbbyS2wOhBAFYNuSuz/I86UTy4t0exSPAM9IOPnHc2cpvDu7rwHw5kYB++6Z9BgfG9M4CCaykOmWAAcHE4yNPwAe4nNSy99syILz2cV4OAI+7/bzCp8mIylslM08UH3HFvX7mK+a8/kW9681VMKZrq9BE1hluhhayJIOIN0SdbXJa0QBJbRfsVdoTHpFwF5jtxo7BBNsyWgge0NUXgOHB/UB1+V+G+pLCbVHJHNwPmj6P1VP+wifqxL2Ci02I8PsCxcgrYkwa7Pq+YHt8M3QsPOFEN+D3yuEX6GZJAEdmfapTc5W3S0DkORll4qCJJH4H1QkWEliDIouwY7Y5bVFQhk X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec3903d2-99f7-4252-a971-08dd50aab605 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2025 06:00:28.7379 (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: yRtRGnXPS977dkxNtkaxXMJz2v0VkrN6l8YYxXJ+OjfLh7D2vwUpW9KRbLk2e154eObCjhqbXxQ9KsJtpi86Jw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9409 X-Patchwork-Delegate: kuba@kernel.org There is an off-by-one issue for the err_chained_bd path, it will free one more tx_swbd than expected. But there is no such issue for the err_map_data path. To fix this off-by-one issue and make the two error handling consistent, the loop condition of error handling is modified and the 'count++' operation is moved before enetc_map_tx_tso_data(). Fixes: fb8629e2cbfc ("net: enetc: add support for software TSO") Cc: stable@vger.kernel.org Signed-off-by: Wei Fang Reviewed-by: Michal Swiatkowski Reviewed-by: Claudiu Manoil --- drivers/net/ethernet/freescale/enetc/enetc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c index 9a24d1176479..fe3967268a19 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.c +++ b/drivers/net/ethernet/freescale/enetc/enetc.c @@ -832,6 +832,7 @@ static int enetc_map_tx_tso_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb txbd = ENETC_TXBD(*tx_ring, i); tx_swbd = &tx_ring->tx_swbd[i]; prefetchw(txbd); + count++; /* Compute the checksum over this segment of data and * add it to the csum already computed (over the L4 @@ -848,7 +849,6 @@ static int enetc_map_tx_tso_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb goto err_map_data; data_len -= size; - count++; bd_data_num++; tso_build_data(skb, &tso, size); @@ -874,13 +874,13 @@ static int enetc_map_tx_tso_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb dev_err(tx_ring->dev, "DMA map error"); err_chained_bd: - 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; }