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 C7B2145B5A; Thu, 17 Oct 2024 08:16:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6F2484064C; Thu, 17 Oct 2024 08:16:18 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2128.outbound.protection.outlook.com [40.107.236.128]) by mails.dpdk.org (Postfix) with ESMTP id 412404042C for ; Thu, 17 Oct 2024 08:16:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=a3fUIj9qL2OKj/tFpk7xKom6VzEm0nyczexp+EmT9DYW15MuDUlQ0CUFC36Enro6BS4599Cpbua1d+7xeswXgi/9+SHyZE+/8cuxaK2cvWZm4yPHI+2Eqmk9vWKIT9piZY3E3Vaqm0rlzisuxo3xHB19Q7U3zNC7EcLyZXdn+xm5se+df4L4goOqNI38B2XzbEspLQ4OA08slmahb0bKKoWlNAgNhFlU5rsjTxKim6+0S37iRxRwubtWVvdllyUwEsRlb/K9OYWMqOn71mmtraFzZ2vFNQgk+RCro6BdAHf2tODBfYxrjguY48LGVg2loEVYkPYnOUWEaJ2WYyJ81A== 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=Gi5JR3sKQGRhvoaH1xUawZJZWVEk6AHIoUKhrTGecAk=; b=GU5z1kYPu8YJXyBsj0m51eyJt37nAIB1A7D6pLlcLx0VL6v/Sh/16VKvDTMaUukhJv2CflSWhFzKp920QOK9yKeAikE0Gj+nRiKIyU34+w01eDJyuZFO5WGRJUTBsatQ2k2OTECEKQgQnCHhnYEi/O73iWE3kjwGDNYiqMjUZRtfn8W5NFe4zh2DCHKuj2B41pXtHAxHhHqGHjHkuYWKugbU528r962exqX04mnBc5DXwFiiQPO3ONTHU2TzSV9tSVPEMkKZ38Bbd7UF3MWwzfjCrN9WsaXYF5jr7QpbcwOw4+dGcotvLTlHhlfOCLFNpoZLQY0KmWpnHDD5I9MnVQ== 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=Gi5JR3sKQGRhvoaH1xUawZJZWVEk6AHIoUKhrTGecAk=; b=bYe6R2vKjYbNW0lCRgzME0lLDCMDMgC+v45zHA5D8ZHSYDh2SXaDyy1Nv+ag/FXO0Fl9ha1nQWAzRCvpkI5b6RqsxZ6tM1R2Libh6Oit1RWbj6QFIHDFA/VU93acdP5OcUaKoMRxbh2Vzx4l63STrm1118cI7r17y9q/Xy/8wJI= 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 BLAPR13MB4596.namprd13.prod.outlook.com (2603:10b6:208:307::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.18; Thu, 17 Oct 2024 06:16:14 +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; Thu, 17 Oct 2024 06:16:14 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Zerun Fu , Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 3/6] net/nfp: reformat the header of logs Date: Thu, 17 Oct 2024 14:15:44 +0800 Message-Id: <20241017061547.4068520-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20241017061547.4068520-1-chaoyong.he@corigine.com> References: <20241017061547.4068520-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SG2P153CA0003.APCP153.PROD.OUTLOOK.COM (2603:1096::13) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BLAPR13MB4596:EE_ X-MS-Office365-Filtering-Correlation-Id: ad04272c-314c-4f55-d0d1-08dcee7333cb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|376014|52116014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?rCEMKQYtmixZNRAGb9f/BFmd3nmkmn47wvls4kgqRcjhU8P4Dv9cnbx9j44I?= =?us-ascii?Q?sLQVpTHFfiqvHHm+MUWfPv9AFFQTnFU6+xBQCqJ3+C+xOvfxG7/71dnH7K71?= =?us-ascii?Q?5ppBrS5GAD0fhH9sflMysFtk+X2kgzT5oKoqbwpIrz1gj36VblYiEByS9NiR?= =?us-ascii?Q?rfG9rAbkxYRT1adbRv+DxWBjc5OJVxuEIvnJwzRcsqBBxPMkZSxm4hFjXALQ?= =?us-ascii?Q?xXFgKz1Qn/XsD73lXDOdgFap2HPcDSRdgEo4wVUEGUXCPEBelmODwzH0PSS1?= =?us-ascii?Q?h2Xi8736QsZ6vSKd10kwVZBPTHSj/E5qzuiP28khtzu04mROWIGEd5BYcvGa?= =?us-ascii?Q?q9Tulyf40MgovJhSscXeXRDDnWLFHLHz5jhe3EzPTC+wNXvf7D5pIAyjbmpW?= =?us-ascii?Q?ktXNj3XW150+OSzIdYgLOZB4fhlx+Fg+fYntDHD/oFfjsHTQKP3+w101fDqo?= =?us-ascii?Q?/kCCRsxx/2ttg1VWcM+bMIN79a/hvr4nEzyb0zvfQnKXouPd5pE/a8F+cGnj?= =?us-ascii?Q?dpv2MJln20mUFb6YocxAL03/p4XMg4qb1zfysjcu6oHklymcw2+qyHZPPujh?= =?us-ascii?Q?v7Uvq6jyV7YV8ElLw3I2g/ZHK0Knwn1JJG72s70DhwEKjhjUO9zoAhxrhRnv?= =?us-ascii?Q?GX3QckKnBENN3TnlIGMDPZJRTDL0LzHo+Fskha/QgOnt0LvbKpNeysPDNsky?= =?us-ascii?Q?46tDFdLgKxZEfHcWeOS2emYM5N471SWrt/6pOu2NB6FJu9ss8HJHlENY8M48?= =?us-ascii?Q?/QNpXdfmCZcvv7beZ8M/VnbHYjMS9H1N8iwJFD2IxmDlqqHn1/fH+60k6nkK?= =?us-ascii?Q?7h3CH49NWKrmu63VoXR7q6E0Ibom5irafl4DtYchXkupXwDUbtuU8/tQ/kG0?= =?us-ascii?Q?IGAjIYtighd0HB1nE2nv0Cn1pwIlwvfjzla/ZJp930Mu3HiG/p5OucWimdwe?= =?us-ascii?Q?qC45FkQV5sWo9O2W39pJjbjZK7bud2JYZFqCle46Fk3ow2wEpSZxVykZGlN3?= =?us-ascii?Q?BVscEWSYUumEX9jUdLnsVjLwhq11yG+9hyAe9L875HTdHWcI1Pd7zhWlx87r?= =?us-ascii?Q?U6GJ4urxqnsbkjXLrj8dPGXrrs3xOpz5uJTD/A+rWLoet6wOTAXPw0QAx3ix?= =?us-ascii?Q?+YnVH47ok7nPwODWrXQvZQ50slQO5xxJA3AK253IwUozyDjqtEYuwCNa4IGU?= =?us-ascii?Q?wQNVZMCrIS7h0NUXDmIFEcRLUSa9ZsynIGnUSlfl38JPJCSAdPVkSISLenRZ?= =?us-ascii?Q?GqWQBRBBuBXaj+CtTUmizVdjwzLP3anMvkVeCA4uGJ+EWhQ5+glTfEjMBu3i?= =?us-ascii?Q?eDK7Lln8w/8H8lwTcSPmmjEIMxmlLRjvXAVObS70xywmUDp5qemObJtytNVM?= =?us-ascii?Q?cNFwdII=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)(366016)(376014)(52116014)(1800799024)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bDh0W+8LF61eCsYeZpQUY5nIxuCkp1TkQ7VkPkkUtcjetUj6LYUuDmLZErpj?= =?us-ascii?Q?NUa0wEm/zbde6eRnsKP1zjXJ8Hecr7NjShO1P9Y3IMM/i0qmLVADYZic7xSx?= =?us-ascii?Q?w/DnQMuFRmxoXZt1D1SfdPWjhIsbOzqmuS7jkL4EyMKAEhg139FyRHM+cGbV?= =?us-ascii?Q?sjo0T+yxqaEKySV+I6Lun/OBoc5ZlhG6BrWz22tXACbNjFb1V8jJKYU90nan?= =?us-ascii?Q?70zi/pNpcuf0RRrG5SAeC38kzmev42RTmBzOUHFFsg3BRzUiPqKIfBlqv/ik?= =?us-ascii?Q?0/OWgzA3ETgBw6B+isD97Rq+OnRaLQ0aDASv6xx9YzBHIDL4IjlU9C6PhV0f?= =?us-ascii?Q?ZNP1SEUuPOYWBXW8zmGdYSBQ521QP1HM4MzU+kQxnSkY9hY9YewgwF6+B7gp?= =?us-ascii?Q?ezePQ9zVDWzAHAmbR0piJ2DzGaMUSUdNwuww/eOXAtl5nCejGyHhcBciZ2BC?= =?us-ascii?Q?tyQBtbEJsl8W6XjzROXJLfAV4mf4ajeNzbgrJDAw0dgB/7ml4RFo2XIo2DfN?= =?us-ascii?Q?GSpes2ZtJ+ndtmLnSdQ/M3Yd9CWNn1KB0Jwgw0cJyNvDgbxXjuTZhjIN4ti5?= =?us-ascii?Q?m98lApFOOSDhPDyRmaR3px26i0HEamObuJbqaIsQgWcDzTihAuR4E46aD/pb?= =?us-ascii?Q?sO1cgE72eP7hNiGuPzN9vnQ0Q02Px/L0aNfNTY2urEIJqHhc+oaNOnBdsdCE?= =?us-ascii?Q?WJw+RXZAUkSpuGUg4hB/4HFfWo4+oyHgBoWemtGuxsrXKSwhR09bmio62SxJ?= =?us-ascii?Q?9qua3FOXYujs7iqFviDG+Ht73lsbmAfJ9yKJQvOxdl4TWuxgppJ/PhYq0wqE?= =?us-ascii?Q?taOnMCmnG8EYTw7ZOa/gm8djZD/KiCtidbTwQJQHpw2kYAklEZvBroZkanwf?= =?us-ascii?Q?gRzj7xTu5+AM224xBms78axQZZnwvNjdyujinhjhHIzTtkVBh7yBEtMhGXGZ?= =?us-ascii?Q?FrkL6xgks7srmcEWF5tEpUBoZK51TD/CU3yR5gh0em9PJv0NFxmriUlKP/Yh?= =?us-ascii?Q?d7RHyYlIwNBoNK9AvxjoGq59Yj8sj4fK2+AjexzOl9wNxh5eMyE9HWa9jkrn?= =?us-ascii?Q?fyg6CxEB2itN1mEOFki5aW3cfRUI8uNrgOHWT6Cx/N04fsmIriLZTBn3oRPX?= =?us-ascii?Q?5bhitCMI6X40Z7n1YYhDrcCGH12Zet0Vfz2ncEcoBHi98MUTZ8Glm5BTiMAF?= =?us-ascii?Q?Mc5gfuPJmIkB1a5KxR22xF05vnFDcxFKRfT8lXNa84eHLV3AgOgHK2YOr8Ng?= =?us-ascii?Q?UADG1Un1QlM7JohA+oBFzYNTXXpMjGOdR4y9rEZLAnkkhPhZ3qL5r9tUIOAh?= =?us-ascii?Q?Vrlve6K7Ck5RxeNAFHllJKbbZI8lQRZPkZqqU+fuAUXhckB9pWiaJ1KlWudM?= =?us-ascii?Q?1M7G2uLVvC+IsP4RgybIB1DaOK/e0jKDk5kJktVVBU5asfaoPOosAWuEFhU1?= =?us-ascii?Q?eLGrt9oMARi6+IAh/JvKddR9ldbqPnpclnRXHItY4j/Axp00JlKCGnFWDJns?= =?us-ascii?Q?kivbZyGU+te6CHoX4VEdOSES77jT6nTBQfdCW2qIkr5EMLDH84u6mPvm01TP?= =?us-ascii?Q?TltXjEEJsc25ZZxSSqgYWpd0kSSxGZrSjMmqWVue+DPBC31u0fsabPiZjIW1?= =?us-ascii?Q?vQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad04272c-314c-4f55-d0d1-08dcee7333cb X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2024 06:16:14.0951 (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: 2WBwdUSrXySlU22rvEggKFUwYOM6qCQDgeBJoPstgOSlW0vqKEl0pwX37QQGMClQ3sTbF/P4hIGKpNT7QNQEc8BFo8ewoAUjJsw+idK3coU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR13MB4596 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: Zerun Fu Capitalize the first letter of each sentence in the log. Signed-off-by: Zerun Fu Reviewed-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/common/nfp/nfp_common.c | 4 +- drivers/common/nfp/nfp_common_pci.c | 2 +- drivers/net/nfp/flower/nfp_conntrack.c | 6 +- drivers/net/nfp/flower/nfp_flower.c | 6 +- drivers/net/nfp/flower/nfp_flower_cmsg.c | 6 +- drivers/net/nfp/flower/nfp_flower_ctrl.c | 14 ++-- drivers/net/nfp/flower/nfp_flower_flow.c | 84 +++++++++---------- .../net/nfp/flower/nfp_flower_representor.c | 12 +-- drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 6 +- drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 6 +- drivers/net/nfp/nfp_cpp_bridge.c | 36 ++++---- drivers/net/nfp/nfp_ethdev.c | 22 ++--- drivers/net/nfp/nfp_ethdev_vf.c | 8 +- drivers/net/nfp/nfp_mtr.c | 4 +- drivers/net/nfp/nfp_net_common.c | 6 +- drivers/net/nfp/nfp_net_flow.c | 4 +- drivers/net/nfp/nfp_rxtx.c | 12 +-- drivers/net/nfp/nfp_rxtx_vec_avx2.c | 2 +- drivers/net/nfp/nfpcore/nfp6000_pcie.c | 4 +- drivers/net/nfp/nfpcore/nfp_elf.c | 2 +- drivers/net/nfp/nfpcore/nfp_nsp.c | 2 +- drivers/net/nfp/nfpcore/nfp_nsp_cmds.c | 2 +- drivers/net/nfp/nfpcore/nfp_nsp_eth.c | 2 +- drivers/net/nfp/nfpcore/nfp_rtsym.c | 22 ++--- drivers/vdpa/nfp/nfp_vdpa.c | 6 +- drivers/vdpa/nfp/nfp_vdpa_core.c | 4 +- 26 files changed, 142 insertions(+), 142 deletions(-) diff --git a/drivers/common/nfp/nfp_common.c b/drivers/common/nfp/nfp_common.c index 40e1620c2e..8cfcda7d00 100644 --- a/drivers/common/nfp/nfp_common.c +++ b/drivers/common/nfp/nfp_common.c @@ -96,7 +96,7 @@ nfp_reconfig(struct nfp_hw *hw, rte_spinlock_unlock(&hw->reconfig_lock); if (ret != 0) { - PMD_DRV_LOG(ERR, "Error nfp reconfig: ctrl=%#08x update=%#08x", + PMD_DRV_LOG(ERR, "Error NFP reconfig: ctrl=%#08x update=%#08x", ctrl, update); return -EIO; } @@ -140,7 +140,7 @@ nfp_ext_reconfig(struct nfp_hw *hw, rte_spinlock_unlock(&hw->reconfig_lock); if (ret != 0) { - PMD_DRV_LOG(ERR, "Error nfp ext reconfig: ctrl_ext=%#08x update=%#08x", + PMD_DRV_LOG(ERR, "Error NFP ext reconfig: ctrl_ext=%#08x update=%#08x", ctrl_ext, update); return -EIO; } diff --git a/drivers/common/nfp/nfp_common_pci.c b/drivers/common/nfp/nfp_common_pci.c index 5c36052f9d..1a4d3f91b4 100644 --- a/drivers/common/nfp/nfp_common_pci.c +++ b/drivers/common/nfp/nfp_common_pci.c @@ -206,7 +206,7 @@ nfp_common_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, enum nfp_class class; struct rte_device *eal_dev = &pci_dev->device; - PMD_DRV_LOG(INFO, "probe device %s.", eal_dev->name); + PMD_DRV_LOG(INFO, "Probe device %s.", eal_dev->name); class = nfp_parse_class_options(eal_dev->devargs); if (class == NFP_CLASS_INVALID) { diff --git a/drivers/net/nfp/flower/nfp_conntrack.c b/drivers/net/nfp/flower/nfp_conntrack.c index eff52c66ee..ba9134eb5e 100644 --- a/drivers/net/nfp/flower/nfp_conntrack.c +++ b/drivers/net/nfp/flower/nfp_conntrack.c @@ -880,7 +880,7 @@ nfp_ct_zone_entry_init(struct nfp_ct_zone_entry *ze, ct_merge_hash_params.hash_func_init_val = priv->hash_seed; ze->ct_merge_table = rte_hash_create(&ct_merge_hash_params); if (ze->ct_merge_table == NULL) { - PMD_DRV_LOG(ERR, "ct merge table creation failed"); + PMD_DRV_LOG(ERR, "CT merge table creation failed"); return false; } @@ -1715,7 +1715,7 @@ nfp_ct_flow_setup(struct rte_eth_dev *dev, validate_flag, cookie, false, false); } - PMD_DRV_LOG(ERR, "Handle nfp post ct flow failed."); + PMD_DRV_LOG(ERR, "Handle NFP post ct flow failed."); return NULL; } @@ -1726,7 +1726,7 @@ nfp_ct_flow_setup(struct rte_eth_dev *dev, validate_flag, cookie, false, false); } - PMD_DRV_LOG(ERR, "Handle nfp pre ct flow failed."); + PMD_DRV_LOG(ERR, "Handle NFP pre ct flow failed."); return NULL; } diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index c1a3532c11..7c612e471a 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -312,7 +312,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_app_fw_flower *app_fw_flower, sizeof(eth_dev->data->rx_queues[0]) * n_rxq, RTE_CACHE_LINE_SIZE); if (eth_dev->data->rx_queues == NULL) { - PMD_INIT_LOG(ERR, "rte_zmalloc failed for ctrl vNIC rx queues"); + PMD_INIT_LOG(ERR, "The rte_zmalloc failed for ctrl vNIC rx queues"); ret = -ENOMEM; goto mempool_cleanup; } @@ -321,7 +321,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_app_fw_flower *app_fw_flower, sizeof(eth_dev->data->tx_queues[0]) * n_txq, RTE_CACHE_LINE_SIZE); if (eth_dev->data->tx_queues == NULL) { - PMD_INIT_LOG(ERR, "rte_zmalloc failed for ctrl vNIC tx queues"); + PMD_INIT_LOG(ERR, "The rte_zmalloc failed for ctrl vNIC tx queues"); ret = -ENOMEM; goto rx_queue_free; } @@ -670,7 +670,7 @@ nfp_init_app_fw_flower(struct nfp_net_hw_priv *hw_priv) ret = nfp_flow_priv_init(pf_dev); if (ret != 0) { - PMD_INIT_LOG(ERR, "init flow priv failed"); + PMD_INIT_LOG(ERR, "Init flow priv failed"); goto app_cleanup; } diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.c b/drivers/net/nfp/flower/nfp_flower_cmsg.c index 9a5b5f52b8..41dd9e6e3e 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.c +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.c @@ -29,7 +29,7 @@ nfp_flower_cmsg_init(struct nfp_app_fw_flower *app_fw_flower, struct nfp_flower_cmsg_hdr *hdr; pkt = rte_pktmbuf_mtod(m, char *); - PMD_DRV_LOG(DEBUG, "flower_cmsg_init using pkt at %p", pkt); + PMD_DRV_LOG(DEBUG, "The flower_cmsg_init using pkt at %p", pkt); new_size += nfp_flower_pkt_add_metadata(app_fw_flower, m, NFP_NET_META_PORT_ID_CTRL); @@ -131,7 +131,7 @@ nfp_flower_cmsg_repr_reify(struct nfp_app_fw_flower *app_fw_flower, mbuf = rte_pktmbuf_alloc(app_fw_flower->ctrl_pktmbuf_pool); if (mbuf == NULL) { - PMD_DRV_LOG(DEBUG, "alloc mbuf for repr reify failed"); + PMD_DRV_LOG(DEBUG, "Alloc mbuf for repr reify failed"); return -ENOMEM; } @@ -161,7 +161,7 @@ nfp_flower_cmsg_port_mod(struct nfp_app_fw_flower *app_fw_flower, mbuf = rte_pktmbuf_alloc(app_fw_flower->ctrl_pktmbuf_pool); if (mbuf == NULL) { - PMD_DRV_LOG(DEBUG, "alloc mbuf for repr portmod failed"); + PMD_DRV_LOG(DEBUG, "Alloc mbuf for repr portmod failed"); return -ENOMEM; } diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c b/drivers/net/nfp/flower/nfp_flower_ctrl.c index 9b957e1f1e..a44663765b 100644 --- a/drivers/net/nfp/flower/nfp_flower_ctrl.c +++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c @@ -46,7 +46,7 @@ nfp_flower_ctrl_vnic_recv(void *rx_queue, while (avail < nb_pkts) { rxb = &rxq->rxbufs[rxq->rd_p]; if (unlikely(rxb == NULL)) { - PMD_RX_LOG(ERR, "rxb does not exist!"); + PMD_RX_LOG(ERR, "The rxb does not exist!"); break; } @@ -90,7 +90,7 @@ nfp_flower_ctrl_vnic_recv(void *rx_queue, * responsibility of avoiding it. But we have * to give some info about the error. */ - PMD_RX_LOG(ERR, "mbuf overflow likely due to the RX offset."); + PMD_RX_LOG(ERR, "The mbuf overflow likely due to the RX offset."); rte_pktmbuf_free(mb); break; } @@ -133,7 +133,7 @@ nfp_flower_ctrl_vnic_recv(void *rx_queue, */ rte_wmb(); if (nb_hold >= rxq->rx_free_thresh) { - PMD_RX_LOG(DEBUG, "port=%hu queue=%hu nb_hold=%hu avail=%hu", + PMD_RX_LOG(DEBUG, "The port=%hu queue=%hu nb_hold=%hu avail=%hu", rxq->port_id, rxq->qidx, nb_hold, avail); nfp_qcp_ptr_add(rxq->qcp_fl, NFP_QCP_WRITE_PTR, nb_hold); nb_hold = 0; @@ -165,7 +165,7 @@ nfp_flower_ctrl_vnic_nfd3_xmit(struct nfp_app_fw_flower *app_fw_flower, * DPDK just checks the queue is lower than max queues * enabled. But the queue needs to be configured. */ - PMD_TX_LOG(ERR, "ctrl dev TX Bad queue"); + PMD_TX_LOG(ERR, "Ctrl dev TX Bad queue"); goto xmit_end; } @@ -180,7 +180,7 @@ nfp_flower_ctrl_vnic_nfd3_xmit(struct nfp_app_fw_flower *app_fw_flower, free_descs = nfp_net_nfd3_free_tx_desc(txq); if (unlikely(free_descs == 0)) { - PMD_TX_LOG(ERR, "ctrl dev no free descs"); + PMD_TX_LOG(ERR, "Ctrl dev no free descs"); goto xmit_end; } @@ -246,7 +246,7 @@ nfp_flower_ctrl_vnic_nfdk_xmit(struct nfp_app_fw_flower *app_fw_flower, free_descs = nfp_net_nfdk_free_tx_desc(txq); if (unlikely(free_descs < NFDK_TX_DESC_PER_SIMPLE_PKT)) { - PMD_TX_LOG(ERR, "ctrl dev no free descs"); + PMD_TX_LOG(ERR, "Ctrl dev no free descs"); return 0; } @@ -442,7 +442,7 @@ nfp_flower_cmsg_port_mod_rx(struct nfp_net_hw_priv *hw_priv, repr = app_fw_flower->pf_repr; break; default: - PMD_DRV_LOG(ERR, "ctrl msg for unknown port %#x", port); + PMD_DRV_LOG(ERR, "Ctrl msg for unknown port %#x", port); return -EINVAL; } diff --git a/drivers/net/nfp/flower/nfp_flower_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c index e94c7e22e3..b605bced3a 100644 --- a/drivers/net/nfp/flower/nfp_flower_flow.c +++ b/drivers/net/nfp/flower/nfp_flower_flow.c @@ -316,7 +316,7 @@ nfp_mask_table_add(struct nfp_app_fw_flower *app_fw_flower, mask_entry->mask_id = mask_id; mask_entry->hash_key = hash_key; mask_entry->ref_cnt = 1; - PMD_DRV_LOG(DEBUG, "hash_key=%#x id=%u ref=%u", hash_key, + PMD_DRV_LOG(DEBUG, "The hash_key=%#x id=%u ref=%u", hash_key, mask_id, mask_entry->ref_cnt); ret = rte_hash_add_key_data(priv->mask_table, &hash_key, mask_entry); @@ -1831,26 +1831,26 @@ nfp_flow_key_layers_calculate(struct rte_eth_dev *dev, ret = nfp_flow_key_layers_check_items(items, ¶m); if (ret != 0) { - PMD_DRV_LOG(ERR, "flow items check failed"); + PMD_DRV_LOG(ERR, "Flow items check failed"); return ret; } memset(param.flag, 0, sizeof(struct nfp_item_flag)); ret = nfp_flow_key_layers_calculate_items(items, ¶m); if (ret != 0) { - PMD_DRV_LOG(ERR, "flow items calculate failed"); + PMD_DRV_LOG(ERR, "Flow items calculate failed"); return ret; } ret = nfp_flow_key_layers_check_actions(dev, actions); if (ret != 0) { - PMD_DRV_LOG(ERR, "flow actions check failed"); + PMD_DRV_LOG(ERR, "Flow actions check failed"); return ret; } ret = nfp_flow_key_layers_calculate_actions(dev, actions, key_ls); if (ret != 0) { - PMD_DRV_LOG(ERR, "flow actions check failed"); + PMD_DRV_LOG(ERR, "Flow actions check failed"); return ret; } @@ -1893,7 +1893,7 @@ nfp_flow_merge_eth(struct nfp_flow_merge_param *param) item = param->item; spec = item->spec; if (spec == NULL) { - PMD_DRV_LOG(DEBUG, "nfp flow merge eth: no item->spec!"); + PMD_DRV_LOG(DEBUG, "NFP flow merge eth: no item->spec!"); goto eth_end; } @@ -1941,7 +1941,7 @@ nfp_flow_merge_vlan(struct nfp_flow_merge_param *param) item = param->item; spec = item->spec; if (spec == NULL) { - PMD_DRV_LOG(DEBUG, "nfp flow merge vlan: no item->spec!"); + PMD_DRV_LOG(DEBUG, "NFP flow merge vlan: no item->spec!"); return 0; } @@ -1979,7 +1979,7 @@ nfp_flow_merge_ipv4(struct nfp_flow_merge_param *param) if (param->is_outer_layer && nfp_flow_is_tunnel(param->nfp_flow)) { if (spec == NULL) { - PMD_DRV_LOG(DEBUG, "nfp flow merge ipv4: no item->spec!"); + PMD_DRV_LOG(DEBUG, "NFP flow merge ipv4: no item->spec!"); return 0; } @@ -2010,7 +2010,7 @@ nfp_flow_merge_ipv4(struct nfp_flow_merge_param *param) *param->mbuf_off += sizeof(struct nfp_flower_tp_ports); if (spec == NULL) { - PMD_DRV_LOG(DEBUG, "nfp flow merge ipv4: no item->spec!"); + PMD_DRV_LOG(DEBUG, "NFP flow merge ipv4: no item->spec!"); goto ipv4_end; } @@ -2053,7 +2053,7 @@ nfp_flow_merge_ipv6(struct nfp_flow_merge_param *param) if (param->is_outer_layer && nfp_flow_is_tunnel(param->nfp_flow)) { if (spec == NULL) { - PMD_DRV_LOG(DEBUG, "nfp flow merge ipv6: no item->spec!"); + PMD_DRV_LOG(DEBUG, "NFP flow merge ipv6: no item->spec!"); return 0; } @@ -2089,7 +2089,7 @@ nfp_flow_merge_ipv6(struct nfp_flow_merge_param *param) *param->mbuf_off += sizeof(struct nfp_flower_tp_ports); if (spec == NULL) { - PMD_DRV_LOG(DEBUG, "nfp flow merge ipv6: no item->spec!"); + PMD_DRV_LOG(DEBUG, "NFP flow merge ipv6: no item->spec!"); goto ipv6_end; } @@ -2142,14 +2142,14 @@ nfp_flow_merge_tcp(struct nfp_flow_merge_param *param) ports = (struct nfp_flower_tp_ports *) ((char *)ipv6 - sizeof(struct nfp_flower_tp_ports)); } else { - PMD_DRV_LOG(ERR, "nfp flow merge tcp: no L3 layer!"); + PMD_DRV_LOG(ERR, "NFP flow merge tcp: no L3 layer!"); return -EINVAL; } item = param->item; spec = item->spec; if (spec == NULL) { - PMD_DRV_LOG(DEBUG, "nfp flow merge tcp: no item->spec!"); + PMD_DRV_LOG(DEBUG, "NFP flow merge tcp: no item->spec!"); return 0; } @@ -2228,14 +2228,14 @@ nfp_flow_merge_udp(struct nfp_flow_merge_param *param) ports = (struct nfp_flower_tp_ports *) ((char *)ipv6 - sizeof(struct nfp_flower_tp_ports)); } else { - PMD_DRV_LOG(ERR, "nfp flow merge udp: no L3 layer!"); + PMD_DRV_LOG(ERR, "NFP flow merge udp: no L3 layer!"); return -EINVAL; } item = param->item; spec = item->spec; if (spec == NULL) { - PMD_DRV_LOG(DEBUG, "nfp flow merge udp: no item->spec!"); + PMD_DRV_LOG(DEBUG, "NFP flow merge udp: no item->spec!"); return 0; } @@ -2282,14 +2282,14 @@ nfp_flow_merge_sctp(struct nfp_flow_merge_param *param) ports = (struct nfp_flower_tp_ports *) ((char *)ipv6 - sizeof(struct nfp_flower_tp_ports)); } else { - PMD_DRV_LOG(ERR, "nfp flow merge sctp: no L3 layer!"); + PMD_DRV_LOG(ERR, "NFP flow merge sctp: no L3 layer!"); return -EINVAL; } item = param->item; spec = item->spec; if (spec == NULL) { - PMD_DRV_LOG(DEBUG, "nfp flow merge sctp: no item->spec!"); + PMD_DRV_LOG(DEBUG, "NFP flow merge sctp: no item->spec!"); return 0; } @@ -2325,7 +2325,7 @@ nfp_flow_merge_vxlan(struct nfp_flow_merge_param *param) item = param->item; spec = item->spec; if (spec == NULL) { - PMD_DRV_LOG(DEBUG, "nfp flow merge vxlan: no item->spec!"); + PMD_DRV_LOG(DEBUG, "NFP flow merge vxlan: no item->spec!"); goto vxlan_end; } @@ -2375,7 +2375,7 @@ nfp_flow_merge_geneve(struct nfp_flow_merge_param *param) item = param->item; spec = item->spec; if (spec == NULL) { - PMD_DRV_LOG(DEBUG, "nfp flow merge geneve: no item->spec!"); + PMD_DRV_LOG(DEBUG, "NFP flow merge geneve: no item->spec!"); goto geneve_end; } @@ -2457,7 +2457,7 @@ nfp_flow_merge_gre_key(struct nfp_flow_merge_param *param) item = param->item; spec = item->spec; if (spec == NULL) { - PMD_DRV_LOG(DEBUG, "nfp flow merge gre key: no item->spec!"); + PMD_DRV_LOG(DEBUG, "NFP flow merge gre key: no item->spec!"); goto gre_key_end; } @@ -2654,7 +2654,7 @@ nfp_flow_item_check(const struct rte_flow_item *item, /* item->last and item->mask cannot exist without item->spec. */ if (item->spec == NULL) { if (item->mask || item->last) { - PMD_DRV_LOG(ERR, "'mask' or 'last' field provided" + PMD_DRV_LOG(ERR, "The 'mask' or 'last' field provided" " without a corresponding 'spec'."); return -EINVAL; } @@ -2774,13 +2774,13 @@ nfp_flow_compile_item_proc(struct nfp_flower_representor *repr, /* Perform basic sanity checks */ ret = nfp_flow_item_check(item, proc); if (ret != 0) { - PMD_DRV_LOG(ERR, "nfp flow item %d check failed", item->type); + PMD_DRV_LOG(ERR, "NFP flow item %d check failed", item->type); ret = -EINVAL; break; } if (proc->merge == NULL) { - PMD_DRV_LOG(ERR, "nfp flow item %d no proc function", item->type); + PMD_DRV_LOG(ERR, "NFP flow item %d no proc function", item->type); ret = -ENOTSUP; break; } @@ -2798,7 +2798,7 @@ nfp_flow_compile_item_proc(struct nfp_flower_representor *repr, param.is_mask = false; ret = proc->merge(¶m); if (ret != 0) { - PMD_DRV_LOG(ERR, "nfp flow item %d exact merge failed", item->type); + PMD_DRV_LOG(ERR, "NFP flow item %d exact merge failed", item->type); break; } @@ -2807,7 +2807,7 @@ nfp_flow_compile_item_proc(struct nfp_flower_representor *repr, param.is_mask = true; ret = proc->merge(¶m); if (ret != 0) { - PMD_DRV_LOG(ERR, "nfp flow item %d mask merge failed", item->type); + PMD_DRV_LOG(ERR, "NFP flow item %d mask merge failed", item->type); break; } @@ -2855,7 +2855,7 @@ nfp_flow_compile_items(struct nfp_flower_representor *representor, ret = nfp_flow_compile_item_proc(representor, loop_item, nfp_flow, &mbuf_off_exact, &mbuf_off_mask, is_outer_layer); if (ret != 0) { - PMD_DRV_LOG(ERR, "nfp flow item compile failed."); + PMD_DRV_LOG(ERR, "NFP flow item compile failed."); return -EINVAL; } @@ -2864,7 +2864,7 @@ nfp_flow_compile_items(struct nfp_flower_representor *representor, ret = nfp_flow_compile_item_proc(representor, items, nfp_flow, &mbuf_off_exact, &mbuf_off_mask, true); if (ret != 0) { - PMD_DRV_LOG(ERR, "nfp flow outer item compile failed."); + PMD_DRV_LOG(ERR, "NFP flow outer item compile failed."); return -EINVAL; } } @@ -4890,7 +4890,7 @@ nfp_flow_process(struct rte_eth_dev *dev, ret = nfp_stats_id_alloc(representor->app_fw_flower, &stats_ctx); if (ret != 0) { - PMD_DRV_LOG(ERR, "nfp stats id alloc failed."); + PMD_DRV_LOG(ERR, "NFP stats id alloc failed."); return NULL; } @@ -4908,13 +4908,13 @@ nfp_flow_process(struct rte_eth_dev *dev, ret = nfp_flow_compile_items(representor, items, nfp_flow); if (ret != 0) { - PMD_DRV_LOG(ERR, "nfp flow item process failed."); + PMD_DRV_LOG(ERR, "NFP flow item process failed."); goto free_flow; } ret = nfp_flow_compile_action(representor, actions, nfp_flow); if (ret != 0) { - PMD_DRV_LOG(ERR, "nfp flow action process failed."); + PMD_DRV_LOG(ERR, "NFP flow action process failed."); goto free_flow; } @@ -4923,7 +4923,7 @@ nfp_flow_process(struct rte_eth_dev *dev, mask_len = key_layer.key_size; if (!nfp_check_mask_add(representor->app_fw_flower, mask_data, mask_len, &nfp_flow_meta->flags, &new_mask_id)) { - PMD_DRV_LOG(ERR, "nfp mask add check failed."); + PMD_DRV_LOG(ERR, "NFP mask add check failed."); goto free_flow; } @@ -4940,7 +4940,7 @@ nfp_flow_process(struct rte_eth_dev *dev, PMD_DRV_LOG(ERR, "This flow is already exist."); if (!nfp_check_mask_remove(representor->app_fw_flower, mask_data, mask_len, &nfp_flow_meta->flags)) { - PMD_DRV_LOG(ERR, "nfp mask del check failed."); + PMD_DRV_LOG(ERR, "NFP mask del check failed."); } goto free_flow; } @@ -5013,7 +5013,7 @@ nfp_flow_teardown(struct nfp_app_fw_flower *app_fw_flower, nfp_flow_meta->flags &= ~NFP_FL_META_FLAG_MANAGE_MASK; if (!nfp_check_mask_remove(app_fw_flower, mask_data, mask_len, &nfp_flow_meta->flags)) { - PMD_DRV_LOG(ERR, "nfp mask del check failed."); + PMD_DRV_LOG(ERR, "NFP mask del check failed."); return -EINVAL; } @@ -5525,7 +5525,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev) priv = rte_zmalloc("nfp_app_flow_priv", sizeof(struct nfp_flow_priv), 0); if (priv == NULL) { - PMD_INIT_LOG(ERR, "nfp app flow priv creation failed"); + PMD_INIT_LOG(ERR, "NFP app flow priv creation failed"); ret = -ENOMEM; goto exit; } @@ -5543,7 +5543,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev) priv->mask_ids.free_list.buf = rte_zmalloc("nfp_app_mask_ids", NFP_FLOWER_MASK_ENTRY_RS * NFP_FLOWER_MASK_ELEMENT_RS, 0); if (priv->mask_ids.free_list.buf == NULL) { - PMD_INIT_LOG(ERR, "mask id free list creation failed"); + PMD_INIT_LOG(ERR, "Mask id free list creation failed"); ret = -ENOMEM; goto free_priv; } @@ -5553,7 +5553,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev) priv->stats_ids.free_list.buf = rte_zmalloc("nfp_app_stats_ids", priv->stats_ring_size * NFP_FL_STATS_ELEM_RS, 0); if (priv->stats_ids.free_list.buf == NULL) { - PMD_INIT_LOG(ERR, "stats id free list creation failed"); + PMD_INIT_LOG(ERR, "Stats id free list creation failed"); ret = -ENOMEM; goto free_mask_id; } @@ -5563,12 +5563,12 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev) rte_spinlock_init(&priv->stats_lock); stats_size = (ctx_count & NFP_FL_STAT_ID_STAT) | ((ctx_split - 1) & NFP_FL_STAT_ID_MU_NUM); - PMD_INIT_LOG(INFO, "ctx_count:%0lx, ctx_split:%0lx, stats_size:%0lx ", + PMD_INIT_LOG(INFO, "The ctx_count:%0lx, ctx_split:%0lx, stats_size:%0lx ", ctx_count, ctx_split, stats_size); priv->stats = rte_zmalloc("nfp_flow_stats", stats_size * sizeof(struct nfp_fl_stats), 0); if (priv->stats == NULL) { - PMD_INIT_LOG(ERR, "flow stats creation failed"); + PMD_INIT_LOG(ERR, "Flow stats creation failed"); ret = -ENOMEM; goto free_stats_id; } @@ -5577,7 +5577,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev) mask_hash_params.hash_func_init_val = priv->hash_seed; priv->mask_table = rte_hash_create(&mask_hash_params); if (priv->mask_table == NULL) { - PMD_INIT_LOG(ERR, "mask hash table creation failed"); + PMD_INIT_LOG(ERR, "Mask hash table creation failed"); ret = -ENOMEM; goto free_stats; } @@ -5587,7 +5587,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev) flow_hash_params.entries = ctx_count; priv->flow_table = rte_hash_create(&flow_hash_params); if (priv->flow_table == NULL) { - PMD_INIT_LOG(ERR, "flow hash table creation failed"); + PMD_INIT_LOG(ERR, "Flow hash table creation failed"); ret = -ENOMEM; goto free_mask_table; } @@ -5606,7 +5606,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev) ct_zone_hash_params.hash_func_init_val = priv->hash_seed; priv->ct_zone_table = rte_hash_create(&ct_zone_hash_params); if (priv->ct_zone_table == NULL) { - PMD_INIT_LOG(ERR, "ct zone table creation failed"); + PMD_INIT_LOG(ERR, "CT zone table creation failed"); ret = -ENOMEM; goto free_pre_tnl_table; } @@ -5616,7 +5616,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev) ct_map_hash_params.entries = ctx_count; priv->ct_map_table = rte_hash_create(&ct_map_hash_params); if (priv->ct_map_table == NULL) { - PMD_INIT_LOG(ERR, "ct map table creation failed"); + PMD_INIT_LOG(ERR, "CT map table creation failed"); ret = -ENOMEM; goto free_ct_zone_table; } diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index eae6ba39e1..73d148ec95 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -167,7 +167,7 @@ nfp_flower_repr_rx_queue_setup(struct rte_eth_dev *dev, repr->ring[rx_queue_id] = rte_ring_create(ring_name, nb_rx_desc, rte_socket_id(), 0); if (repr->ring[rx_queue_id] == NULL) { - PMD_DRV_LOG(ERR, "rte_ring_create failed for rx queue %u", rx_queue_id); + PMD_DRV_LOG(ERR, "The rte_ring_create failed for rx queue %u", rx_queue_id); rte_free(rxq); return -ENOMEM; } @@ -267,7 +267,7 @@ nfp_flower_repr_rx_burst(void *rx_queue, repr = dev->data->dev_private; if (unlikely(repr->ring == NULL) || unlikely(repr->ring[rxq->qidx] == NULL)) { - PMD_RX_LOG(ERR, "representor %s has no ring configured!", + PMD_RX_LOG(ERR, "Representor %s has no ring configured!", repr->name); return 0; } @@ -944,13 +944,13 @@ nfp_flower_repr_create(struct nfp_app_fw_flower *app_fw_flower, /* Allocate a switch domain for the flower app */ ret = rte_eth_switch_domain_alloc(&app_fw_flower->switch_domain_id); if (ret != 0) - PMD_INIT_LOG(WARNING, "failed to allocate switch domain for device"); + PMD_INIT_LOG(WARNING, "Failed to allocate switch domain for device"); /* Now parse PCI device args passed for representor info */ if (pci_dev->device.devargs != NULL) { ret = rte_eth_devargs_parse(pci_dev->device.devargs->args, ð_da, 1); if (ret < 0) { - PMD_INIT_LOG(ERR, "devarg parse failed"); + PMD_INIT_LOG(ERR, "Devarg parse failed"); return -EINVAL; } } @@ -987,7 +987,7 @@ nfp_flower_repr_create(struct nfp_app_fw_flower *app_fw_flower, ret = nfp_flower_repr_alloc(app_fw_flower, hw_priv); if (ret != 0) { - PMD_INIT_LOG(ERR, "representors allocation failed"); + PMD_INIT_LOG(ERR, "Representors allocation failed"); ret = -EINVAL; goto domain_free; } @@ -996,7 +996,7 @@ nfp_flower_repr_create(struct nfp_app_fw_flower *app_fw_flower, domain_free: if (rte_eth_switch_domain_free(app_fw_flower->switch_domain_id) != 0) - PMD_INIT_LOG(WARNING, "failed to free switch domain for device"); + PMD_INIT_LOG(WARNING, "Failed to free switch domain for device"); return ret; } diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c index 4ff1ae63b0..bfcd357774 100644 --- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c +++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c @@ -249,7 +249,7 @@ nfp_net_nfd3_xmit_pkts_common(void *tx_queue, hw = txq->hw; txds = &txq->txds[txq->wr_p]; - PMD_TX_LOG(DEBUG, "working for queue %hu at pos %d and %hu packets", + PMD_TX_LOG(DEBUG, "Working for queue %hu at pos %d and %hu packets", txq->qidx, txq->wr_p, nb_pkts); if (nfp_net_nfd3_free_tx_desc(txq) < NFD3_TX_DESC_PER_PKT * nb_pkts || @@ -263,7 +263,7 @@ nfp_net_nfd3_xmit_pkts_common(void *tx_queue, pkt = *tx_pkts; issued_descs = 0; - PMD_TX_LOG(DEBUG, "queue: %hu. Sending %hu packets", txq->qidx, nb_pkts); + PMD_TX_LOG(DEBUG, "Queue: %hu. Sending %hu packets", txq->qidx, nb_pkts); /* Sending packets */ for (i = 0; i < nb_pkts && free_descs > 0; i++) { @@ -403,7 +403,7 @@ nfp_net_nfd3_tx_queue_setup(struct rte_eth_dev *dev, tx_free_thresh = (tx_conf->tx_free_thresh != 0) ? tx_conf->tx_free_thresh : DEFAULT_TX_FREE_THRESH; if (tx_free_thresh > nb_desc) { - PMD_DRV_LOG(ERR, "tx_free_thresh must be less than the number of TX " + PMD_DRV_LOG(ERR, "The tx_free_thresh must be less than the number of TX " "descriptors. (tx_free_thresh=%u port=%d queue=%d)", tx_free_thresh, dev->data->port_id, queue_idx); return -EINVAL; diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c index 68fcbe93da..1b789e32dc 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c @@ -236,7 +236,7 @@ nfp_net_nfdk_xmit_pkts_common(void *tx_queue, txq = tx_queue; hw = txq->hw; - PMD_TX_LOG(DEBUG, "working for queue %hu at pos %d and %hu packets", + PMD_TX_LOG(DEBUG, "Working for queue %hu at pos %d and %hu packets", txq->qidx, txq->wr_p, nb_pkts); if (nfp_net_nfdk_free_tx_desc(txq) < NFDK_TX_DESC_PER_SIMPLE_PKT * nb_pkts || @@ -247,7 +247,7 @@ nfp_net_nfdk_xmit_pkts_common(void *tx_queue, if (unlikely(free_descs == 0)) return 0; - PMD_TX_LOG(DEBUG, "queue: %hu. Sending %hu packets", txq->qidx, nb_pkts); + PMD_TX_LOG(DEBUG, "Queue: %hu. Sending %hu packets", txq->qidx, nb_pkts); /* Sending packets */ while (npkts < nb_pkts && free_descs > 0) { @@ -439,7 +439,7 @@ nfp_net_nfdk_tx_queue_setup(struct rte_eth_dev *dev, if (tx_free_thresh == 0) tx_free_thresh = DEFAULT_TX_FREE_THRESH; if (tx_free_thresh > nb_desc) { - PMD_DRV_LOG(ERR, "tx_free_thresh must be less than the number of TX " + PMD_DRV_LOG(ERR, "The tx_free_thresh must be less than the number of TX " "descriptors. (tx_free_thresh=%u port=%d queue=%d)", tx_free_thresh, dev->data->port_id, queue_idx); return -EINVAL; diff --git a/drivers/net/nfp/nfp_cpp_bridge.c b/drivers/net/nfp/nfp_cpp_bridge.c index fc73fa20ab..1cd17d0983 100644 --- a/drivers/net/nfp/nfp_cpp_bridge.c +++ b/drivers/net/nfp/nfp_cpp_bridge.c @@ -107,14 +107,14 @@ nfp_cpp_bridge_serve_write(int sockfd, area = nfp_cpp_area_alloc_with_name(cpp, cpp_id, "nfp.cdev", nfp_offset, curlen); if (area == NULL) { - PMD_CPP_LOG(ERR, "area alloc fail"); + PMD_CPP_LOG(ERR, "Area alloc fail"); return -EIO; } /* Mapping the target */ err = nfp_cpp_area_acquire(area); if (err < 0) { - PMD_CPP_LOG(ERR, "area acquire failed"); + PMD_CPP_LOG(ERR, "Area acquire failed"); nfp_cpp_area_free(area); return -EIO; } @@ -128,7 +128,7 @@ nfp_cpp_bridge_serve_write(int sockfd, len, count); err = recv(sockfd, tmpbuf, len, MSG_WAITALL); if (err != (int)len) { - PMD_CPP_LOG(ERR, "error when receiving, %d of %zu", + PMD_CPP_LOG(ERR, "Error when receiving, %d of %zu", err, count); nfp_cpp_area_release(area); nfp_cpp_area_free(area); @@ -137,7 +137,7 @@ nfp_cpp_bridge_serve_write(int sockfd, err = nfp_cpp_area_write(area, pos, tmpbuf, len); if (err < 0) { - PMD_CPP_LOG(ERR, "nfp_cpp_area_write error"); + PMD_CPP_LOG(ERR, "The nfp_cpp_area_write error"); nfp_cpp_area_release(area); nfp_cpp_area_free(area); return -EIO; @@ -212,13 +212,13 @@ nfp_cpp_bridge_serve_read(int sockfd, area = nfp_cpp_area_alloc_with_name(cpp, cpp_id, "nfp.cdev", nfp_offset, curlen); if (area == NULL) { - PMD_CPP_LOG(ERR, "area alloc failed"); + PMD_CPP_LOG(ERR, "Area alloc failed"); return -EIO; } err = nfp_cpp_area_acquire(area); if (err < 0) { - PMD_CPP_LOG(ERR, "area acquire failed"); + PMD_CPP_LOG(ERR, "Area acquire failed"); nfp_cpp_area_free(area); return -EIO; } @@ -230,7 +230,7 @@ nfp_cpp_bridge_serve_read(int sockfd, err = nfp_cpp_area_read(area, pos, tmpbuf, len); if (err < 0) { - PMD_CPP_LOG(ERR, "nfp_cpp_area_read error"); + PMD_CPP_LOG(ERR, "The nfp_cpp_area_read error"); nfp_cpp_area_release(area); nfp_cpp_area_free(area); return -EIO; @@ -240,7 +240,7 @@ nfp_cpp_bridge_serve_read(int sockfd, err = send(sockfd, tmpbuf, len, 0); if (err != (int)len) { - PMD_CPP_LOG(ERR, "error when sending: %d of %zu", + PMD_CPP_LOG(ERR, "Error when sending: %d of %zu", err, count); nfp_cpp_area_release(area); nfp_cpp_area_free(area); @@ -278,19 +278,19 @@ nfp_cpp_bridge_serve_ioctl(int sockfd, /* Reading now the IOCTL command */ err = recv(sockfd, &cmd, 4, 0); if (err != 4) { - PMD_CPP_LOG(ERR, "read error from socket"); + PMD_CPP_LOG(ERR, "Read error from socket"); return -EIO; } /* Only supporting NFP_IOCTL_CPP_IDENTIFICATION */ if (cmd != NFP_IOCTL_CPP_IDENTIFICATION) { - PMD_CPP_LOG(ERR, "unknown cmd %d", cmd); + PMD_CPP_LOG(ERR, "Unknown cmd %d", cmd); return -EINVAL; } err = recv(sockfd, &ident_size, 4, 0); if (err != 4) { - PMD_CPP_LOG(ERR, "read error from socket"); + PMD_CPP_LOG(ERR, "Read error from socket"); return -EIO; } @@ -300,7 +300,7 @@ nfp_cpp_bridge_serve_ioctl(int sockfd, err = send(sockfd, &tmp, 4, 0); if (err != 4) { - PMD_CPP_LOG(ERR, "error writing to socket"); + PMD_CPP_LOG(ERR, "Error writing to socket"); return -EIO; } @@ -310,7 +310,7 @@ nfp_cpp_bridge_serve_ioctl(int sockfd, err = send(sockfd, &tmp, 4, 0); if (err != 4) { - PMD_CPP_LOG(ERR, "error writing to socket"); + PMD_CPP_LOG(ERR, "Error writing to socket"); return -EIO; } @@ -347,7 +347,7 @@ nfp_cpp_bridge_service_func(void *args) unlink(socket_handle); sockfd = socket(AF_UNIX, SOCK_STREAM, 0); if (sockfd < 0) { - PMD_CPP_LOG(ERR, "socket creation error. Service failed"); + PMD_CPP_LOG(ERR, "Socket creation error. Service failed"); return -EIO; } @@ -361,14 +361,14 @@ nfp_cpp_bridge_service_func(void *args) ret = bind(sockfd, (const struct sockaddr *)&address, sizeof(struct sockaddr)); if (ret < 0) { - PMD_CPP_LOG(ERR, "bind error (%d). Service failed", errno); + PMD_CPP_LOG(ERR, "Bind error (%d). Service failed", errno); close(sockfd); return ret; } ret = listen(sockfd, 20); if (ret < 0) { - PMD_CPP_LOG(ERR, "listen error(%d). Service failed", errno); + PMD_CPP_LOG(ERR, "Listen error(%d). Service failed", errno); close(sockfd); return ret; } @@ -380,8 +380,8 @@ nfp_cpp_bridge_service_func(void *args) if (errno == EAGAIN || errno == EWOULDBLOCK) continue; - PMD_CPP_LOG(ERR, "accept call error (%d)", errno); - PMD_CPP_LOG(ERR, "service failed"); + PMD_CPP_LOG(ERR, "Accept call error (%d)", errno); + PMD_CPP_LOG(ERR, "Service failed"); close(sockfd); return -EIO; } diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index b16fbe7db7..1f9b191c7c 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -1042,7 +1042,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev, net_hw->mac_stats = pf_dev->mac_stats_bar + (net_hw->nfp_idx * NFP_MAC_STATS_SIZE); - PMD_INIT_LOG(DEBUG, "ctrl bar: %p", hw->ctrl_bar); + PMD_INIT_LOG(DEBUG, "Ctrl bar: %p", hw->ctrl_bar); PMD_INIT_LOG(DEBUG, "MAC stats: %p", net_hw->mac_stats); err = nfp_net_common_init(pf_dev, net_hw); @@ -1066,7 +1066,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev, net_hw->eth_xstats_base = rte_malloc("rte_eth_xstat", sizeof(struct rte_eth_xstat) * nfp_net_xstats_size(eth_dev), 0); if (net_hw->eth_xstats_base == NULL) { - PMD_INIT_LOG(ERR, "no memory for xstats base values on device %s!", + PMD_INIT_LOG(ERR, "No memory for xstats base values on device %s!", pci_dev->device.name); err = -ENOMEM; goto ipsec_exit; @@ -1079,7 +1079,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev, net_hw->tx_bar = pf_dev->qc_bar + tx_base * NFP_QCP_QUEUE_ADDR_SZ; net_hw->rx_bar = pf_dev->qc_bar + rx_base * NFP_QCP_QUEUE_ADDR_SZ; - PMD_INIT_LOG(DEBUG, "ctrl_bar: %p, tx_bar: %p, rx_bar: %p", + PMD_INIT_LOG(DEBUG, "The ctrl_bar: %p, tx_bar: %p, rx_bar: %p", hw->ctrl_bar, net_hw->tx_bar, net_hw->rx_bar); nfp_net_cfg_queue_setup(net_hw); @@ -1134,7 +1134,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev, eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS; - PMD_INIT_LOG(INFO, "port %d VendorID=%#x DeviceID=%#x " + PMD_INIT_LOG(INFO, "Port %d VendorID=%#x DeviceID=%#x " "mac=" RTE_ETHER_ADDR_PRT_FMT, eth_dev->data->port_id, pci_dev->id.vendor_id, pci_dev->id.device_id, @@ -1240,7 +1240,7 @@ nfp_fw_get_name(struct nfp_pf_dev *pf_dev, if (nfp_fw_model == NULL) { nfp_fw_model = nfp_hwinfo_lookup(pf_dev->hwinfo, "assembly.partno"); if (nfp_fw_model == NULL) { - PMD_DRV_LOG(ERR, "firmware model NOT found"); + PMD_DRV_LOG(ERR, "Firmware model NOT found"); return -EIO; } } @@ -1274,7 +1274,7 @@ nfp_fw_upload(struct nfp_nsp *nsp, err = rte_firmware_read(fw_name, &fw_buf, &fsize); if (err != 0) { - PMD_DRV_LOG(ERR, "firmware %s not found!", fw_name); + PMD_DRV_LOG(ERR, "Firmware %s not found!", fw_name); return -ENOENT; } @@ -1896,12 +1896,12 @@ nfp_init_app_fw_nic(struct nfp_net_hw_priv *hw_priv) pf_dev->total_phyports * pf_dev->ctrl_bar_size, &pf_dev->ctrl_area); if (pf_dev->ctrl_bar == NULL) { - PMD_INIT_LOG(ERR, "nfp_rtsym_map fails for %s", bar_name); + PMD_INIT_LOG(ERR, "The nfp_rtsym_map fails for %s", bar_name); ret = -EIO; goto app_cleanup; } - PMD_INIT_LOG(DEBUG, "ctrl bar: %p", pf_dev->ctrl_bar); + PMD_INIT_LOG(DEBUG, "Ctrl bar: %p", pf_dev->ctrl_bar); /* Loop through all physical ports on PF */ for (i = 0; i < pf_dev->total_phyports; i++) { @@ -2496,18 +2496,18 @@ nfp_pf_init(struct rte_pci_device *pci_dev) pf_dev->qc_bar = nfp_cpp_map_area(pf_dev->cpp, cpp_id, addr, dev_info->qc_area_sz, &pf_dev->qc_area); if (pf_dev->qc_bar == NULL) { - PMD_INIT_LOG(ERR, "nfp_rtsym_map fails for net.qc"); + PMD_INIT_LOG(ERR, "The nfp_rtsym_map fails for net.qc"); ret = -EIO; goto sym_tbl_cleanup; } - PMD_INIT_LOG(DEBUG, "qc_bar address: %p", pf_dev->qc_bar); + PMD_INIT_LOG(DEBUG, "The qc_bar address: %p", pf_dev->qc_bar); pf_dev->mac_stats_bar = nfp_rtsym_map(sym_tbl, "_mac_stats", NFP_MAC_STATS_SIZE * nfp_eth_table->max_index, &pf_dev->mac_stats_area); if (pf_dev->mac_stats_bar == NULL) { - PMD_INIT_LOG(ERR, "nfp_rtsym_map fails for _mac_stats"); + PMD_INIT_LOG(ERR, "The nfp_rtsym_map fails for _mac_stats"); goto hwqueues_cleanup; } diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index 0aadca9010..b5fa05fc10 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -277,7 +277,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) hw->ctrl_bar = pci_dev->mem_resource[0].addr; if (hw->ctrl_bar == NULL) { - PMD_DRV_LOG(ERR, "hw->super.ctrl_bar is NULL. BAR0 not configured"); + PMD_DRV_LOG(ERR, "The hw->super.ctrl_bar is NULL. BAR0 not configured"); return -ENODEV; } @@ -298,7 +298,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) /* Set the ctrl bar size */ nfp_net_ctrl_bar_size_set(pf_dev); - PMD_INIT_LOG(DEBUG, "ctrl bar: %p", hw->ctrl_bar); + PMD_INIT_LOG(DEBUG, "Ctrl bar: %p", hw->ctrl_bar); err = nfp_net_common_init(pf_dev, net_hw); if (err != 0) @@ -340,7 +340,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) net_hw->tx_bar = (uint8_t *)pci_dev->mem_resource[2].addr + tx_bar_off; net_hw->rx_bar = (uint8_t *)pci_dev->mem_resource[2].addr + rx_bar_off; - PMD_INIT_LOG(DEBUG, "ctrl_bar: %p, tx_bar: %p, rx_bar: %p", + PMD_INIT_LOG(DEBUG, "The ctrl_bar: %p, tx_bar: %p, rx_bar: %p", hw->ctrl_bar, net_hw->tx_bar, net_hw->rx_bar); nfp_net_cfg_queue_setup(net_hw); @@ -379,7 +379,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS; - PMD_INIT_LOG(INFO, "port %hu VendorID=%#x DeviceID=%#x " + PMD_INIT_LOG(INFO, "Port %hu VendorID=%#x DeviceID=%#x " "mac=" RTE_ETHER_ADDR_PRT_FMT, port, pci_dev->id.vendor_id, pci_dev->id.device_id, diff --git a/drivers/net/nfp/nfp_mtr.c b/drivers/net/nfp/nfp_mtr.c index 6abc6dc9bc..2370349534 100644 --- a/drivers/net/nfp/nfp_mtr.c +++ b/drivers/net/nfp/nfp_mtr.c @@ -1097,7 +1097,7 @@ nfp_mtr_priv_init(struct nfp_pf_dev *pf_dev) priv = rte_zmalloc("nfp_app_mtr_priv", sizeof(struct nfp_mtr_priv), 0); if (priv == NULL) { - PMD_INIT_LOG(ERR, "nfp app mtr priv creation failed"); + PMD_INIT_LOG(ERR, "NFP app mtr priv creation failed"); return -ENOMEM; } @@ -1107,7 +1107,7 @@ nfp_mtr_priv_init(struct nfp_pf_dev *pf_dev) ret = rte_eal_alarm_set(NFP_METER_STATS_INTERVAL, nfp_mtr_stats_request, (void *)app_fw_flower); if (ret < 0) { - PMD_INIT_LOG(ERR, "nfp mtr timer init failed."); + PMD_INIT_LOG(ERR, "NFP mtr timer init failed."); rte_free(priv); return ret; } diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index 70531bc337..9f06536dfc 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -432,7 +432,7 @@ nfp_net_log_device_information(const struct nfp_net_hw *hw, cap_ext & NFP_NET_CFG_CTRL_FLOW_STEER ? "FLOW_STEER " : "", cap_ext & NFP_NET_CFG_CTRL_IN_ORDER ? "VIRTIO_IN_ORDER " : ""); - PMD_INIT_LOG(INFO, "max_rx_queues: %u, max_tx_queues: %u", + PMD_INIT_LOG(INFO, "The max_rx_queues: %u, max_tx_queues: %u", hw->max_rx_queues, hw->max_tx_queues); } @@ -1065,7 +1065,7 @@ nfp_net_xstats_info(const struct rte_eth_dev *dev, uint32_t index) { if (index >= nfp_net_xstats_size(dev)) { - PMD_DRV_LOG(ERR, "xstat index out of bounds"); + PMD_DRV_LOG(ERR, "The xstat index out of bounds"); return NULL; } @@ -1690,7 +1690,7 @@ nfp_net_dev_mtu_set(struct rte_eth_dev *dev, /* MTU setting is forbidden if port is started */ if (dev->data->dev_started) { - PMD_DRV_LOG(ERR, "port %d must be stopped before configuration", + PMD_DRV_LOG(ERR, "Port %d must be stopped before configuration", dev->data->port_id); return -EBUSY; } diff --git a/drivers/net/nfp/nfp_net_flow.c b/drivers/net/nfp/nfp_net_flow.c index e9f0ce3710..430eca1c7a 100644 --- a/drivers/net/nfp/nfp_net_flow.c +++ b/drivers/net/nfp/nfp_net_flow.c @@ -462,7 +462,7 @@ nfp_net_flow_item_check(const struct rte_flow_item *item, /* item->last and item->mask cannot exist without item->spec. */ if (item->spec == NULL) { if (item->mask || item->last) { - PMD_DRV_LOG(ERR, "'mask' or 'last' field provided" + PMD_DRV_LOG(ERR, "The 'mask' or 'last' field provided" " without a corresponding 'spec'."); return -EINVAL; } @@ -1122,7 +1122,7 @@ nfp_net_flow_priv_init(struct nfp_pf_dev *pf_dev, flow_hash_params.entries = priv->flow_limit * NFP_NET_HASH_REDUNDANCE; priv->flow_table = rte_hash_create(&flow_hash_params); if (priv->flow_table == NULL) { - PMD_INIT_LOG(ERR, "flow hash table creation failed"); + PMD_INIT_LOG(ERR, "Flow hash table creation failed"); ret = -ENOMEM; goto free_flow_position; } diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index 740cc6eac7..d38f51b777 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -435,7 +435,7 @@ nfp_net_recv_pkts(void *rx_queue, while (avail + avail_multiplexed < nb_pkts) { rxb = &rxq->rxbufs[rxq->rd_p]; if (unlikely(rxb == NULL)) { - PMD_RX_LOG(ERR, "rxb does not exist!"); + PMD_RX_LOG(ERR, "The rxb does not exist!"); break; } @@ -482,7 +482,7 @@ nfp_net_recv_pkts(void *rx_queue, * responsibility of avoiding it. But we have * to give some info about the error. */ - PMD_RX_LOG(ERR, "mbuf overflow likely due to the RX offset."); + PMD_RX_LOG(ERR, "The mbuf overflow likely due to the RX offset."); rte_pktmbuf_free(mb); break; } @@ -543,7 +543,7 @@ nfp_net_recv_pkts(void *rx_queue, */ rte_wmb(); if (nb_hold > rxq->rx_free_thresh) { - PMD_RX_LOG(DEBUG, "port=%hu queue=%hu nb_hold=%hu avail=%hu", + PMD_RX_LOG(DEBUG, "The port=%hu queue=%hu nb_hold=%hu avail=%hu", rxq->port_id, rxq->qidx, nb_hold, avail); nfp_qcp_ptr_add(rxq->qcp_fl, NFP_QCP_WRITE_PTR, nb_hold); nb_hold = 0; @@ -748,14 +748,14 @@ nfp_net_tx_free_bufs(struct nfp_net_txq *txq) uint32_t todo; uint32_t qcp_rd_p; - PMD_TX_LOG(DEBUG, "queue %hu. Check for descriptor with a complete" + PMD_TX_LOG(DEBUG, "Queue %hu. Check for descriptor with a complete" " status", txq->qidx); /* Work out how many packets have been sent */ qcp_rd_p = nfp_net_read_tx_free_qcp(txq); if (qcp_rd_p == txq->rd_p) { - PMD_TX_LOG(DEBUG, "queue %hu: It seems harrier is not sending " + PMD_TX_LOG(DEBUG, "Queue %hu: It seems harrier is not sending " "packets (%u, %u)", txq->qidx, qcp_rd_p, txq->rd_p); return 0; @@ -766,7 +766,7 @@ nfp_net_tx_free_bufs(struct nfp_net_txq *txq) else todo = qcp_rd_p + txq->tx_count - txq->rd_p; - PMD_TX_LOG(DEBUG, "qcp_rd_p %u, txq->rd_p: %u, qcp->rd_p: %u", + PMD_TX_LOG(DEBUG, "The qcp_rd_p %u, txq->rd_p: %u, qcp->rd_p: %u", qcp_rd_p, txq->rd_p, txq->rd_p); if (todo == 0) diff --git a/drivers/net/nfp/nfp_rxtx_vec_avx2.c b/drivers/net/nfp/nfp_rxtx_vec_avx2.c index 2a033133a1..e6f6f58221 100644 --- a/drivers/net/nfp/nfp_rxtx_vec_avx2.c +++ b/drivers/net/nfp/nfp_rxtx_vec_avx2.c @@ -273,7 +273,7 @@ nfp_net_vec_avx2_recv_pkts(void *rx_queue, */ rte_wmb(); if (nb_hold > rxq->rx_free_thresh) { - PMD_RX_LOG(DEBUG, "port=%hu queue=%hu nb_hold=%hu avail=%hu", + PMD_RX_LOG(DEBUG, "The port=%hu queue=%hu nb_hold=%hu avail=%hu", rxq->port_id, rxq->qidx, nb_hold, avail); nfp_qcp_ptr_add(rxq->qcp_fl, NFP_QCP_WRITE_PTR, nb_hold); nb_hold = 0; diff --git a/drivers/net/nfp/nfpcore/nfp6000_pcie.c b/drivers/net/nfp/nfpcore/nfp6000_pcie.c index 2c989ee70c..11cb45dd7d 100644 --- a/drivers/net/nfp/nfpcore/nfp6000_pcie.c +++ b/drivers/net/nfp/nfpcore/nfp6000_pcie.c @@ -704,7 +704,7 @@ nfp6000_area_read(struct nfp_cpp_area *area, /* Unaligned? Translate to an explicit access */ if (((priv->offset + offset) & (width - 1)) != 0) { - PMD_DRV_LOG(ERR, "aread_read unaligned!!!"); + PMD_DRV_LOG(ERR, "The aread_read unaligned!!!"); return -EINVAL; } @@ -868,7 +868,7 @@ nfp6000_get_dsn(struct rte_pci_device *pci_dev, len = sizeof(tmp); if (rte_pci_read_config(pci_dev, &tmp, len, pos) < 0) { - PMD_DRV_LOG(ERR, "nfp get device serial number failed"); + PMD_DRV_LOG(ERR, "NFP get device serial number failed"); return -ENOENT; } diff --git a/drivers/net/nfp/nfpcore/nfp_elf.c b/drivers/net/nfp/nfpcore/nfp_elf.c index cfa59ed16d..766e0827f7 100644 --- a/drivers/net/nfp/nfpcore/nfp_elf.c +++ b/drivers/net/nfp/nfpcore/nfp_elf.c @@ -1066,7 +1066,7 @@ nfp_elf_get_fw_version(uint32_t *fw_version, struct nfp_elf *elf; if (rte_firmware_read(fw_name, &fw_buf, &fsize) != 0) { - PMD_DRV_LOG(ERR, "firmware %s not found!", fw_name); + PMD_DRV_LOG(ERR, "Firmware %s not found!", fw_name); return -ENOENT; } diff --git a/drivers/net/nfp/nfpcore/nfp_nsp.c b/drivers/net/nfp/nfpcore/nfp_nsp.c index 32f092eda1..f9480b24c1 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp.c +++ b/drivers/net/nfp/nfpcore/nfp_nsp.c @@ -188,7 +188,7 @@ nfp_nsp_print_extended_error(uint32_t ret_val) for (i = 0; i < RTE_DIM(nsp_errors); i++) if (ret_val == nsp_errors[i].code) - PMD_DRV_LOG(ERR, "err msg: %s", nsp_errors[i].msg); + PMD_DRV_LOG(ERR, "Err msg: %s", nsp_errors[i].msg); } static int diff --git a/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c b/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c index 46fa5467de..e03d0db299 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c +++ b/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c @@ -36,7 +36,7 @@ nfp_nsp_identify(struct nfp_nsp *nsp) memset(ni, 0, sizeof(*ni)); ret = nfp_nsp_read_identify(nsp, ni, sizeof(*ni)); if (ret < 0) { - PMD_DRV_LOG(ERR, "reading bsp version failed %d", ret); + PMD_DRV_LOG(ERR, "Reading BSP version failed %d", ret); goto exit_free; } diff --git a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c index d1b43a75f0..22c9ee98a4 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c +++ b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c @@ -536,7 +536,7 @@ nfp_eth_set_bit_config(struct nfp_nsp *nsp, * codes were initially not populated correctly. */ if (nfp_nsp_get_abi_ver_minor(nsp) < 17) { - PMD_DRV_LOG(ERR, "set operations not supported, please update flash"); + PMD_DRV_LOG(ERR, "Set operations not supported, please update flash"); return -EOPNOTSUPP; } diff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.c b/drivers/net/nfp/nfpcore/nfp_rtsym.c index 7d9cfb0d42..fecf3d7b68 100644 --- a/drivers/net/nfp/nfpcore/nfp_rtsym.c +++ b/drivers/net/nfp/nfpcore/nfp_rtsym.c @@ -296,7 +296,7 @@ nfp_rtsym_to_dest(struct nfp_cpp *cpp, uint64_t *addr) { if (sym->type != NFP_RTSYM_TYPE_OBJECT) { - PMD_DRV_LOG(ERR, "rtsym '%s': direct access to non-object rtsym", + PMD_DRV_LOG(ERR, "RTSYM '%s': direct access to non-object rtsym", sym->name); return -EINVAL; } @@ -314,7 +314,7 @@ nfp_rtsym_to_dest(struct nfp_cpp *cpp, *cpp_id = NFP_CPP_ISLAND_ID(NFP_CPP_TARGET_MU, action, token, sym->domain); } else { - PMD_DRV_LOG(ERR, "rtsym '%s': unhandled target encoding: %d", + PMD_DRV_LOG(ERR, "RTSYM '%s': unhandled target encoding: %d", sym->name, sym->target); return -EINVAL; } @@ -338,7 +338,7 @@ nfp_rtsym_read_real(struct nfp_cpp *cpp, uint64_t sym_size = nfp_rtsym_size(sym); if (offset >= sym_size) { - PMD_DRV_LOG(ERR, "rtsym '%s' read out of bounds", sym->name); + PMD_DRV_LOG(ERR, "RTSYM '%s' read out of bounds", sym->name); return -ENXIO; } @@ -387,7 +387,7 @@ nfp_rtsym_readl_real(struct nfp_cpp *cpp, uint32_t cpp_id; if (offset + 4 > nfp_rtsym_size(sym)) { - PMD_DRV_LOG(ERR, "rtsym '%s': readl out of bounds", sym->name); + PMD_DRV_LOG(ERR, "RTSYM '%s': readl out of bounds", sym->name); return -ENXIO; } @@ -420,7 +420,7 @@ nfp_rtsym_readq_real(struct nfp_cpp *cpp, uint32_t cpp_id; if (offset + 8 > nfp_rtsym_size(sym)) { - PMD_DRV_LOG(ERR, "rtsym '%s': readq out of bounds", sym->name); + PMD_DRV_LOG(ERR, "RTSYM '%s': readq out of bounds", sym->name); return -ENXIO; } @@ -461,7 +461,7 @@ nfp_rtsym_write_real(struct nfp_cpp *cpp, uint64_t sym_size = nfp_rtsym_size(sym); if (offset > sym_size) { - PMD_DRV_LOG(ERR, "rtsym '%s' write out of bounds", sym->name); + PMD_DRV_LOG(ERR, "RTSYM '%s' write out of bounds", sym->name); return -ENXIO; } @@ -498,7 +498,7 @@ nfp_rtsym_writel_real(struct nfp_cpp *cpp, uint32_t cpp_id; if (offset + 4 > nfp_rtsym_size(sym)) { - PMD_DRV_LOG(ERR, "rtsym '%s' write out of bounds", sym->name); + PMD_DRV_LOG(ERR, "RTSYM '%s' write out of bounds", sym->name); return -ENXIO; } @@ -531,7 +531,7 @@ nfp_rtsym_writeq_real(struct nfp_cpp *cpp, uint32_t cpp_id; if (offset + 8 > nfp_rtsym_size(sym)) { - PMD_DRV_LOG(ERR, "rtsym '%s' write out of bounds", sym->name); + PMD_DRV_LOG(ERR, "RTSYM '%s' write out of bounds", sym->name); return -ENXIO; } @@ -593,7 +593,7 @@ nfp_rtsym_read_le(struct nfp_rtsym_table *rtbl, err = nfp_rtsym_readq(rtbl->cpp, sym, 0, &val); break; default: - PMD_DRV_LOG(ERR, "rtsym '%s' unsupported size: %#lx", + PMD_DRV_LOG(ERR, "RTSYM '%s' unsupported size: %#lx", name, sym->size); err = -EINVAL; break; @@ -648,7 +648,7 @@ nfp_rtsym_write_le(struct nfp_rtsym_table *rtbl, err = nfp_rtsym_writeq(rtbl->cpp, sym, 0, value); break; default: - PMD_DRV_LOG(ERR, "rtsym '%s' unsupported size: %#lx", + PMD_DRV_LOG(ERR, "RTSYM '%s' unsupported size: %#lx", name, sym_size); err = -EINVAL; break; @@ -679,7 +679,7 @@ nfp_rtsym_map_offset(struct nfp_rtsym_table *rtbl, ret = nfp_rtsym_to_dest(rtbl->cpp, sym, NFP_CPP_ACTION_RW, 0, 0, &cpp_id, &addr); if (ret != 0) { - PMD_DRV_LOG(ERR, "rtsym '%s': mapping failed", name); + PMD_DRV_LOG(ERR, "RTSYM '%s': mapping failed", name); return NULL; } diff --git a/drivers/vdpa/nfp/nfp_vdpa.c b/drivers/vdpa/nfp/nfp_vdpa.c index a32ed2b193..4fb6e93d1f 100644 --- a/drivers/vdpa/nfp/nfp_vdpa.c +++ b/drivers/vdpa/nfp/nfp_vdpa.c @@ -134,7 +134,7 @@ nfp_vdpa_vfio_setup(struct nfp_vdpa_dev *device) if (device->vfio_group_fd < 0) goto container_destroy; - DRV_VDPA_LOG(DEBUG, "container_fd=%d, group_fd=%d,", + DRV_VDPA_LOG(DEBUG, "The container_fd=%d, group_fd=%d,", device->vfio_container_fd, device->vfio_group_fd); ret = rte_pci_map_device(pci_dev); @@ -225,7 +225,7 @@ nfp_vdpa_dma_map(struct nfp_vdpa_dev *device, } vfio_container_fd = device->vfio_container_fd; - DRV_VDPA_LOG(DEBUG, "vfio_container_fd %d", vfio_container_fd); + DRV_VDPA_LOG(DEBUG, "The vfio_container_fd %d", vfio_container_fd); if (do_map) ret = nfp_vdpa_dma_do_map(mem, mem->nregions, vfio_container_fd); @@ -659,7 +659,7 @@ nfp_vdpa_notify_relay(void *arg) epoll_fd = epoll_create(NFP_VDPA_MAX_QUEUES * 2); if (epoll_fd < 0) { - DRV_VDPA_LOG(ERR, "failed to create epoll instance."); + DRV_VDPA_LOG(ERR, "Failed to create epoll instance."); return 1; } diff --git a/drivers/vdpa/nfp/nfp_vdpa_core.c b/drivers/vdpa/nfp/nfp_vdpa_core.c index 70aeb4a3ac..bb5375bb5f 100644 --- a/drivers/vdpa/nfp/nfp_vdpa_core.c +++ b/drivers/vdpa/nfp/nfp_vdpa_core.c @@ -64,7 +64,7 @@ nfp_vdpa_hw_init(struct nfp_vdpa_hw *vdpa_hw, hw = &vdpa_hw->super; hw->ctrl_bar = pci_dev->mem_resource[0].addr; if (hw->ctrl_bar == NULL) { - DRV_CORE_LOG(ERR, "hw->ctrl_bar is NULL. BAR0 not configured."); + DRV_CORE_LOG(ERR, "The hw->ctrl_bar is NULL. BAR0 not configured."); return -ENODEV; } @@ -80,7 +80,7 @@ nfp_vdpa_hw_init(struct nfp_vdpa_hw *vdpa_hw, notify_base += NFP_VDPA_NOTIFY_ADDR_INTERVAL; vdpa_hw->notify_region = queue; - DRV_CORE_LOG(DEBUG, "notify_addr[%d] at %p, notify_addr[%d] at %p", + DRV_CORE_LOG(DEBUG, "The notify_addr[%d] at %p, notify_addr[%d] at %p", idx, vdpa_hw->notify_addr[idx], idx + 1, vdpa_hw->notify_addr[idx + 1]); } -- 2.39.1