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 09D9745B33; Mon, 14 Oct 2024 04:44:50 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0D68240652; Mon, 14 Oct 2024 04:44:34 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2112.outbound.protection.outlook.com [40.107.95.112]) by mails.dpdk.org (Postfix) with ESMTP id 9099D402F1 for ; Mon, 14 Oct 2024 04:44:30 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gcVJT8FQV+zo2ZiMxnT6JfcmJAIlE5G7+dIHbIQb3b1pAk3MBoCQOK7ER/rLV7jRG2Ax49eZgV/IYFCSiiLEcpksWOLcxzolEtDmYtza8Jp9fcn6R+C+jBpVIhxOYh1FQvR/DdLLb5XBdPJCvVj3qxfwZ7y5fP8hX+C+FeBhPD7zXfsknYwxyM4VZtQf2pLh+21t9YtTULFeMlM0aWMMGE04qYyF+pCeB01bM0qn+UPWz2Y2741IsKpzKXR2LLbu5/8E030TQAFVJ0YevhtIX0BiU87l+b4taKttidOew13lQDT+n2pIkkWUkXJcKHfK/PwHsh5NuT587iRITmeGeQ== 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=dxAySp6j89WPgSBKLCpDuJnRvOJR8YfQ2OiUCA/TNWo=; b=sVUeY2LqCTGW4QqjQs4CHSlPqGjGLCT4lBH09QwfmvQwKhKm1ucg2W6f55B+E3iJMeExne5DwgTs45CVXvCjYIgZqQQbfRUofX65TpQqf0dU4w0G7LSbFc4+hZdNA/wtTG5/SZuJrAbAbD0hZ24W4jBa3qTz04E0rf8e9qCpF6kHQBP/wvWYjt4+73ADkx7o8W23Gn8JinHh3bX8cGSjB/W4o5+FH+hdWvK0sIgYdmK5LV1gJ7PVNwhqelUZJUwlwxRiGGa+fOeJX7LbVVUMRXWXd8JJjmxXHNY5bqigzVKi3URXctcYiNTWYSbCc7uP3WjBCHWrY8jNsOob2a2f6Q== 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=dxAySp6j89WPgSBKLCpDuJnRvOJR8YfQ2OiUCA/TNWo=; b=sl+805PC3U+wdIAtxCVekP/NUbsH4Iy5/aSUV4Sm0K+vNMNVVr2KhpU0FCerLR4IITN8UWVPaQNrSSt98asw+a06yo/7Kfkgv/8zDPTLlviOn1SG0DL789mPJMvx47BuQSvjSUkA/JJ+W6CC3TV1rrLHMMaLZlBoRCDpcEFuVcs= 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:28 +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:28 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Huaxing Zhu , Long Wu , Peng Zhang , Chaoyong He Subject: [PATCH 3/4] net/nfp: add more logs to debug probe process Date: Mon, 14 Oct 2024 10:43:57 +0800 Message-Id: <20241014024358.3873420-4-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: 80b84f8b-f43f-4142-e5c5-08dcebfa1fa2 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?Ri44iCirduO4cdJV+nKwJT73SADoL78LSyf5ZO7Td/oUMHyVgQTDR1u3/Hnz?= =?us-ascii?Q?zhbJukAMatTZFrTiyfosgxw+uuau2KoCtJK7RG6iARrvhuJv/3lOdu2glsKM?= =?us-ascii?Q?EKonXd18+p751JKfXZhwAvhrcaT5gS6h1jCqT7ecl1Ig2t1DbemecyDnyoIv?= =?us-ascii?Q?uIzD57Z1Fx9k1TUiXHTWB19tzytEI15JzEWUuF8rqHyAJuMfdakYOj03pThW?= =?us-ascii?Q?FGDaRqi5SCqcZnLCPYdlF+f9C3YjQ7bYAmZ/ZUwoRXS8wVqi0W1F++u/w0rd?= =?us-ascii?Q?OSfnBEof94Kin9YAW3JJwtF3d4BBpCv6QIS3/evlLZgtSMdfFecQwbnuEG3v?= =?us-ascii?Q?MTKbq8Y9fpCQ0gL6GztOA3Piybs3MtRuhK6oPiSS+ZX7AWUeTRECopZ/fxin?= =?us-ascii?Q?DSy3w0z5X5sLPdq3iBI8q5bsf7pcmaKGLRwFFM7M9EpZSAf8ajYEt1et1Qce?= =?us-ascii?Q?JSqHYunhXtV+65U0xC2sgK4QuJGsje149YeE7OYGQkebvVcU2R52pSHwIb+y?= =?us-ascii?Q?uG6oml3ifJor76aEqyM11SMk5FqF1Io/CCUsvYB28NIJOHAWQ/ui2ZMsV8V0?= =?us-ascii?Q?SfGu+GJoueYdyO1nqaAmRcTY3OvPpMw/Qzkzaw6xI6HojjBGlhnqzowyy3fe?= =?us-ascii?Q?11nZXhQb4pNzy0C/sgw+Qa6K/FIIDPXEX+SCgfJua1UAUvUbRcze4oTzGsHP?= =?us-ascii?Q?cQVirHaQTV0NaeU66ZvEYsTKpq2cVcTYJhUr7aQZ8tHQTGFwrpG5HeAJz6Qr?= =?us-ascii?Q?fin+OC7mYZOatH61F0iO/22bAYnne2YthV4r9AWel3lTJNFkDwYi3IdiOBQS?= =?us-ascii?Q?H9O9LBAIuX20GhQOh1jhh/f09fxogrNF4HXXGQyKwo/8ZV3CLz9A7umm37nc?= =?us-ascii?Q?tKOuhWQdMozGcbg1SbfkROczIddKoxeAIqZzCo5GmLSjEa/kFfHcv9TIFYH+?= =?us-ascii?Q?PTlrn35gPccyUixygkyl8Wbq3+rtgvLEhukOwpFVJFUQ8o54O+CsEEcjYhKy?= =?us-ascii?Q?jCWMgHsDmdDM0Bj9Wl5EKg5FZrvJCfXqRo26KNvL6ySa3GPs6zAliSVlwbj7?= =?us-ascii?Q?KTtSaywtkROnbKvBA1a0nhIwOufKCLfr1IgKU8lB0reCETHnMDVYlENfmfOT?= =?us-ascii?Q?J6xud1HodTDUG6l5FUEVQL99+4A3Cu+Kp93UPPCJSpi+WOiUQunDLwjsr4uR?= =?us-ascii?Q?iESdOSBce0+0AZEeS6ErQG2juP+snrXbBGea7UQyIGrWOnzmsgPMWFx42aYc?= =?us-ascii?Q?i9hKLUf9NprwpoF7ghKcwsArHs2ycvSdYWeOErj0ba4ME8kZNRhBGwsnefXI?= =?us-ascii?Q?o7HZj1mBrt53EI/v2XM6q2fIROJKLzCGhaXHXew3ieuhFQ=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?tW6m8r2wP5S36+YGj3sVxWVzPvP6SBsKzVWh7SFnza4PzwfW9i38S4gNnEmE?= =?us-ascii?Q?3ZRJQLUDgv8fceNJWvmOdUSd3hXQI1uc5RYu+BVojehH+w+HLe8iC6REMBJz?= =?us-ascii?Q?/N2oHCfLIFpzWW4Hyu3MXQ7Z8cMVgeKq2Ui+tpzbQ6Ll3qQ4G0RrpxK3dIjD?= =?us-ascii?Q?L0MyTuOHEMXIMBTo1bASuaH972fAcmY4Aa5dQlS8kDnZ8fad2owNBd1S39Cn?= =?us-ascii?Q?0pIKy9bY0DWaFNx07CDSVi4KcbADdSqpj8qEq9CevDRXGmi70GdBKBrzPhPi?= =?us-ascii?Q?ru9/7YTq4WtV9wi5/fEdwl0hU/D7ZvHOcYoSclH3Ia3vuKNClF8mUY8z08Zp?= =?us-ascii?Q?G6v6LVJo5H5KrD+gSTKxmrx6jh2+vX+m0zj0V34czwVXkn0A/DGmZlGNeQAv?= =?us-ascii?Q?b8Zp2ZNud6VfZBP5IoRF3jvKZEPTP+ReviIvqpTWtzB+zLJ8l+GgIO/hv1tj?= =?us-ascii?Q?xd83kOGOTcY3eQtjQ47g4QKmIZd7NHbr+HSoYDzJA77OCPICpQMtmxqfBqSW?= =?us-ascii?Q?2uHTFt/u/+GjbLp2wdzF1k0iiEjfNHQ5JMlqqFniX1tZnc2addMeMr6ryOo1?= =?us-ascii?Q?AQXOLaXrLxi6MzLLtgmiCtU/vlxsg7IdJnhvOhN+ryZ1KoqRjkiGH52OD0uO?= =?us-ascii?Q?+K9MTZ1QXEe11oxKkZsSeYjo3rJ9HIf5sNsJRiXTdNuSrogGT69O6epAGLo8?= =?us-ascii?Q?o4AhKcAMTkSrfmmJ/KoxaQhuRWMKmPDWtmBDOU4hRSYDB2VnXc5Vq0sgJWc3?= =?us-ascii?Q?ipTC7NPMQMj3uFbmxyMamgs/DYV73YTVDFULAxC2GPSvbiPYk+qD8ilDvw8f?= =?us-ascii?Q?5JjZEFtY9Q9sbySWdTbc1H5IQIBrGTZovjTsdzTU0RBDVkXNZrW2y+McJdkK?= =?us-ascii?Q?BBeZE8qwxQ8qt8RzhvTkFuSfpD3PgugfVpz14Xhzdpv9KDwQQ7FUy0ayCAyt?= =?us-ascii?Q?eNdhfBBepqfbFkSghHSZ3RlDbSsbfk+eaz2xZ/R7oPAiqltmjuKncNVR1a7U?= =?us-ascii?Q?Gxxd4lstUhtEaiN+9mYgY6ZU5q9xhwJ+TLKBG+4huQkMuM01iEOwSqRIu2gO?= =?us-ascii?Q?TAAHxtKmtU9YHUEKH7WQi9YM886l7yh2GUdOjM1MryY1szcY+FPltq9x2mxy?= =?us-ascii?Q?bbxRWm96c4GUv08C9SoYcpkMcWwci4/RGHwrz+UGZgUDceZc2/CeWepC7ZYc?= =?us-ascii?Q?UG7lsbnh0eHtM5x05Y5CjY1hcQmIxdTqXCb53DELdtZOX4lur0gWZuoPra7r?= =?us-ascii?Q?ZN/ol2lmCmNCdR9uWc+YrFRjUFmgV+i7nBcFg+9JTwodoXBmsj9foi6ag6id?= =?us-ascii?Q?ASenqpJbOoTgiZdW1L4gZIDXchntHVNJNyzGY8oJ4fV1KMgl6iap3lCyPBSE?= =?us-ascii?Q?fjWLjw/hX4h4jPMNy7EZhB/pvSZWax8LPSwxre+2RyumaAD5Pf7hAa9C8BtY?= =?us-ascii?Q?KQKCQpXqzyKunnNTI/0YOCRTCWrw9aEvRK30r1dKFdWieFVghqQ19dn65Zlt?= =?us-ascii?Q?8JMznn2inFDQ49MT82yDz3S4EW8s/8yjanpG3u99jfp3aJteU/pA9VKFuSqa?= =?us-ascii?Q?e4TWsbrLOGFQTJky1JQcVKx0IYa9a68GOfHhOZjRmF7VKxmUH/QMtdetpIYe?= =?us-ascii?Q?BA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80b84f8b-f43f-4142-e5c5-08dcebfa1fa2 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:28.6452 (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: 1bSioUAUhG8lpHNrXciwV9NPshOqJNkI+nTF2eqoOUwkFGaHnifVSRa2YB/nUlGFlaL2GUdmc4nAPeo8jb6b0UEKNT7qIyKINc4eI8KqDRk= 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 Add more logs to debug probe process, and modify some log level. Also add an new entry to the mailmap file. Signed-off-by: Huaxing Zhu Reviewed-by: Long Wu Reviewed-by: Peng Zhang Reviewed-by: Chaoyong He --- .mailmap | 1 + drivers/net/nfp/nfp_ethdev.c | 6 +++++- drivers/net/nfp/nfpcore/nfp_mutex.c | 17 +++++++++++++---- drivers/net/nfp/nfpcore/nfp_nsp.c | 15 +++++++++++---- drivers/net/nfp/nfpcore/nfp_nsp_eth.c | 5 ++++- drivers/net/nfp/nfpcore/nfp_resource.c | 4 +++- 6 files changed, 37 insertions(+), 11 deletions(-) diff --git a/.mailmap b/.mailmap index ec12c42dd4..a4439c9020 100644 --- a/.mailmap +++ b/.mailmap @@ -561,6 +561,7 @@ Hrvoje Habjanic Huaibin Wang Huanle Han Huawei Xie +Huaxing Zhu Huichao Cai Huilong Xu Huisong Li diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index a199988999..8cbbadb4de 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -1297,13 +1297,17 @@ nfp_fw_upload(struct nfp_nsp *nsp, static void nfp_fw_unload(struct nfp_cpp *cpp) { + int err; struct nfp_nsp *nsp; nsp = nfp_nsp_open(cpp); if (nsp == NULL) return; - nfp_nsp_device_soft_reset(nsp); + err = nfp_nsp_device_soft_reset(nsp); + if (err != 0) + PMD_DRV_LOG(WARNING, "Failed to do soft reset when nfp fw unload."); + nfp_nsp_close(nsp); } diff --git a/drivers/net/nfp/nfpcore/nfp_mutex.c b/drivers/net/nfp/nfpcore/nfp_mutex.c index edb78dfdc9..9a4dc1e14e 100644 --- a/drivers/net/nfp/nfpcore/nfp_mutex.c +++ b/drivers/net/nfp/nfpcore/nfp_mutex.c @@ -308,11 +308,16 @@ nfp_cpp_mutex_trylock(struct nfp_cpp_mutex *mutex) /* Verify that the lock marker is not damaged */ err = nfp_cpp_readl(cpp, mur, mutex->address + 4, &key); - if (err < 0) + if (err < 0) { + PMD_DRV_LOG(ERR, "Failed to read key."); return err; + } - if (key != mutex->key) + if (key != mutex->key) { + PMD_DRV_LOG(ERR, "Key: %x is not same with the mutex: %x.", + key, mutex->key); return -EPERM; + } /* * Compare against the unlocked state, and if true, @@ -335,8 +340,10 @@ nfp_cpp_mutex_trylock(struct nfp_cpp_mutex *mutex) * atomic, which returns the original value. */ err = nfp_cpp_readl(cpp, mus, mutex->address, &tmp); - if (err < 0) + if (err < 0) { + PMD_DRV_LOG(ERR, "Failed to read tmp."); return err; + } /* Was it unlocked? */ if (nfp_mutex_is_unlocked(tmp)) { @@ -350,8 +357,10 @@ nfp_cpp_mutex_trylock(struct nfp_cpp_mutex *mutex) * debug and bookkeeping. */ err = nfp_cpp_writel(cpp, muw, mutex->address, value); - if (err < 0) + if (err < 0) { + PMD_DRV_LOG(ERR, "Failed to write value."); return err; + } mutex->depth = 1; return 0; diff --git a/drivers/net/nfp/nfpcore/nfp_nsp.c b/drivers/net/nfp/nfpcore/nfp_nsp.c index 2ac39b10b5..32f092eda1 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp.c +++ b/drivers/net/nfp/nfpcore/nfp_nsp.c @@ -252,6 +252,7 @@ nfp_nsp_open(struct nfp_cpp *cpp) state = malloc(sizeof(*state)); if (state == NULL) { + PMD_DRV_LOG(ERR, "NSP - failed to malloc name %s", NFP_RESOURCE_NSP); nfp_resource_release(res); return NULL; } @@ -369,8 +370,10 @@ nfp_nsp_command_real(struct nfp_nsp *state, } err = nfp_cpp_writeq(cpp, nsp_cpp, nsp_buffer, arg->buf); - if (err < 0) + if (err < 0) { + PMD_DRV_LOG(ERR, "CPP write buffer failed. err %d", err); return err; + } err = nfp_cpp_writeq(cpp, nsp_cpp, nsp_command, FIELD_PREP(NSP_COMMAND_OPTION, arg->option) | @@ -378,8 +381,10 @@ nfp_nsp_command_real(struct nfp_nsp *state, FIELD_PREP(NSP_COMMAND_CODE, arg->code) | FIELD_PREP(NSP_COMMAND_DMA_BUF, arg->dma) | FIELD_PREP(NSP_COMMAND_START, 1)); - if (err < 0) + if (err < 0) { + PMD_DRV_LOG(ERR, "CPP write command failed. err %d", err); return err; + } /* Wait for NSP_COMMAND_START to go to 0 */ err = nfp_nsp_wait_reg(cpp, ®, nsp_cpp, nsp_command, @@ -400,15 +405,17 @@ nfp_nsp_command_real(struct nfp_nsp *state, } err = nfp_cpp_readq(cpp, nsp_cpp, nsp_command, &ret_val); - if (err < 0) + if (err < 0) { + PMD_DRV_LOG(ERR, "CPP read return value failed. err %d", err); return err; + } ret_val = FIELD_GET(NSP_COMMAND_OPTION, ret_val); err = FIELD_GET(NSP_STATUS_RESULT, reg); if (err != 0) { if (!arg->error_quiet) - PMD_DRV_LOG(WARNING, "Result (error) code set: %d (%d) command: %d", + PMD_DRV_LOG(ERR, "Result (error) code set: %d (%d) command: %d", -err, (int)ret_val, arg->code); if (arg->error_cb != 0) diff --git a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c index 87db928c08..d1b43a75f0 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c +++ b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c @@ -347,12 +347,15 @@ nfp_eth_config_start(struct nfp_cpp *cpp, union eth_table_entry *entries; entries = malloc(NSP_ETH_TABLE_SIZE); - if (entries == NULL) + if (entries == NULL) { + PMD_DRV_LOG(ERR, "Malloc entries failed."); return NULL; + } memset(entries, 0, NSP_ETH_TABLE_SIZE); nsp = nfp_nsp_open(cpp); if (nsp == NULL) { + PMD_DRV_LOG(ERR, "NSP open failed."); free(entries); return nsp; } diff --git a/drivers/net/nfp/nfpcore/nfp_resource.c b/drivers/net/nfp/nfpcore/nfp_resource.c index d59d2d6c1e..b05144036a 100644 --- a/drivers/net/nfp/nfpcore/nfp_resource.c +++ b/drivers/net/nfp/nfpcore/nfp_resource.c @@ -161,8 +161,10 @@ nfp_resource_acquire(struct nfp_cpp *cpp, struct nfp_cpp_mutex *dev_mutex; res = malloc(sizeof(*res)); - if (res == NULL) + if (res == NULL) { + PMD_DRV_LOG(ERR, "RESOURCE - Malloc NSP memory failed."); return NULL; + } memset(res, 0, sizeof(*res)); -- 2.39.1