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 D6E5845B33; Mon, 14 Oct 2024 04:44:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7554E40655; Mon, 14 Oct 2024 04:44:37 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2115.outbound.protection.outlook.com [40.107.95.115]) by mails.dpdk.org (Postfix) with ESMTP id A3D2F40647 for ; Mon, 14 Oct 2024 04:44:32 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dMq2icRl8DmpfgNjPR9xI4vZIcBXc2k5vsLednINAEdqUrQ0jB/djBbUFfxWFMsA7ykiZUTfBRRHi+0V2GMMmbjmKYMMUw1BmNfoIubOoICNizvHDik98UojLzRgD8aVr92R0pCD+P63mLp4TGZhIAj4I1bwj1jNNWuikQPocQmAi9OKwnuQBO6+pQ69s222IDgN5AmQGlbQy7FRk7NmZ3pm7N4QU45fcO6tyrox9JJNmva2EGFL8jOWwgjV+pr+MrHxRzp9Ql9SIT3S6ubv1nPZ8XyBVC2y64bg0eiCiA38APcndymZG/EfoN4d39Fejg2YS9mbiCQrtisZJaS2aQ== 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=LB1c8CqdXw98NrQDdtxB2rm6fa0HjRj1d/FzfjCqOXA=; b=iPefzgFUVQltfFwRJh0LF79JNP6heYipeLRQ5fGeLgPjCc0+wEGKrg01XXrjlOM8QadQGht0HGYTrCQkgj+CWkUHQZ6CMBE22Uz0aQ4MB7nZ8vO/GdfAL0XfE64JUKF8MFtF74t1kAnYkpx0qMEYd76Qh1hGZwZy2GjXO+ch1nc9kT43bl4qy7/QyNzljerqrVryf384U4BOUSbe2tpJ7K8mWcyo8JuZCSzm0TCO/hRhD3KJgTbsnulHyMEl9AXx/roHa8dJstZzKCWF12jL3UtWQ4OFV+ixki6QFXaoGSdSWoX4YBMmK/1eW2Fsf6mGSHeu0JlFyAgbkLOPa4SFrQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LB1c8CqdXw98NrQDdtxB2rm6fa0HjRj1d/FzfjCqOXA=; b=qX2iIQuD5en1WqqlM9B2qcATwGn2yV0LM72F4YC5n4zK6klrL3zeXeuPhu/50AvuxmkS3Qzrf1pMeakYc8BNXv/RY7Exno+D6BVekABpfmxkNFgoWh7LJWLwerwduFIYP+FIFlWDVQm29h0Rjmw0eJmlNlCGrh24dGRcb/1+4Mw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by PH7PR13MB6115.namprd13.prod.outlook.com (2603:10b6:510:2bc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.24; Mon, 14 Oct 2024 02:44:31 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833%5]) with mapi id 15.20.8048.020; Mon, 14 Oct 2024 02:44:31 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Huaxing Zhu , Long Wu , Peng Zhang , Chaoyong He Subject: [PATCH 4/4] net/nfp: clear errors status of aer after soft reset Date: Mon, 14 Oct 2024 10:43:58 +0800 Message-Id: <20241014024358.3873420-5-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20241014024358.3873420-1-chaoyong.he@corigine.com> References: <20241014024358.3873420-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SI2PR01CA0023.apcprd01.prod.exchangelabs.com (2603:1096:4:192::17) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB6115:EE_ X-MS-Office365-Filtering-Correlation-Id: 398f2221-3559-4634-8ca1-08dcebfa210a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?d9b2yfA1fLrZCgLi7UYCvGtc9CpWXCYiTkTcgPTX2VN8z6CArb2jeyLJfPNo?= =?us-ascii?Q?+/S+dI04uBy5FNHdhze8qENCAtxhjPFiP8Hdw9SGmY1yh5oE5pq+IcPrUION?= =?us-ascii?Q?9BBStqBgsSI6dAPExxUSEIkuAvO7o4a9LbhJK6siOhl3YhFpRbJFPj/Mb/KP?= =?us-ascii?Q?tLcIc6lms7csAC/b6NXWJ1sGtDjl5qGPxZLzVbqmDMq73nnzDiZkltPYk029?= =?us-ascii?Q?LLWpbSPYovWbqZBDaIiH6o2LLjtBI11qas87xbI7WTteMSGTp/l1gkn4yPZz?= =?us-ascii?Q?rcx32FoKPd6QtNQH+PaSjTc8DkFHXi0Q8q5ZpXyMFMLXQDxB2kXFlGlVfYIY?= =?us-ascii?Q?jx+U8mOMsocM6i799qfZcnPI3QlwPvxq+HSAoOIhZh/PcpCEccwM+wvAbeNG?= =?us-ascii?Q?WzPGku7d459g8XcNb7UhbwzpN16wt/nZ3s1EYTAfZdlXcf6P536VecGkNacS?= =?us-ascii?Q?7Uq0ax9Lw1eqxoiftrscybOFzK6toa5cTW2Tl6E4pYZnSgDXMZyh1b/F/46m?= =?us-ascii?Q?/F6oaGiYrYanE4VoCJdcxyZBMAFzLBUSafuPPZz95EPyVnsbBqDcS+VCAyyx?= =?us-ascii?Q?XavrKJkWlIlEXf8ui1g2+NwCDxuBIHxSTryM90CfMcSRQH+t8dJjX4bpSQok?= =?us-ascii?Q?5zA6BDbFnjK3R7Bs/iAkiP7y0gAQBlfhxqV2ke/fQNJ04TVXFodb2iG8UbL4?= =?us-ascii?Q?zfhJmcvGMTc1vUULT7GsaeIM2QcmCFCX6G9h22tqPSA0lRBDVmpPSfYnNWzS?= =?us-ascii?Q?epCNywUBzDq811u2lL3Z6i7emV67fT5zBLQX35F3WpHN5oDR3QulzvHSMh/A?= =?us-ascii?Q?YlE8dCZWH/q/oLGPetO3rbIHzBYml9KVa3WVEjJthOcIFx20fVeI7xZbYIuO?= =?us-ascii?Q?mYbYyZfjrRAJ0ddSYtdLpFogRfpAP+EDLjNygcBV+OMjdi0IgkQDiCSLdeCE?= =?us-ascii?Q?16PxCHXI69MdJXj9bW4rZRh8O6f+BtCyyCqatFWq8I3LjnLUS37vtuDhtg0N?= =?us-ascii?Q?WEJGr514yiLVJeUYiQGnOjaAKyfIPrxhTr1OBC6IhrbjmReRofci8+4ej52B?= =?us-ascii?Q?0F05hQrsfIYSPKmNp4cxwcU0c9LQfC8AibkfrPvyCmX3PUdQqrcjrrDYuiHC?= =?us-ascii?Q?lZtebOD+eNfpqrH07ucdOLQIZhFEhUwPx1So6qJ7SX3z1D9lgrV1snrzKNPH?= =?us-ascii?Q?z7IH4BKSqWu0GVvvTFufssWTD8L/4KTeEjr0M86ZpFdQehiKNdj3tS5/32mz?= =?us-ascii?Q?JhwAaH0/BdylcTQFWgbRfz9OIO5x40xoVySBto5H1BHJPl8/L11IDLPb+C8B?= =?us-ascii?Q?3jrihT17pUndQbLVeTvKWQKBw/qBFb0eG9XPCvcWT9G0aA=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(376014)(52116014)(366016)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?eIz5Y55G6F4qJwr3jVSuj2OMOqE2Z+hWHrxpZoGNfB79welwpaBsNO+XMoL7?= =?us-ascii?Q?GLvxdz5TTuDSTBcveSMvd5R2UQghJfUentoJ7yYxfxCqyyZjq/1BEz7YF6S9?= =?us-ascii?Q?Q3PMiqQpLAoJBwxHiR/T23xj+bnm0BbFjscyZ590o2EfpEl5ENdvOka4RG5C?= =?us-ascii?Q?zeq+oEBPahcVmUtY8QtUZxS9SPCAa7uyogrSR7A+XGxXE0PBU5EmT/QO7sbI?= =?us-ascii?Q?mfAxjfSyyUEelDaG4+KkNNkFCw/ozwJk/5lCq7iuyXdFDmOD3F+KPdNG3Pf+?= =?us-ascii?Q?2jvH6/rGypFQoOg7PwULSknABI0vYJzFWK/4R1UXfpO0YTszJoPnNpkesSWK?= =?us-ascii?Q?zmclmu+3qJq7nx1QRANWU/W25HSDrxPNH8IWKndrHW8dUPqO+Q3ZKBlvIP56?= =?us-ascii?Q?m+PrEBZqDW9ZA3XQmurbmmCTnXnG9QVUiUQIBbm1dQ2MWHbUG0FmHUQVeZWG?= =?us-ascii?Q?m8BItK4bjGZTh1LHBLoF/GjTYrSViyrNa3cq2PF4EEAY8ZnLb2pgbY6akjWf?= =?us-ascii?Q?rL70T4K+CSS55GZZRsAdJrSaWJaFYPkh7a7QvD5s6WgBMSPL7OZzNNrsnTod?= =?us-ascii?Q?ZDcW9Ps+XAzXQijBOXgfwJi2AuWj+zFGOkdRmxshOfQ1qsjJda1FA59Yyu6v?= =?us-ascii?Q?bk3ghe0xxYoCAvk7lHGMImMKLa7lha/MzPhXSYcko4OV43nJzkKrA4RK7o1q?= =?us-ascii?Q?0Ua/bPH+cb8OT3BuKUhU5vHU7lILAdmVkLCu/Lv3jrEfX60xgl79m1FQn2/y?= =?us-ascii?Q?NZs0DPvYCLtif0VaTRDkOjF5GNm2jmBiruGaDRavskM/QVcilaTLOHO+qrhA?= =?us-ascii?Q?v9QHLQIVfWdilzZBeGhCBFVRNiOXN4hlXOl+KUqgYOdpcgRenLbvMX+Xvv1Y?= =?us-ascii?Q?tO+0pTzyFdTUxzHMCAPoat298cTeXuZ2t3QsKiPpWIE3GDVFrQ7scikdjsua?= =?us-ascii?Q?rX3CeDnQo0208W4Bhee512+gMFWBqZgUfLgivsDdHQkIE0v4JL/kK5q/lHI1?= =?us-ascii?Q?2mSlfRfwBfF8j+jT0EqsYXjmVAt7zGr5lomUwiNz0EDkr4BDmav0kc3hjxZB?= =?us-ascii?Q?I3m2ZOpGN2RKNawc8iYLmXPSn3RrRr0ifciXC66lW08If8yEdyGbkGB6uqhE?= =?us-ascii?Q?Y/XVJtm13ANN1/Gq68+qd7X7ypqBFY2Bs54SkyfEBDrZzyvUpsdJy3QtFDEZ?= =?us-ascii?Q?/yQ3LCmkL4/cSem9B+4AQUhi6+FayVF87dcRVWuuY4AKmyZvozdPlDnQF2p8?= =?us-ascii?Q?kPNs1A5fo2bYbV9FcZG5MIq6XI2D7yKcQ/fMZzvN2JjGTU3VOzee8km+SUS4?= =?us-ascii?Q?cr4oyYrQlfJ8COT7t8zywCAFmmNsnoDCQMnE5yGQXC4zprztqGJ159gA8Env?= =?us-ascii?Q?7GLJwDCLajr8Vcg2RGzAItQkS4oDOqGUfo2hHfmqNkFbqmBYOem7yCUVysZw?= =?us-ascii?Q?W3noK6V/XbObic7+/JokyBu++O61xAkeqg1sRFTNg9Ju4Z2xyZ6Z3Ur/1d0H?= =?us-ascii?Q?5+3tpMe/NnC06wcaOe5ooTyt1sYNnLsqe2djavsTV/r+y8wCWZryxIpz9OdU?= =?us-ascii?Q?v78FbgV51YVCtmT7/BFGYKqepuUkutHOiE2ZthO1EjjAlR7yDCXeiCSJRJD6?= =?us-ascii?Q?Xg=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 398f2221-3559-4634-8ca1-08dcebfa210a X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Oct 2024 02:44:31.0098 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: TL2V/36kAbqZtmQXedqHxXOPueEXomIaVOJap/95jHrwGtaz/DrWQkzp30Ex4jV2yiHvxcM9KmvPldSqWvkZ/9lXdMZ9CbKZFUaIPBGF0gM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB6115 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Huaxing Zhu Accessing device memory during soft reset may result in some errors being recorded in PCIE's AER register, which is normal. Therefore, after the soft reset is completed, these errors should be cleared. Signed-off-by: Huaxing Zhu Reviewed-by: Long Wu Reviewed-by: Peng Zhang Reviewed-by: Chaoyong He --- drivers/net/nfp/nfp_ethdev.c | 40 ++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 8cbbadb4de..b16fbe7db7 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -1338,9 +1338,37 @@ nfp_fw_check_change(struct nfp_cpp *cpp, return 0; } +static void +nfp_pcie_reg32_write_clear(struct rte_pci_device *pci_dev, + int position) +{ + int ret; + uint32_t capability; + + ret = rte_pci_read_config(pci_dev, &capability, 4, position); + if (ret < 0) + capability = 0xffffffff; + + (void)rte_pci_write_config(pci_dev, &capability, 4, position); +} + +static void +nfp_pcie_aer_clear(struct rte_pci_device *pci_dev) +{ + int pos; + + pos = rte_pci_find_ext_capability(pci_dev, RTE_PCI_EXT_CAP_ID_ERR); + if (pos <= 0) + return; + + nfp_pcie_reg32_write_clear(pci_dev, pos + RTE_PCI_ERR_UNCOR_STATUS); + nfp_pcie_reg32_write_clear(pci_dev, pos + RTE_PCI_ERR_COR_STATUS); +} + static int nfp_fw_reload(struct nfp_nsp *nsp, char *fw_name, + struct rte_pci_device *pci_dev, int reset) { int err; @@ -1357,6 +1385,14 @@ nfp_fw_reload(struct nfp_nsp *nsp, } } + /* + * Accessing device memory during soft reset may result in some + * errors being recorded in PCIE's AER register, which is normal. + * Therefore, after the soft reset is completed, these errors + * should be cleared. + */ + nfp_pcie_aer_clear(pci_dev); + err = nfp_fw_upload(nsp, fw_name); if (err != 0) { PMD_DRV_LOG(ERR, "NFP firmware load failed"); @@ -1463,7 +1499,7 @@ nfp_fw_reload_for_single_pf_from_disk(struct nfp_nsp *nsp, if (!fw_changed) return 0; - ret = nfp_fw_reload(nsp, fw_name, reset); + ret = nfp_fw_reload(nsp, fw_name, pf_dev->pci_dev, reset); if (ret != 0) return ret; @@ -1523,7 +1559,7 @@ nfp_fw_reload_for_multi_pf_from_disk(struct nfp_nsp *nsp, if (skip_load_fw && !reload_fw) return 0; - err = nfp_fw_reload(nsp, fw_name, reset); + err = nfp_fw_reload(nsp, fw_name, pf_dev->pci_dev, reset); if (err != 0) return err; -- 2.39.1