From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7B889433D8 for ; Mon, 11 Dec 2023 11:16:59 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 762AC40ED2; Mon, 11 Dec 2023 11:16:59 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2047.outbound.protection.outlook.com [40.107.94.47]) by mails.dpdk.org (Postfix) with ESMTP id 11C4D42830 for ; Mon, 11 Dec 2023 11:16:58 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mRc0cTEkXkHw45RCH6W5g2Qdxz3mbDVgG9AFL8l2pqYi6BQYz4NcEaU5n5XlMNukozTcWPLpxn1b+nSCZYsjPvCmLGnRoooRhVz4wxhSXPiXnQ3qpJOIDDZXtXAGmYm6TMiofe7MUCB86H0LdCfCBzKHuF9f0kmWRCRAtSmEYUySwP9p5dhdSL2GB1OH8mVyuhncXXHZ6Lp8a2TqpOgnZiDLVrGH6BwEJ20ojw6GinMCrcn9VzB92bkz1hHPk7kwqc6qr45tfoMFjRIylH5cT9aOBijDDnRoB8HXR5mcdVDKdsNK8NKEqrbkGe0VQWBP3ISw8heDI1xmGy0YGor7nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=JBOvbzOOcdwdEkgANN//CPQRVKP6OAoGeRu/oIEhJMs=; b=F7ZyXoprThOjqC/oEDBl38iYTw7uNP5430NYIcvLU+/oRCrqjyGRU58jZDuKe4j5b+hCfCJ7qblaTlNFGBPGj4qDlCN1gl9RtTzjEKTjzYwzjtEDL9hty1+vHSyYq5p1pyOgAJgN90TsRKZPR28UF+P63tkaOlhQXYS6KPk1EqIATy4mEIa+k4ztBOJc8azwmjEbDmoHBTpTj2nsyBorVFz7BesfUYB+M3HRbeeRT+TiaaBX7yBh2expRQFO4FanfSEkB+JACD/hf3NhX6YgOe2/Wgrgh7Rcj9poRfJ6By/1HW094OLMn/5ScU6VCY6faRG1H02UuQYtpXWgWO5clA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=corigine.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JBOvbzOOcdwdEkgANN//CPQRVKP6OAoGeRu/oIEhJMs=; b=pZnr7RIOr8DeomVBy2Tjy+HAGuev7I52FcJ2abFAOt9ujIB+TifxsJRmXVQf/vvUQuegVs7Aw4HGpy11w91K4+XRIredGFU8oKiUNC6y6IgU2UZmI6czA3i49ra3ofzZ9VXLuDiOQ72JyXZQ3Pg6Fw4EcPQfAfnVb2nwfzFDe/1ckd2HgChiaPEtLaib5Al9K+vJLpO7I7gz3aKLMbOY3o1EXYtE25Zq9R/BI1oqRiMpU74lZkVDTsIb0qc6Y48KLZuaGhKgZJ2eB+Qx7Y/s+xlvPE3gM9PaIY/7TYx9eLo0fP8SU0kqZnTmj5WqmD6CWOaL8qsgPoU/A2vQueKopA== Received: from DS7PR05CA0012.namprd05.prod.outlook.com (2603:10b6:5:3b9::17) by PH0PR12MB7096.namprd12.prod.outlook.com (2603:10b6:510:21d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:16:55 +0000 Received: from CY4PEPF0000EE3E.namprd03.prod.outlook.com (2603:10b6:5:3b9:cafe::7a) by DS7PR05CA0012.outlook.office365.com (2603:10b6:5:3b9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.23 via Frontend Transport; Mon, 11 Dec 2023 10:16:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CY4PEPF0000EE3E.mail.protection.outlook.com (10.167.242.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:16:55 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:16:38 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:16:37 -0800 From: Xueming Li To: Shihong Wang CC: Peng Zhang , Chaoyong He , dpdk stable Subject: patch 'net/nfp: fix DMA error after abnormal exit' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:10 +0800 Message-ID: <20231211101226.2122-46-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE3E:EE_|PH0PR12MB7096:EE_ X-MS-Office365-Filtering-Correlation-Id: ebf48479-ddfa-4271-8f85-08dbfa324d21 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /BLxwOwN/tnvtCw7Jtih9gRRMfqSP3KLSLdJiDM0FLe/kzNtsrkf/wvzQcEbIYR83bouqsh9H4Ec53PLZ8dLtXG6MHdex1OlvmvX/mBgu/4pOBwuUOk2vL32wdmNc5NxTXeFcisClUgYfdghSSsBFe+7l53jXn3Adv19olXy6nUn5V9XlkGSknk26Cef+Az8IOJk7iXLidVAolvtDgs6lunvT/AZfD9aIEuOjgR2hVGM4cSqlmELCdk0X6Z9Rb7TNKoucH8CoZWiMD6YEpqjkQUzXqHp7HRdc+tNmtEmBSKlvdSTKb8fUbaOZUGn2GyoW/LAcywlyFni1no6jC3BnSGo4LNFsXxLUHQ+gvm3jul5NJacwtEgVWEKMSSue6982WCBzE6aW/rBwUH4yKVO/O2YnYdifuelttBje3EYqgub1xowHmdu+NXG+6dxHsBcr1yySH/KHk1h6Kk9FDbpqBrUcSwCFRuHZAmYULaflnbFTWty2spIiPJhnp0V+u9KEQxVlOwW6r5/0wwsYHkMW5F5YaN/uqqrTXU1gIX+tl0smRKtZOInhg/26L9djQ9vQiLqU9futhJOZMwU0mn2x+TvH0mIdHpLdkCirRX7+znAsqU0WbY1AB5jnnsTZL+Kq4beT0Vp7X2sXVqt6ruffCjRUoHmN+3w5oHy5oEBy2q9kxVaCVETQBs+vUCEPKoEpG0KN3KQRSO4Z6u8G+298OA2pJ0M+ug4+3XpsFMY9MvZZw3p6aroTZPXwbtqtT3dAzd96UvvPSGFqFoltnEYqhGnhiygfagDxGxEMPuHJWQ= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(39860400002)(396003)(136003)(376002)(346002)(230922051799003)(64100799003)(82310400011)(1800799012)(451199024)(186009)(40470700004)(36840700001)(46966006)(4001150100001)(6666004)(7696005)(2906002)(54906003)(70206006)(6916009)(53546011)(7636003)(356005)(36756003)(86362001)(316002)(8936002)(4326008)(8676002)(5660300002)(55016003)(40480700001)(70586007)(966005)(478600001)(40460700003)(41300700001)(36860700001)(82740400003)(47076005)(6286002)(26005)(336012)(426003)(1076003)(2616005)(83380400001)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:16:55.1160 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ebf48479-ddfa-4271-8f85-08dbfa324d21 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE3E.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB7096 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/13/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=85b95b48ceaffb51f3bec5481c93c9bcb25b7267 Thanks. Xueming Li --- >From 85b95b48ceaffb51f3bec5481c93c9bcb25b7267 Mon Sep 17 00:00:00 2001 From: Shihong Wang Date: Thu, 2 Nov 2023 10:23:13 +0800 Subject: [PATCH] net/nfp: fix DMA error after abnormal exit Cc: Xueming Li [ upstream commit 9e442599802e788874110339901f4eeb8f0ecc3b ] When DPDK application exit abnormally, there might have DMA error, and which will cause the load of firmware failed. Fix this by force the physical port down to clear the possible DMA error. Fixes: 896c265ef954 ("net/nfp: use new CPP interface") Signed-off-by: Shihong Wang Signed-off-by: Peng Zhang Reviewed-by: Chaoyong He --- drivers/net/nfp/nfp_ethdev.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index a780887868..1b0131b1d8 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -931,7 +931,8 @@ app_cleanup: static int nfp_pf_init(struct rte_pci_device *pci_dev) { - int ret; + uint32_t i; + int ret = 0; int err = 0; uint64_t addr; uint32_t cpp_id; @@ -978,6 +979,10 @@ nfp_pf_init(struct rte_pci_device *pci_dev) goto hwinfo_cleanup; } + /* Force the physical port down to clear the possible DMA error */ + for (i = 0; i < nfp_eth_table->count; i++) + nfp_eth_set_configured(cpp, nfp_eth_table->ports[i].index, 0); + if (nfp_fw_setup(pci_dev, cpp, nfp_eth_table, hwinfo)) { PMD_INIT_LOG(ERR, "Error when uploading firmware"); ret = -EIO; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:24.595989300 +0800 +++ 0045-net-nfp-fix-DMA-error-after-abnormal-exit.patch 2023-12-11 17:56:22.987652300 +0800 @@ -1 +1 @@ -From 9e442599802e788874110339901f4eeb8f0ecc3b Mon Sep 17 00:00:00 2001 +From 85b95b48ceaffb51f3bec5481c93c9bcb25b7267 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 9e442599802e788874110339901f4eeb8f0ecc3b ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -18,2 +20,2 @@ - drivers/net/nfp/nfp_ethdev.c | 5 +++++ - 1 file changed, 5 insertions(+) + drivers/net/nfp/nfp_ethdev.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) @@ -22 +24 @@ -index d4cc6ca64a..e988bcf5ac 100644 +index a780887868..1b0131b1d8 100644 @@ -25 +27 @@ -@@ -849,6 +849,7 @@ app_cleanup: +@@ -931,7 +931,8 @@ app_cleanup: @@ -28,0 +31 @@ +- int ret; @@ -30 +33,2 @@ - int ret = 0; ++ int ret = 0; + int err = 0; @@ -33 +37 @@ -@@ -907,6 +908,10 @@ nfp_pf_init(struct rte_pci_device *pci_dev) +@@ -978,6 +979,10 @@ nfp_pf_init(struct rte_pci_device *pci_dev) @@ -41 +45 @@ - if (nfp_fw_setup(pci_dev, cpp, nfp_eth_table, hwinfo) != 0) { + if (nfp_fw_setup(pci_dev, cpp, nfp_eth_table, hwinfo)) {