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 CD2E445B5A; Thu, 17 Oct 2024 08:16:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BA5C64060F; Thu, 17 Oct 2024 08:16:26 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2124.outbound.protection.outlook.com [40.107.220.124]) by mails.dpdk.org (Postfix) with ESMTP id 79F184067E for ; Thu, 17 Oct 2024 08:16:24 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TGoE2vmwMD1O5eZXOaNVRoPqxzXszu7DmL/rEw6ATCXQ2qrwmTPVR5IoJ+k0Ap8GqvMIk7cSO8til77+VqWJdSmsDXpXKek1Rr2XMdX0x7luwnNRwgSIMx5bGZQn8wDSu5mcKqSzJu5/AzL7jGI7Jj2cwWqi5Hb0kUEEcBX8Tnsqg8gzhQbUB52rAu04phI3Dvta1cRTx+TenbyRYj6FOD1MjD+NewBfcRNvLmrnO5Zu6/DTqzNmicHy2JCxuIr8hUmj4AEVK4g71RPkqviQwKAf78G8MJuTpsVOkg9raSSXcWskOPSp/m5PpeXB/V2y1pfi5I/OgSsjyDeKPh2DzQ== 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=Is0ukOzcBUaKEtPEOg5fYX80bvIhM0r4aAtseqYgW28=; b=JL6daifyU9/Wz3q0Gpm8/2GZBJnK0z7dOnwmapFr06+2+L2i3vVxcmV9MqXyNV80b9eQ2Uf065uW/rEPNJn/5IZGhrtMywoQ33S7xpnF1Wh7yleSsj3bE4DDLGBWw1TPVPPS+Etad0SzbNRxZjRdFLpqiyzR4r226d0sVoOmutq7DJI3DTrjN5cDPu6Zs6TLwZu/wsD3aoeiwcUpktRpwIvpWCuqtSR33cqdrXlO8a2vJIXTB20o6OGNPhkGRSNTo+sVXTppxGseIzW3SXcnKfKbv5r/X7eIfHgd6wLR5ycX3CymEiWnkADxOKndGthHGjxMiSse18vQVk1LOCNL7w== 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=Is0ukOzcBUaKEtPEOg5fYX80bvIhM0r4aAtseqYgW28=; b=jSJs3ajTzO9QJlrVrNl3IBapzY3e5OOUo6VgqSM5sRCpi09xtRE4E77trDcbKQPL1VpFpGBtrWZp5AXvKJ1NqPm/mlLPhNkWJhCpgm4wsadgpKqczJ+L+zBanjLnvY4tbhD//WRUimyT9sYSi4ayitCEbO65C8BfxtdGLMW/Q+Y= 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:19 +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:19 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Zerun Fu , Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 5/6] net/nfp: reformat the period of logs Date: Thu, 17 Oct 2024 14:15:46 +0800 Message-Id: <20241017061547.4068520-6-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: 0cbb2559-2f01-4fc9-68a0-08dcee7336cc 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?N+PxqxbmVj6JhWWitQsz80LeFK//QDRnWFQBHDlfIu/cYSOlH11ngpAq/Hzv?= =?us-ascii?Q?pLYXxl7Sav70EMnPPG32VPCdPrqk4z9/JS0w5jWjrOLXSF++NBtbkLxW/+dy?= =?us-ascii?Q?Pnol30SWLLl99LXlSYd6q1fX6G/prLe8tDTSBydnk+T1+TKSoF9d+8mW5xwH?= =?us-ascii?Q?d9wyPeV+78wYvEGoeTQWdugeEaJCGevQMXX8gNolRYqDhdhyAQz5Gt/1LX2M?= =?us-ascii?Q?8q6WLK8E9Nh6vWWbn3PTRkDTrbkDhqZu0fRAikKCIiq4roYs8lY7LG63gsQS?= =?us-ascii?Q?nYYIqcl1ViZLbG4ZPyt3VtWjfMRtxt2DO4M9Dfs2kMmSutG4+KVLzvp+pjJe?= =?us-ascii?Q?Leg1Vs2sFsKxsgr6tlnHGe+n7alYw+lqOH3y/z/RMuljwjh2O54+fe0op4T1?= =?us-ascii?Q?loqg4Y+D9brfWqKx1avj1F1QDgrC2Hbinx0Sbtso/I2zBSsEEBph5HAAv0Bw?= =?us-ascii?Q?czX8nnJK39a491YTK8ktgmZisLJW8ZtoDp7BlHoGTNIJ/8xyeFTqPeYITij3?= =?us-ascii?Q?HXev8plBctWwFog3YgoQqxmVcpsu2XAqqrDNW8vxHJOISK/xL+zagG1R4puV?= =?us-ascii?Q?6qVFprU9UkW/QXUU1MGBXWIKgmNnFbT9jd1GxTrM79YbrdP7yehitVVZkBDk?= =?us-ascii?Q?12qk9hJcstk3zOnNcuUiA7jgAbTFTLz9uivkBrji8l+dADtiYA8rQnkBAWB1?= =?us-ascii?Q?Q57IvKXim+lD+KIvNG3OeYBMbKzwL95QSlrE89vDqr/jQND3E9OiT4uyg98L?= =?us-ascii?Q?kaLecRXQRq1qiVuJXStk8cLkvvHB46Dc7vMGrxjLG9oGUBuSfA4nsi22FRIx?= =?us-ascii?Q?A4xyCeNGss7dIZ80pL8GNz2Lqx4UjApAPUMkjMe41QLAvlcjtBzcoCWXLKM2?= =?us-ascii?Q?HfNDWFUHoMPQhQzJyOm8WhXnxWcLFSN7JNbLGS4cY+H7r7h2yFP75c5tKEAS?= =?us-ascii?Q?ugjJ1PNO0NPonfuAF4Uy3xLQixE/x8vomlAQT88fhNlU+iv87IG6ZiUpajan?= =?us-ascii?Q?KGFTf3soT9lGXDuRQx3JkIl3jdDasjp9rQmmHqbcWnan8rsWiwJ4DPlF/ha/?= =?us-ascii?Q?s8EcLQ0hJQKsxVyiyOpOv5uj1rxICobEKG65rs5u6dh6rDBBw3i39wFAmWyX?= =?us-ascii?Q?O9io+O7R9alCH1cRF8FXtEtoc1UPsW/imoQCEFb6r+Js3OkJZv6auaSirSzu?= =?us-ascii?Q?8pYWet4YGVvcoNSfGlrWQU7GXZ8RAvoAO1ElVFzTUdgNcKw7HoB6kMrRJYXC?= =?us-ascii?Q?+Gr4sRK8N6XnKP+y0HeQxXedg1y1HpSE8JE0WeE/pAG2xN+91bY3A8P2zzso?= =?us-ascii?Q?v8x2YpqUFgGbUn3/Zc+CW02tSA3B/eVUtW6FtgJJjz628vzoN7yw1eTdGa6o?= =?us-ascii?Q?TkGTpjI=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?DBSlL8m1fQ7cbPYfjfUdRk0gBSsR+yuw9MzqwPX8ESZYw8PqSZ6A9clhSmuC?= =?us-ascii?Q?TEsvLnIax8gFn1cS7qz7C/fTgRbccnrKBijHs1zgWNpdhLZkxsjiiZvKKgrG?= =?us-ascii?Q?90T+D5R14XQtN8LR5iexlgrJnKRZDKWHCneHkXtIcxKRKJRfsoxWyKTzhj/E?= =?us-ascii?Q?QY0RqYAo70L7qxjbPOcH3e2CJ8k2ypmEpBjhHg/HwoPy11PIokunHX7H3F/j?= =?us-ascii?Q?rUgs8jz1Si6sCfBAOm+zf7t3zpUHPullyb3lE+1Gn0VVnjcWhODxMb/tcQNb?= =?us-ascii?Q?aXU2pObJON7gUo3mzCOk2rSpF4onXVEcFcyeeTacVAGIQH3Ct6lfltRmiWr9?= =?us-ascii?Q?WxcOIhe5qXL+P70LOqK6Q/iYBqIAGy+8XkLP8XzFG0V0cYLDPP56BLc/rn5e?= =?us-ascii?Q?dv7MNwS6CFMUbZnc2ggplJ65JzsgvhriHW9HgAdLMnS0IHNFpi5DkuQYhmGe?= =?us-ascii?Q?8RVugJGb4BKghD2gnLnQ6dgUevn97DFypH3Te8nm7Rf5ng2RdTf+nnObDB5F?= =?us-ascii?Q?qG2wxvqg9VaT7+itNJADCfcMdJIa461hYp25w9U4hl+8+LClSZPx6Pa3Vi/S?= =?us-ascii?Q?SebsU8uRfiT6qkaZyXXUo8Vfrz5lQgc6Hnbf6ACPMBNyr+j6FWzF5OtKmw79?= =?us-ascii?Q?RS1ThbsD4mvmA8P7+xh5zmr4itNOC6HCZWiD9o35Do/niGBdFTG1ORvXEZYz?= =?us-ascii?Q?gpC37wUfN86HC9ShjW8gZBhOWCj0O0r0ziK8pwBsX0CPfXiIszLvTpgOtrvB?= =?us-ascii?Q?aTbVroD24wXfBV8w9p1pwB6Nxvzy/s+oxR0XFLxEkhwzAxWOr4Dlr18YUMRZ?= =?us-ascii?Q?Pk5YOq8t9cdPUTz18o5XCrz4OZYimb+xrcsqY+mseadLssVSL3YATrlbmrdh?= =?us-ascii?Q?JRfak8z/W5k0O48u/BGsKHwzo9HjzrRHAMBH36H3kyaSgFZwzBqtBxRt529N?= =?us-ascii?Q?Apwbtth8JZrKkTz3bc0vvAkkEj8tcm28AvRzoFYjwHratv7tuYpmfi1+vOIl?= =?us-ascii?Q?vxsMVKYC00Q49KBvLiAqfi0lgnYDSkdKplXuf8SEf05ge6wyYoSGYOyz9rC8?= =?us-ascii?Q?ohbZTdL87X5xlyuxxb1YIeu0dmT/gY/4AxufSqvOUSaOlJMNzYPk9rx+J4Pl?= =?us-ascii?Q?r46JBCTMNSo506XcHQ9IDn7kNgb0KWIHkbFDV1snGOrvEdkfQMW+K9+GdnlC?= =?us-ascii?Q?Idqsv01QIPSxLzsUf31OVoWfP8lrIbv0zZrsHnHV8/8lPLOWSUKVYhlbVgYf?= =?us-ascii?Q?+FTuI4J9v9SjDxdaaPmDm6zAY9bqJU28QZUiJNDsnjDKzmulcXBmJgAOBn1B?= =?us-ascii?Q?2MSNbS3JbKsMA30UznIEt6wBN3YJhXzFnKZlxXi1zO00f7QguCvK70Q/1HrF?= =?us-ascii?Q?BMOhLpXd0BKInXkuhzCBKqY4GzndbAOgsVV6d0lM84P5G7Nq4GNkUszqL+1f?= =?us-ascii?Q?/ebGWczzUW84QjSYt/7Jx/Cz+kSw5xSWBrM42P/70Y9QR5a4yliJYs1VJVeq?= =?us-ascii?Q?1LvB33N9ovIyV0YpsA6tPE5qaGxX/yLcBMFyxlzk3EPUTYpH/DcT7xgtotQI?= =?us-ascii?Q?eLG0l5iBAdwjqCHlou2E8+elcYu56mclnKM3lKu6NT3dXH6DSmFUk8rDSuR4?= =?us-ascii?Q?NQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0cbb2559-2f01-4fc9-68a0-08dcee7336cc 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:19.2216 (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: kvjcGfWMuITtK25l1QHfOc1MksKCig0CBeqcNL7TIBg0JEVTHJPhzyVCJ+FMb6K77MaFtTBf4hqEEUtxnI8FGQhibC5fdxPgesPOSKzOPi0= 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 Unified add period at the end of the sentence in log. Signed-off-by: Zerun Fu Reviewed-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/common/nfp/nfp_common.c | 12 +- drivers/common/nfp/nfp_common_pci.c | 4 +- drivers/net/nfp/flower/nfp_conntrack.c | 106 +++++------ drivers/net/nfp/flower/nfp_flower.c | 68 +++---- drivers/net/nfp/flower/nfp_flower_cmsg.c | 26 +-- drivers/net/nfp/flower/nfp_flower_ctrl.c | 20 +- drivers/net/nfp/flower/nfp_flower_flow.c | 136 +++++++------- .../net/nfp/flower/nfp_flower_representor.c | 42 ++--- drivers/net/nfp/flower/nfp_flower_service.c | 6 +- drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 18 +- drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 18 +- drivers/net/nfp/nfdk/nfp_nfdk_vec_avx2_dp.c | 4 +- drivers/net/nfp/nfp_cpp_bridge.c | 62 +++---- drivers/net/nfp/nfp_ethdev.c | 172 +++++++++--------- drivers/net/nfp/nfp_ethdev_vf.c | 16 +- drivers/net/nfp/nfp_ipsec.c | 42 ++--- drivers/net/nfp/nfp_mtr.c | 86 ++++----- drivers/net/nfp/nfp_net_cmsg.c | 8 +- drivers/net/nfp/nfp_net_common.c | 88 ++++----- drivers/net/nfp/nfp_net_ctrl.c | 14 +- drivers/net/nfp/nfp_net_flow.c | 30 +-- drivers/net/nfp/nfp_net_meta.c | 2 +- drivers/net/nfp/nfp_rxtx.c | 34 ++-- drivers/net/nfp/nfp_rxtx_vec_avx2.c | 10 +- drivers/net/nfp/nfp_service.c | 8 +- drivers/net/nfp/nfpcore/nfp6000_pcie.c | 12 +- drivers/net/nfp/nfpcore/nfp_cppcore.c | 22 +-- drivers/net/nfp/nfpcore/nfp_elf.c | 2 +- drivers/net/nfp/nfpcore/nfp_hwinfo.c | 16 +- drivers/net/nfp/nfpcore/nfp_mip.c | 8 +- drivers/net/nfp/nfpcore/nfp_nffw.c | 4 +- drivers/net/nfp/nfpcore/nfp_nsp.c | 42 ++--- drivers/net/nfp/nfpcore/nfp_nsp_cmds.c | 2 +- drivers/net/nfp/nfpcore/nfp_nsp_eth.c | 14 +- drivers/net/nfp/nfpcore/nfp_resource.c | 14 +- drivers/net/nfp/nfpcore/nfp_rtsym.c | 40 ++-- drivers/net/nfp/nfpcore/nfp_sync.c | 8 +- drivers/vdpa/nfp/nfp_vdpa.c | 42 ++--- drivers/vdpa/nfp/nfp_vdpa_core.c | 2 +- 39 files changed, 630 insertions(+), 630 deletions(-) diff --git a/drivers/common/nfp/nfp_common.c b/drivers/common/nfp/nfp_common.c index 8cfcda7d00..0df8332dfb 100644 --- a/drivers/common/nfp/nfp_common.c +++ b/drivers/common/nfp/nfp_common.c @@ -25,7 +25,7 @@ nfp_reconfig_real(struct nfp_hw *hw, hw->qcp_cfg); if (hw->qcp_cfg == NULL) { - PMD_DRV_LOG(ERR, "Bad configuration queue pointer"); + PMD_DRV_LOG(ERR, "Bad configuration queue pointer."); return -ENXIO; } @@ -43,12 +43,12 @@ nfp_reconfig_real(struct nfp_hw *hw, break; if ((new & NFP_NET_CFG_UPDATE_ERR) != 0) { - PMD_DRV_LOG(ERR, "Reconfig error: %#08x", new); + PMD_DRV_LOG(ERR, "Reconfig error: %#08x.", new); return -1; } if (cnt >= NFP_NET_POLL_TIMEOUT) { - PMD_DRV_LOG(ERR, "Reconfig timeout for %#08x after %u ms", + PMD_DRV_LOG(ERR, "Reconfig timeout for %#08x after %u ms.", update, cnt); return -EIO; } @@ -56,7 +56,7 @@ nfp_reconfig_real(struct nfp_hw *hw, nanosleep(&wait, 0); /* waiting for a 1ms */ } - PMD_DRV_LOG(DEBUG, "Ack DONE"); + PMD_DRV_LOG(DEBUG, "Ack DONE."); return 0; } @@ -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 1a4d3f91b4..856f3917a2 100644 --- a/drivers/common/nfp/nfp_common_pci.c +++ b/drivers/common/nfp/nfp_common_pci.c @@ -191,7 +191,7 @@ nfp_drivers_probe(struct rte_pci_device *pci_dev, ret = driver->probe(pci_dev); if (ret < 0) { - PMD_DRV_LOG(ERR, "Failed to load driver %s", driver->name); + PMD_DRV_LOG(ERR, "Failed to load driver %s.", driver->name); return ret; } } @@ -210,7 +210,7 @@ nfp_common_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, class = nfp_parse_class_options(eal_dev->devargs); if (class == NFP_CLASS_INVALID) { - PMD_DRV_LOG(ERR, "Unsupported nfp class type: %s", + PMD_DRV_LOG(ERR, "Unsupported nfp class type: %s.", eal_dev->devargs->args); return -ENOTSUP; } diff --git a/drivers/net/nfp/flower/nfp_conntrack.c b/drivers/net/nfp/flower/nfp_conntrack.c index ba9134eb5e..0b21e4ee5b 100644 --- a/drivers/net/nfp/flower/nfp_conntrack.c +++ b/drivers/net/nfp/flower/nfp_conntrack.c @@ -133,7 +133,7 @@ nfp_ct_merge_table_search(struct nfp_ct_zone_entry *ze, hash_key = rte_jhash(hash_data, hash_len, ze->priv->hash_seed); index = rte_hash_lookup_data(ze->ct_merge_table, &hash_key, (void **)&m_ent); if (index < 0) { - PMD_DRV_LOG(DEBUG, "Data NOT found in the ct_merge table"); + PMD_DRV_LOG(DEBUG, "Data NOT found in the ct_merge table."); return NULL; } @@ -150,7 +150,7 @@ nfp_ct_merge_table_add(struct nfp_ct_zone_entry *ze, hash_key = rte_jhash(merge_entry, sizeof(uint64_t) * 2, ze->priv->hash_seed); ret = rte_hash_add_key_data(ze->ct_merge_table, &hash_key, merge_entry); if (ret != 0) { - PMD_DRV_LOG(ERR, "Add to ct_merge table failed"); + PMD_DRV_LOG(ERR, "Add to ct_merge table failed."); return false; } @@ -167,7 +167,7 @@ nfp_ct_merge_table_delete(struct nfp_ct_zone_entry *ze, hash_key = rte_jhash(m_ent, sizeof(uint64_t) * 2, ze->priv->hash_seed); ret = rte_hash_del_key(ze->ct_merge_table, &hash_key); if (ret < 0) - PMD_DRV_LOG(ERR, "Delete from ct_merge table failed, ret=%d", ret); + PMD_DRV_LOG(ERR, "Delete from ct_merge table failed, ret=%d.", ret); } static void @@ -197,7 +197,7 @@ nfp_ct_map_table_search(struct nfp_flow_priv *priv, hash_key = rte_jhash(hash_data, hash_len, priv->hash_seed); index = rte_hash_lookup_data(priv->ct_map_table, &hash_key, (void **)&me); if (index < 0) { - PMD_DRV_LOG(DEBUG, "Data NOT found in the ct_map table"); + PMD_DRV_LOG(DEBUG, "Data NOT found in the ct_map table."); return NULL; } @@ -214,7 +214,7 @@ nfp_ct_map_table_add(struct nfp_flow_priv *priv, hash_key = rte_jhash(me, sizeof(uint64_t), priv->hash_seed); ret = rte_hash_add_key_data(priv->ct_map_table, &hash_key, me); if (ret != 0) { - PMD_DRV_LOG(ERR, "Add to ct_map table failed"); + PMD_DRV_LOG(ERR, "Add to ct_map table failed."); return false; } @@ -231,7 +231,7 @@ nfp_ct_map_table_delete(struct nfp_flow_priv *priv, hash_key = rte_jhash(me, sizeof(uint64_t), priv->hash_seed); ret = rte_hash_del_key(priv->ct_map_table, &hash_key); if (ret < 0) - PMD_DRV_LOG(ERR, "Delete form ct_map table failed"); + PMD_DRV_LOG(ERR, "Delete form ct_map table failed."); } static void @@ -331,7 +331,7 @@ nfp_flow_item_conf_size_get(enum rte_flow_item_type type, len = sizeof(struct rte_flow_item_geneve); break; default: - PMD_DRV_LOG(ERR, "Unsupported item type: %d", type); + PMD_DRV_LOG(ERR, "Unsupported item type: %d.", type); *size = 0; return false; } @@ -351,13 +351,13 @@ nfp_ct_flow_item_copy_real(const void *src, ret = nfp_flow_item_conf_size_get(type, &len); if (!ret) { - PMD_DRV_LOG(ERR, "Get flow item conf size failed"); + PMD_DRV_LOG(ERR, "Get flow item conf size failed."); return NULL; } dst = rte_zmalloc("flow_item", len, 0); if (dst == NULL) { - PMD_DRV_LOG(ERR, "Malloc memory for ct item failed"); + PMD_DRV_LOG(ERR, "Malloc memory for ct item failed."); return NULL; } @@ -375,7 +375,7 @@ nfp_ct_flow_item_copy(const struct rte_flow_item *src, if (src->spec != NULL) { dst->spec = nfp_ct_flow_item_copy_real(src->spec, src->type); if (dst->spec == NULL) { - PMD_DRV_LOG(ERR, "Copy spec of ct item failed"); + PMD_DRV_LOG(ERR, "Copy spec of ct item failed."); goto end; } } @@ -383,7 +383,7 @@ nfp_ct_flow_item_copy(const struct rte_flow_item *src, if (src->mask != NULL) { dst->mask = nfp_ct_flow_item_copy_real(src->mask, src->type); if (dst->mask == NULL) { - PMD_DRV_LOG(ERR, "Copy mask of ct item failed"); + PMD_DRV_LOG(ERR, "Copy mask of ct item failed."); goto free_spec; } } @@ -391,7 +391,7 @@ nfp_ct_flow_item_copy(const struct rte_flow_item *src, if (src->last != NULL) { dst->last = nfp_ct_flow_item_copy_real(src->last, src->type); if (dst->last == NULL) { - PMD_DRV_LOG(ERR, "Copy last of ct item failed"); + PMD_DRV_LOG(ERR, "Copy last of ct item failed."); goto free_mask; } } @@ -417,7 +417,7 @@ nfp_ct_flow_items_copy(const struct rte_flow_item *src, for (loop = 0; loop < item_cnt; ++loop) { ret = nfp_ct_flow_item_copy(src + loop, dst + loop); if (!ret) { - PMD_DRV_LOG(ERR, "Copy ct item failed"); + PMD_DRV_LOG(ERR, "Copy ct item failed."); nfp_ct_flow_items_free(dst, loop); return false; } @@ -490,7 +490,7 @@ nfp_ct_flow_action_free(struct rte_flow_action *action) func = nfp_ct_flow_action_free_raw; break; default: - PMD_DRV_LOG(ERR, "Unsupported action type: %d", action->type); + PMD_DRV_LOG(ERR, "Unsupported action type: %d.", action->type); break; } @@ -517,14 +517,14 @@ nfp_ct_flow_action_copy_real(const void *src, dst = rte_zmalloc("flow_action", len, 0); if (dst == NULL) { - PMD_DRV_LOG(ERR, "Malloc memory for ct action failed"); + PMD_DRV_LOG(ERR, "Malloc memory for ct action failed."); return NULL; } if (func != NULL) { ret = func(src, dst); if (!ret) { - PMD_DRV_LOG(ERR, "Copy ct action failed"); + PMD_DRV_LOG(ERR, "Copy ct action failed."); return NULL; } @@ -559,7 +559,7 @@ nfp_ct_flow_action_copy_raw(const void *src, raw_dst->data = nfp_ct_flow_action_copy_real(raw_src->data, raw_src->size, NULL); if (raw_dst->data == NULL) { - PMD_DRV_LOG(ERR, "Copy ct action process failed"); + PMD_DRV_LOG(ERR, "Copy ct action process failed."); return false; } @@ -625,13 +625,13 @@ nfp_ct_flow_action_copy(const struct rte_flow_action *src, func = nfp_ct_flow_action_copy_raw; break; default: - PMD_DRV_LOG(DEBUG, "Unsupported action type: %d", src->type); + PMD_DRV_LOG(DEBUG, "Unsupported action type: %d.", src->type); return false; } dst->conf = nfp_ct_flow_action_copy_real(src->conf, len, func); if (dst->conf == NULL) { - PMD_DRV_LOG(DEBUG, "Copy ct action process failed"); + PMD_DRV_LOG(DEBUG, "Copy ct action process failed."); return false; } @@ -649,7 +649,7 @@ nfp_ct_flow_actions_copy(const struct rte_flow_action *src, for (loop = 0; loop < action_cnt; ++loop) { ret = nfp_ct_flow_action_copy(src + loop, dst + loop); if (!ret) { - PMD_DRV_LOG(DEBUG, "Copy ct action failed"); + PMD_DRV_LOG(DEBUG, "Copy ct action failed."); nfp_ct_flow_actions_free(dst, loop); return false; } @@ -676,7 +676,7 @@ nfp_ct_flow_entry_get(struct nfp_ct_zone_entry *ze, fe = rte_zmalloc("ct_flow_entry", sizeof(*fe), 0); if (fe == NULL) { - PMD_DRV_LOG(ERR, "Could not alloc ct_flow entry"); + PMD_DRV_LOG(ERR, "Could not alloc ct_flow entry."); return NULL; } @@ -693,28 +693,28 @@ nfp_ct_flow_entry_get(struct nfp_ct_zone_entry *ze, fe->rule.items = rte_zmalloc("ct_flow_item", sizeof(struct rte_flow_item) * item_cnt, 0); if (fe->rule.items == NULL) { - PMD_DRV_LOG(ERR, "Could not alloc ct flow items"); + PMD_DRV_LOG(ERR, "Could not alloc ct flow items."); goto free_flow_entry; } fe->rule.actions = rte_zmalloc("ct_flow_action", sizeof(struct rte_flow_action) * action_cnt, 0); if (fe->rule.actions == NULL) { - PMD_DRV_LOG(ERR, "Could not alloc ct flow actions"); + PMD_DRV_LOG(ERR, "Could not alloc ct flow actions."); goto free_flow_item; } /* Deep copy of items */ ret = nfp_ct_flow_items_copy(items, fe->rule.items, item_cnt); if (!ret) { - PMD_DRV_LOG(ERR, "Could not deep copy ct flow items"); + PMD_DRV_LOG(ERR, "Could not deep copy ct flow items."); goto free_flow_action; } /* Deep copy of actions */ ret = nfp_ct_flow_actions_copy(actions, fe->rule.actions, action_cnt); if (!ret) { - PMD_DRV_LOG(ERR, "Could not deep copy ct flow actions"); + PMD_DRV_LOG(ERR, "Could not deep copy ct flow actions."); goto free_copied_items; } @@ -724,7 +724,7 @@ nfp_ct_flow_entry_get(struct nfp_ct_zone_entry *ze, /* Now add a ct map entry */ me = rte_zmalloc("ct_map_entry", sizeof(*me), 0); if (me == NULL) { - PMD_DRV_LOG(ERR, "Malloc memory for ct map entry failed"); + PMD_DRV_LOG(ERR, "Malloc memory for ct map entry failed."); goto free_copied_actions; } @@ -735,7 +735,7 @@ nfp_ct_flow_entry_get(struct nfp_ct_zone_entry *ze, priv = repr->app_fw_flower->flow_priv; ret = nfp_ct_map_table_add(priv, me); if (!ret) { - PMD_DRV_LOG(ERR, "Add into ct map table failed"); + PMD_DRV_LOG(ERR, "Add into ct map table failed."); goto free_map_entry; } @@ -818,7 +818,7 @@ nfp_ct_zone_table_search(struct nfp_flow_priv *priv, hash_key = rte_jhash(hash_data, hash_len, priv->hash_seed); index = rte_hash_lookup_data(priv->ct_zone_table, &hash_key, (void **)&ze); if (index < 0) { - PMD_DRV_LOG(DEBUG, "Data NOT found in the ct_zone table"); + PMD_DRV_LOG(DEBUG, "Data NOT found in the ct_zone table."); return NULL; } @@ -835,7 +835,7 @@ nfp_ct_zone_table_add(struct nfp_flow_priv *priv, hash_key = rte_jhash(ze, sizeof(uint32_t), priv->hash_seed); ret = rte_hash_add_key_data(priv->ct_zone_table, &hash_key, ze); if (ret != 0) { - PMD_DRV_LOG(ERR, "Add to the ct_zone table failed"); + PMD_DRV_LOG(ERR, "Add to the ct_zone table failed."); return false; } @@ -852,7 +852,7 @@ nfp_ct_zone_table_delete(struct nfp_flow_priv *priv, hash_key = rte_jhash(ze, sizeof(uint32_t), priv->hash_seed); ret = rte_hash_del_key(priv->ct_zone_table, &hash_key); if (ret < 0) - PMD_DRV_LOG(ERR, "Delete from the ct_zone table failed"); + PMD_DRV_LOG(ERR, "Delete from the ct_zone table failed."); } static bool @@ -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; } @@ -925,13 +925,13 @@ nfp_ct_zone_entry_get(struct nfp_flow_priv *priv, ze = rte_zmalloc("ct_zone_wc", sizeof(*ze), 0); if (ze == NULL) { - PMD_DRV_LOG(ERR, "Could not alloc ct_zone_wc entry"); + PMD_DRV_LOG(ERR, "Could not alloc ct_zone_wc entry."); return NULL; } is_ok = nfp_ct_zone_entry_init(ze, priv, zone, true); if (!is_ok) { - PMD_DRV_LOG(ERR, "Init ct zone wc entry failed"); + PMD_DRV_LOG(ERR, "Init ct zone wc entry failed."); goto free_ct_zone_entry; } @@ -943,19 +943,19 @@ nfp_ct_zone_entry_get(struct nfp_flow_priv *priv, ze = rte_zmalloc("ct_zone_entry", sizeof(*ze), 0); if (ze == NULL) { - PMD_DRV_LOG(ERR, "Could not alloc ct_zone entry"); + PMD_DRV_LOG(ERR, "Could not alloc ct_zone entry."); return NULL; } is_ok = nfp_ct_zone_entry_init(ze, priv, zone, false); if (!is_ok) { - PMD_DRV_LOG(ERR, "Init ct zone entry failed"); + PMD_DRV_LOG(ERR, "Init ct zone entry failed."); goto free_ct_zone_entry; } is_ok = nfp_ct_zone_table_add(priv, ze); if (!is_ok) { - PMD_DRV_LOG(ERR, "Add into ct zone table failed"); + PMD_DRV_LOG(ERR, "Add into ct zone table failed."); goto free_ct_zone_entry; } } @@ -1046,7 +1046,7 @@ nfp_ct_offload_del(struct rte_eth_dev *dev, if (m_ent->compiled_rule != NULL) { ret = nfp_flow_destroy(dev, m_ent->compiled_rule, error); if (ret != 0) { - PMD_DRV_LOG(ERR, "Could not alloc ct_flow_item"); + PMD_DRV_LOG(ERR, "Could not alloc ct_flow_item."); return -EINVAL; } m_ent->compiled_rule = NULL; @@ -1062,7 +1062,7 @@ nfp_ct_offload_del(struct rte_eth_dev *dev, if (m_ent->compiled_rule != NULL) { ret = nfp_flow_destroy(dev, m_ent->compiled_rule, error); if (ret != 0) { - PMD_DRV_LOG(ERR, "Could not alloc ct_flow_item"); + PMD_DRV_LOG(ERR, "Could not alloc ct_flow_item."); return -EINVAL; } m_ent->compiled_rule = NULL; @@ -1467,7 +1467,7 @@ nfp_ct_do_flow_merge(struct nfp_ct_zone_entry *ze, merge_entry = rte_zmalloc("ct_merge_entry", sizeof(*merge_entry), 0); if (merge_entry == NULL) { - PMD_DRV_LOG(ERR, "Malloc memory for ct merge entry failed"); + PMD_DRV_LOG(ERR, "Malloc memory for ct merge entry failed."); return false; } @@ -1483,14 +1483,14 @@ nfp_ct_do_flow_merge(struct nfp_ct_zone_entry *ze, merge_entry->rule.items = rte_zmalloc("ct_flow_item", sizeof(struct rte_flow_item) * merge_entry->rule.items_cnt, 0); if (merge_entry->rule.items == NULL) { - PMD_DRV_LOG(ERR, "Could not alloc items for merged flow"); + PMD_DRV_LOG(ERR, "Could not alloc items for merged flow."); goto merge_exit; } merge_entry->rule.actions = rte_zmalloc("ct_flow_action", sizeof(struct rte_flow_action) * merge_entry->rule.actions_cnt, 0); if (merge_entry->rule.actions == NULL) { - PMD_DRV_LOG(ERR, "Could not alloc actions for merged flow"); + PMD_DRV_LOG(ERR, "Could not alloc actions for merged flow."); goto free_items; } @@ -1503,14 +1503,14 @@ nfp_ct_do_flow_merge(struct nfp_ct_zone_entry *ze, ret = nfp_ct_merge_table_add(ze, merge_entry); if (!ret) { - PMD_DRV_LOG(ERR, "Add into ct merge table failed"); + PMD_DRV_LOG(ERR, "Add into ct merge table failed."); goto free_actions; } /* Send to firmware */ ret = nfp_ct_offload_add(pre_ct_entry->dev, merge_entry); if (ret != 0) { - PMD_DRV_LOG(ERR, "Send the merged flow to firmware failed"); + PMD_DRV_LOG(ERR, "Send the merged flow to firmware failed."); goto merge_table_del; } @@ -1542,7 +1542,7 @@ nfp_ct_merge_flow_entries(struct nfp_ct_flow_entry *fe, LIST_FOREACH(fe_tmp, &ze_src->post_ct_list, post_ct_list) { ret = nfp_ct_do_flow_merge(ze_dst, fe, fe_tmp); if (!ret) { - PMD_DRV_LOG(ERR, "Merge for ct pre flow failed"); + PMD_DRV_LOG(ERR, "Merge for ct pre flow failed."); return false; } } @@ -1550,7 +1550,7 @@ nfp_ct_merge_flow_entries(struct nfp_ct_flow_entry *fe, LIST_FOREACH(fe_tmp, &ze_src->pre_ct_list, pre_ct_list) { ret = nfp_ct_do_flow_merge(ze_dst, fe_tmp, fe); if (!ret) { - PMD_DRV_LOG(ERR, "Merge for ct post flow failed"); + PMD_DRV_LOG(ERR, "Merge for ct post flow failed."); return false; } } @@ -1577,14 +1577,14 @@ nfp_flow_handle_pre_ct(const struct rte_flow_item *ct_item, priv = representor->app_fw_flower->flow_priv; ze = nfp_ct_zone_entry_get(priv, ct->ct_zone, false); if (ze == NULL) { - PMD_DRV_LOG(ERR, "Could not get ct zone entry"); + PMD_DRV_LOG(ERR, "Could not get ct zone entry."); return false; } /* Add entry to pre_ct_list */ fe = nfp_ct_flow_entry_get(ze, dev, items, actions, cookie); if (fe == NULL) { - PMD_DRV_LOG(ERR, "Could not get ct flow entry"); + PMD_DRV_LOG(ERR, "Could not get ct flow entry."); goto ct_zone_entry_free; } @@ -1593,7 +1593,7 @@ nfp_flow_handle_pre_ct(const struct rte_flow_item *ct_item, ret = nfp_ct_merge_flow_entries(fe, ze, ze); if (!ret) { - PMD_DRV_LOG(ERR, "Merge ct flow entries failed"); + PMD_DRV_LOG(ERR, "Merge ct flow entries failed."); goto ct_flow_entry_free; } @@ -1601,7 +1601,7 @@ nfp_flow_handle_pre_ct(const struct rte_flow_item *ct_item, if (priv->ct_zone_wc != NULL) { ret = nfp_ct_merge_flow_entries(fe, priv->ct_zone_wc, ze); if (!ret) { - PMD_DRV_LOG(ERR, "Merge ct flow entries wildcast failed"); + PMD_DRV_LOG(ERR, "Merge ct flow entries wildcast failed."); goto ct_flow_entry_free; } } @@ -1639,7 +1639,7 @@ nfp_flow_handle_post_ct(const struct rte_flow_item *ct_item, if (ct_mask->ct_zone == 0) { wildcard = true; } else if (ct_mask->ct_zone != UINT16_MAX) { - PMD_DRV_LOG(ERR, "Partially wildcard ct_zone is not supported"); + PMD_DRV_LOG(ERR, "Partially wildcard ct_zone is not supported."); return false; } @@ -1647,14 +1647,14 @@ nfp_flow_handle_post_ct(const struct rte_flow_item *ct_item, priv = representor->app_fw_flower->flow_priv; ze = nfp_ct_zone_entry_get(priv, ct->ct_zone, wildcard); if (ze == NULL) { - PMD_DRV_LOG(ERR, "Could not get ct zone entry"); + PMD_DRV_LOG(ERR, "Could not get ct zone entry."); return false; } /* Add entry to post_ct_list */ fe = nfp_ct_flow_entry_get(ze, dev, items, actions, cookie); if (fe == NULL) { - PMD_DRV_LOG(ERR, "Could not get ct flow entry"); + PMD_DRV_LOG(ERR, "Could not get ct flow entry."); goto ct_zone_entry_free; } @@ -1666,7 +1666,7 @@ nfp_flow_handle_post_ct(const struct rte_flow_item *ct_item, ze = (struct nfp_ct_zone_entry *)next_data; ret = nfp_ct_merge_flow_entries(fe, ze, ze); if (!ret) { - PMD_DRV_LOG(ERR, "Merge ct flow entries wildcast failed"); + PMD_DRV_LOG(ERR, "Merge ct flow entries wildcast failed."); break; } } diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index d38b077c09..ee4f1a2983 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -71,7 +71,7 @@ nfp_flower_pf_start(struct rte_eth_dev *dev) /* If an error when reconfig we avoid to change hw state */ ret = nfp_reconfig(hw, new_ctrl, update); if (ret != 0) { - PMD_INIT_LOG(ERR, "Failed to reconfig PF vnic"); + PMD_INIT_LOG(ERR, "Failed to reconfig PF vnic."); return -EIO; } @@ -80,7 +80,7 @@ nfp_flower_pf_start(struct rte_eth_dev *dev) /* Setup the freelist ring */ ret = nfp_net_rx_freelist_setup(dev); if (ret != 0) { - PMD_INIT_LOG(ERR, "Error with flower PF vNIC freelist setup"); + PMD_INIT_LOG(ERR, "Error with flower PF vNIC freelist setup."); return -EIO; } @@ -134,12 +134,12 @@ nfp_flower_pf_dispatch_pkts(struct nfp_net_rxq *rxq, repr = nfp_flower_get_repr(rxq->hw_priv, port_id); if (repr == NULL) { - PMD_RX_LOG(ERR, "Can not get repr for port %u", port_id); + PMD_RX_LOG(ERR, "Can not get repr for port %u.", port_id); return false; } if (repr->ring == NULL || repr->ring[rxq->qidx] == NULL) { - PMD_RX_LOG(ERR, "No ring available for repr_port %s", repr->name); + PMD_RX_LOG(ERR, "No ring available for repr_port %s.", repr->name); return false; } @@ -207,7 +207,7 @@ nfp_flower_init_vnic_common(struct nfp_net_hw_priv *hw_priv, pf_dev = hw_priv->pf_dev; - PMD_INIT_LOG(DEBUG, "%s vNIC ctrl bar: %p", vnic_type, hw->super.ctrl_bar); + PMD_INIT_LOG(DEBUG, "%s vNIC ctrl bar: %p.", vnic_type, hw->super.ctrl_bar); err = nfp_net_common_init(pf_dev, hw); if (err != 0) @@ -264,7 +264,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_app_fw_flower *app_fw_flower, ret = nfp_flower_init_vnic_common(hw_priv, hw, "ctrl_vnic"); if (ret != 0) { - PMD_INIT_LOG(ERR, "Could not init pf vnic"); + PMD_INIT_LOG(ERR, "Could not init pf vnic."); return -EINVAL; } @@ -272,7 +272,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_app_fw_flower *app_fw_flower, app_fw_flower->ctrl_ethdev = rte_zmalloc("nfp_ctrl_vnic", sizeof(struct rte_eth_dev), RTE_CACHE_LINE_SIZE); if (app_fw_flower->ctrl_ethdev == NULL) { - PMD_INIT_LOG(ERR, "Could not allocate ctrl vnic"); + PMD_INIT_LOG(ERR, "Could not allocate ctrl vnic."); return -ENOMEM; } @@ -283,7 +283,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_app_fw_flower *app_fw_flower, eth_dev->data = rte_zmalloc("nfp_ctrl_vnic_data", sizeof(struct rte_eth_dev_data), RTE_CACHE_LINE_SIZE); if (eth_dev->data == NULL) { - PMD_INIT_LOG(ERR, "Could not allocate ctrl vnic data"); + PMD_INIT_LOG(ERR, "Could not allocate ctrl vnic data."); ret = -ENOMEM; goto eth_dev_cleanup; } @@ -298,7 +298,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_app_fw_flower *app_fw_flower, rte_pktmbuf_pool_create(ctrl_pktmbuf_pool_name, 4 * CTRL_VNIC_NB_DESC, 64, 0, 9216, numa_node); if (app_fw_flower->ctrl_pktmbuf_pool == NULL) { - PMD_INIT_LOG(ERR, "Create mbuf pool for ctrl vnic failed"); + PMD_INIT_LOG(ERR, "Create mbuf pool for ctrl vnic failed."); ret = -ENOMEM; goto dev_data_cleanup; } @@ -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, "The 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, "The 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; } @@ -339,7 +339,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_app_fw_flower *app_fw_flower, sizeof(struct nfp_net_rxq), RTE_CACHE_LINE_SIZE, numa_node); if (rxq == NULL) { - PMD_DRV_LOG(ERR, "Error allocating rxq"); + PMD_DRV_LOG(ERR, "Error allocating rxq."); ret = -ENOMEM; goto rx_queue_setup_cleanup; } @@ -373,7 +373,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_app_fw_flower *app_fw_flower, hw_priv->dev_info->max_qc_size, NFP_MEMZONE_ALIGN, numa_node); if (tz == NULL) { - PMD_DRV_LOG(ERR, "Error allocating rx dma"); + PMD_DRV_LOG(ERR, "Error allocating rx dma."); rte_free(rxq); ret = -ENOMEM; goto rx_queue_setup_cleanup; @@ -414,7 +414,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_app_fw_flower *app_fw_flower, sizeof(struct nfp_net_txq), RTE_CACHE_LINE_SIZE, numa_node); if (txq == NULL) { - PMD_DRV_LOG(ERR, "Error allocating txq"); + PMD_DRV_LOG(ERR, "Error allocating txq."); ret = -ENOMEM; goto tx_queue_setup_cleanup; } @@ -431,7 +431,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_app_fw_flower *app_fw_flower, hw_priv->dev_info->max_qc_size, NFP_MEMZONE_ALIGN, numa_node); if (tz == NULL) { - PMD_DRV_LOG(ERR, "Error allocating tx dma"); + PMD_DRV_LOG(ERR, "Error allocating tx dma."); rte_free(txq); ret = -ENOMEM; goto tx_queue_setup_cleanup; @@ -476,7 +476,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_app_fw_flower *app_fw_flower, /* Alloc sync memory zone */ ret = nfp_flower_service_sync_alloc(hw_priv); if (ret != 0) { - PMD_INIT_LOG(ERR, "Alloc sync memory zone failed"); + PMD_INIT_LOG(ERR, "Alloc sync memory zone failed."); goto tx_queue_setup_cleanup; } @@ -593,7 +593,7 @@ nfp_flower_start_ctrl_vnic(struct nfp_app_fw_flower *app_fw_flower) /* If an error when reconfig we avoid to change hw state */ ret = nfp_reconfig(hw, new_ctrl, update); if (ret != 0) { - PMD_INIT_LOG(ERR, "Failed to reconfig ctrl vnic"); + PMD_INIT_LOG(ERR, "Failed to reconfig ctrl vnic."); return -EIO; } @@ -602,7 +602,7 @@ nfp_flower_start_ctrl_vnic(struct nfp_app_fw_flower *app_fw_flower) /* Setup the freelist ring */ ret = nfp_net_rx_freelist_setup(dev); if (ret != 0) { - PMD_INIT_LOG(ERR, "Error with flower ctrl vNIC freelist setup"); + PMD_INIT_LOG(ERR, "Error with flower ctrl vNIC freelist setup."); return -EIO; } @@ -662,7 +662,7 @@ nfp_init_app_fw_flower(struct nfp_net_hw_priv *hw_priv) app_fw_flower = rte_zmalloc_socket("nfp_app_fw_flower", sizeof(*app_fw_flower), RTE_CACHE_LINE_SIZE, numa_node); if (app_fw_flower == NULL) { - PMD_INIT_LOG(ERR, "Could not malloc app fw flower"); + PMD_INIT_LOG(ERR, "Could not malloc app fw flower."); return -ENOMEM; } @@ -670,13 +670,13 @@ 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; } ret = nfp_mtr_priv_init(pf_dev); if (ret != 0) { - PMD_INIT_LOG(ERR, "Error initializing metering private data"); + PMD_INIT_LOG(ERR, "Error initializing metering private data."); goto flow_priv_cleanup; } @@ -684,7 +684,7 @@ nfp_init_app_fw_flower(struct nfp_net_hw_priv *hw_priv) pf_hw = rte_zmalloc_socket("nfp_pf_vnic", 2 * sizeof(struct nfp_net_hw), RTE_CACHE_LINE_SIZE, numa_node); if (pf_hw == NULL) { - PMD_INIT_LOG(ERR, "Could not malloc nfp pf vnic"); + PMD_INIT_LOG(ERR, "Could not malloc nfp pf vnic."); ret = -ENOMEM; goto mtr_priv_cleanup; } @@ -694,7 +694,7 @@ nfp_init_app_fw_flower(struct nfp_net_hw_priv *hw_priv) pf_dev->ctrl_bar = nfp_rtsym_map(pf_dev->sym_tbl, bar_name, pf_dev->ctrl_bar_size, &pf_dev->ctrl_area); if (pf_dev->ctrl_bar == NULL) { - PMD_INIT_LOG(ERR, "Cloud not map the PF vNIC ctrl bar"); + PMD_INIT_LOG(ERR, "Cloud not map the PF vNIC ctrl bar."); ret = -ENODEV; goto vnic_cleanup; } @@ -703,7 +703,7 @@ nfp_init_app_fw_flower(struct nfp_net_hw_priv *hw_priv) ext_features = nfp_rtsym_read_le(pf_dev->sym_tbl, "_abi_flower_extra_features", &err); if (err != 0) { - PMD_INIT_LOG(ERR, "Could not read extra features from fw"); + PMD_INIT_LOG(ERR, "Could not read extra features from fw."); ret = -EIO; goto pf_cpp_area_cleanup; } @@ -718,13 +718,13 @@ nfp_init_app_fw_flower(struct nfp_net_hw_priv *hw_priv) ret = nfp_flower_init_vnic_common(hw_priv, pf_hw, "pf_vnic"); if (ret != 0) { - PMD_INIT_LOG(ERR, "Could not initialize flower PF vNIC"); + PMD_INIT_LOG(ERR, "Could not initialize flower PF vNIC."); goto pf_cpp_area_cleanup; } ret = nfp_net_vf_config_app_init(pf_hw, pf_dev); if (ret != 0) { - PMD_INIT_LOG(ERR, "Failed to init sriov module"); + PMD_INIT_LOG(ERR, "Failed to init sriov module."); goto pf_cpp_area_cleanup; } @@ -739,35 +739,35 @@ nfp_init_app_fw_flower(struct nfp_net_hw_priv *hw_priv) ctrl_hw->super.ctrl_bar = nfp_rtsym_map(pf_dev->sym_tbl, ctrl_name, pf_dev->ctrl_bar_size, &ctrl_hw->ctrl_area); if (ctrl_hw->super.ctrl_bar == NULL) { - PMD_INIT_LOG(ERR, "Cloud not map the ctrl vNIC ctrl bar"); + PMD_INIT_LOG(ERR, "Cloud not map the ctrl vNIC ctrl bar."); ret = -ENODEV; goto pf_cpp_area_cleanup; } ret = nfp_flower_init_ctrl_vnic(app_fw_flower, hw_priv); if (ret != 0) { - PMD_INIT_LOG(ERR, "Could not initialize flower ctrl vNIC"); + PMD_INIT_LOG(ERR, "Could not initialize flower ctrl vNIC."); goto ctrl_cpp_area_cleanup; } /* Start the ctrl vNIC */ ret = nfp_flower_start_ctrl_vnic(app_fw_flower); if (ret != 0) { - PMD_INIT_LOG(ERR, "Could not start flower ctrl vNIC"); + PMD_INIT_LOG(ERR, "Could not start flower ctrl vNIC."); goto ctrl_vnic_cleanup; } /* Start up flower services */ ret = nfp_flower_service_start(hw_priv); if (ret != 0) { - PMD_INIT_LOG(ERR, "Could not enable flower services"); + PMD_INIT_LOG(ERR, "Could not enable flower services."); ret = -ESRCH; goto ctrl_vnic_cleanup; } ret = nfp_flower_repr_create(app_fw_flower, hw_priv); if (ret != 0) { - PMD_INIT_LOG(ERR, "Could not create representor ports"); + PMD_INIT_LOG(ERR, "Could not create representor ports."); goto ctrl_vnic_service_stop; } @@ -807,7 +807,7 @@ nfp_uninit_app_fw_flower(struct nfp_net_hw_priv *hw_priv) nfp_mtr_priv_uninit(pf_dev); nfp_flow_priv_uninit(pf_dev); if (rte_eth_switch_domain_free(app_fw_flower->switch_domain_id) != 0) - PMD_DRV_LOG(WARNING, "Failed to free switch domain for device"); + PMD_DRV_LOG(WARNING, "Failed to free switch domain for device."); rte_free(app_fw_flower); } @@ -833,12 +833,12 @@ nfp_secondary_init_app_fw_flower(struct nfp_net_hw_priv *hw_priv) pci_name = strchr(hw_priv->pf_dev->pci_dev->name, ':') + 1; snprintf(port_name, RTE_ETH_NAME_MAX_LEN, "%s_repr_pf", pci_name); - PMD_INIT_LOG(DEBUG, "Secondary attaching to port %s", port_name); + PMD_INIT_LOG(DEBUG, "Secondary attaching to port %s.", port_name); ret = rte_eth_dev_create(&hw_priv->pf_dev->pci_dev->device, port_name, 0, NULL, NULL, nfp_secondary_flower_init, hw_priv); if (ret != 0) { - PMD_INIT_LOG(ERR, "Secondary process attach to port %s failed", port_name); + PMD_INIT_LOG(ERR, "Secondary process attach to port %s failed.", port_name); return -ENODEV; } diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.c b/drivers/net/nfp/flower/nfp_flower_cmsg.c index 41dd9e6e3e..92bb927196 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, "The 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); @@ -94,7 +94,7 @@ nfp_flower_cmsg_mac_repr(struct nfp_app_fw_flower *app_fw_flower, mbuf = rte_pktmbuf_alloc(app_fw_flower->ctrl_pktmbuf_pool); if (mbuf == NULL) { - PMD_DRV_LOG(ERR, "Could not allocate mac repr cmsg"); + PMD_DRV_LOG(ERR, "Could not allocate mac repr cmsg."); return -ENOMEM; } @@ -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; } @@ -263,7 +263,7 @@ nfp_flower_cmsg_tun_neigh_v4_rule(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, "Failed to alloc mbuf for v4 tun neigh"); + PMD_DRV_LOG(DEBUG, "Failed to alloc mbuf for v4 tun neigh."); return -ENOMEM; } @@ -295,7 +295,7 @@ nfp_flower_cmsg_tun_neigh_v6_rule(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, "Failed to alloc mbuf for v6 tun neigh"); + PMD_DRV_LOG(DEBUG, "Failed to alloc mbuf for v6 tun neigh."); return -ENOMEM; } @@ -328,7 +328,7 @@ nfp_flower_cmsg_tun_off_v4(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, "Failed to alloc mbuf for v4 tun addr"); + PMD_DRV_LOG(DEBUG, "Failed to alloc mbuf for v4 tun addr."); return -ENOMEM; } @@ -371,7 +371,7 @@ nfp_flower_cmsg_tun_off_v6(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, "Failed to alloc mbuf for v6 tun addr"); + PMD_DRV_LOG(DEBUG, "Failed to alloc mbuf for v6 tun addr."); return -ENOMEM; } @@ -415,7 +415,7 @@ nfp_flower_cmsg_pre_tunnel_rule(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, "Failed to alloc mbuf for pre tunnel rule"); + PMD_DRV_LOG(DEBUG, "Failed to alloc mbuf for pre tunnel rule."); return -ENOMEM; } @@ -457,7 +457,7 @@ nfp_flower_cmsg_tun_mac_rule(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, "Failed to alloc mbuf for tunnel mac"); + PMD_DRV_LOG(DEBUG, "Failed to alloc mbuf for tunnel mac."); return -ENOMEM; } @@ -491,7 +491,7 @@ nfp_flower_cmsg_qos_add(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, "Failed to alloc mbuf for qos add"); + PMD_DRV_LOG(DEBUG, "Failed to alloc mbuf for qos add."); return -ENOMEM; } @@ -521,7 +521,7 @@ nfp_flower_cmsg_qos_delete(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, "Failed to alloc mbuf for qos delete"); + PMD_DRV_LOG(DEBUG, "Failed to alloc mbuf for qos delete."); return -ENOMEM; } @@ -551,7 +551,7 @@ nfp_flower_cmsg_qos_stats(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, "Failed to alloc mbuf for qos stats"); + PMD_DRV_LOG(DEBUG, "Failed to alloc mbuf for qos stats."); return -ENOMEM; } diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c b/drivers/net/nfp/flower/nfp_flower_ctrl.c index a44663765b..3bf8b1f399 100644 --- a/drivers/net/nfp/flower/nfp_flower_ctrl.c +++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c @@ -38,7 +38,7 @@ nfp_flower_ctrl_vnic_recv(void *rx_queue, * DPDK just checks the queue is lower than max queues * enabled. But the queue needs to be configured. */ - PMD_RX_LOG(ERR, "RX Bad queue"); + PMD_RX_LOG(ERR, "RX Bad queue."); return 0; } @@ -66,7 +66,7 @@ nfp_flower_ctrl_vnic_recv(void *rx_queue, */ new_mb = rte_pktmbuf_alloc(rxq->mem_pool); if (unlikely(new_mb == NULL)) { - PMD_RX_LOG(ERR, "RX mbuf alloc failed port_id=%u queue_id=%hu", + PMD_RX_LOG(ERR, "RX mbuf alloc failed port_id=%u queue_id=%hu.", rxq->port_id, rxq->qidx); nfp_net_mbuf_alloc_failed(rxq); 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, "The 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; } @@ -236,7 +236,7 @@ nfp_flower_ctrl_vnic_nfdk_xmit(struct nfp_app_fw_flower *app_fw_flower, txq = ctrl_dev->data->tx_queues[0]; if (unlikely(mbuf->nb_segs > 1)) { - PMD_TX_LOG(ERR, "Multisegment packet not supported"); + PMD_TX_LOG(ERR, "Multisegment packet not supported."); return 0; } @@ -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; } @@ -323,7 +323,7 @@ nfp_flower_ctrl_vnic_nfdk_xmit(struct nfp_app_fw_flower *app_fw_flower, used_descs = ktxds - txq->ktxds - txq->wr_p; if (RTE_ALIGN_FLOOR(txq->wr_p, NFDK_TX_DESC_BLOCK_CNT) != RTE_ALIGN_FLOOR(txq->wr_p + used_descs - 1, NFDK_TX_DESC_BLOCK_CNT)) { - PMD_TX_LOG(INFO, "Used descs cross block boundary"); + PMD_TX_LOG(INFO, "Used descs cross block boundary."); return 0; } @@ -442,12 +442,12 @@ 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; } if (repr == NULL) { - PMD_DRV_LOG(ERR, "Can not get 'repr' for port %#x", port); + PMD_DRV_LOG(ERR, "Can not get 'repr' for 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 e65b47e007..abe67be5ae 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, "The 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); @@ -1058,7 +1058,7 @@ nfp_flow_key_layers_check_items(const struct rte_flow_item items[], for (item = items; item->type != RTE_FLOW_ITEM_TYPE_END; ++item) { if (item->type >= RTE_DIM(check_item_fns)) { - PMD_DRV_LOG(ERR, "Flow item %d unsupported", item->type); + PMD_DRV_LOG(ERR, "Flow item %d unsupported.", item->type); return -ERANGE; } @@ -1068,7 +1068,7 @@ nfp_flow_key_layers_check_items(const struct rte_flow_item items[], param->item = item; ret = check_item_fns[item->type](param); if (ret != 0) { - PMD_DRV_LOG(ERR, "Flow item %d check fail", item->type); + PMD_DRV_LOG(ERR, "Flow item %d check fail.", item->type); return ret; } @@ -1264,7 +1264,7 @@ nfp_flow_key_layers_calculate_items(const struct rte_flow_item items[], for (item = items; item->type != RTE_FLOW_ITEM_TYPE_END; ++item) { if (item->type >= RTE_DIM(item_fns) || item_fns[item->type] == NULL) { - PMD_DRV_LOG(ERR, "Flow item %d unsupported", item->type); + PMD_DRV_LOG(ERR, "Flow item %d unsupported.", item->type); return -ERANGE; } @@ -1432,22 +1432,22 @@ nfp_flow_is_validate_field_data(const struct rte_flow_field_data *data, uint32_t data_width) { if (data->level != 0) { - PMD_DRV_LOG(ERR, "The 'level' is not support"); + PMD_DRV_LOG(ERR, "The 'level' is not support."); return false; } if (data->tag_index != 0) { - PMD_DRV_LOG(ERR, "The 'tag_index' is not support"); + PMD_DRV_LOG(ERR, "The 'tag_index' is not support."); return false; } if (data->class_id != 0) { - PMD_DRV_LOG(ERR, "The 'class_id' is not support"); + PMD_DRV_LOG(ERR, "The 'class_id' is not support."); return false; } if (data->offset + conf_width > data_width) { - PMD_DRV_LOG(ERR, "The 'offset' value is too big"); + PMD_DRV_LOG(ERR, "The 'offset' value is too big."); return false; } @@ -1472,25 +1472,25 @@ nfp_flow_action_check_modify(struct nfp_action_calculate_param *param) src_data = &conf->src; if (!nfp_flow_field_id_dst_support(dst_data->field) || !nfp_flow_field_id_src_support(src_data->field)) { - PMD_DRV_LOG(ERR, "Not supported field id"); + PMD_DRV_LOG(ERR, "Not supported field id."); return -EINVAL; } width = conf->width; if (width == 0) { - PMD_DRV_LOG(ERR, "No bits are required to modify"); + PMD_DRV_LOG(ERR, "No bits are required to modify."); return -EINVAL; } dst_width = nfp_flow_field_width(dst_data->field, 0); src_width = nfp_flow_field_width(src_data->field, dst_width); if (width > dst_width || width > src_width) { - PMD_DRV_LOG(ERR, "Can not modify more bits than the width of a field"); + PMD_DRV_LOG(ERR, "Can not modify more bits than the width of a field."); return -EINVAL; } if (!nfp_flow_is_validate_field_data(dst_data, width, dst_width)) { - PMD_DRV_LOG(ERR, "The dest field data has problem"); + PMD_DRV_LOG(ERR, "The dest field data has problem."); return -EINVAL; } @@ -1505,14 +1505,14 @@ nfp_flow_action_check_queue(struct nfp_action_calculate_param *param) repr = param->dev->data->dev_private; if (!nfp_flow_support_partial(repr)) { - PMD_DRV_LOG(ERR, "Queue action not supported"); + PMD_DRV_LOG(ERR, "Queue action not supported."); return -ENOTSUP; } queue = param->action->conf; if (queue->index >= param->dev->data->nb_rx_queues || param->dev->data->rx_queues[queue->index] == NULL) { - PMD_DRV_LOG(ERR, "Queue index is illegal"); + PMD_DRV_LOG(ERR, "Queue index is illegal."); return -EINVAL; } @@ -1541,7 +1541,7 @@ nfp_flow_key_layers_check_actions(struct rte_eth_dev *dev, for (action = actions; action->type != RTE_FLOW_ACTION_TYPE_END; ++action) { if (action->type >= RTE_DIM(check_action_fns)) { - PMD_DRV_LOG(ERR, "Flow action %d unsupported", action->type); + PMD_DRV_LOG(ERR, "Flow action %d unsupported.", action->type); return -ERANGE; } @@ -1551,7 +1551,7 @@ nfp_flow_key_layers_check_actions(struct rte_eth_dev *dev, param.action = action; ret = check_action_fns[action->type](¶m); if (ret != 0) { - PMD_DRV_LOG(ERR, "Flow action %d calculate fail", action->type); + PMD_DRV_LOG(ERR, "Flow action %d calculate fail.", action->type); return ret; } } @@ -1790,7 +1790,7 @@ nfp_flow_key_layers_calculate_actions(struct rte_eth_dev *dev, } if (action->type >= RTE_DIM(action_fns) || action_fns[action->type] == NULL) { - PMD_DRV_LOG(ERR, "Flow action %d unsupported", action->type); + PMD_DRV_LOG(ERR, "Flow action %d unsupported.", action->type); return -ERANGE; } @@ -1800,7 +1800,7 @@ nfp_flow_key_layers_calculate_actions(struct rte_eth_dev *dev, if (param.flag->partial_both_flag && key_ls->act_size != sizeof(struct nfp_fl_act_partial)) { - PMD_DRV_LOG(ERR, "Mark and Queue can not be offloaded with other actions"); + PMD_DRV_LOG(ERR, "Mark and Queue can not be offloaded with other actions."); return -ENOTSUP; } @@ -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; } @@ -2766,7 +2766,7 @@ nfp_flow_compile_item_proc(struct nfp_flower_representor *repr, } if (proc == NULL) { - PMD_DRV_LOG(ERR, "No next item provided for %d", item->type); + PMD_DRV_LOG(ERR, "No next item provided for %d.", item->type); ret = -ENOTSUP; break; } @@ -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; } @@ -3499,7 +3499,7 @@ nfp_flower_del_tun_neigh(struct nfp_app_fw_flower *app_fw_flower, } if (!flag) { - PMD_DRV_LOG(DEBUG, "Can not find nn entry in the nn list"); + PMD_DRV_LOG(DEBUG, "Can not find nn entry in the nn list."); return -EINVAL; } @@ -3544,7 +3544,7 @@ nfp_flower_del_tun_neigh(struct nfp_app_fw_flower *app_fw_flower, } if (ret != 0) { - PMD_DRV_LOG(DEBUG, "Failed to send the nn entry"); + PMD_DRV_LOG(DEBUG, "Failed to send the nn entry."); return -EINVAL; } @@ -3680,7 +3680,7 @@ nfp_pre_tun_table_search(struct nfp_flow_priv *priv, hash_key = rte_jhash(hash_data, hash_len, priv->hash_seed); index = rte_hash_lookup_data(priv->pre_tun_table, &hash_key, (void **)&mac_index); if (index < 0) { - PMD_DRV_LOG(DEBUG, "Data NOT found in the hash table"); + PMD_DRV_LOG(DEBUG, "Data NOT found in the hash table."); return NULL; } @@ -3698,7 +3698,7 @@ nfp_pre_tun_table_add(struct nfp_flow_priv *priv, hash_key = rte_jhash(hash_data, hash_len, priv->hash_seed); ret = rte_hash_add_key_data(priv->pre_tun_table, &hash_key, hash_data); if (ret != 0) { - PMD_DRV_LOG(ERR, "Add to pre tunnel table failed"); + PMD_DRV_LOG(ERR, "Add to pre tunnel table failed."); return false; } @@ -3716,7 +3716,7 @@ nfp_pre_tun_table_delete(struct nfp_flow_priv *priv, hash_key = rte_jhash(hash_data, hash_len, priv->hash_seed); ret = rte_hash_del_key(priv->pre_tun_table, &hash_key); if (ret < 0) { - PMD_DRV_LOG(ERR, "Delete from pre tunnel table failed"); + PMD_DRV_LOG(ERR, "Delete from pre tunnel table failed."); return false; } @@ -3736,14 +3736,14 @@ nfp_pre_tun_table_check_add(struct nfp_flower_representor *repr, priv = repr->app_fw_flower->flow_priv; if (priv->pre_tun_cnt >= NFP_TUN_PRE_TUN_RULE_LIMIT) { - PMD_DRV_LOG(ERR, "Pre tunnel table has full"); + PMD_DRV_LOG(ERR, "Pre tunnel table has full."); return -EINVAL; } entry_size = sizeof(struct nfp_pre_tun_entry); entry = rte_zmalloc("nfp_pre_tun", entry_size, 0); if (entry == NULL) { - PMD_DRV_LOG(ERR, "Memory alloc failed for pre tunnel table"); + PMD_DRV_LOG(ERR, "Memory alloc failed for pre tunnel table."); return -ENOMEM; } @@ -3805,7 +3805,7 @@ nfp_pre_tun_table_check_del(struct nfp_flower_representor *repr, entry_size = sizeof(struct nfp_pre_tun_entry); entry = rte_zmalloc("nfp_pre_tun", entry_size, 0); if (entry == NULL) { - PMD_DRV_LOG(ERR, "Memory alloc failed for pre tunnel table"); + PMD_DRV_LOG(ERR, "Memory alloc failed for pre tunnel table."); return -ENOMEM; } @@ -3839,7 +3839,7 @@ nfp_pre_tun_table_check_del(struct nfp_flower_representor *repr, ret = nfp_flower_cmsg_tun_mac_rule(repr->app_fw_flower, &repr->mac_addr, nfp_mac_idx, true); if (ret != 0) { - PMD_DRV_LOG(ERR, "Send tunnel mac rule failed"); + PMD_DRV_LOG(ERR, "Send tunnel mac rule failed."); ret = -EINVAL; goto free_entry; } @@ -3848,7 +3848,7 @@ nfp_pre_tun_table_check_del(struct nfp_flower_representor *repr, ret = nfp_flower_cmsg_pre_tunnel_rule(repr->app_fw_flower, nfp_flow_meta, nfp_mac_idx, true); if (ret != 0) { - PMD_DRV_LOG(ERR, "Send pre tunnel rule failed"); + PMD_DRV_LOG(ERR, "Send pre tunnel rule failed."); ret = -EINVAL; goto free_entry; } @@ -3856,7 +3856,7 @@ nfp_pre_tun_table_check_del(struct nfp_flower_representor *repr, find_entry->ref_cnt = 1U; if (!nfp_pre_tun_table_delete(priv, (char *)find_entry, entry_size)) { - PMD_DRV_LOG(ERR, "Delete entry from pre tunnel table failed"); + PMD_DRV_LOG(ERR, "Delete entry from pre tunnel table failed."); ret = -EINVAL; goto free_entry; } @@ -3883,7 +3883,7 @@ nfp_flow_action_tunnel_decap(struct nfp_flower_representor *repr, ret = nfp_pre_tun_table_check_add(repr, &nfp_mac_idx); if (ret != 0) { - PMD_DRV_LOG(ERR, "Pre tunnel table add failed"); + PMD_DRV_LOG(ERR, "Pre tunnel table add failed."); return -EINVAL; } @@ -3897,7 +3897,7 @@ nfp_flow_action_tunnel_decap(struct nfp_flower_representor *repr, ret = nfp_flower_cmsg_tun_mac_rule(app_fw_flower, &repr->mac_addr, nfp_mac_idx, false); if (ret != 0) { - PMD_DRV_LOG(ERR, "Send tunnel mac rule failed"); + PMD_DRV_LOG(ERR, "Send tunnel mac rule failed."); return -EINVAL; } @@ -3905,7 +3905,7 @@ nfp_flow_action_tunnel_decap(struct nfp_flower_representor *repr, ret = nfp_flower_cmsg_pre_tunnel_rule(app_fw_flower, nfp_flow_meta, nfp_mac_idx, false); if (ret != 0) { - PMD_DRV_LOG(ERR, "Send pre tunnel rule failed"); + PMD_DRV_LOG(ERR, "Send pre tunnel rule failed."); return -EINVAL; } } @@ -4146,17 +4146,17 @@ nfp_flow_action_meter(struct nfp_flower_representor *representor, mtr = nfp_mtr_find_by_mtr_id(app_fw_flower->mtr_priv, meter->mtr_id); if (mtr == NULL) { - PMD_DRV_LOG(ERR, "Meter id not exist"); + PMD_DRV_LOG(ERR, "Meter id not exist."); return -EINVAL; } if (!mtr->enable) { - PMD_DRV_LOG(ERR, "Requested meter disable"); + PMD_DRV_LOG(ERR, "Requested meter disable."); return -EINVAL; } if (!mtr->shared && mtr->ref_cnt > 0) { - PMD_DRV_LOG(ERR, "Can not use a used unshared meter"); + PMD_DRV_LOG(ERR, "Can not use a used unshared meter."); return -EINVAL; } @@ -4351,7 +4351,7 @@ nfp_flow_action_compile_output(struct nfp_action_compile_param *param) ret = nfp_flow_action_output(param->position, param->action, param->nfp_flow_meta, output_cnt); if (ret != 0) { - PMD_DRV_LOG(ERR, "Failed process output action"); + PMD_DRV_LOG(ERR, "Failed process output action."); return ret; } @@ -4402,7 +4402,7 @@ nfp_flow_action_compile_push_vlan(struct nfp_action_compile_param *param) ret = nfp_flow_action_push_vlan(param->position, param->action); if (ret != 0) { - PMD_DRV_LOG(ERR, "Failed process RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN"); + PMD_DRV_LOG(ERR, "Failed process RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN."); return ret; } @@ -4541,7 +4541,7 @@ nfp_flow_action_compile_vxlan_encap(struct nfp_action_compile_param *param) param->position, param->action_data, param->action, param->nfp_flow_meta, ¶m->nfp_flow->tun); if (ret != 0) { - PMD_DRV_LOG(ERR, "Failed process RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP"); + PMD_DRV_LOG(ERR, "Failed process RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP."); return ret; } @@ -4561,7 +4561,7 @@ nfp_flow_action_compile_raw_encap(struct nfp_action_compile_param *param) param->position, param->action_data, param->action, param->nfp_flow_meta, ¶m->nfp_flow->tun); if (ret != 0) { - PMD_DRV_LOG(ERR, "Failed process RTE_FLOW_ACTION_TYPE_RAW_ENCAP"); + PMD_DRV_LOG(ERR, "Failed process RTE_FLOW_ACTION_TYPE_RAW_ENCAP."); return ret; } @@ -4580,7 +4580,7 @@ nfp_flow_action_compile_tnl_decap(struct nfp_action_compile_param *param) ret = nfp_flow_action_tunnel_decap(param->repr, param->action, param->nfp_flow_meta, param->nfp_flow); if (ret != 0) { - PMD_DRV_LOG(ERR, "Failed process tunnel decap"); + PMD_DRV_LOG(ERR, "Failed process tunnel decap."); return ret; } @@ -4600,7 +4600,7 @@ nfp_flow_action_compile_meter(struct nfp_action_compile_param *param) ret = nfp_flow_action_meter(param->repr, param->action, param->position, ¶m->nfp_flow->mtr_id); if (ret != 0) { - PMD_DRV_LOG(ERR, "Failed process RTE_FLOW_ACTION_TYPE_METER"); + PMD_DRV_LOG(ERR, "Failed process RTE_FLOW_ACTION_TYPE_METER."); return -EINVAL; } @@ -4685,7 +4685,7 @@ nfp_flow_action_compile_rss(struct nfp_action_compile_param *param) ret = nfp_flow_action_rss_add(param->repr, param->action, ¶m->nfp_flow->rss); if (ret != 0) { - PMD_DRV_LOG(ERR, "Failed process RTE_FLOW_ACTION_TYPE_RSS"); + PMD_DRV_LOG(ERR, "Failed process RTE_FLOW_ACTION_TYPE_RSS."); return ret; } @@ -4749,7 +4749,7 @@ nfp_flow_action_compile_modify(struct nfp_action_compile_param *param) } else if (conf->src.field == RTE_FLOW_FIELD_VALUE) { action.conf = (void *)(uintptr_t)&conf->src.value; } else { - PMD_DRV_LOG(ERR, "The SRC field of flow modify is not right"); + PMD_DRV_LOG(ERR, "The SRC field of flow modify is not right."); return -EINVAL; } @@ -4759,7 +4759,7 @@ nfp_flow_action_compile_modify(struct nfp_action_compile_param *param) param->action = &action; ret = nfp_flow_action_compile_modify_dispatch(param, conf->dst.field); if (ret != 0) - PMD_DRV_LOG(ERR, "Something wrong when modify dispatch"); + PMD_DRV_LOG(ERR, "Something wrong when modify dispatch."); /* Reload the old action pointer */ param->action = action_old; @@ -4827,14 +4827,14 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor, for (action = actions; action->type != RTE_FLOW_ACTION_TYPE_END; ++action) { if (action->type >= RTE_DIM(action_compile_fns) || action_compile_fns[action->type] == NULL) { - PMD_DRV_LOG(ERR, "Flow action %d unsupported", action->type); + PMD_DRV_LOG(ERR, "Flow action %d unsupported.", action->type); return -ERANGE; } param.action = action; ret = action_compile_fns[action->type](¶m); if (ret != 0) { - PMD_DRV_LOG(ERR, "Flow action %d compile fail", action->type); + PMD_DRV_LOG(ERR, "Flow action %d compile fail.", action->type); return ret; } @@ -4842,7 +4842,7 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor, } if (nfp_flow->install_flag && total_actions == 0) { - PMD_DRV_LOG(ERR, "The action list is empty"); + PMD_DRV_LOG(ERR, "The action list is empty."); return -ENOTSUP; } @@ -5512,20 +5512,20 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev) ctx_count = nfp_rtsym_read_le(pf_dev->sym_tbl, "CONFIG_FC_HOST_CTX_COUNT", &ret); if (ret < 0) { - PMD_INIT_LOG(ERR, "Read CTX_COUNT from symbol table failed"); + PMD_INIT_LOG(ERR, "Read CTX_COUNT from symbol table failed."); goto exit; } ctx_split = nfp_rtsym_read_le(pf_dev->sym_tbl, "CONFIG_FC_HOST_CTX_SPLIT", &ret); if (ret < 0) { - PMD_INIT_LOG(ERR, "Read CTX_SPLIT from symbol table failed"); + PMD_INIT_LOG(ERR, "Read CTX_SPLIT from symbol table failed."); goto exit; } 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, "The 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; } @@ -5597,7 +5597,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev) pre_tun_hash_params.hash_func_init_val = priv->hash_seed; priv->pre_tun_table = rte_hash_create(&pre_tun_hash_params); if (priv->pre_tun_table == NULL) { - PMD_INIT_LOG(ERR, "Pre tunnel table creation failed"); + PMD_INIT_LOG(ERR, "Pre tunnel table creation failed."); ret = -ENOMEM; goto free_flow_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 73d148ec95..fb0741c294 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, "The 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; } @@ -259,7 +259,7 @@ nfp_flower_repr_rx_burst(void *rx_queue, rxq = rx_queue; if (unlikely(rxq == NULL)) { - PMD_RX_LOG(ERR, "RX Bad queue"); + PMD_RX_LOG(ERR, "RX Bad queue."); return 0; } @@ -275,7 +275,7 @@ nfp_flower_repr_rx_burst(void *rx_queue, total_dequeue = rte_ring_dequeue_burst(repr->ring[rxq->qidx], (void *)rx_pkts, nb_pkts, &available); if (total_dequeue != 0) { - PMD_RX_LOG(DEBUG, "Port: %#x, queue: %hu received: %u, available: %u", + PMD_RX_LOG(DEBUG, "Port: %#x, queue: %hu received: %u, available: %u.", repr->port_id, rxq->qidx, total_dequeue, available); data_len = 0; @@ -306,7 +306,7 @@ nfp_flower_repr_tx_burst(void *tx_queue, txq = tx_queue; if (unlikely(txq == NULL)) { - PMD_TX_LOG(ERR, "TX Bad queue"); + PMD_TX_LOG(ERR, "TX Bad queue."); return 0; } @@ -324,7 +324,7 @@ nfp_flower_repr_tx_burst(void *tx_queue, pf_tx_queue = dev->data->tx_queues[txq->qidx]; sent = nfp_flower_pf_xmit_pkts(pf_tx_queue, tx_pkts, nb_pkts); if (sent != 0) { - PMD_TX_LOG(DEBUG, "Port: %#x transmitted: %hu queue: %u", + PMD_TX_LOG(DEBUG, "Port: %#x transmitted: %hu queue: %u.", repr->port_id, sent, txq->qidx); data_len = 0; @@ -603,7 +603,7 @@ nfp_flower_pf_repr_init(struct rte_eth_dev *eth_dev, /* Allocating memory for mac addr */ eth_dev->data->mac_addrs = rte_zmalloc("mac_addr", RTE_ETHER_ADDR_LEN, 0); if (eth_dev->data->mac_addrs == NULL) { - PMD_INIT_LOG(ERR, "Failed to allocate memory for repr MAC"); + PMD_INIT_LOG(ERR, "Failed to allocate memory for repr MAC."); return -ENOMEM; } @@ -650,7 +650,7 @@ nfp_flower_repr_init(struct rte_eth_dev *eth_dev, sizeof(struct rte_ring *) * app_fw_flower->pf_hw->max_rx_queues, RTE_CACHE_LINE_SIZE, numa_node); if (repr->ring == NULL) { - PMD_DRV_LOG(ERR, "Ring create failed for %s", ring_name); + PMD_DRV_LOG(ERR, "Ring create failed for %s.", ring_name); return -ENOMEM; } @@ -683,7 +683,7 @@ nfp_flower_repr_init(struct rte_eth_dev *eth_dev, /* Allocating memory for mac addr */ eth_dev->data->mac_addrs = rte_zmalloc("mac_addr", RTE_ETHER_ADDR_LEN, 0); if (eth_dev->data->mac_addrs == NULL) { - PMD_INIT_LOG(ERR, "Failed to allocate memory for repr MAC"); + PMD_INIT_LOG(ERR, "Failed to allocate memory for repr MAC."); ret = -ENOMEM; goto ring_cleanup; } @@ -694,7 +694,7 @@ nfp_flower_repr_init(struct rte_eth_dev *eth_dev, /* Send reify message to hardware to inform it about the new repr */ ret = nfp_flower_cmsg_repr_reify(app_fw_flower, repr); if (ret != 0) { - PMD_INIT_LOG(WARNING, "Failed to send repr reify message"); + PMD_INIT_LOG(WARNING, "Failed to send repr reify message."); goto mac_cleanup; } @@ -823,7 +823,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower, /* Send a NFP_FLOWER_CMSG_TYPE_MAC_REPR cmsg to hardware */ ret = nfp_flower_cmsg_mac_repr(app_fw_flower, pf_dev); if (ret != 0) { - PMD_INIT_LOG(ERR, "Cloud not send mac repr cmsgs"); + PMD_INIT_LOG(ERR, "Cloud not send mac repr cmsgs."); return ret; } @@ -850,7 +850,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower, sizeof(struct nfp_flower_representor), NULL, NULL, nfp_flower_pf_repr_init, &flower_repr); if (ret != 0) { - PMD_INIT_LOG(ERR, "Failed to init the pf repr"); + PMD_INIT_LOG(ERR, "Failed to init the pf repr."); return -EINVAL; } @@ -878,7 +878,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower, sizeof(struct nfp_flower_representor), NULL, NULL, nfp_flower_repr_init, &repr_init); if (ret != 0) { - PMD_INIT_LOG(ERR, "Cloud not create eth_dev for repr"); + PMD_INIT_LOG(ERR, "Cloud not create eth_dev for repr."); break; } } @@ -909,7 +909,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower, sizeof(struct nfp_flower_representor), NULL, NULL, nfp_flower_repr_init, &repr_init); if (ret != 0) { - PMD_INIT_LOG(ERR, "Cloud not create eth_dev for repr"); + PMD_INIT_LOG(ERR, "Cloud not create eth_dev for repr."); break; } } @@ -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; } } @@ -968,7 +968,7 @@ nfp_flower_repr_create(struct nfp_app_fw_flower *app_fw_flower, /* Only support VF representor creation via the command line */ if (eth_da.type != RTE_ETH_REPRESENTOR_VF) { - PMD_INIT_LOG(ERR, "Unsupported representor type: %d", eth_da.type); + PMD_INIT_LOG(ERR, "Unsupported representor type: %d.", eth_da.type); return -ENOTSUP; } @@ -977,17 +977,17 @@ nfp_flower_repr_create(struct nfp_app_fw_flower *app_fw_flower, app_fw_flower->num_vf_reprs = eth_da.nb_representor_ports - pf_dev->total_phyports - 1; if (pf_dev->max_vfs != 0 && pf_dev->sriov_vf < app_fw_flower->num_vf_reprs) { - PMD_INIT_LOG(ERR, "The VF repr nums %d is bigger than VF nums %d", + PMD_INIT_LOG(ERR, "The VF repr nums %d is bigger than VF nums %d.", app_fw_flower->num_vf_reprs, pf_dev->sriov_vf); return -ERANGE; } - PMD_INIT_LOG(INFO, "%d number of VF reprs", app_fw_flower->num_vf_reprs); - PMD_INIT_LOG(INFO, "%d number of phyport reprs", app_fw_flower->num_phyport_reprs); + PMD_INIT_LOG(INFO, "%d number of VF reprs.", app_fw_flower->num_vf_reprs); + PMD_INIT_LOG(INFO, "%d number of phyport reprs.", app_fw_flower->num_phyport_reprs); 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/flower/nfp_flower_service.c b/drivers/net/nfp/flower/nfp_flower_service.c index aac11dbb94..b4d987a980 100644 --- a/drivers/net/nfp/flower/nfp_flower_service.c +++ b/drivers/net/nfp/flower/nfp_flower_service.c @@ -155,7 +155,7 @@ nfp_flower_service_start(struct nfp_net_hw_priv *hw_priv) service_handle = nfp_flower_service_handle_get(hw_priv); if (service_handle == NULL) { - PMD_DRV_LOG(ERR, "Can not get service handle"); + PMD_DRV_LOG(ERR, "Can not get service handle."); return -EINVAL; } @@ -175,7 +175,7 @@ nfp_flower_service_start(struct nfp_net_hw_priv *hw_priv) /* Insert the NIC to flower service slot */ ret = nfp_flower_service_insert(hw_priv, service_handle); if (ret == MAX_FLOWER_SERVICE_SLOT) { - PMD_DRV_LOG(ERR, "Flower ctrl vnic service slot over %u", + PMD_DRV_LOG(ERR, "Flower ctrl vnic service slot over %u.", MAX_FLOWER_SERVICE_SLOT); return -ENOSPC; } @@ -192,7 +192,7 @@ nfp_flower_service_stop(struct nfp_net_hw_priv *hw_priv) service_handle = nfp_flower_service_handle_get(hw_priv); if (service_handle == NULL) { - PMD_DRV_LOG(ERR, "Can not get service handle"); + PMD_DRV_LOG(ERR, "Can not get service handle."); return; } diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c index bfcd357774..3ffcbb2576 100644 --- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c +++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c @@ -190,7 +190,7 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw *meta_data, switch (meta_info & NFP_NET_META_FIELD_MASK) { case NFP_NET_META_VLAN: if (vlan_layer > 0) { - PMD_DRV_LOG(ERR, "At most 1 layers of vlan is supported"); + PMD_DRV_LOG(ERR, "At most 1 layers of vlan is supported."); return -EINVAL; } nfp_net_meta_set_vlan(meta_data, pkt, layer); @@ -206,7 +206,7 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw *meta_data, ipsec_layer++; break; default: - PMD_DRV_LOG(ERR, "The metadata type not supported"); + PMD_DRV_LOG(ERR, "The metadata type not supported."); return -ENOTSUP; } @@ -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++) { @@ -288,7 +288,7 @@ nfp_net_nfd3_xmit_pkts_common(void *tx_queue, if (unlikely(pkt->nb_segs > 1 && (hw->super.ctrl & NFP_NET_CFG_CTRL_GATHER) == 0)) { - PMD_TX_LOG(ERR, "Multisegment packet not supported"); + PMD_TX_LOG(ERR, "Multisegment packet not supported."); goto xmit_end; } @@ -396,7 +396,7 @@ nfp_net_nfd3_tx_queue_setup(struct rte_eth_dev *dev, tx_desc_sz = nb_desc * sizeof(struct nfp_net_nfd3_tx_desc); if ((NFD3_TX_DESC_PER_PKT * tx_desc_sz) % NFP_ALIGN_RING_DESC != 0 || nb_desc > max_tx_desc || nb_desc < min_tx_desc) { - PMD_DRV_LOG(ERR, "Wrong nb_desc value"); + PMD_DRV_LOG(ERR, "Wrong nb_desc value."); return -EINVAL; } @@ -414,7 +414,7 @@ nfp_net_nfd3_tx_queue_setup(struct rte_eth_dev *dev, * calling nfp_net_stop(). */ if (dev->data->tx_queues[queue_idx] != NULL) { - PMD_TX_LOG(DEBUG, "Freeing memory prior to re-allocation %d", + PMD_TX_LOG(DEBUG, "Freeing memory prior to re-allocation %d.", queue_idx); nfp_net_tx_queue_release(dev, queue_idx); dev->data->tx_queues[queue_idx] = NULL; @@ -424,7 +424,7 @@ nfp_net_nfd3_tx_queue_setup(struct rte_eth_dev *dev, txq = rte_zmalloc_socket("ethdev TX queue", sizeof(struct nfp_net_txq), RTE_CACHE_LINE_SIZE, socket_id); if (txq == NULL) { - PMD_DRV_LOG(ERR, "Error allocating tx dma"); + PMD_DRV_LOG(ERR, "Error allocating tx dma."); return -ENOMEM; } @@ -439,7 +439,7 @@ nfp_net_nfd3_tx_queue_setup(struct rte_eth_dev *dev, tz = rte_eth_dma_zone_reserve(dev, "tx_ring", queue_idx, size, NFP_MEMZONE_ALIGN, socket_id); if (tz == NULL) { - PMD_DRV_LOG(ERR, "Error allocating tx dma"); + PMD_DRV_LOG(ERR, "Error allocating tx dma."); nfp_net_tx_queue_release(dev, queue_idx); dev->data->tx_queues[queue_idx] = NULL; return -ENOMEM; diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c index 1b789e32dc..15867ab62f 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c @@ -195,7 +195,7 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, ipsec_layer++; break; default: - PMD_DRV_LOG(ERR, "The metadata type not supported"); + PMD_DRV_LOG(ERR, "The metadata type not supported."); return -ENOTSUP; } @@ -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) { @@ -289,7 +289,7 @@ nfp_net_nfdk_xmit_pkts_common(void *tx_queue, if (unlikely(pkt->nb_segs > 1 && (hw->super.ctrl & NFP_NET_CFG_CTRL_GATHER) == 0)) { - PMD_TX_LOG(ERR, "Multisegment packet not supported"); + PMD_TX_LOG(ERR, "Multisegment packet not supported."); goto xmit_end; } @@ -381,7 +381,7 @@ nfp_net_nfdk_xmit_pkts_common(void *tx_queue, if (RTE_ALIGN_FLOOR(txq->wr_p, NFDK_TX_DESC_BLOCK_CNT) != RTE_ALIGN_FLOOR(txq->wr_p + used_descs - 1, NFDK_TX_DESC_BLOCK_CNT)) { - PMD_TX_LOG(INFO, "Used descs cross block boundary"); + PMD_TX_LOG(INFO, "Used descs cross block boundary."); goto xmit_end; } @@ -431,7 +431,7 @@ nfp_net_nfdk_tx_queue_setup(struct rte_eth_dev *dev, if ((NFDK_TX_DESC_PER_SIMPLE_PKT * tx_desc_sz) % NFP_ALIGN_RING_DESC != 0 || (NFDK_TX_DESC_PER_SIMPLE_PKT * nb_desc) % NFDK_TX_DESC_BLOCK_CNT != 0 || nb_desc > max_tx_desc || nb_desc < min_tx_desc) { - PMD_DRV_LOG(ERR, "Wrong nb_desc value"); + PMD_DRV_LOG(ERR, "Wrong nb_desc value."); return -EINVAL; } @@ -450,7 +450,7 @@ nfp_net_nfdk_tx_queue_setup(struct rte_eth_dev *dev, * calling nfp_net_stop(). */ if (dev->data->tx_queues[queue_idx] != NULL) { - PMD_TX_LOG(DEBUG, "Freeing memory prior to re-allocation %d", + PMD_TX_LOG(DEBUG, "Freeing memory prior to re-allocation %d.", queue_idx); nfp_net_tx_queue_release(dev, queue_idx); dev->data->tx_queues[queue_idx] = NULL; @@ -460,7 +460,7 @@ nfp_net_nfdk_tx_queue_setup(struct rte_eth_dev *dev, txq = rte_zmalloc_socket("ethdev TX queue", sizeof(struct nfp_net_txq), RTE_CACHE_LINE_SIZE, socket_id); if (txq == NULL) { - PMD_DRV_LOG(ERR, "Error allocating tx dma"); + PMD_DRV_LOG(ERR, "Error allocating tx dma."); return -ENOMEM; } @@ -474,7 +474,7 @@ nfp_net_nfdk_tx_queue_setup(struct rte_eth_dev *dev, tz = rte_eth_dma_zone_reserve(dev, "tx_ring", queue_idx, size, NFP_MEMZONE_ALIGN, socket_id); if (tz == NULL) { - PMD_DRV_LOG(ERR, "Error allocating tx dma"); + PMD_DRV_LOG(ERR, "Error allocating tx dma."); nfp_net_tx_queue_release(dev, queue_idx); return -ENOMEM; } diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_vec_avx2_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_vec_avx2_dp.c index 6d1359fdb1..8354b0378b 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_vec_avx2_dp.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_vec_avx2_dp.c @@ -152,7 +152,7 @@ nfp_net_nfdk_vec_avx2_xmit_simple_pkts(struct nfp_net_txq *txq, struct rte_mbuf **lmbuf; struct nfp_net_nfdk_tx_desc *ktxds; - PMD_TX_LOG(DEBUG, "Working for queue %hu at pos %u and %hu packets", + PMD_TX_LOG(DEBUG, "Working for queue %hu at pos %u and %hu packets.", txq->qidx, txq->wr_p, nb_pkts); need_txds = nb_pkts << 1; @@ -167,7 +167,7 @@ nfp_net_nfdk_vec_avx2_xmit_simple_pkts(struct nfp_net_txq *txq, 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 >= NFDK_TX_DESC_PER_SIMPLE_PKT) { diff --git a/drivers/net/nfp/nfp_cpp_bridge.c b/drivers/net/nfp/nfp_cpp_bridge.c index 1cd17d0983..da7ea35d62 100644 --- a/drivers/net/nfp/nfp_cpp_bridge.c +++ b/drivers/net/nfp/nfp_cpp_bridge.c @@ -38,7 +38,7 @@ nfp_enable_cpp_service(struct nfp_pf_dev *pf_dev) ret = nfp_service_enable(&cpp_service, &pf_dev->cpp_service_info); if (ret != 0) { - PMD_INIT_LOG(DEBUG, "Could not enable service %s", cpp_service.name); + PMD_INIT_LOG(DEBUG, "Could not enable service %s.", cpp_service.name); return ret; } @@ -71,7 +71,7 @@ nfp_cpp_bridge_serve_write(int sockfd, uint32_t tmpbuf[16]; struct nfp_cpp_area *area; - PMD_CPP_LOG(DEBUG, "%s: offset size %zu, count_size: %zu", __func__, + PMD_CPP_LOG(DEBUG, "%s: offset size %zu, count_size: %zu.", __func__, sizeof(off_t), sizeof(size_t)); /* Reading the count param */ @@ -90,9 +90,9 @@ nfp_cpp_bridge_serve_write(int sockfd, cpp_id = (offset >> 40) << 8; nfp_offset = offset & ((1ull << 40) - 1); - PMD_CPP_LOG(DEBUG, "%s: count %zu and offset %jd", __func__, count, + PMD_CPP_LOG(DEBUG, "%s: count %zu and offset %jd.", __func__, count, offset); - PMD_CPP_LOG(DEBUG, "%s: cpp_id %08x and nfp_offset %jd", __func__, + PMD_CPP_LOG(DEBUG, "%s: cpp_id %08x and nfp_offset %jd.", __func__, cpp_id, nfp_offset); /* Adjust length if not aligned */ @@ -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; } @@ -124,11 +124,11 @@ nfp_cpp_bridge_serve_write(int sockfd, if (len > sizeof(tmpbuf)) len = sizeof(tmpbuf); - PMD_CPP_LOG(DEBUG, "%s: Receive %u of %zu", __func__, + PMD_CPP_LOG(DEBUG, "%s: Receive %u of %zu.", __func__, 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, "The 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; @@ -177,7 +177,7 @@ nfp_cpp_bridge_serve_read(int sockfd, uint32_t tmpbuf[16]; struct nfp_cpp_area *area; - PMD_CPP_LOG(DEBUG, "%s: offset size %zu, count_size: %zu", __func__, + PMD_CPP_LOG(DEBUG, "%s: offset size %zu, count_size: %zu.", __func__, sizeof(off_t), sizeof(size_t)); /* Reading the count param */ @@ -196,9 +196,9 @@ nfp_cpp_bridge_serve_read(int sockfd, cpp_id = (offset >> 40) << 8; nfp_offset = offset & ((1ull << 40) - 1); - PMD_CPP_LOG(DEBUG, "%s: count %zu and offset %jd", __func__, count, + PMD_CPP_LOG(DEBUG, "%s: count %zu and offset %jd.", __func__, count, offset); - PMD_CPP_LOG(DEBUG, "%s: cpp_id %08x and nfp_offset %jd", __func__, + PMD_CPP_LOG(DEBUG, "%s: cpp_id %08x and nfp_offset %jd.", __func__, cpp_id, nfp_offset); /* Adjust length if not aligned */ @@ -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,17 +230,17 @@ nfp_cpp_bridge_serve_read(int sockfd, err = nfp_cpp_area_read(area, pos, tmpbuf, len); if (err < 0) { - PMD_CPP_LOG(ERR, "The 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; } - PMD_CPP_LOG(DEBUG, "%s: sending %u of %zu", __func__, + PMD_CPP_LOG(DEBUG, "%s: sending %u of %zu.", __func__, len, count); 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,39 +278,39 @@ 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; } tmp = nfp_cpp_model(cpp); - PMD_CPP_LOG(DEBUG, "%s: sending NFP model %08x", __func__, tmp); + PMD_CPP_LOG(DEBUG, "%s: sending NFP model %08x.", __func__, tmp); 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; } tmp = nfp_cpp_interface(cpp); - PMD_CPP_LOG(DEBUG, "%s: sending NFP interface %08x", __func__, tmp); + PMD_CPP_LOG(DEBUG, "%s: sending NFP interface %08x.", __func__, tmp); 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; } @@ -389,11 +389,11 @@ nfp_cpp_bridge_service_func(void *args) for (;;) { ret = recv(datafd, &op, 4, 0); if (ret <= 0) { - PMD_CPP_LOG(DEBUG, "%s: socket close", __func__); + PMD_CPP_LOG(DEBUG, "%s: socket close.", __func__); break; } - PMD_CPP_LOG(DEBUG, "%s: getting op %u", __func__, op); + PMD_CPP_LOG(DEBUG, "%s: getting op %u.", __func__, op); if (op == NFP_BRIDGE_OP_READ) nfp_cpp_bridge_serve_read(datafd, cpp); diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 2b55076a18..f2e7bc1eb4 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -61,7 +61,7 @@ nfp_devarg_handle_int(const char *key, *num = strtoul(value, &end_ptr, 10); if (*num == ULONG_MAX) { - PMD_DRV_LOG(ERR, "%s: '%s' is not a valid param", key, value); + PMD_DRV_LOG(ERR, "%s: '%s' is not a valid param.", key, value); return -ERANGE; } else if (value == end_ptr) { return -EPERM; @@ -84,7 +84,7 @@ nfp_devarg_parse_bool_para(struct rte_kvargs *kvlist, return 0; if (count > 1) { - PMD_DRV_LOG(ERR, "Too much bool arguments: %s", key_match); + PMD_DRV_LOG(ERR, "Too much bool arguments: %s.", key_match); return -EINVAL; } @@ -97,7 +97,7 @@ nfp_devarg_parse_bool_para(struct rte_kvargs *kvlist, } else if (value == 0) { *value_ret = false; } else { - PMD_DRV_LOG(ERR, "The param does not work, the format is %s=0/1", + PMD_DRV_LOG(ERR, "The param does not work, the format is %s=0/1.", key_match); return -EINVAL; } @@ -389,7 +389,7 @@ nfp_net_start(struct rte_eth_dev *dev) if (dev->data->dev_conf.intr_conf.rxq != 0) { if (app_fw_nic->multiport) { PMD_INIT_LOG(ERR, "PMD rx interrupt is not supported " - "with NFP multiport PF"); + "with NFP multiport PF."); return -EINVAL; } @@ -403,7 +403,7 @@ nfp_net_start(struct rte_eth_dev *dev) if (dev->data->nb_rx_queues > 1) { PMD_INIT_LOG(ERR, "PMD rx interrupt only " - "supports 1 queue with UIO"); + "supports 1 queue with UIO."); return -EIO; } } @@ -418,7 +418,7 @@ nfp_net_start(struct rte_eth_dev *dev) /* Checking MTU set */ if (dev->data->mtu > net_hw->flbufsz) { - PMD_INIT_LOG(ERR, "MTU (%u) can not be larger than the current NFP_FRAME_SIZE (%u)", + PMD_INIT_LOG(ERR, "MTU (%u) can not be larger than the current NFP_FRAME_SIZE (%u).", dev->data->mtu, net_hw->flbufsz); return -ERANGE; } @@ -573,7 +573,7 @@ nfp_net_beat_timer(void *arg) /* Beat once per second. */ if (rte_eal_alarm_set(1000 * 1000, nfp_net_beat_timer, (void *)multi_pf) < 0) { - PMD_DRV_LOG(ERR, "Error setting alarm"); + PMD_DRV_LOG(ERR, "Error setting alarm."); } } @@ -620,7 +620,7 @@ nfp_net_keepalive_start(struct nfp_multi_pf *multi_pf) { if (rte_eal_alarm_set(1000 * 1000, nfp_net_beat_timer, (void *)multi_pf) < 0) { - PMD_DRV_LOG(ERR, "Error setting alarm"); + PMD_DRV_LOG(ERR, "Error setting alarm."); return -EIO; } @@ -863,20 +863,20 @@ nfp_udp_tunnel_port_add(struct rte_eth_dev *dev, tnl_type = tunnel_udp->prot_type; if (tnl_type != RTE_ETH_TUNNEL_TYPE_VXLAN) { - PMD_DRV_LOG(ERR, "Not VXLAN tunnel"); + PMD_DRV_LOG(ERR, "Not VXLAN tunnel."); return -ENOTSUP; } ret = nfp_net_find_vxlan_idx(hw, vxlan_port, &idx); if (ret != 0) { - PMD_DRV_LOG(ERR, "Failed find valid vxlan idx"); + PMD_DRV_LOG(ERR, "Failed find valid vxlan idx."); return -EINVAL; } if (hw->vxlan_usecnt[idx] == 0) { ret = nfp_net_set_vxlan_port(hw, idx, vxlan_port); if (ret != 0) { - PMD_DRV_LOG(ERR, "Failed set vxlan port"); + PMD_DRV_LOG(ERR, "Failed set vxlan port."); return -EINVAL; } } @@ -901,13 +901,13 @@ nfp_udp_tunnel_port_del(struct rte_eth_dev *dev, tnl_type = tunnel_udp->prot_type; if (tnl_type != RTE_ETH_TUNNEL_TYPE_VXLAN) { - PMD_DRV_LOG(ERR, "Not VXLAN tunnel"); + PMD_DRV_LOG(ERR, "Not VXLAN tunnel."); return -ENOTSUP; } ret = nfp_net_find_vxlan_idx(hw, vxlan_port, &idx); if (ret != 0 || hw->vxlan_usecnt[idx] == 0) { - PMD_DRV_LOG(ERR, "Failed find valid vxlan idx"); + PMD_DRV_LOG(ERR, "Failed find valid vxlan idx."); return -EINVAL; } @@ -916,7 +916,7 @@ nfp_udp_tunnel_port_del(struct rte_eth_dev *dev, if (hw->vxlan_usecnt[idx] == 0) { ret = nfp_net_set_vxlan_port(hw, idx, 0); if (ret != 0) { - PMD_DRV_LOG(ERR, "Failed set vxlan port"); + PMD_DRV_LOG(ERR, "Failed set vxlan port."); return -EINVAL; } } @@ -1023,14 +1023,14 @@ nfp_net_init(struct rte_eth_dev *eth_dev, port = net_hw->idx; if (port > 7) { - PMD_DRV_LOG(ERR, "Port value is wrong"); + PMD_DRV_LOG(ERR, "Port value is wrong."); return -ENODEV; } hw = &net_hw->super; PMD_INIT_LOG(DEBUG, "Working with physical port number: %hu, " - "NFP internal port number: %d", port, net_hw->nfp_idx); + "NFP internal port number: %d.", port, net_hw->nfp_idx); rte_eth_copy_pci_info(eth_dev, pci_dev); @@ -1042,8 +1042,8 @@ 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, "MAC stats: %p", net_hw->mac_stats); + 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); if (err != 0) @@ -1051,13 +1051,13 @@ nfp_net_init(struct rte_eth_dev *eth_dev, err = nfp_net_tlv_caps_parse(eth_dev); if (err != 0) { - PMD_INIT_LOG(ERR, "Failed to parser TLV caps"); + PMD_INIT_LOG(ERR, "Failed to parser TLV caps."); return err; } err = nfp_ipsec_init(eth_dev); if (err != 0) { - PMD_INIT_LOG(ERR, "Failed to init IPsec module"); + PMD_INIT_LOG(ERR, "Failed to init IPsec module."); return err; } @@ -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, "The 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); @@ -1097,7 +1097,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev, if ((port == 0 || pf_dev->multi_pf.enabled)) { err = nfp_net_vf_config_app_init(net_hw, pf_dev); if (err != 0) { - PMD_INIT_LOG(ERR, "Failed to init sriov module"); + PMD_INIT_LOG(ERR, "Failed to init sriov module."); goto xstats_free; } } @@ -1105,7 +1105,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev, /* Allocating memory for mac addr */ eth_dev->data->mac_addrs = rte_zmalloc("mac_addr", RTE_ETHER_ADDR_LEN, 0); if (eth_dev->data->mac_addrs == NULL) { - PMD_INIT_LOG(ERR, "Failed to space for MAC address"); + PMD_INIT_LOG(ERR, "Failed to space for MAC address."); err = -ENOMEM; goto xstats_free; } @@ -1120,7 +1120,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev, nfp_write_mac(hw, &hw->mac_addr.addr_bytes[0]); if (rte_is_valid_assigned_ether_addr(&hw->mac_addr) == 0) { - PMD_INIT_LOG(INFO, "Using random mac address for port %d", port); + PMD_INIT_LOG(INFO, "Using random mac address for port %d.", port); /* Using random mac addresses for VFs */ rte_eth_random_addr(&hw->mac_addr.addr_bytes[0]); nfp_write_mac(hw, &hw->mac_addr.addr_bytes[0]); @@ -1153,7 +1153,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev, if ((hw->cap_ext & NFP_NET_CFG_CTRL_FLOW_STEER) != 0) { err = nfp_net_flow_priv_init(pf_dev, port); if (err != 0) { - PMD_INIT_LOG(ERR, "Init net flow priv failed"); + PMD_INIT_LOG(ERR, "Init net flow priv failed."); goto txrwb_free; } } @@ -1182,7 +1182,7 @@ nfp_net_device_activate(struct nfp_pf_dev *pf_dev) if (multi_pf->enabled && multi_pf->function_id != 0) { nsp = nfp_nsp_open(pf_dev->cpp); if (nsp == NULL) { - PMD_DRV_LOG(ERR, "NFP error when obtaining NSP handle"); + PMD_DRV_LOG(ERR, "NFP error when obtaining NSP handle."); return -EIO; } @@ -1224,7 +1224,7 @@ nfp_fw_get_name(struct nfp_pf_dev *pf_dev, cpp_serial[4], cpp_serial[5], interface >> 8, interface & 0xff); snprintf(fw_name, fw_size, "%s/%s.nffw", DEFAULT_FW_PATH, serial); - PMD_DRV_LOG(DEBUG, "Trying with fw file: %s", fw_name); + PMD_DRV_LOG(DEBUG, "Trying with fw file: %s.", fw_name); if (access(fw_name, F_OK) == 0) return 0; @@ -1232,7 +1232,7 @@ nfp_fw_get_name(struct nfp_pf_dev *pf_dev, snprintf(fw_name, fw_size, "%s/pci-%s.nffw", DEFAULT_FW_PATH, pf_dev->pci_dev->name); - PMD_DRV_LOG(DEBUG, "Trying with fw file: %s", fw_name); + PMD_DRV_LOG(DEBUG, "Trying with fw file: %s.", fw_name); if (access(fw_name, F_OK) == 0) return 0; @@ -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; } } @@ -1248,7 +1248,7 @@ nfp_fw_get_name(struct nfp_pf_dev *pf_dev, /* And then try the model name */ snprintf(card_desc, sizeof(card_desc), "%s.nffw", nfp_fw_model); snprintf(fw_name, fw_size, "%s/%s", DEFAULT_FW_PATH, card_desc); - PMD_DRV_LOG(DEBUG, "Trying with fw file: %s", fw_name); + PMD_DRV_LOG(DEBUG, "Trying with fw file: %s.", fw_name); if (access(fw_name, F_OK) == 0) return 0; @@ -1257,7 +1257,7 @@ nfp_fw_get_name(struct nfp_pf_dev *pf_dev, nfp_fw_model, pf_dev->nfp_eth_table->count, pf_dev->nfp_eth_table->ports[0].speed / 1000); snprintf(fw_name, fw_size, "%s/%s", DEFAULT_FW_PATH, card_desc); - PMD_DRV_LOG(DEBUG, "Trying with fw file: %s", fw_name); + PMD_DRV_LOG(DEBUG, "Trying with fw file: %s.", fw_name); if (access(fw_name, F_OK) == 0) return 0; @@ -1278,7 +1278,7 @@ nfp_fw_upload(struct nfp_nsp *nsp, return -ENOENT; } - PMD_DRV_LOG(INFO, "Firmware file found at %s with size: %zu", + PMD_DRV_LOG(INFO, "Firmware file found at %s with size: %zu.", fw_name, fsize); PMD_DRV_LOG(INFO, "Uploading the firmware ..."); if (nfp_nsp_load_fw(nsp, fw_buf, fsize) < 0) { @@ -1287,7 +1287,7 @@ nfp_fw_upload(struct nfp_nsp *nsp, return -EIO; } - PMD_DRV_LOG(INFO, "Done"); + PMD_DRV_LOG(INFO, "Done."); free(fw_buf); @@ -1327,11 +1327,11 @@ nfp_fw_check_change(struct nfp_cpp *cpp, nfp_net_get_fw_version(cpp, &old_version); if (new_version != old_version) { - PMD_DRV_LOG(INFO, "FW version is changed, new %u, old %u", + PMD_DRV_LOG(INFO, "FW version is changed, new %u, old %u.", new_version, old_version); *fw_changed = true; } else { - PMD_DRV_LOG(INFO, "FW version is not changed and is %u", new_version); + PMD_DRV_LOG(INFO, "FW version is not changed and is %u.", new_version); *fw_changed = false; } @@ -1380,7 +1380,7 @@ nfp_fw_reload(struct nfp_nsp *nsp, if (reset_flag) { err = nfp_nsp_device_soft_reset(nsp); if (err != 0) { - PMD_DRV_LOG(ERR, "NFP firmware soft reset failed"); + PMD_DRV_LOG(ERR, "NFP firmware soft reset failed."); return err; } } @@ -1395,7 +1395,7 @@ nfp_fw_reload(struct nfp_nsp *nsp, err = nfp_fw_upload(nsp, fw_name); if (err != 0) { - PMD_DRV_LOG(ERR, "NFP firmware load failed"); + PMD_DRV_LOG(ERR, "NFP firmware load failed."); return err; } @@ -1447,7 +1447,7 @@ nfp_fw_skip_load(const struct nfp_dev_info *dev_info, beat[port_num] = 0; if (*reload_fw) { *reload_fw = false; - PMD_DRV_LOG(ERR, "The param %s does not work", + PMD_DRV_LOG(ERR, "The param %s does not work.", NFP_PF_FORCE_RELOAD_FW); } } @@ -1581,13 +1581,13 @@ nfp_fw_reload_for_multi_pf(struct nfp_nsp *nsp, err = nfp_net_keepalive_init(pf_dev->cpp, multi_pf); if (err != 0) { - PMD_DRV_LOG(ERR, "NFP init beat failed"); + PMD_DRV_LOG(ERR, "NFP init beat failed."); return err; } err = nfp_net_keepalive_start(multi_pf); if (err != 0) { - PMD_DRV_LOG(ERR, "NFP write beat failed"); + PMD_DRV_LOG(ERR, "NFP write beat failed."); goto keepalive_uninit; } @@ -1660,7 +1660,7 @@ nfp_fw_policy_value_get(struct nfp_nsp *nsp, ret = nfp_strtol(buf, 0, &val); if (ret != 0 || val < 0 || val > max_val) { - PMD_DRV_LOG(WARNING, "Invalid value '%s' from '%s', ignoring", + PMD_DRV_LOG(WARNING, "Invalid value '%s' from '%s', ignoring.", buf, key); /* Fall back to the default value */ ret = nfp_strtol(default_val, 0, &val); @@ -1685,7 +1685,7 @@ nfp_fw_setup(struct nfp_pf_dev *pf_dev, nsp = nfp_nsp_open(pf_dev->cpp); if (nsp == NULL) { - PMD_DRV_LOG(ERR, "NFP error when obtaining NSP handle"); + PMD_DRV_LOG(ERR, "NFP error when obtaining NSP handle."); return -EIO; } @@ -1744,7 +1744,7 @@ nfp_check_multi_pf_from_nsp(struct rte_pci_device *pci_dev, nsp = nfp_nsp_open(cpp); if (nsp == NULL) { - PMD_DRV_LOG(ERR, "NFP error when obtaining NSP handle"); + PMD_DRV_LOG(ERR, "NFP error when obtaining NSP handle."); return false; } @@ -1776,7 +1776,7 @@ nfp_enable_multi_pf(struct nfp_pf_dev *pf_dev) ctrl_bar = nfp_rtsym_map(pf_dev->sym_tbl, name, pf_dev->ctrl_bar_size, &area); if (ctrl_bar == NULL) { - PMD_INIT_LOG(ERR, "Failed to find data vNIC memory symbol"); + PMD_INIT_LOG(ERR, "Failed to find data vNIC memory symbol."); return -ENODEV; } @@ -1798,7 +1798,7 @@ nfp_enable_multi_pf(struct nfp_pf_dev *pf_dev) cap_extend = nn_cfg_readl(hw, NFP_NET_CFG_CAP_WORD1); if ((cap_extend & NFP_NET_CFG_CTRL_MULTI_PF) == 0) { - PMD_INIT_LOG(ERR, "Loaded firmware does not support multiple PF"); + PMD_INIT_LOG(ERR, "Loaded firmware does not support multiple PF."); err = -EINVAL; goto end; } @@ -1822,7 +1822,7 @@ nfp_app_fw_nic_total_phyports_check(struct nfp_pf_dev *pf_dev) if (pf_dev->multi_pf.enabled) { if (!nfp_check_multi_pf_from_fw(total_phyports)) { - PMD_INIT_LOG(ERR, "NSP report multipf, but FW report not multipf"); + PMD_INIT_LOG(ERR, "NSP report multipf, but FW report not multipf."); return false; } } else { @@ -1831,7 +1831,7 @@ nfp_app_fw_nic_total_phyports_check(struct nfp_pf_dev *pf_dev) * number of physical ports. */ if (total_phyports != pf_dev->nfp_eth_table->count) { - PMD_INIT_LOG(ERR, "Total physical ports do not match number of vNICs"); + PMD_INIT_LOG(ERR, "Total physical ports do not match number of vNICs."); return false; } } @@ -1869,7 +1869,7 @@ nfp_init_app_fw_nic(struct nfp_net_hw_priv *hw_priv) }; nfp_eth_table = pf_dev->nfp_eth_table; - PMD_INIT_LOG(INFO, "Total physical ports: %d", nfp_eth_table->count); + PMD_INIT_LOG(INFO, "Total physical ports: %d.", nfp_eth_table->count); id = nfp_function_id_get(pf_dev, 0); /* Allocate memory for the CoreNIC app */ @@ -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, "The 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++) { @@ -2141,7 +2141,7 @@ nfp_fw_app_primary_init(struct nfp_net_hw_priv *hw_priv) switch (pf_dev->app_fw_id) { case NFP_APP_FW_CORE_NIC: - PMD_INIT_LOG(INFO, "Initializing coreNIC"); + PMD_INIT_LOG(INFO, "Initializing coreNIC."); ret = nfp_init_app_fw_nic(hw_priv); if (ret != 0) { PMD_INIT_LOG(ERR, "Could not initialize coreNIC!"); @@ -2149,7 +2149,7 @@ nfp_fw_app_primary_init(struct nfp_net_hw_priv *hw_priv) } break; case NFP_APP_FW_FLOWER_NIC: - PMD_INIT_LOG(INFO, "Initializing Flower"); + PMD_INIT_LOG(INFO, "Initializing Flower."); ret = nfp_init_app_fw_flower(hw_priv); if (ret != 0) { PMD_INIT_LOG(ERR, "Could not initialize Flower!"); @@ -2157,7 +2157,7 @@ nfp_fw_app_primary_init(struct nfp_net_hw_priv *hw_priv) } break; default: - PMD_INIT_LOG(ERR, "Unsupported Firmware loaded"); + PMD_INIT_LOG(ERR, "Unsupported Firmware loaded."); ret = -EINVAL; return ret; } @@ -2197,7 +2197,7 @@ nfp_pf_get_sriov_vf(struct nfp_pf_dev *pf_dev, pos = rte_pci_find_ext_capability(pf_dev->pci_dev, RTE_PCI_EXT_CAP_ID_SRIOV); if (pos == 0) { - PMD_INIT_LOG(ERR, "Can not get the pci sriov cap"); + PMD_INIT_LOG(ERR, "Can not get the pci sriov cap."); return -EIO; } @@ -2208,7 +2208,7 @@ nfp_pf_get_sriov_vf(struct nfp_pf_dev *pf_dev, ret = rte_pci_read_config(pf_dev->pci_dev, &sriov_vf, sizeof(sriov_vf), pos + RTE_PCI_SRIOV_TOTAL_VF); if (ret < 0) { - PMD_INIT_LOG(ERR, "Can not read the sriov toatl VF"); + PMD_INIT_LOG(ERR, "Can not read the sriov toatl VF."); return -EIO; } @@ -2216,7 +2216,7 @@ nfp_pf_get_sriov_vf(struct nfp_pf_dev *pf_dev, ret = rte_pci_read_config(pf_dev->pci_dev, &offset, sizeof(offset), pos + RTE_PCI_SRIOV_VF_OFFSET); if (ret < 0) { - PMD_INIT_LOG(ERR, "Can not get the VF offset"); + PMD_INIT_LOG(ERR, "Can not get the VF offset."); return -EIO; } @@ -2226,7 +2226,7 @@ nfp_pf_get_sriov_vf(struct nfp_pf_dev *pf_dev, offset -= dev_info->pf_num_per_unit; if (offset >= pf_dev->max_vfs || offset + sriov_vf > pf_dev->max_vfs) { - PMD_INIT_LOG(ERR, "The pci allocate VF is more than the MAX VF"); + PMD_INIT_LOG(ERR, "The pci allocate VF is more than the MAX VF."); return -ERANGE; } @@ -2245,11 +2245,11 @@ nfp_net_get_vf_info(struct nfp_pf_dev *pf_dev, ret = nfp_pf_get_max_vf(pf_dev); if (ret != 0) { if (ret != -ENOENT) { - PMD_INIT_LOG(ERR, "Read max VFs failed"); + PMD_INIT_LOG(ERR, "Read max VFs failed."); return ret; } - PMD_INIT_LOG(WARNING, "The firmware can not support read max VFs"); + PMD_INIT_LOG(WARNING, "The firmware can not support read max VFs."); return 0; } @@ -2335,13 +2335,13 @@ nfp_pf_init(struct rte_pci_device *pci_dev) dev_info = nfp_dev_info_get(pci_dev->id.device_id); if (dev_info == NULL) { - PMD_INIT_LOG(ERR, "Not supported device ID"); + PMD_INIT_LOG(ERR, "Not supported device ID."); return -ENODEV; } hw_priv = rte_zmalloc(NULL, sizeof(*hw_priv), 0); if (hw_priv == NULL) { - PMD_INIT_LOG(ERR, "Can not alloc memory for hw priv data"); + PMD_INIT_LOG(ERR, "Can not alloc memory for hw priv data."); return -ENOMEM; } @@ -2350,7 +2350,7 @@ nfp_pf_init(struct rte_pci_device *pci_dev) snprintf(name, sizeof(name), "nfp_pf%u", function_id); pf_dev = rte_zmalloc(name, sizeof(*pf_dev), 0); if (pf_dev == NULL) { - PMD_INIT_LOG(ERR, "Can not allocate memory for the PF device"); + PMD_INIT_LOG(ERR, "Can not allocate memory for the PF device."); ret = -ENOMEM; goto hw_priv_free; } @@ -2380,7 +2380,7 @@ nfp_pf_init(struct rte_pci_device *pci_dev) cpp = nfp_cpp_from_nfp6000_pcie(pci_dev, dev_info, true); if (cpp == NULL) { - PMD_INIT_LOG(ERR, "A CPP handle can not be obtained"); + PMD_INIT_LOG(ERR, "A CPP handle can not be obtained."); ret = -EIO; goto sync_free; } @@ -2390,7 +2390,7 @@ nfp_pf_init(struct rte_pci_device *pci_dev) hwinfo = nfp_hwinfo_read(cpp); if (hwinfo == NULL) { - PMD_INIT_LOG(ERR, "Error reading hwinfo table"); + PMD_INIT_LOG(ERR, "Error reading hwinfo table."); ret = -EIO; goto cpp_cleanup; } @@ -2400,13 +2400,13 @@ nfp_pf_init(struct rte_pci_device *pci_dev) /* Read the number of physical ports from hardware */ nfp_eth_table = nfp_eth_read_ports(cpp); if (nfp_eth_table == NULL) { - PMD_INIT_LOG(ERR, "Error reading NFP ethernet table"); + PMD_INIT_LOG(ERR, "Error reading NFP ethernet table."); ret = -EIO; goto hwinfo_cleanup; } if (nfp_eth_table->count == 0 || nfp_eth_table->count > 8) { - PMD_INIT_LOG(ERR, "NFP ethernet table reports wrong ports: %u", + PMD_INIT_LOG(ERR, "NFP ethernet table reports wrong ports: %u.", nfp_eth_table->count); ret = -EIO; goto eth_table_cleanup; @@ -2419,28 +2419,28 @@ nfp_pf_init(struct rte_pci_device *pci_dev) ret = nfp_net_force_port_down(pf_dev); if (ret != 0) { - PMD_INIT_LOG(ERR, "Failed to force port down"); + PMD_INIT_LOG(ERR, "Failed to force port down."); ret = -EIO; goto eth_table_cleanup; } ret = nfp_devargs_parse(&pf_dev->devargs, pci_dev->device.devargs); if (ret != 0) { - PMD_INIT_LOG(ERR, "Error when parsing device args"); + PMD_INIT_LOG(ERR, "Error when parsing device args."); ret = -EINVAL; goto eth_table_cleanup; } ret = nfp_net_device_activate(pf_dev); if (ret != 0) { - PMD_INIT_LOG(ERR, "Failed to activate the NFP device"); + PMD_INIT_LOG(ERR, "Failed to activate the NFP device."); ret = -EIO; goto eth_table_cleanup; } ret = nfp_fw_setup(pf_dev, dev_info); if (ret != 0) { - PMD_INIT_LOG(ERR, "Error when uploading firmware"); + PMD_INIT_LOG(ERR, "Error when uploading firmware."); ret = -EIO; goto eth_table_cleanup; } @@ -2448,7 +2448,7 @@ nfp_pf_init(struct rte_pci_device *pci_dev) /* Now the symbol table should be there */ sym_tbl = nfp_rtsym_table_read(cpp); if (sym_tbl == NULL) { - PMD_INIT_LOG(ERR, "Something is wrong with the firmware symbol table"); + PMD_INIT_LOG(ERR, "Something is wrong with the firmware symbol table."); ret = -EIO; goto fw_cleanup; } @@ -2459,7 +2459,7 @@ nfp_pf_init(struct rte_pci_device *pci_dev) snprintf(app_name, sizeof(app_name), "_pf%u_net_app_id", function_id); app_fw_id = nfp_rtsym_read_le(sym_tbl, app_name, &ret); if (ret != 0) { - PMD_INIT_LOG(ERR, "Could not read %s from firmware", app_name); + PMD_INIT_LOG(ERR, "Could not read %s from firmware.", app_name); ret = -EIO; goto sym_tbl_cleanup; } @@ -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, "The 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, "The 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, "The nfp_rtsym_map fails for _mac_stats"); + PMD_INIT_LOG(ERR, "The nfp_rtsym_map fails for _mac_stats."); goto hwqueues_cleanup; } @@ -2603,11 +2603,11 @@ nfp_secondary_init_app_fw_nic(struct nfp_net_hw_priv *hw_priv) for (i = 0; i < total_vnics; i++) { nfp_port_name_generate(port_name, sizeof(port_name), i, pf_dev); - PMD_INIT_LOG(DEBUG, "Secondary attaching to port %s", port_name); + PMD_INIT_LOG(DEBUG, "Secondary attaching to port %s.", port_name); ret = rte_eth_dev_create(&pf_dev->pci_dev->device, port_name, 0, NULL, NULL, nfp_secondary_net_init, hw_priv); if (ret != 0) { - PMD_INIT_LOG(ERR, "Secondary process attach to port %s failed", port_name); + PMD_INIT_LOG(ERR, "Secondary process attach to port %s failed.", port_name); goto port_cleanup; } } @@ -2635,7 +2635,7 @@ nfp_fw_app_secondary_init(struct nfp_net_hw_priv *hw_priv) switch (pf_dev->app_fw_id) { case NFP_APP_FW_CORE_NIC: - PMD_INIT_LOG(INFO, "Initializing coreNIC"); + PMD_INIT_LOG(INFO, "Initializing coreNIC."); ret = nfp_secondary_init_app_fw_nic(hw_priv); if (ret != 0) { PMD_INIT_LOG(ERR, "Could not initialize coreNIC!"); @@ -2643,7 +2643,7 @@ nfp_fw_app_secondary_init(struct nfp_net_hw_priv *hw_priv) } break; case NFP_APP_FW_FLOWER_NIC: - PMD_INIT_LOG(INFO, "Initializing Flower"); + PMD_INIT_LOG(INFO, "Initializing Flower."); ret = nfp_secondary_init_app_fw_flower(hw_priv); if (ret != 0) { PMD_INIT_LOG(ERR, "Could not initialize Flower!"); @@ -2651,7 +2651,7 @@ nfp_fw_app_secondary_init(struct nfp_net_hw_priv *hw_priv) } break; default: - PMD_INIT_LOG(ERR, "Unsupported Firmware loaded"); + PMD_INIT_LOG(ERR, "Unsupported Firmware loaded."); ret = -EINVAL; return ret; } @@ -2689,13 +2689,13 @@ nfp_pf_secondary_init(struct rte_pci_device *pci_dev) dev_info = nfp_dev_info_get(pci_dev->id.device_id); if (dev_info == NULL) { - PMD_INIT_LOG(ERR, "Not supported device ID"); + PMD_INIT_LOG(ERR, "Not supported device ID."); return -ENODEV; } hw_priv = rte_zmalloc(NULL, sizeof(*hw_priv), 0); if (hw_priv == NULL) { - PMD_INIT_LOG(ERR, "Can not alloc memory for hw priv data"); + PMD_INIT_LOG(ERR, "Can not alloc memory for hw priv data."); return -ENOMEM; } @@ -2704,7 +2704,7 @@ nfp_pf_secondary_init(struct rte_pci_device *pci_dev) snprintf(name, sizeof(name), "nfp_pf%d", 0); pf_dev = rte_zmalloc(name, sizeof(*pf_dev), 0); if (pf_dev == NULL) { - PMD_INIT_LOG(ERR, "Can not allocate memory for the PF device"); + PMD_INIT_LOG(ERR, "Can not allocate memory for the PF device."); ret = -ENOMEM; goto hw_priv_free; } @@ -2734,7 +2734,7 @@ nfp_pf_secondary_init(struct rte_pci_device *pci_dev) cpp = nfp_cpp_from_nfp6000_pcie(pci_dev, dev_info, true); if (cpp == NULL) { - PMD_INIT_LOG(ERR, "A CPP handle can not be obtained"); + PMD_INIT_LOG(ERR, "A CPP handle can not be obtained."); ret = -EIO; goto sync_free; } @@ -2748,7 +2748,7 @@ nfp_pf_secondary_init(struct rte_pci_device *pci_dev) */ sym_tbl = nfp_rtsym_table_read(cpp); if (sym_tbl == NULL) { - PMD_INIT_LOG(ERR, "Something is wrong with the firmware symbol table"); + PMD_INIT_LOG(ERR, "Something is wrong with the firmware symbol table."); ret = -EIO; goto cpp_cleanup; } @@ -2764,7 +2764,7 @@ nfp_pf_secondary_init(struct rte_pci_device *pci_dev) snprintf(app_name, sizeof(app_name), "_pf%u_net_app_id", function_id); app_fw_id = nfp_rtsym_read_le(sym_tbl, app_name, &ret); if (ret != 0) { - PMD_INIT_LOG(ERR, "Could not read %s from fw", app_name); + PMD_INIT_LOG(ERR, "Could not read %s from fw.", app_name); ret = -EIO; goto sym_tbl_cleanup; } diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index b5fa05fc10..4941c915e7 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -51,7 +51,7 @@ nfp_netvf_start(struct rte_eth_dev *dev) if (dev->data->nb_rx_queues > 1) { PMD_INIT_LOG(ERR, "PMD rx interrupt only " - "supports 1 queue with UIO"); + "supports 1 queue with UIO."); return -EIO; } } @@ -268,7 +268,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) dev_info = nfp_dev_info_get(pci_dev->id.device_id); if (dev_info == NULL) { - PMD_INIT_LOG(ERR, "Not supported device ID"); + PMD_INIT_LOG(ERR, "Not supported device ID."); return -ENODEV; } @@ -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, "The 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) @@ -308,7 +308,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) hw_priv = rte_zmalloc(NULL, sizeof(*hw_priv), 0); if (hw_priv == NULL) { - PMD_INIT_LOG(ERR, "Can not alloc memory for hw priv data"); + PMD_INIT_LOG(ERR, "Can not alloc memory for hw priv data."); err = -ENOMEM; goto hw_priv_free; } @@ -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, "The 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); @@ -358,14 +358,14 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) /* Allocating memory for mac addr */ eth_dev->data->mac_addrs = rte_zmalloc("mac_addr", RTE_ETHER_ADDR_LEN, 0); if (eth_dev->data->mac_addrs == NULL) { - PMD_INIT_LOG(ERR, "Failed to space for MAC address"); + PMD_INIT_LOG(ERR, "Failed to space for MAC address."); err = -ENOMEM; goto free_xstats; } nfp_read_mac(hw); if (rte_is_valid_assigned_ether_addr(&hw->mac_addr) == 0) { - PMD_INIT_LOG(INFO, "Using random mac address for port %hu", port); + PMD_INIT_LOG(INFO, "Using random mac address for port %hu.", port); /* Using random mac addresses for VFs */ rte_eth_random_addr(&hw->mac_addr.addr_bytes[0]); nfp_write_mac(hw, &hw->mac_addr.addr_bytes[0]); diff --git a/drivers/net/nfp/nfp_ipsec.c b/drivers/net/nfp/nfp_ipsec.c index 89116af1b2..b8f6d06371 100644 --- a/drivers/net/nfp/nfp_ipsec.c +++ b/drivers/net/nfp/nfp_ipsec.c @@ -453,7 +453,7 @@ nfp_ipsec_cfg_cmd_issue(struct nfp_net_hw *net_hw, ret = nfp_net_mbox_reconfig(net_hw, NFP_NET_CFG_MBOX_CMD_IPSEC); if (ret < 0) { - PMD_DRV_LOG(ERR, "Failed to IPsec reconfig mbox"); + PMD_DRV_LOG(ERR, "Failed to IPsec reconfig mbox."); return ret; } @@ -530,7 +530,7 @@ nfp_aesgcm_iv_update(struct ipsec_add_sa *cfg, iv_str = strdup(iv_string); if (iv_str == NULL) { - PMD_DRV_LOG(ERR, "Failed to strdup iv_string"); + PMD_DRV_LOG(ERR, "Failed to strdup iv_string."); return; } @@ -616,13 +616,13 @@ nfp_aead_map(struct rte_eth_dev *eth_dev, } if (aead->digest_length != 16) { - PMD_DRV_LOG(ERR, "ICV must be 128bit with RTE_CRYPTO_AEAD_CHACHA20_POLY1305"); + PMD_DRV_LOG(ERR, "ICV must be 128bit with RTE_CRYPTO_AEAD_CHACHA20_POLY1305."); return -EINVAL; } /* Aead->alg_key_len includes 32-bit salt */ if (key_length != 32) { - PMD_DRV_LOG(ERR, "Unsupported CHACHA20 key length"); + PMD_DRV_LOG(ERR, "Unsupported CHACHA20 key length."); return -EINVAL; } @@ -659,7 +659,7 @@ nfp_aead_map(struct rte_eth_dev *eth_dev, if (iv_str != NULL) { iv_len = aead->iv.length; if (iv_len > NFP_ESP_IV_LENGTH) { - PMD_DRV_LOG(ERR, "Unsupported length of iv data"); + PMD_DRV_LOG(ERR, "Unsupported length of iv data."); return -EINVAL; } @@ -715,7 +715,7 @@ nfp_cipher_map(struct rte_eth_dev *eth_dev, key = (const rte_be32_t *)(cipher->key.data); if (key_length > sizeof(cfg->cipher_key)) { - PMD_DRV_LOG(ERR, "Insufficient space for offloaded key"); + PMD_DRV_LOG(ERR, "Insufficient space for offloaded key."); return -EINVAL; } @@ -858,7 +858,7 @@ nfp_auth_map(struct rte_eth_dev *eth_dev, } if (digest_length == 0) { - PMD_DRV_LOG(ERR, "Unsupported authentication algorithm digest length"); + PMD_DRV_LOG(ERR, "Unsupported authentication algorithm digest length."); return -EINVAL; } @@ -1013,7 +1013,7 @@ nfp_ipsec_msg_build(struct rte_eth_dev *eth_dev, cfg->ctrl_word.encap_dsbl = 0; break; default: - PMD_DRV_LOG(ERR, "Unsupported IPsec action for offload, action: %d", + PMD_DRV_LOG(ERR, "Unsupported IPsec action for offload, action: %d.", conf->action_type); return -EINVAL; } @@ -1026,7 +1026,7 @@ nfp_ipsec_msg_build(struct rte_eth_dev *eth_dev, cfg->ctrl_word.proto = NFP_IPSEC_PROTOCOL_AH; break; default: - PMD_DRV_LOG(ERR, "Unsupported IPsec protocol for offload, protocol: %d", + PMD_DRV_LOG(ERR, "Unsupported IPsec protocol for offload, protocol: %d.", conf->ipsec.proto); return -EINVAL; } @@ -1062,7 +1062,7 @@ nfp_ipsec_msg_build(struct rte_eth_dev *eth_dev, break; default: - PMD_DRV_LOG(ERR, "Unsupported IPsec mode for offload, mode: %d", + PMD_DRV_LOG(ERR, "Unsupported IPsec mode for offload, mode: %d.", conf->ipsec.mode); return -EINVAL; } @@ -1100,7 +1100,7 @@ nfp_crypto_create_session(void *device, net_hw = eth_dev->data->dev_private; if (net_hw->ipsec_data->sa_free_cnt == 0) { - PMD_DRV_LOG(ERR, "No space in SA table, spi: %d", conf->ipsec.spi); + PMD_DRV_LOG(ERR, "No space in SA table, spi: %d.", conf->ipsec.spi); return -EINVAL; } @@ -1122,7 +1122,7 @@ nfp_crypto_create_session(void *device, msg.sa_idx = sa_idx; ret = nfp_ipsec_cfg_cmd_issue(net_hw, &msg); if (ret < 0) { - PMD_DRV_LOG(ERR, "Failed to add SA to nic"); + PMD_DRV_LOG(ERR, "Failed to add SA to nic."); return -EINVAL; } @@ -1255,7 +1255,7 @@ nfp_security_session_get_stats(void *device, ret = nfp_ipsec_cfg_cmd_issue(net_hw, &msg); if (ret < 0) { - PMD_DRV_LOG(ERR, "Failed to get SA stats"); + PMD_DRV_LOG(ERR, "Failed to get SA stats."); return ret; } @@ -1330,13 +1330,13 @@ nfp_crypto_remove_session(void *device, eth_dev = device; priv_session = SECURITY_GET_SESS_PRIV(session); if (eth_dev != priv_session->dev) { - PMD_DRV_LOG(ERR, "Session not bound to this device"); + PMD_DRV_LOG(ERR, "Session not bound to this device."); return -ENODEV; } ret = nfp_crypto_remove_sa(eth_dev, priv_session); if (ret < 0) { - PMD_DRV_LOG(ERR, "Failed to remove session"); + PMD_DRV_LOG(ERR, "Failed to remove session."); return -EFAULT; } @@ -1369,7 +1369,7 @@ nfp_ipsec_ctx_create(struct rte_eth_dev *dev, ctx = rte_zmalloc("security_ctx", sizeof(struct rte_security_ctx), 0); if (ctx == NULL) { - PMD_INIT_LOG(ERR, "Failed to malloc security_ctx"); + PMD_INIT_LOG(ERR, "Failed to malloc security_ctx."); return -ENOMEM; } @@ -1380,7 +1380,7 @@ nfp_ipsec_ctx_create(struct rte_eth_dev *dev, data->pkt_dynfield_offset = rte_mbuf_dynfield_register(&pkt_md_dynfield); if (data->pkt_dynfield_offset < 0) { - PMD_INIT_LOG(ERR, "Failed to register mbuf esn_dynfield"); + PMD_INIT_LOG(ERR, "Failed to register mbuf esn_dynfield."); return -ENOMEM; } @@ -1399,13 +1399,13 @@ nfp_ipsec_init(struct rte_eth_dev *dev) cap_extend = net_hw->super.cap_ext; if ((cap_extend & NFP_NET_CFG_CTRL_IPSEC) == 0) { - PMD_INIT_LOG(INFO, "Unsupported IPsec extend capability"); + PMD_INIT_LOG(INFO, "Unsupported IPsec extend capability."); return 0; } data = rte_zmalloc("ipsec_data", sizeof(struct nfp_net_ipsec_data), 0); if (data == NULL) { - PMD_INIT_LOG(ERR, "Failed to malloc ipsec_data"); + PMD_INIT_LOG(ERR, "Failed to malloc ipsec_data."); return -ENOMEM; } @@ -1415,7 +1415,7 @@ nfp_ipsec_init(struct rte_eth_dev *dev) ret = nfp_ipsec_ctx_create(dev, data); if (ret != 0) { - PMD_INIT_LOG(ERR, "Failed to create IPsec ctx"); + PMD_INIT_LOG(ERR, "Failed to create IPsec ctx."); goto ipsec_cleanup; } @@ -1445,7 +1445,7 @@ nfp_ipsec_uninit(struct rte_eth_dev *dev) cap_extend = net_hw->super.cap_ext; if ((cap_extend & NFP_NET_CFG_CTRL_IPSEC) == 0) { - PMD_INIT_LOG(INFO, "Unsupported IPsec extend capability"); + PMD_INIT_LOG(INFO, "Unsupported IPsec extend capability."); return; } diff --git a/drivers/net/nfp/nfp_mtr.c b/drivers/net/nfp/nfp_mtr.c index ae7f9558be..d4f2c4f2f0 100644 --- a/drivers/net/nfp/nfp_mtr.c +++ b/drivers/net/nfp/nfp_mtr.c @@ -43,7 +43,7 @@ nfp_mtr_cap_get(struct rte_eth_dev *dev __rte_unused, if (cap == NULL) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_UNSPECIFIED, - NULL, "NULL pointer for capabilitie argument"); + NULL, "NULL pointer for capabilitie argument."); } memset(cap, 0, sizeof(struct rte_mtr_capabilities)); @@ -78,14 +78,14 @@ nfp_mtr_profile_validate(uint32_t mtr_profile_id, if (profile == NULL) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_METER_PROFILE, - NULL, "Meter profile is null"); + NULL, "Meter profile is null."); } /* Meter profile ID must be valid. */ if (mtr_profile_id >= NFP_MAX_PROFILE_CNT) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_METER_PROFILE_ID, - NULL, "Meter profile id not valid"); + NULL, "Meter profile id not valid."); } switch (profile->alg) { @@ -95,11 +95,11 @@ nfp_mtr_profile_validate(uint32_t mtr_profile_id, case RTE_MTR_TRTCM_RFC4115: return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_METER_PROFILE, - NULL, "Unsupported metering algorithm"); + NULL, "Unsupported metering algorithm."); default: return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_METER_PROFILE, - NULL, "Unknown metering algorithm"); + NULL, "Unknown metering algorithm."); } } @@ -202,7 +202,7 @@ nfp_mtr_profile_insert(struct nfp_app_fw_flower *app_fw_flower, if (mtr_profile == NULL) { return -rte_mtr_error_set(error, ENOMEM, RTE_MTR_ERROR_TYPE_UNSPECIFIED, - NULL, "Meter profile alloc failed"); + NULL, "Meter profile alloc failed."); } ret = nfp_mtr_profile_conf_insert(mtr_profile_id, @@ -210,7 +210,7 @@ nfp_mtr_profile_insert(struct nfp_app_fw_flower *app_fw_flower, if (ret != 0) { rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_UNSPECIFIED, - NULL, "Insert profile config failed"); + NULL, "Insert profile config failed."); goto free_profile; } @@ -218,7 +218,7 @@ nfp_mtr_profile_insert(struct nfp_app_fw_flower *app_fw_flower, if (ret != 0) { rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_UNSPECIFIED, - NULL, "Add meter to firmware failed"); + NULL, "Add meter to firmware failed."); goto free_profile; } @@ -252,7 +252,7 @@ nfp_mtr_profile_mod(struct nfp_app_fw_flower *app_fw_flower, if (ret != 0) { rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_UNSPECIFIED, - NULL, "Mod profile config failed"); + NULL, "Mod profile config failed."); goto rollback; } @@ -260,7 +260,7 @@ nfp_mtr_profile_mod(struct nfp_app_fw_flower *app_fw_flower, if (ret != 0) { rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_UNSPECIFIED, - NULL, "Mod meter to firmware failed"); + NULL, "Mod meter to firmware failed."); goto rollback; } @@ -354,20 +354,20 @@ nfp_mtr_profile_delete(struct rte_eth_dev *dev, if (mtr_profile == NULL) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_METER_PROFILE_ID, - NULL, "Request meter profile not exist"); + NULL, "Request meter profile not exist."); } if (mtr_profile->in_use) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_METER_PROFILE, - NULL, "Request meter profile is been used"); + NULL, "Request meter profile is been used."); } ret = nfp_flower_cmsg_qos_delete(app_fw_flower, &mtr_profile->conf); if (ret != 0) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_UNSPECIFIED, - NULL, "Delete meter from firmware failed"); + NULL, "Delete meter from firmware failed."); } /* Remove profile from profile list */ @@ -417,7 +417,7 @@ nfp_mtr_policy_validate(uint32_t mtr_policy_id, if (action != NULL && action->type != RTE_FLOW_ACTION_TYPE_VOID) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_METER_POLICY, - NULL, "Green action must be void or end"); + NULL, "Green action must be void or end."); } /* Check yellow action @@ -427,7 +427,7 @@ nfp_mtr_policy_validate(uint32_t mtr_policy_id, if (action != NULL && action->type != RTE_FLOW_ACTION_TYPE_VOID) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_METER_POLICY, - NULL, "Yellow action must be void or end"); + NULL, "Yellow action must be void or end."); } /* Check red action */ @@ -435,7 +435,7 @@ nfp_mtr_policy_validate(uint32_t mtr_policy_id, if (action == NULL || action->type != RTE_FLOW_ACTION_TYPE_DROP) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_METER_POLICY, - NULL, "Red action must be drop"); + NULL, "Red action must be drop."); } return 0; @@ -475,7 +475,7 @@ nfp_mtr_policy_add(struct rte_eth_dev *dev, if (mtr_policy != NULL) { return -rte_mtr_error_set(error, EEXIST, RTE_MTR_ERROR_TYPE_METER_POLICY_ID, - NULL, "Meter policy already exist"); + NULL, "Meter policy already exist."); } /* Check input params */ @@ -488,7 +488,7 @@ nfp_mtr_policy_add(struct rte_eth_dev *dev, if (mtr_policy == NULL) { return -rte_mtr_error_set(error, ENOMEM, RTE_MTR_ERROR_TYPE_UNSPECIFIED, - NULL, "Meter policy alloc failed"); + NULL, "Meter policy alloc failed."); } mtr_policy->policy_id = mtr_policy_id; @@ -531,13 +531,13 @@ nfp_mtr_policy_delete(struct rte_eth_dev *dev, if (mtr_policy == NULL) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_METER_POLICY_ID, - NULL, "Request meter policy not exist"); + NULL, "Request meter policy not exist."); } if (mtr_policy->ref_cnt > 0) { return -rte_mtr_error_set(error, EBUSY, RTE_MTR_ERROR_TYPE_METER_POLICY, - NULL, "Request mtr policy is been used"); + NULL, "Request mtr policy is been used."); } /* Remove profile from profile list */ @@ -577,25 +577,25 @@ nfp_mtr_stats_mask_validate(uint64_t stats_mask, struct rte_mtr_error *error) if ((stats_mask & RTE_MTR_STATS_N_PKTS_YELLOW) != 0) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_MTR_PARAMS, - NULL, "RTE_MTR_STATS_N_PKTS_YELLOW not support"); + NULL, "RTE_MTR_STATS_N_PKTS_YELLOW not support."); } if ((stats_mask & RTE_MTR_STATS_N_PKTS_RED) != 0) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_MTR_PARAMS, - NULL, "RTE_MTR_STATS_N_PKTS_RED not support"); + NULL, "RTE_MTR_STATS_N_PKTS_RED not support."); } if ((stats_mask & RTE_MTR_STATS_N_BYTES_YELLOW) != 0) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_MTR_PARAMS, - NULL, "RTE_MTR_STATS_N_BYTES_YELLOW not support"); + NULL, "RTE_MTR_STATS_N_BYTES_YELLOW not support."); } if ((stats_mask & RTE_MTR_STATS_N_BYTES_RED) != 0) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_MTR_PARAMS, - NULL, "RTE_MTR_STATS_N_BYTES_RED not support"); + NULL, "RTE_MTR_STATS_N_BYTES_RED not support."); } return 0; @@ -623,7 +623,7 @@ nfp_mtr_validate(uint32_t meter_id, if (params->use_prev_mtr_color != 0) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_MTR_PARAMS, - NULL, "Feature use_prev_mtr_color not support"); + NULL, "Feature use_prev_mtr_color not support."); } return nfp_mtr_stats_mask_validate(params->stats_mask, error); @@ -689,7 +689,7 @@ nfp_mtr_create(struct rte_eth_dev *dev, if (mtr != NULL) { return -rte_mtr_error_set(error, EEXIST, RTE_MTR_ERROR_TYPE_MTR_ID, - NULL, "Meter already exist"); + NULL, "Meter already exist."); } /* Check input meter params */ @@ -701,20 +701,20 @@ nfp_mtr_create(struct rte_eth_dev *dev, if (mtr_profile == NULL) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_METER_PROFILE_ID, - NULL, "Request meter profile not exist"); + NULL, "Request meter profile not exist."); } if (mtr_profile->in_use) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_METER_PROFILE_ID, - NULL, "Request meter profile is been used"); + NULL, "Request meter profile is been used."); } mtr_policy = nfp_mtr_policy_search(priv, params->meter_policy_id); if (mtr_policy == NULL) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_METER_POLICY_ID, - NULL, "Request meter policy not exist"); + NULL, "Request meter policy not exist."); } /* Meter param memory alloc */ @@ -722,7 +722,7 @@ nfp_mtr_create(struct rte_eth_dev *dev, if (mtr == NULL) { return -rte_mtr_error_set(error, ENOMEM, RTE_MTR_ERROR_TYPE_UNSPECIFIED, - NULL, "Meter param alloc failed"); + NULL, "Meter param alloc failed."); } nfp_mtr_config(mtr_id, shared, params, mtr_profile, mtr_policy, mtr); @@ -767,13 +767,13 @@ nfp_mtr_destroy(struct rte_eth_dev *dev, if (mtr == NULL) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_MTR_ID, - NULL, "Request meter not exist"); + NULL, "Request meter not exist."); } if (mtr->ref_cnt > 0) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_MTR_ID, - NULL, "Meter object is being used"); + NULL, "Meter object is being used."); } /* Update profile/policy status */ @@ -817,7 +817,7 @@ nfp_mtr_enable(struct rte_eth_dev *dev, if (mtr == NULL) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_MTR_ID, - NULL, "Request meter not exist"); + NULL, "Request meter not exist."); } mtr->enable = true; @@ -855,13 +855,13 @@ nfp_mtr_disable(struct rte_eth_dev *dev, if (mtr == NULL) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_MTR_ID, - NULL, "Request meter not exist"); + NULL, "Request meter not exist."); } if (mtr->ref_cnt > 0) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_MTR_ID, - NULL, "Can not disable a used meter"); + NULL, "Can not disable a used meter."); } mtr->enable = false; @@ -903,13 +903,13 @@ nfp_mtr_profile_update(struct rte_eth_dev *dev, if (mtr == NULL) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_MTR_ID, - NULL, "Request meter not exist"); + NULL, "Request meter not exist."); } if (mtr->ref_cnt > 0) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_MTR_ID, - NULL, "Request meter is been used"); + NULL, "Request meter is been used."); } if (mtr->mtr_profile->profile_id == mtr_profile_id) @@ -919,13 +919,13 @@ nfp_mtr_profile_update(struct rte_eth_dev *dev, if (mtr_profile == NULL) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_METER_PROFILE_ID, - NULL, "Request meter profile not exist"); + NULL, "Request meter profile not exist."); } if (mtr_profile->in_use) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_METER_PROFILE_ID, - NULL, "Request meter profile is been used"); + NULL, "Request meter profile is been used."); } mtr_profile->in_use = true; @@ -969,7 +969,7 @@ nfp_mtr_stats_update(struct rte_eth_dev *dev, if (mtr == NULL) { return -rte_mtr_error_set(error, EEXIST, RTE_MTR_ERROR_TYPE_MTR_ID, - NULL, "Request meter id not exist"); + NULL, "Request meter id not exist."); } ret = nfp_mtr_stats_mask_validate(stats_mask, error); @@ -1022,7 +1022,7 @@ nfp_mtr_stats_read(struct rte_eth_dev *dev, if (mtr == NULL) { return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_MTR_ID, - NULL, "Request meter not exist"); + NULL, "Request meter not exist."); } *stats_mask = mtr->stats_mask; @@ -1067,7 +1067,7 @@ int nfp_net_mtr_ops_get(struct rte_eth_dev *dev, void *arg) { if (!rte_eth_dev_is_repr(dev)) { - PMD_DRV_LOG(ERR, "Port is not a representor"); + PMD_DRV_LOG(ERR, "Port is not a representor."); return -EINVAL; } @@ -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; } diff --git a/drivers/net/nfp/nfp_net_cmsg.c b/drivers/net/nfp/nfp_net_cmsg.c index f2f694be0b..8f77c5588a 100644 --- a/drivers/net/nfp/nfp_net_cmsg.c +++ b/drivers/net/nfp/nfp_net_cmsg.c @@ -45,19 +45,19 @@ nfp_net_cmsg_xmit(struct nfp_net_hw *hw, case NFP_NET_CFG_MBOX_RET_FS_OK: break; case NFP_NET_CFG_MBOX_RET_FS_ERR_NO_SPACE: - PMD_DRV_LOG(ERR, "Not enough space for cmd %u", cmsg->cmd); + PMD_DRV_LOG(ERR, "Not enough space for cmd %u.", cmsg->cmd); ret = -ENOSPC; break; case NFP_NET_CFG_MBOX_RET_FS_ERR_MASK_FULL: - PMD_DRV_LOG(ERR, "The mask table is full for cmd %u", cmsg->cmd); + PMD_DRV_LOG(ERR, "The mask table is full for cmd %u.", cmsg->cmd); ret = -EXFULL; break; case NFP_NET_CFG_MBOX_RET_FS_ERR_CMD_INVALID: - PMD_DRV_LOG(ERR, "The mbox cmd %u invalid", cmsg->cmd); + PMD_DRV_LOG(ERR, "The mbox cmd %u invalid.", cmsg->cmd); ret = -EINVAL; break; default: - PMD_DRV_LOG(ERR, "Unrecognized mbox cmd %u", cmsg->cmd); + PMD_DRV_LOG(ERR, "Unrecognized mbox cmd %u.", cmsg->cmd); ret = -EINVAL; break; } diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index 7a37b9c2aa..1a04916068 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -288,7 +288,7 @@ nfp_net_mbox_reconfig(struct nfp_net_hw *net_hw, rte_spinlock_unlock(&net_hw->super.reconfig_lock); if (ret != 0) { - PMD_DRV_LOG(ERR, "Error nft net mailbox reconfig: mbox=%#08x update=%#08x", + PMD_DRV_LOG(ERR, "Error nft net mailbox reconfig: mbox=%#08x update=%#08x.", mbox_cmd, NFP_NET_CFG_UPDATE_MBOX); return -EIO; } @@ -359,20 +359,20 @@ nfp_net_configure(struct rte_eth_dev *dev) /* Checking TX mode */ if (txmode->mq_mode != RTE_ETH_MQ_TX_NONE) { - PMD_DRV_LOG(ERR, "TX mq_mode DCB and VMDq not supported"); + PMD_DRV_LOG(ERR, "TX mq_mode DCB and VMDq not supported."); return -EINVAL; } /* Checking RX mode */ if ((rxmode->mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) != 0 && (hw->super.cap & NFP_NET_CFG_CTRL_RSS_ANY) == 0) { - PMD_DRV_LOG(ERR, "RSS not supported"); + PMD_DRV_LOG(ERR, "RSS not supported."); return -EINVAL; } /* Checking MTU set */ if (rxmode->mtu > hw->max_mtu + NFP_ETH_OVERHEAD) { - PMD_DRV_LOG(ERR, "MTU (%u) larger than the maximum possible frame size (%u)", + PMD_DRV_LOG(ERR, "MTU (%u) larger than the maximum possible frame size (%u).", rxmode->mtu, hw->max_mtu + NFP_ETH_OVERHEAD); return -ERANGE; } @@ -387,10 +387,10 @@ nfp_net_log_device_information(const struct nfp_net_hw *hw, uint32_t cap = hw->super.cap; uint32_t cap_ext = hw->super.cap_ext; - PMD_INIT_LOG(INFO, "VER: %u.%u, Maximum supported MTU: %d", + PMD_INIT_LOG(INFO, "VER: %u.%u, Maximum supported MTU: %d.", pf_dev->ver.major, pf_dev->ver.minor, hw->max_mtu); - PMD_INIT_LOG(INFO, "CAP: %#x", cap); + PMD_INIT_LOG(INFO, "CAP: %#x.", cap); PMD_INIT_LOG(INFO, "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", cap & NFP_NET_CFG_CTRL_ENABLE ? "ENABLE " : "", cap & NFP_NET_CFG_CTRL_PROMISC ? "PROMISC " : "", @@ -422,7 +422,7 @@ nfp_net_log_device_information(const struct nfp_net_hw *hw, cap & NFP_NET_CFG_CTRL_LIVE_ADDR ? "LIVE_ADDR " : "", cap & NFP_NET_CFG_CTRL_USO ? "USO" : ""); - PMD_INIT_LOG(INFO, "CAP_WORD1: %#x", cap_ext); + PMD_INIT_LOG(INFO, "CAP_WORD1: %#x.", cap_ext); PMD_INIT_LOG(INFO, "%s%s%s%s%s%s%s", cap_ext & NFP_NET_CFG_CTRL_PKT_TYPE ? "PKT_TYPE " : "", cap_ext & NFP_NET_CFG_CTRL_IPSEC ? "IPSEC " : "", @@ -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, "The 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); } @@ -493,12 +493,12 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev, hw = &net_hw->super; if ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 && (hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0) { - PMD_DRV_LOG(ERR, "MAC address unable to change when port enabled"); + PMD_DRV_LOG(ERR, "MAC address unable to change when port enabled."); return -EBUSY; } if (rte_is_valid_assigned_ether_addr(mac_addr) == 0) { - PMD_DRV_LOG(ERR, "Invalid MAC address"); + PMD_DRV_LOG(ERR, "Invalid MAC address."); return -EINVAL; } @@ -513,7 +513,7 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev, /* Signal the NIC about the change */ if (nfp_reconfig(hw, new_ctrl, update) != 0) { - PMD_DRV_LOG(ERR, "MAC address update failed"); + PMD_DRV_LOG(ERR, "MAC address update failed."); return -EIO; } @@ -531,7 +531,7 @@ nfp_configure_rx_interrupt(struct rte_eth_dev *dev, if (rte_intr_vec_list_alloc(intr_handle, "intr_vec", dev->data->nb_rx_queues) != 0) { - PMD_DRV_LOG(ERR, "Failed to allocate %d rx_queues intr_vec", + PMD_DRV_LOG(ERR, "Failed to allocate %d rx_queues intr_vec.", dev->data->nb_rx_queues); return -ENOMEM; } @@ -539,13 +539,13 @@ nfp_configure_rx_interrupt(struct rte_eth_dev *dev, hw = nfp_net_get_hw(dev); if (rte_intr_type_get(intr_handle) == RTE_INTR_HANDLE_UIO) { - PMD_DRV_LOG(INFO, "VF: enabling RX interrupt with UIO"); + PMD_DRV_LOG(INFO, "VF: enabling RX interrupt with UIO."); /* UIO just supports one queue and no LSC */ nn_cfg_writeb(&hw->super, NFP_NET_CFG_RXR_VEC(0), 0); if (rte_intr_vec_list_index_set(intr_handle, 0, 0) != 0) return -1; } else { - PMD_DRV_LOG(INFO, "VF: enabling RX interrupt with VFIO"); + PMD_DRV_LOG(INFO, "VF: enabling RX interrupt with VFIO."); for (i = 0; i < dev->data->nb_rx_queues; i++) { /* * The first msix vector is reserved for non @@ -645,12 +645,12 @@ nfp_net_promisc_enable(struct rte_eth_dev *dev) hw = &net_hw->super; if ((hw->cap & NFP_NET_CFG_CTRL_PROMISC) == 0) { - PMD_DRV_LOG(ERR, "Promiscuous mode not supported"); + PMD_DRV_LOG(ERR, "Promiscuous mode not supported."); return -ENOTSUP; } if ((hw->ctrl & NFP_NET_CFG_CTRL_PROMISC) != 0) { - PMD_DRV_LOG(INFO, "Promiscuous mode already enabled"); + PMD_DRV_LOG(INFO, "Promiscuous mode already enabled."); return 0; } @@ -679,12 +679,12 @@ nfp_net_promisc_disable(struct rte_eth_dev *dev) hw = &net_hw->super; if ((hw->cap & NFP_NET_CFG_CTRL_PROMISC) == 0) { - PMD_DRV_LOG(ERR, "Promiscuous mode not supported"); + PMD_DRV_LOG(ERR, "Promiscuous mode not supported."); return -ENOTSUP; } if ((hw->ctrl & NFP_NET_CFG_CTRL_PROMISC) == 0) { - PMD_DRV_LOG(INFO, "Promiscuous mode already disabled"); + PMD_DRV_LOG(INFO, "Promiscuous mode already disabled."); return 0; } @@ -717,7 +717,7 @@ nfp_net_set_allmulticast_mode(struct rte_eth_dev *dev, cap_extend = hw->cap_ext; if ((cap_extend & NFP_NET_CFG_CTRL_MCAST_FILTER) == 0) { - PMD_DRV_LOG(DEBUG, "Allmulticast mode not supported"); + PMD_DRV_LOG(DEBUG, "Allmulticast mode not supported."); return -ENOTSUP; } @@ -834,9 +834,9 @@ nfp_net_link_update_common(struct rte_eth_dev *dev, ret = rte_eth_linkstatus_set(dev, link); if (ret == 0) { if (link->link_status == RTE_ETH_LINK_UP) - PMD_DRV_LOG(INFO, "NIC Link is Up"); + PMD_DRV_LOG(INFO, "NIC Link is Up."); else - PMD_DRV_LOG(INFO, "NIC Link is Down"); + PMD_DRV_LOG(INFO, "NIC Link is Down."); } return ret; @@ -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, "The xstat index out of bounds"); + PMD_DRV_LOG(ERR, "The xstat index out of bounds."); return NULL; } @@ -1422,7 +1422,7 @@ nfp_net_common_init(struct nfp_pf_dev *pf_dev, hw->max_tx_queues = nn_cfg_readl(&hw->super, NFP_NET_CFG_MAX_TXRINGS); if (hw->max_rx_queues == 0 || hw->max_tx_queues == 0) { PMD_INIT_LOG(ERR, "Device %s can not be used, there are no valid queue " - "pairs for use", pci_dev->name); + "pairs for use.", pci_dev->name); return -ENODEV; } @@ -1587,12 +1587,12 @@ nfp_net_dev_link_status_print(struct rte_eth_dev *dev) rte_eth_linkstatus_get(dev, &link); if (link.link_status != 0) - PMD_DRV_LOG(INFO, "Port %d: Link Up - speed %u Mbps - %s", + PMD_DRV_LOG(INFO, "Port %d: Link Up - speed %u Mbps - %s.", dev->data->port_id, link.link_speed, link.link_duplex == RTE_ETH_LINK_FULL_DUPLEX ? "full-duplex" : "half-duplex"); else - PMD_DRV_LOG(INFO, " Port %d: Link Down", dev->data->port_id); + PMD_DRV_LOG(INFO, " Port %d: Link Down.", dev->data->port_id); PMD_DRV_LOG(INFO, "PCI Address: " PCI_PRI_FMT, pci_dev->addr.domain, pci_dev->addr.bus, @@ -1674,7 +1674,7 @@ nfp_net_dev_interrupt_handler(void *param) if (rte_eal_alarm_set(timeout * 1000, nfp_net_dev_interrupt_delayed_handler, (void *)dev) != 0) { - PMD_INIT_LOG(ERR, "Error setting alarm"); + PMD_INIT_LOG(ERR, "Error setting alarm."); /* Unmasking */ nfp_net_irq_unmask(dev); } @@ -1690,14 +1690,14 @@ 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; } /* MTU larger than current mbufsize not supported */ if (mtu > hw->flbufsz) { - PMD_DRV_LOG(ERR, "MTU (%u) larger than current mbufsize (%u) not supported", + PMD_DRV_LOG(ERR, "MTU (%u) larger than current mbufsize (%u) not supported.", mtu, hw->flbufsz); return -ERANGE; } @@ -1777,7 +1777,7 @@ nfp_net_rss_reta_write(struct rte_eth_dev *dev, if (reta_size != NFP_NET_CFG_RSS_ITBL_SZ) { PMD_DRV_LOG(ERR, "The size of hash lookup table configured (%hu)" - " does not match hardware can supported (%d)", + " does not match hardware can supported (%d).", reta_size, NFP_NET_CFG_RSS_ITBL_SZ); return -EINVAL; } @@ -1869,7 +1869,7 @@ nfp_net_reta_query(struct rte_eth_dev *dev, if (reta_size != NFP_NET_CFG_RSS_ITBL_SZ) { PMD_DRV_LOG(ERR, "The size of hash lookup table configured (%d)" - " does not match hardware can supported (%d)", + " does not match hardware can supported (%d).", reta_size, NFP_NET_CFG_RSS_ITBL_SZ); return -EINVAL; } @@ -1979,7 +1979,7 @@ nfp_net_rss_hash_update(struct rte_eth_dev *dev, /* Checking if RSS is enabled */ if ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0) { if (rss_hf != 0) { - PMD_DRV_LOG(ERR, "RSS unsupported"); + PMD_DRV_LOG(ERR, "RSS unsupported."); return -EINVAL; } @@ -1987,7 +1987,7 @@ nfp_net_rss_hash_update(struct rte_eth_dev *dev, } if (rss_conf->rss_key_len > NFP_NET_CFG_RSS_KEY_SZ) { - PMD_DRV_LOG(ERR, "RSS hash key too long"); + PMD_DRV_LOG(ERR, "RSS hash key too long."); return -EINVAL; } @@ -2089,7 +2089,7 @@ nfp_net_rss_config_default(struct rte_eth_dev *dev) dev_conf = &dev->data->dev_conf; if (dev_conf == NULL) { - PMD_DRV_LOG(ERR, "Wrong rss conf"); + PMD_DRV_LOG(ERR, "Wrong rss conf."); return -EINVAL; } @@ -2215,7 +2215,7 @@ nfp_net_txrwb_alloc(struct rte_eth_dev *eth_dev) rte_socket_id(), RTE_MEMZONE_IOVA_CONTIG, RTE_CACHE_LINE_SIZE); if (net_hw->txrwb_mz == NULL) { - PMD_INIT_LOG(ERR, "Failed to alloc %s for TX ring write back", + PMD_INIT_LOG(ERR, "Failed to alloc %s for TX ring write back.", mz_name); return -ENOMEM; } @@ -2390,7 +2390,7 @@ nfp_net_is_valid_nfd_version(struct nfp_net_fw_ver version) if (nfd_version == NFP_NET_CFG_VERSION_DP_NFDK) { if (version.major < 5) { - PMD_INIT_LOG(ERR, "NFDK must use ABI 5 or newer, found: %d", + PMD_INIT_LOG(ERR, "NFDK must use ABI 5 or newer, found: %d.", version.major); return false; } @@ -2796,7 +2796,7 @@ nfp_net_sriov_update(struct nfp_net_hw *net_hw, ret = nfp_net_vf_reconfig(net_hw, pf_dev, update, pf_dev->vf_base_id, NFP_NET_VF_CFG_MB_VF_NUM); if (ret != 0) { - PMD_INIT_LOG(ERR, "Error nfp VF reconfig"); + PMD_INIT_LOG(ERR, "Error nfp VF reconfig."); return ret; } @@ -2814,11 +2814,11 @@ nfp_net_vf_queues_config(struct nfp_net_hw *net_hw, ret = nfp_net_sriov_check(pf_dev, NFP_NET_VF_CFG_MB_CAP_QUEUE_CONFIG); if (ret != 0) { if (ret == -ENOTSUP) { - PMD_INIT_LOG(DEBUG, "Set VF max queue not supported"); + PMD_INIT_LOG(DEBUG, "Set VF max queue not supported."); return 0; } - PMD_INIT_LOG(ERR, "Set VF max queue failed"); + PMD_INIT_LOG(ERR, "Set VF max queue failed."); return ret; } @@ -2827,7 +2827,7 @@ nfp_net_vf_queues_config(struct nfp_net_hw *net_hw, ret = nfp_net_vf_reconfig(net_hw, pf_dev, NFP_NET_VF_CFG_MB_UPD_QUEUE_CONFIG, pf_dev->queue_per_vf, pf_dev->vf_base_id + offset + i); if (ret != 0) { - PMD_INIT_LOG(ERR, "Set VF max_queue failed"); + PMD_INIT_LOG(ERR, "Set VF max_queue failed."); return ret; } } @@ -2844,11 +2844,11 @@ nfp_net_sriov_init(struct nfp_net_hw *net_hw, ret = nfp_net_sriov_check(pf_dev, NFP_NET_VF_CFG_MB_CAP_SPLIT); if (ret != 0) { if (ret == -ENOTSUP) { - PMD_INIT_LOG(DEBUG, "Set VF split not supported"); + PMD_INIT_LOG(DEBUG, "Set VF split not supported."); return 0; } - PMD_INIT_LOG(ERR, "Set VF split failed"); + PMD_INIT_LOG(ERR, "Set VF split failed."); return ret; } @@ -2856,7 +2856,7 @@ nfp_net_sriov_init(struct nfp_net_hw *net_hw, ret = nfp_net_sriov_update(net_hw, pf_dev, NFP_NET_VF_CFG_MB_UPD_SPLIT); if (ret != 0) { - PMD_INIT_LOG(ERR, "The nfp sriov update spilt failed"); + PMD_INIT_LOG(ERR, "The nfp sriov update spilt failed."); return ret; } @@ -2874,13 +2874,13 @@ nfp_net_vf_config_app_init(struct nfp_net_hw *net_hw, ret = nfp_net_sriov_init(net_hw, pf_dev); if (ret != 0) { - PMD_INIT_LOG(ERR, "Failed to init sriov module"); + PMD_INIT_LOG(ERR, "Failed to init sriov module."); return ret; } ret = nfp_net_vf_queues_config(net_hw, pf_dev); if (ret != 0) { - PMD_INIT_LOG(ERR, "Failed to config vf queue"); + PMD_INIT_LOG(ERR, "Failed to config vf queue."); return ret; } diff --git a/drivers/net/nfp/nfp_net_ctrl.c b/drivers/net/nfp/nfp_net_ctrl.c index b34d8f140f..cc56ff69e9 100644 --- a/drivers/net/nfp/nfp_net_ctrl.c +++ b/drivers/net/nfp/nfp_net_ctrl.c @@ -50,7 +50,7 @@ nfp_net_tlv_caps_parse(struct rte_eth_dev *dev) offset = data - net_hw->super.ctrl_bar; if (data + NFP_NET_CFG_TLV_VALUE > end) { - PMD_DRV_LOG(ERR, "Reached end of BAR without END TLV"); + PMD_DRV_LOG(ERR, "Reached end of BAR without END TLV."); return -EINVAL; } @@ -58,14 +58,14 @@ nfp_net_tlv_caps_parse(struct rte_eth_dev *dev) length = FIELD_GET(NFP_NET_CFG_TLV_HEADER_LENGTH, hdr); if ((length & (NFP_NET_CFG_TLV_LENGTH_INC - 1)) != 0) { - PMD_DRV_LOG(ERR, "TLV size not multiple of 4B len: %u", length); + PMD_DRV_LOG(ERR, "TLV size not multiple of 4B len: %u.", length); return -EINVAL; } /* Advance past the header */ data += NFP_NET_CFG_TLV_VALUE; if (data + length > end) { - PMD_DRV_LOG(ERR, "Oversized TLV offset: %u len: %u", + PMD_DRV_LOG(ERR, "Oversized TLV offset: %u len: %u.", offset, length); return -EINVAL; } @@ -74,7 +74,7 @@ nfp_net_tlv_caps_parse(struct rte_eth_dev *dev) switch (tlv_type) { case NFP_NET_CFG_TLV_TYPE_UNKNOWN: - PMD_DRV_LOG(ERR, "Unknown TLV at offset: %u", offset); + PMD_DRV_LOG(ERR, "Unknown TLV at offset: %u.", offset); return -EINVAL; case NFP_NET_CFG_TLV_TYPE_RESERVED: break; @@ -82,7 +82,7 @@ nfp_net_tlv_caps_parse(struct rte_eth_dev *dev) if (length == 0) return 0; - PMD_DRV_LOG(ERR, "END TLV should be empty, has len: %u", length); + PMD_DRV_LOG(ERR, "END TLV should be empty, has len: %u.", length); return -EINVAL; case NFP_NET_CFG_TLV_TYPE_MBOX: caps->mbox_len = length; @@ -100,12 +100,12 @@ nfp_net_tlv_caps_parse(struct rte_eth_dev *dev) if (FIELD_GET(NFP_NET_CFG_TLV_HEADER_REQUIRED, hdr) == 0) break; - PMD_DRV_LOG(ERR, "Unknown TLV type: %u offset: %u len: %u", + PMD_DRV_LOG(ERR, "Unknown TLV type: %u offset: %u len: %u.", tlv_type, offset, length); return -EINVAL; } } - PMD_DRV_LOG(ERR, "Reached end of BAR without END TLV"); + PMD_DRV_LOG(ERR, "Reached end of BAR without END TLV."); return -EINVAL; } diff --git a/drivers/net/nfp/nfp_net_flow.c b/drivers/net/nfp/nfp_net_flow.c index a5d1362001..7a68dc204f 100644 --- a/drivers/net/nfp/nfp_net_flow.c +++ b/drivers/net/nfp/nfp_net_flow.c @@ -194,23 +194,23 @@ nfp_net_flow_calculate_items(const struct rte_flow_item items[], for (item = items; item->type != RTE_FLOW_ITEM_TYPE_END; ++item) { switch (item->type) { case RTE_FLOW_ITEM_TYPE_ETH: - PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_ETH detected"); + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_ETH detected."); *match_len = sizeof(struct nfp_net_cmsg_match_eth); *item_type = RTE_FLOW_ITEM_TYPE_ETH; ret = 0; break; case RTE_FLOW_ITEM_TYPE_IPV4: - PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_IPV4 detected"); + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_IPV4 detected."); *match_len = sizeof(struct nfp_net_cmsg_match_v4); *item_type = RTE_FLOW_ITEM_TYPE_IPV4; return 0; case RTE_FLOW_ITEM_TYPE_IPV6: - PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_IPV6 detected"); + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_IPV6 detected."); *match_len = sizeof(struct nfp_net_cmsg_match_v6); *item_type = RTE_FLOW_ITEM_TYPE_IPV6; return 0; default: - PMD_DRV_LOG(ERR, "Can not calculate match length"); + PMD_DRV_LOG(ERR, "Can not calculate match length."); *match_len = 0; return -ENOTSUP; } @@ -525,7 +525,7 @@ nfp_net_flow_compile_items(const struct rte_flow_item items[], } if (proc == NULL) { - PMD_DRV_LOG(ERR, "No next item provided for %d", item->type); + PMD_DRV_LOG(ERR, "No next item provided for %d.", item->type); ret = -ENOTSUP; break; } @@ -533,20 +533,20 @@ nfp_net_flow_compile_items(const struct rte_flow_item items[], /* Perform basic sanity checks */ ret = nfp_net_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; } ret = proc->merge(nfp_flow, item, proc); 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; } @@ -592,7 +592,7 @@ nfp_net_flow_action_queue(struct rte_eth_dev *dev, queue = action->conf; if (queue->index >= dev->data->nb_rx_queues || dev->data->rx_queues[queue->index] == NULL) { - PMD_DRV_LOG(ERR, "Queue index is illegal"); + PMD_DRV_LOG(ERR, "Queue index is illegal."); return -EINVAL; } @@ -613,19 +613,19 @@ nfp_net_flow_compile_actions(struct rte_eth_dev *dev, for (action = actions; action->type != RTE_FLOW_ACTION_TYPE_END; ++action) { switch (action->type) { case RTE_FLOW_ACTION_TYPE_DROP: - PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_DROP"); + PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_DROP."); nfp_net_flow_action_drop(nfp_flow); return 0; case RTE_FLOW_ACTION_TYPE_MARK: - PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_MARK"); + PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_MARK."); nfp_net_flow_action_mark(nfp_flow, action); break; case RTE_FLOW_ACTION_TYPE_QUEUE: - PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_QUEUE"); + PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_QUEUE."); ret = nfp_net_flow_action_queue(dev, nfp_flow, action); break; default: - PMD_DRV_LOG(ERR, "Unsupported action type: %d", action->type); + PMD_DRV_LOG(ERR, "Unsupported action type: %d.", action->type); return -ENOTSUP; } } @@ -1091,7 +1091,7 @@ nfp_net_flow_priv_init(struct nfp_pf_dev *pf_dev, priv = rte_zmalloc("nfp_app_nic_priv", sizeof(struct nfp_net_priv), 0); if (priv == NULL) { - PMD_INIT_LOG(ERR, "NFP app nic priv creation failed"); + PMD_INIT_LOG(ERR, "NFP app nic priv creation failed."); ret = -ENOMEM; goto exit; } @@ -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_net_meta.c b/drivers/net/nfp/nfp_net_meta.c index 5a67f87bee..70169eba6b 100644 --- a/drivers/net/nfp/nfp_net_meta.c +++ b/drivers/net/nfp/nfp_net_meta.c @@ -177,7 +177,7 @@ nfp_net_meta_parse_qinq(const struct nfp_net_meta_parsed *meta, mb->vlan_tci = rte_cpu_to_le_16(meta->vlan[0].tci); mb->vlan_tci_outer = rte_cpu_to_le_16(meta->vlan[1].tci); - PMD_RX_LOG(DEBUG, "Received outer vlan TCI is %u inner vlan TCI is %u", + PMD_RX_LOG(DEBUG, "Received outer vlan TCI is %u inner vlan TCI is %u.", mb->vlan_tci_outer, mb->vlan_tci); mb->ol_flags |= RTE_MBUF_F_RX_QINQ | RTE_MBUF_F_RX_QINQ_STRIPPED; } diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index d38f51b777..c7812a6dee 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -151,7 +151,7 @@ nfp_net_rx_fill_freelist(struct nfp_net_rxq *rxq) uint64_t dma_addr; struct nfp_net_dp_buf *rxe = rxq->rxbufs; - PMD_RX_LOG(DEBUG, "Fill Rx Freelist for %hu descriptors", + PMD_RX_LOG(DEBUG, "Fill Rx Freelist for %hu descriptors.", rxq->rx_count); for (i = 0; i < rxq->rx_count; i++) { @@ -159,7 +159,7 @@ nfp_net_rx_fill_freelist(struct nfp_net_rxq *rxq) struct rte_mbuf *mbuf = rte_pktmbuf_alloc(rxq->mem_pool); if (mbuf == NULL) { - PMD_DRV_LOG(ERR, "RX mbuf alloc failed queue_id=%hu", + PMD_DRV_LOG(ERR, "RX mbuf alloc failed queue_id=%hu.", rxq->qidx); return -ENOMEM; } @@ -178,7 +178,7 @@ nfp_net_rx_fill_freelist(struct nfp_net_rxq *rxq) rte_wmb(); /* Not advertising the whole ring as the firmware gets confused if so */ - PMD_RX_LOG(DEBUG, "Increment FL write pointer in %hu", rxq->rx_count - 1); + PMD_RX_LOG(DEBUG, "Increment FL write pointer in %hu.", rxq->rx_count - 1); nfp_qcp_ptr_add(rxq->qcp_fl, NFP_QCP_WRITE_PTR, rxq->rx_count - 1); @@ -260,7 +260,7 @@ nfp_net_set_ptype(const struct nfp_ptype_parsed *nfp_ptype, mbuf_ptype |= RTE_PTYPE_L3_IPV6; break; default: - PMD_RX_LOG(DEBUG, "Unrecognized nfp outer layer 3 packet type: %u", + PMD_RX_LOG(DEBUG, "Unrecognized nfp outer layer 3 packet type: %u.", nfp_ptype->outer_l3_ptype); break; } @@ -278,7 +278,7 @@ nfp_net_set_ptype(const struct nfp_ptype_parsed *nfp_ptype, mbuf_ptype |= RTE_PTYPE_TUNNEL_GENEVE | RTE_PTYPE_L4_UDP; break; default: - PMD_RX_LOG(DEBUG, "Unrecognized nfp tunnel packet type: %u", + PMD_RX_LOG(DEBUG, "Unrecognized nfp tunnel packet type: %u.", nfp_tunnel_ptype); break; } @@ -305,7 +305,7 @@ nfp_net_set_ptype(const struct nfp_ptype_parsed *nfp_ptype, mbuf_ptype |= NFP_PTYPE2RTE(nfp_tunnel_ptype, L4_SCTP); break; default: - PMD_RX_LOG(DEBUG, "Unrecognized nfp layer 4 packet type: %u", + PMD_RX_LOG(DEBUG, "Unrecognized nfp layer 4 packet type: %u.", nfp_ptype->l4_ptype); break; } @@ -332,7 +332,7 @@ nfp_net_set_ptype(const struct nfp_ptype_parsed *nfp_ptype, mbuf_ptype |= NFP_PTYPE2RTE(nfp_tunnel_ptype, L3_IPV6_EXT_UNKNOWN); break; default: - PMD_RX_LOG(DEBUG, "Unrecognized nfp layer 3 packet type: %u", + PMD_RX_LOG(DEBUG, "Unrecognized nfp layer 3 packet type: %u.", nfp_ptype->l3_ptype); break; } @@ -426,7 +426,7 @@ nfp_net_recv_pkts(void *rx_queue, * DPDK just checks the queue is lower than max queues * enabled. But the queue needs to be configured. */ - PMD_RX_LOG(ERR, "RX Bad queue"); + PMD_RX_LOG(ERR, "RX Bad queue."); return 0; } @@ -455,7 +455,7 @@ nfp_net_recv_pkts(void *rx_queue, */ new_mb = rte_pktmbuf_alloc(rxq->mem_pool); if (unlikely(new_mb == NULL)) { - PMD_RX_LOG(DEBUG, "RX mbuf alloc failed port_id=%u queue_id=%hu", + PMD_RX_LOG(DEBUG, "RX mbuf alloc failed port_id=%u queue_id=%hu.", rxq->port_id, rxq->qidx); nfp_net_mbuf_alloc_failed(rxq); break; @@ -468,7 +468,7 @@ nfp_net_recv_pkts(void *rx_queue, mb = rxb->mbuf; rxb->mbuf = new_mb; - PMD_RX_LOG(DEBUG, "Packet len: %u, mbuf_size: %u", + PMD_RX_LOG(DEBUG, "Packet len: %u, mbuf_size: %u.", rxds->rxd.data_len, rxq->mbuf_size); /* Size of this segment */ @@ -532,7 +532,7 @@ nfp_net_recv_pkts(void *rx_queue, if (nb_hold == 0) return nb_hold; - PMD_RX_LOG(DEBUG, "RX port_id=%hu queue_id=%hu, %hu packets received", + PMD_RX_LOG(DEBUG, "RX port_id=%hu queue_id=%hu, %hu packets received.", rxq->port_id, rxq->qidx, avail); nb_hold += rxq->nb_rx_hold; @@ -543,7 +543,7 @@ nfp_net_recv_pkts(void *rx_queue, */ rte_wmb(); if (nb_hold > rxq->rx_free_thresh) { - PMD_RX_LOG(DEBUG, "The 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; @@ -630,7 +630,7 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev, rx_desc_sz = nb_desc * sizeof(struct nfp_net_rx_desc); if (rx_desc_sz % NFP_ALIGN_RING_DESC != 0 || nb_desc > max_rx_desc || nb_desc < min_rx_desc) { - PMD_DRV_LOG(ERR, "Wrong nb_desc value"); + PMD_DRV_LOG(ERR, "Wrong nb_desc value."); return -EINVAL; } @@ -678,7 +678,7 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev, sizeof(struct nfp_net_rx_desc) * max_rx_desc, NFP_MEMZONE_ALIGN, socket_id); if (tz == NULL) { - PMD_DRV_LOG(ERR, "Error allocating rx dma"); + PMD_DRV_LOG(ERR, "Error allocating rx dma."); nfp_net_rx_queue_release(dev, queue_idx); dev->data->rx_queues[queue_idx] = NULL; return -ENOMEM; @@ -749,14 +749,14 @@ nfp_net_tx_free_bufs(struct nfp_net_txq *txq) uint32_t qcp_rd_p; PMD_TX_LOG(DEBUG, "Queue %hu. Check for descriptor with a complete" - " status", txq->qidx); + " 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 " - "packets (%u, %u)", txq->qidx, + "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, "The 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 e6f6f58221..66d003f64d 100644 --- a/drivers/net/nfp/nfp_rxtx_vec_avx2.c +++ b/drivers/net/nfp/nfp_rxtx_vec_avx2.c @@ -125,7 +125,7 @@ nfp_vec_avx2_recv1(struct nfp_net_rxq *rxq, { /* Allocate a new mbuf into the software ring. */ if (rte_pktmbuf_alloc_bulk(rxq->mem_pool, rxb, 1) < 0) { - PMD_RX_LOG(DEBUG, "RX mbuf alloc failed port_id=%u queue_id=%hu", + PMD_RX_LOG(DEBUG, "RX mbuf alloc failed port_id=%u queue_id=%hu.", rxq->port_id, rxq->qidx); nfp_net_mbuf_alloc_failed(rxq); return -ENOMEM; @@ -146,7 +146,7 @@ nfp_vec_avx2_recv4(struct nfp_net_rxq *rxq, { /* Allocate 4 new mbufs into the software ring. */ if (rte_pktmbuf_alloc_bulk(rxq->mem_pool, rxb, 4) < 0) { - PMD_RX_LOG(DEBUG, "RX mbuf bulk alloc failed port_id=%u queue_id=%hu", + PMD_RX_LOG(DEBUG, "RX mbuf bulk alloc failed port_id=%u queue_id=%hu.", rxq->port_id, rxq->qidx); return -ENOMEM; } @@ -188,7 +188,7 @@ nfp_net_vec_avx2_recv_pkts(void *rx_queue, struct nfp_net_rxq *rxq = rx_queue; if (unlikely(rxq == NULL)) { - PMD_RX_LOG(ERR, "RX Bad queue"); + PMD_RX_LOG(ERR, "RX Bad queue."); return 0; } @@ -262,7 +262,7 @@ nfp_net_vec_avx2_recv_pkts(void *rx_queue, if (nb_hold == 0) return nb_hold; - PMD_RX_LOG(DEBUG, "RX port_id=%u queue_id=%u, %d packets received", + PMD_RX_LOG(DEBUG, "RX port_id=%u queue_id=%u, %d packets received.", rxq->port_id, (unsigned int)rxq->qidx, nb_hold); nb_hold += rxq->nb_rx_hold; @@ -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, "The 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/nfp_service.c b/drivers/net/nfp/nfp_service.c index 37e2187a3f..38ab7a39f5 100644 --- a/drivers/net/nfp/nfp_service.c +++ b/drivers/net/nfp/nfp_service.c @@ -27,14 +27,14 @@ nfp_service_enable(const struct rte_service_spec *service_spec, /* Register the service */ ret = rte_service_component_register(service_spec, &info->id); if (ret != 0) { - PMD_DRV_LOG(DEBUG, "Could not register %s", service_spec->name); + PMD_DRV_LOG(DEBUG, "Could not register %s.", service_spec->name); return -EINVAL; } /* Set the NFP service runstate of a component. */ rte_service_component_runstate_set(info->id, 1); - PMD_DRV_LOG(DEBUG, "Enable service %s successfully", service_spec->name); + PMD_DRV_LOG(DEBUG, "Enable service %s successfully.", service_spec->name); return 0; } @@ -47,7 +47,7 @@ nfp_service_disable(struct nfp_service_info *info) service_name = rte_service_get_name(info->id); if (service_name == NULL) { - PMD_DRV_LOG(ERR, "Could not find service %u", info->id); + PMD_DRV_LOG(ERR, "Could not find service %u.", info->id); return -EINVAL; } @@ -60,7 +60,7 @@ nfp_service_disable(struct nfp_service_info *info) } if (i == NFP_SERVICE_DISABLE_WAIT_COUNT) - PMD_DRV_LOG(ERR, "Could not stop service %s", service_name); + PMD_DRV_LOG(ERR, "Could not stop service %s.", service_name); rte_service_component_unregister(info->id); diff --git a/drivers/net/nfp/nfpcore/nfp6000_pcie.c b/drivers/net/nfp/nfpcore/nfp6000_pcie.c index 11cb45dd7d..4693577f4e 100644 --- a/drivers/net/nfp/nfpcore/nfp6000_pcie.c +++ b/drivers/net/nfp/nfpcore/nfp6000_pcie.c @@ -622,7 +622,7 @@ nfp6000_area_acquire(struct nfp_cpp_area *area) bar_num = nfp_alloc_bar(nfp, priv); if (bar_num < 0) { - PMD_DRV_LOG(ERR, "Failed to allocate bar %d:%d:%d:%#lx: %d", + PMD_DRV_LOG(ERR, "Failed to allocate bar %d:%d:%d:%#lx: %d.", priv->target, priv->action, priv->token, priv->offset, bar_num); return bar_num; @@ -860,7 +860,7 @@ nfp6000_get_dsn(struct rte_pci_device *pci_dev, pos = rte_pci_find_ext_capability(pci_dev, RTE_PCI_EXT_CAP_ID_DSN); if (pos <= 0) { - PMD_DRV_LOG(ERR, "PCI_EXT_CAP_ID_DSN not found"); + PMD_DRV_LOG(ERR, "PCI_EXT_CAP_ID_DSN not found."); return -ENODEV; } @@ -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; } @@ -933,7 +933,7 @@ nfp6000_init(struct nfp_cpp *cpp) ret = nfp_enable_bars(desc); if (ret != 0) { - PMD_DRV_LOG(ERR, "Enable bars failed"); + PMD_DRV_LOG(ERR, "Enable bars failed."); return -1; } @@ -1018,7 +1018,7 @@ nfp_cpp_from_nfp6000_pcie(struct rte_pci_device *pci_dev, if (NFP_CPP_INTERFACE_CHANNEL_of(interface) != NFP_CPP_INTERFACE_CHANNEL_PEROPENER) { - PMD_DRV_LOG(ERR, "Interface channel is not right"); + PMD_DRV_LOG(ERR, "Interface channel is not right."); free(nfp); return NULL; } @@ -1026,7 +1026,7 @@ nfp_cpp_from_nfp6000_pcie(struct rte_pci_device *pci_dev, /* Probe for all the common NFP devices */ cpp = nfp_cpp_from_device_name(pci_dev, nfp, driver_lock_needed); if (cpp == NULL) { - PMD_DRV_LOG(ERR, "Get cpp from operation failed"); + PMD_DRV_LOG(ERR, "Get cpp from operation failed."); free(nfp); return NULL; } diff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c index 06996b7bc8..dfc6d4613a 100644 --- a/drivers/net/nfp/nfpcore/nfp_cppcore.c +++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c @@ -344,7 +344,7 @@ nfp_cpp_area_alloc_with_name(struct nfp_cpp *cpp, err = cpp->op->area_init(area, target_id, target_addr, size); if (err < 0) { - PMD_DRV_LOG(ERR, "Area init op failed"); + PMD_DRV_LOG(ERR, "Area init op failed."); free(area); return NULL; } @@ -413,12 +413,12 @@ nfp_cpp_area_alloc_acquire(struct nfp_cpp *cpp, area = nfp_cpp_area_alloc(cpp, destination, address, size); if (area == NULL) { - PMD_DRV_LOG(ERR, "Failed to allocate CPP area"); + PMD_DRV_LOG(ERR, "Failed to allocate CPP area."); return NULL; } if (nfp_cpp_area_acquire(area) != 0) { - PMD_DRV_LOG(ERR, "Failed to acquire CPP area"); + PMD_DRV_LOG(ERR, "Failed to acquire CPP area."); nfp_cpp_area_free(area); return NULL; } @@ -469,7 +469,7 @@ nfp_cpp_area_acquire(struct nfp_cpp_area *area) if (area->cpp->op->area_acquire != NULL) { int err = area->cpp->op->area_acquire(area); if (err < 0) { - PMD_DRV_LOG(ERR, "Area acquire op failed"); + PMD_DRV_LOG(ERR, "Area acquire op failed."); return -1; } } @@ -950,14 +950,14 @@ nfp_cpp_alloc(struct rte_pci_device *pci_dev, */ err = cpp->op->init(cpp); if (err < 0) { - PMD_DRV_LOG(ERR, "NFP interface initialization failed"); + PMD_DRV_LOG(ERR, "NFP interface initialization failed."); free(cpp); return NULL; } err = nfp_cpp_model_autodetect(cpp, &cpp->model); if (err < 0) { - PMD_DRV_LOG(ERR, "NFP model detection failed"); + PMD_DRV_LOG(ERR, "NFP model detection failed."); free(cpp); return NULL; } @@ -967,7 +967,7 @@ nfp_cpp_alloc(struct rte_pci_device *pci_dev, xpb_addr = 0x000a0000 + (target * 4); err = nfp_xpb_readl(cpp, xpb_addr, &cpp->imb_cat_table[target]); if (err < 0) { - PMD_DRV_LOG(ERR, "Can not read CPP mapping from device"); + PMD_DRV_LOG(ERR, "Can not read CPP mapping from device."); free(cpp); return NULL; } @@ -975,7 +975,7 @@ nfp_cpp_alloc(struct rte_pci_device *pci_dev, err = nfp_cpp_set_mu_locality_lsb(cpp); if (err < 0) { - PMD_DRV_LOG(ERR, "Can not calculate MU locality bit offset"); + PMD_DRV_LOG(ERR, "Can not calculate MU locality bit offset."); free(cpp); return NULL; } @@ -1050,7 +1050,7 @@ nfp_cpp_read(struct nfp_cpp *cpp, area = nfp_cpp_area_alloc_acquire(cpp, destination, offset, length); if (area == NULL) { - PMD_DRV_LOG(ERR, "Area allocation/acquire failed for read"); + PMD_DRV_LOG(ERR, "Area allocation/acquire failed for read."); return -EACCES; } @@ -1089,7 +1089,7 @@ nfp_cpp_write(struct nfp_cpp *cpp, area = nfp_cpp_area_alloc_acquire(cpp, destination, offset, length); if (area == NULL) { - PMD_DRV_LOG(ERR, "Area allocation/acquire failed for write"); + PMD_DRV_LOG(ERR, "Area allocation/acquire failed for write."); return -EACCES; } @@ -1155,7 +1155,7 @@ nfp_cpp_map_area(struct nfp_cpp *cpp, *area = nfp_cpp_area_alloc_acquire(cpp, cpp_id, addr, size); if (*area == NULL) { - PMD_DRV_LOG(ERR, "Area allocation/acquire failed for map"); + PMD_DRV_LOG(ERR, "Area allocation/acquire failed for map."); goto err_eio; } diff --git a/drivers/net/nfp/nfpcore/nfp_elf.c b/drivers/net/nfp/nfpcore/nfp_elf.c index 766e0827f7..12a9da0fa0 100644 --- a/drivers/net/nfp/nfpcore/nfp_elf.c +++ b/drivers/net/nfp/nfpcore/nfp_elf.c @@ -627,7 +627,7 @@ nfp_elf_populate_fw_mip(struct nfp_elf *ectx, first_entry = rte_le_to_cpu_32(mip->first_entry); if (mip->signature != NFP_MIP_SIGNATURE) { - PMD_DRV_LOG(ERR, "Incorrect MIP signature %#08x", + PMD_DRV_LOG(ERR, "Incorrect MIP signature %#08x.", rte_le_to_cpu_32(mip->signature)); return -EINVAL; } diff --git a/drivers/net/nfp/nfpcore/nfp_hwinfo.c b/drivers/net/nfp/nfpcore/nfp_hwinfo.c index c334202bd7..5240de44fb 100644 --- a/drivers/net/nfp/nfpcore/nfp_hwinfo.c +++ b/drivers/net/nfp/nfpcore/nfp_hwinfo.c @@ -110,12 +110,12 @@ nfp_hwinfo_db_walk(struct nfp_hwinfo *hwinfo, key = val + strlen(val) + 1) { val = key + strlen(key) + 1; if (val >= end) { - PMD_DRV_LOG(ERR, "Bad HWINFO - overflowing value"); + PMD_DRV_LOG(ERR, "Bad HWINFO - overflowing value."); return -EINVAL; } if (val + strlen(val) + 1 > end) { - PMD_DRV_LOG(ERR, "Bad HWINFO - overflowing value"); + PMD_DRV_LOG(ERR, "Bad HWINFO - overflowing value."); return -EINVAL; } } @@ -133,7 +133,7 @@ nfp_hwinfo_db_validate(struct nfp_hwinfo *db, size = db->size; if (size > len) { - PMD_DRV_LOG(ERR, "Unsupported hwinfo size %u > %u", size, len); + PMD_DRV_LOG(ERR, "Unsupported hwinfo size %u > %u.", size, len); return -EINVAL; } @@ -141,7 +141,7 @@ nfp_hwinfo_db_validate(struct nfp_hwinfo *db, new_crc = nfp_crc32_posix((char *)db, size); crc = (uint32_t *)(db->start + size); if (new_crc != *crc) { - PMD_DRV_LOG(ERR, "CRC mismatch, calculated %#x, expected %#x", + PMD_DRV_LOG(ERR, "CRC mismatch, calculated %#x, expected %#x.", new_crc, *crc); return -EINVAL; } @@ -162,7 +162,7 @@ nfp_hwinfo_try_fetch(struct nfp_cpp *cpp, res = nfp_resource_acquire(cpp, NFP_RESOURCE_NFP_HWINFO); if (res == NULL) { - PMD_DRV_LOG(ERR, "HWInfo - acquire resource failed"); + PMD_DRV_LOG(ERR, "HWInfo - acquire resource failed."); return NULL; } @@ -181,7 +181,7 @@ nfp_hwinfo_try_fetch(struct nfp_cpp *cpp, err = nfp_cpp_read(cpp, cpp_id, cpp_addr, db, *cpp_size); if (err != (int)*cpp_size) { - PMD_DRV_LOG(ERR, "HWInfo - CPP read error %d", err); + PMD_DRV_LOG(ERR, "HWInfo - CPP read error %d.", err); goto exit_free; } @@ -190,7 +190,7 @@ nfp_hwinfo_try_fetch(struct nfp_cpp *cpp, goto exit_free; if (header->version != NFP_HWINFO_VERSION_2) { - PMD_DRV_LOG(ERR, "Unknown HWInfo version: %#08x", + PMD_DRV_LOG(ERR, "Unknown HWInfo version: %#08x.", header->version); goto exit_free; } @@ -223,7 +223,7 @@ nfp_hwinfo_fetch(struct nfp_cpp *cpp, nanosleep(&wait, NULL); if (count++ > 200) { /* 10ms * 200 = 2s */ - PMD_DRV_LOG(ERR, "NFP access error"); + PMD_DRV_LOG(ERR, "NFP access error."); return NULL; } } diff --git a/drivers/net/nfp/nfpcore/nfp_mip.c b/drivers/net/nfp/nfpcore/nfp_mip.c index 98d1d19047..16b94e6c10 100644 --- a/drivers/net/nfp/nfpcore/nfp_mip.c +++ b/drivers/net/nfp/nfpcore/nfp_mip.c @@ -21,18 +21,18 @@ nfp_mip_try_read(struct nfp_cpp *cpp, ret = nfp_cpp_read(cpp, cpp_id, addr, mip, sizeof(*mip)); if (ret != sizeof(*mip)) { - PMD_DRV_LOG(ERR, "Failed to read MIP data"); + PMD_DRV_LOG(ERR, "Failed to read MIP data."); return -EIO; } if (mip->signature != NFP_MIP_SIGNATURE) { - PMD_DRV_LOG(ERR, "Incorrect MIP signature %#08x", + PMD_DRV_LOG(ERR, "Incorrect MIP signature %#08x.", rte_le_to_cpu_32(mip->signature)); return -EINVAL; } if (mip->mip_version != NFP_MIP_VERSION) { - PMD_DRV_LOG(ERR, "Unsupported MIP version %d", + PMD_DRV_LOG(ERR, "Unsupported MIP version %d.", rte_le_to_cpu_32(mip->mip_version)); return -EINVAL; } @@ -88,7 +88,7 @@ nfp_mip_open(struct nfp_cpp *cpp) err = nfp_mip_read_resource(cpp, mip); if (err != 0) { - PMD_DRV_LOG(ERR, "Failed to read MIP resource"); + PMD_DRV_LOG(ERR, "Failed to read MIP resource."); free(mip); return NULL; } diff --git a/drivers/net/nfp/nfpcore/nfp_nffw.c b/drivers/net/nfp/nfpcore/nfp_nffw.c index 2f07fcd6c1..c808af2dab 100644 --- a/drivers/net/nfp/nfpcore/nfp_nffw.c +++ b/drivers/net/nfp/nfpcore/nfp_nffw.c @@ -175,7 +175,7 @@ nfp_nffw_info_open(struct nfp_cpp *cpp) state->res = nfp_resource_acquire(cpp, NFP_RESOURCE_NFP_NFFW); if (state->res == NULL) { - PMD_DRV_LOG(ERR, "NFFW - acquire resource failed"); + PMD_DRV_LOG(ERR, "NFFW - acquire resource failed."); goto err_free; } @@ -188,7 +188,7 @@ nfp_nffw_info_open(struct nfp_cpp *cpp) nfp_resource_address(state->res), fwinf, sizeof(*fwinf)); if (err < (int)sizeof(*fwinf)) { - PMD_DRV_LOG(ERR, "NFFW - CPP read error %d", err); + PMD_DRV_LOG(ERR, "NFFW - CPP read error %d.", err); goto err_release; } diff --git a/drivers/net/nfp/nfpcore/nfp_nsp.c b/drivers/net/nfp/nfpcore/nfp_nsp.c index a2f4f70081..3afbcffa42 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 @@ -205,12 +205,12 @@ nfp_nsp_check(struct nfp_nsp *state) err = nfp_cpp_readq(cpp, nsp_cpp, nsp_status, ®); if (err < 0) { - PMD_DRV_LOG(ERR, "NSP - CPP readq failed %d", err); + PMD_DRV_LOG(ERR, "NSP - CPP readq failed %d.", err); return err; } if (FIELD_GET(NSP_STATUS_MAGIC, reg) != NSP_MAGIC) { - PMD_DRV_LOG(ERR, "Can not detect NFP Service Processor"); + PMD_DRV_LOG(ERR, "Can not detect NFP Service Processor."); return -ENODEV; } @@ -218,7 +218,7 @@ nfp_nsp_check(struct nfp_nsp *state) state->ver.minor = FIELD_GET(NSP_STATUS_MINOR, reg); if (state->ver.major > NSP_MAJOR || state->ver.minor < NSP_MINOR) { - PMD_DRV_LOG(ERR, "Unsupported ABI %hu.%hu", state->ver.major, + PMD_DRV_LOG(ERR, "Unsupported ABI %hu.%hu.", state->ver.major, state->ver.minor); return -EINVAL; } @@ -246,7 +246,7 @@ nfp_nsp_open(struct nfp_cpp *cpp) res = nfp_resource_acquire(cpp, NFP_RESOURCE_NSP); if (res == NULL) { - PMD_DRV_LOG(ERR, "NSP - resource acquire failed"); + PMD_DRV_LOG(ERR, "NSP - resource acquire failed."); return NULL; } @@ -262,7 +262,7 @@ nfp_nsp_open(struct nfp_cpp *cpp) err = nfp_nsp_check(state); if (err != 0) { - PMD_DRV_LOG(DEBUG, "NSP - check failed"); + PMD_DRV_LOG(DEBUG, "NSP - check failed."); nfp_nsp_close(state); return NULL; } @@ -313,7 +313,7 @@ nfp_nsp_wait_reg(struct nfp_cpp *cpp, for (;;) { err = nfp_cpp_readq(cpp, nsp_cpp, addr, reg); if (err < 0) { - PMD_DRV_LOG(ERR, "NSP - CPP readq failed"); + PMD_DRV_LOG(ERR, "NSP - CPP readq failed."); return err; } @@ -365,7 +365,7 @@ nfp_nsp_command_real(struct nfp_nsp *state, err = nfp_nsp_check(state); if (err != 0) { - PMD_DRV_LOG(ERR, "Check NSP command failed"); + PMD_DRV_LOG(ERR, "Check NSP command failed."); return err; } @@ -390,7 +390,7 @@ nfp_nsp_command_real(struct nfp_nsp *state, err = nfp_nsp_wait_reg(cpp, ®, nsp_cpp, nsp_command, NSP_COMMAND_START, 0); if (err != 0) { - PMD_DRV_LOG(ERR, "Error %d waiting for code %#04x to start", + PMD_DRV_LOG(ERR, "Error %d waiting for code %#04x to start.", err, arg->code); return err; } @@ -399,7 +399,7 @@ nfp_nsp_command_real(struct nfp_nsp *state, err = nfp_nsp_wait_reg(cpp, ®, nsp_cpp, nsp_status, NSP_STATUS_BUSY, 0); if (err != 0) { - PMD_DRV_LOG(ERR, "Error %d waiting for code %#04x to complete", + PMD_DRV_LOG(ERR, "Error %d waiting for code %#04x to complete.", err, arg->code); return err; } @@ -415,7 +415,7 @@ nfp_nsp_command_real(struct nfp_nsp *state, err = FIELD_GET(NSP_STATUS_RESULT, reg); if (err != 0) { if (!arg->error_quiet) - PMD_DRV_LOG(ERR, "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) @@ -477,7 +477,7 @@ nfp_nsp_command_buf_def(struct nfp_nsp *nsp, if (!FIELD_FIT(NSP_BUFFER_CPP, cpp_id >> 8) || !FIELD_FIT(NSP_BUFFER_ADDRESS, cpp_buf)) { - PMD_DRV_LOG(ERR, "Buffer out of reach %#08x %#016lx", + PMD_DRV_LOG(ERR, "Buffer out of reach %#08x %#016lx.", cpp_id, cpp_buf); return -EINVAL; } @@ -487,7 +487,7 @@ nfp_nsp_command_buf_def(struct nfp_nsp *nsp, ret = nfp_nsp_command_real(nsp, &arg->arg); if (ret < 0) { if (!arg->arg.error_quiet) - PMD_DRV_LOG(ERR, "NSP command failed"); + PMD_DRV_LOG(ERR, "NSP command failed."); return ret; } @@ -516,7 +516,7 @@ nfp_nsp_command_buf(struct nfp_nsp *nsp, struct nfp_cpp *cpp = nsp->cpp; if (nsp->ver.minor < 13) { - PMD_DRV_LOG(ERR, "NSP: Code %#04x with buffer not supported ABI %hu.%hu)", + PMD_DRV_LOG(ERR, "NSP: Code %#04x with buffer not supported ABI %hu.%hu).", arg->arg.code, nsp->ver.major, nsp->ver.minor); return -EOPNOTSUPP; } @@ -531,7 +531,7 @@ nfp_nsp_command_buf(struct nfp_nsp *nsp, size = FIELD_GET(NSP_DFLT_BUFFER_SIZE_MB, reg) * SZ_1M + FIELD_GET(NSP_DFLT_BUFFER_SIZE_4KB, reg) * SZ_4K; if (size < max_size) { - PMD_DRV_LOG(ERR, "NSP: default buffer too small for command %#04x (%zu < %zu)", + PMD_DRV_LOG(ERR, "NSP: default buffer too small for command %#04x (%zu < %zu).", arg->arg.code, size, max_size); return -EINVAL; } @@ -563,7 +563,7 @@ nfp_nsp_wait(struct nfp_nsp *state) } if (err != 0) - PMD_DRV_LOG(ERR, "NSP failed to respond %d", err); + PMD_DRV_LOG(ERR, "NSP failed to respond %d.", err); return err; } @@ -616,9 +616,9 @@ nfp_nsp_load_fw_extended_msg(struct nfp_nsp *state, return; if (major >= RTE_DIM(major_msg)) - PMD_DRV_LOG(INFO, "FW loading status: %x", ret_val); + PMD_DRV_LOG(INFO, "FW loading status: %x.", ret_val); else if (minor >= RTE_DIM(minor_msg)) - PMD_DRV_LOG(INFO, "%s, reason code: %d", major_msg[major], minor); + PMD_DRV_LOG(INFO, "%s, reason code: %d.", major_msg[major], minor); else PMD_DRV_LOG(INFO, "%s%c %s", major_msg[major], minor != 0 ? ',' : '.', minor_msg[minor]); @@ -818,7 +818,7 @@ nfp_nsp_hwinfo_lookup_optional(struct nfp_nsp *state, size_t min_size; if (strnlen(default_val, size) == size) { - PMD_DRV_LOG(ERR, "NSP HWinfo default value not NULL terminated"); + PMD_DRV_LOG(ERR, "NSP HWinfo default value not NULL terminated."); return -EINVAL; } @@ -831,12 +831,12 @@ nfp_nsp_hwinfo_lookup_optional(struct nfp_nsp *state, if (ret == -ENOENT) goto default_return; - PMD_DRV_LOG(ERR, "NSP HWinfo lookup failed: %d", ret); + PMD_DRV_LOG(ERR, "NSP HWinfo lookup failed: %d.", ret); return ret; } if (strnlen(buf, min_size) == min_size) { - PMD_DRV_LOG(ERR, "NSP HWinfo value not NULL terminated"); + PMD_DRV_LOG(ERR, "NSP HWinfo value not NULL terminated."); return -EINVAL; } diff --git a/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c b/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c index e03d0db299..b1cce03e70 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 22c9ee98a4..1fcd54656a 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c +++ b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c @@ -223,7 +223,7 @@ nfp_eth_calc_port_geometry(struct nfp_eth_table *table) if (table->ports[i].label_subport == table->ports[j].label_subport) - PMD_DRV_LOG(DEBUG, "Port %d subport %d is a duplicate", + PMD_DRV_LOG(DEBUG, "Port %d subport %d is a duplicate.", table->ports[i].label_port, table->ports[i].label_subport); @@ -267,7 +267,7 @@ nfp_eth_read_ports_real(struct nfp_nsp *nsp) memset(entries, 0, NSP_ETH_TABLE_SIZE); ret = nfp_nsp_read_eth_table(nsp, entries, NSP_ETH_TABLE_SIZE); if (ret < 0) { - PMD_DRV_LOG(ERR, "Reading port table failed %d", ret); + PMD_DRV_LOG(ERR, "Reading port table failed %d.", ret); goto err; } @@ -281,7 +281,7 @@ nfp_eth_read_ports_real(struct nfp_nsp *nsp) * above. */ if (ret != 0 && ret != cnt) { - PMD_DRV_LOG(ERR, "Table entry count (%d) unmatch entries present (%d)", + PMD_DRV_LOG(ERR, "Table entry count (%d) unmatch entries present (%d).", ret, cnt); goto err; } @@ -362,12 +362,12 @@ nfp_eth_config_start(struct nfp_cpp *cpp, ret = nfp_nsp_read_eth_table(nsp, entries, NSP_ETH_TABLE_SIZE); if (ret < 0) { - PMD_DRV_LOG(ERR, "Reading port table failed %d", ret); + PMD_DRV_LOG(ERR, "Reading port table failed %d.", ret); goto err; } if ((entries[idx].port & NSP_ETH_PORT_LANES_MASK) == 0) { - PMD_DRV_LOG(ERR, "Trying to set port state on disabled port %d", idx); + PMD_DRV_LOG(ERR, "Trying to set port state on disabled port %d.", idx); goto err; } @@ -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; } @@ -661,7 +661,7 @@ nfp_eth_set_speed(struct nfp_nsp *nsp, rate = nfp_eth_speed2rate(speed); if (rate == RATE_INVALID) { - PMD_DRV_LOG(ERR, "Could not find matching lane rate for speed %u", speed); + PMD_DRV_LOG(ERR, "Could not find matching lane rate for speed %u.", speed); return -EINVAL; } diff --git a/drivers/net/nfp/nfpcore/nfp_resource.c b/drivers/net/nfp/nfpcore/nfp_resource.c index b05144036a..6437a78852 100644 --- a/drivers/net/nfp/nfpcore/nfp_resource.c +++ b/drivers/net/nfp/nfpcore/nfp_resource.c @@ -69,7 +69,7 @@ nfp_cpp_resource_find(struct nfp_cpp *cpp, /* Search for a matching entry */ if (memcmp(name_pad, NFP_RESOURCE_TBL_NAME "\0\0\0\0\0\0\0\0", 8) == 0) { - PMD_DRV_LOG(ERR, "Grabbing device lock not supported"); + PMD_DRV_LOG(ERR, "Grabbing device lock not supported."); return -EOPNOTSUPP; } @@ -109,19 +109,19 @@ nfp_resource_try_acquire(struct nfp_cpp *cpp, int err; if (nfp_cpp_mutex_lock(dev_mutex) != 0) { - PMD_DRV_LOG(ERR, "RESOURCE - CPP mutex lock failed"); + PMD_DRV_LOG(ERR, "RESOURCE - CPP mutex lock failed."); return -EINVAL; } err = nfp_cpp_resource_find(cpp, res); if (err != 0) { - PMD_DRV_LOG(ERR, "RESOURCE - CPP resource find failed"); + PMD_DRV_LOG(ERR, "RESOURCE - CPP resource find failed."); goto err_unlock_dev; } err = nfp_cpp_mutex_trylock(res->mutex); if (err != 0) { - PMD_DRV_LOG(ERR, "RESOURCE - CPP mutex trylock failed"); + PMD_DRV_LOG(ERR, "RESOURCE - CPP mutex trylock failed."); goto err_res_mutex_free; } @@ -173,7 +173,7 @@ nfp_resource_acquire(struct nfp_cpp *cpp, dev_mutex = nfp_cpp_mutex_alloc(cpp, NFP_RESOURCE_TBL_TARGET, NFP_RESOURCE_TBL_BASE, NFP_RESOURCE_TBL_KEY); if (dev_mutex == NULL) { - PMD_DRV_LOG(ERR, "RESOURCE - CPP mutex alloc failed"); + PMD_DRV_LOG(ERR, "RESOURCE - CPP mutex alloc failed."); goto err_free; } @@ -185,12 +185,12 @@ nfp_resource_acquire(struct nfp_cpp *cpp, if (err == 0) break; if (err != -EBUSY) { - PMD_DRV_LOG(ERR, "RESOURCE - try acquire failed"); + PMD_DRV_LOG(ERR, "RESOURCE - try acquire failed."); goto mutex_free; } if (count++ > 1000) { /* 1ms * 1000 = 1s */ - PMD_DRV_LOG(ERR, "Error: resource %s timed out", name); + PMD_DRV_LOG(ERR, "Error: resource %s timed out.", name); goto mutex_free; } diff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.c b/drivers/net/nfp/nfpcore/nfp_rtsym.c index fecf3d7b68..9f0d17cd0a 100644 --- a/drivers/net/nfp/nfpcore/nfp_rtsym.c +++ b/drivers/net/nfp/nfpcore/nfp_rtsym.c @@ -272,7 +272,7 @@ nfp_rtsym_size(const struct nfp_rtsym *sym) { switch (sym->type) { case NFP_RTSYM_TYPE_NONE: - PMD_DRV_LOG(ERR, "The type of rtsym '%s' is NONE", sym->name); + PMD_DRV_LOG(ERR, "The type of rtsym '%s' is NONE.", sym->name); return 0; case NFP_RTSYM_TYPE_OBJECT: /* FALLTHROUGH */ @@ -281,7 +281,7 @@ nfp_rtsym_size(const struct nfp_rtsym *sym) case NFP_RTSYM_TYPE_ABS: return sizeof(uint64_t); default: - PMD_DRV_LOG(ERR, "Unknown RTSYM type %u", sym->type); + PMD_DRV_LOG(ERR, "Unknown RTSYM type %u.", sym->type); return 0; } } @@ -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; @@ -672,26 +672,26 @@ nfp_rtsym_map_offset(struct nfp_rtsym_table *rtbl, sym = nfp_rtsym_lookup(rtbl, name); if (sym == NULL) { - PMD_DRV_LOG(ERR, "Symbol lookup fails for %s", name); + PMD_DRV_LOG(ERR, "Symbol lookup fails for %s.", name); return NULL; } 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; } if (sym->size < min_size) { - PMD_DRV_LOG(ERR, "Symbol %s too small (%" PRIu64 " < %u)", name, + PMD_DRV_LOG(ERR, "Symbol %s too small (%" PRIu64 " < %u).", name, sym->size, min_size); return NULL; } mem = nfp_cpp_map_area(rtbl->cpp, cpp_id, addr + offset, sym->size, area); if (mem == NULL) { - PMD_DRV_LOG(ERR, "Failed to map symbol %s", name); + PMD_DRV_LOG(ERR, "Failed to map symbol %s.", name); return NULL; } @@ -741,13 +741,13 @@ nfp_rtsym_readl_indirect(struct nfp_rtsym_table *rtbl, aux_sym = nfp_rtsym_lookup(rtbl, aux_name); if (aux_sym == NULL) { - PMD_DRV_LOG(ERR, "Failed to find symbol %s", aux_name); + PMD_DRV_LOG(ERR, "Failed to find symbol %s.", aux_name); return -ENOENT; } sym = nfp_rtsym_lookup(rtbl, name); if (sym == NULL) { - PMD_DRV_LOG(ERR, "Failed to find symbol %s", name); + PMD_DRV_LOG(ERR, "Failed to find symbol %s.", name); return -ENOENT; } @@ -791,13 +791,13 @@ nfp_rtsym_writel_indirect(struct nfp_rtsym_table *rtbl, aux_sym = nfp_rtsym_lookup(rtbl, aux_name); if (aux_sym == NULL) { - PMD_DRV_LOG(ERR, "Failed to find symbol %s", aux_name); + PMD_DRV_LOG(ERR, "Failed to find symbol %s.", aux_name); return -ENOENT; } sym = nfp_rtsym_lookup(rtbl, name); if (sym == NULL) { - PMD_DRV_LOG(ERR, "Failed to find symbol %s", name); + PMD_DRV_LOG(ERR, "Failed to find symbol %s.", name); return -ENOENT; } diff --git a/drivers/net/nfp/nfpcore/nfp_sync.c b/drivers/net/nfp/nfpcore/nfp_sync.c index 686cdf8eb1..1b594257c6 100644 --- a/drivers/net/nfp/nfpcore/nfp_sync.c +++ b/drivers/net/nfp/nfpcore/nfp_sync.c @@ -91,11 +91,11 @@ nfp_sync_free(struct nfp_sync *sync) } if (sync->process.avail != NFP_SYNC_ELEMENT_MAX) - PMD_DRV_LOG(ERR, "Sync process handle residue"); + PMD_DRV_LOG(ERR, "Sync process handle residue."); for (i = 0; i < NFP_SYNC_PCI_MAX; i++) { if (sync->pci[i].avail != NFP_SYNC_ELEMENT_MAX) - PMD_DRV_LOG(ERR, "Sync %s pci handle residue", + PMD_DRV_LOG(ERR, "Sync %s pci handle residue.", sync->pci[i].pci_name); } @@ -206,7 +206,7 @@ nfp_sync_process_inner_handle_alloc(struct nfp_sync *sync, handle = nfp_sync_common_handle_alloc(&sync->process, magic, size); if (handle == NULL) - PMD_DRV_LOG(ERR, "Process handle alloc failed"); + PMD_DRV_LOG(ERR, "Process handle alloc failed."); rte_spinlock_unlock(&sync->spinlock); @@ -280,7 +280,7 @@ nfp_sync_pci_inner_handle_alloc(struct nfp_sync *sync, handle = nfp_sync_common_handle_alloc(&sync->pci[pci_avail_id], magic, size); if (handle == NULL) - PMD_DRV_LOG(ERR, "PCI handle alloc failed"); + PMD_DRV_LOG(ERR, "PCI handle alloc failed."); rte_spinlock_unlock(&sync->spinlock); diff --git a/drivers/vdpa/nfp/nfp_vdpa.c b/drivers/vdpa/nfp/nfp_vdpa.c index 4fb6e93d1f..7f2f21ec6c 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, "The 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); @@ -178,7 +178,7 @@ nfp_vdpa_dma_do_unmap(struct rte_vhost_memory *mem, region->size); if (ret < 0) { /* Here should not return, even error happened. */ - DRV_VDPA_LOG(ERR, "DMA unmap failed. Times: %u", i); + DRV_VDPA_LOG(ERR, "DMA unmap failed. Times: %u.", i); } } @@ -225,7 +225,7 @@ nfp_vdpa_dma_map(struct nfp_vdpa_dev *device, } vfio_container_fd = device->vfio_container_fd; - DRV_VDPA_LOG(DEBUG, "The 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); @@ -533,7 +533,7 @@ nfp_vdpa_enable_vfio_intr(struct nfp_vdpa_dev *device, for (i = 0; i < nr_vring; i += 2) { fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); if (fd < 0) { - DRV_VDPA_LOG(ERR, "Can't setup eventfd"); + DRV_VDPA_LOG(ERR, "Can't setup eventfd."); return -EINVAL; } @@ -587,7 +587,7 @@ nfp_vdpa_read_kickfd(int kickfd) if (errno != EINTR && errno != EWOULDBLOCK && errno != EAGAIN) { - DRV_VDPA_LOG(ERR, "Error reading kickfd"); + DRV_VDPA_LOG(ERR, "Error reading kickfd."); break; } } @@ -609,7 +609,7 @@ nfp_vdpa_notify_epoll_ctl(uint32_t queue_num, ev.data.u64 = qid | (uint64_t)vring.kickfd << 32; ret = epoll_ctl(device->epoll_fd, EPOLL_CTL_ADD, vring.kickfd, &ev); if (ret < 0) { - DRV_VDPA_LOG(ERR, "Epoll add error for queue %d", qid); + DRV_VDPA_LOG(ERR, "Epoll add error for queue %d.", qid); return ret; } } @@ -633,7 +633,7 @@ nfp_vdpa_notify_epoll_wait(uint32_t queue_num, if (errno == EINTR) continue; - DRV_VDPA_LOG(ERR, "Epoll wait fail"); + DRV_VDPA_LOG(ERR, "Epoll wait fail."); return -EACCES; } @@ -794,7 +794,7 @@ nfp_vdpa_vring_epoll_ctl(uint32_t queue_num, ev.data.u64 = qid << 1 | (uint64_t)vring.kickfd << 32; ret = epoll_ctl(device->epoll_fd, EPOLL_CTL_ADD, vring.kickfd, &ev); if (ret < 0) { - DRV_VDPA_LOG(ERR, "Epoll add error for queue %u", qid); + DRV_VDPA_LOG(ERR, "Epoll add error for queue %u.", qid); return ret; } } @@ -808,7 +808,7 @@ nfp_vdpa_vring_epoll_ctl(uint32_t queue_num, ret = epoll_ctl(device->epoll_fd, EPOLL_CTL_ADD, device->intr_fd[qid], &ev); if (ret < 0) { - DRV_VDPA_LOG(ERR, "Epoll add error for queue %u", qid); + DRV_VDPA_LOG(ERR, "Epoll add error for queue %u.", qid); return ret; } @@ -834,7 +834,7 @@ nfp_vdpa_vring_epoll_wait(uint32_t queue_num, if (errno == EINTR) continue; - DRV_VDPA_LOG(ERR, "Epoll wait fail"); + DRV_VDPA_LOG(ERR, "Epoll wait fail."); return -EACCES; } @@ -966,7 +966,7 @@ nfp_vdpa_dev_config(int vid) vdev = rte_vhost_get_vdpa_device(vid); node = nfp_vdpa_find_node_by_vdev(vdev); if (node == NULL) { - DRV_VDPA_LOG(ERR, "Invalid vDPA device: %p", vdev); + DRV_VDPA_LOG(ERR, "Invalid vDPA device: %p.", vdev); return -ENODEV; } @@ -993,7 +993,7 @@ nfp_vdpa_dev_close(int vid) vdev = rte_vhost_get_vdpa_device(vid); node = nfp_vdpa_find_node_by_vdev(vdev); if (node == NULL) { - DRV_VDPA_LOG(ERR, "Invalid vDPA device: %p", vdev); + DRV_VDPA_LOG(ERR, "Invalid vDPA device: %p.", vdev); return -ENODEV; } @@ -1032,7 +1032,7 @@ nfp_vdpa_get_vfio_group_fd(int vid) vdev = rte_vhost_get_vdpa_device(vid); node = nfp_vdpa_find_node_by_vdev(vdev); if (node == NULL) { - DRV_VDPA_LOG(ERR, "Invalid vDPA device: %p", vdev); + DRV_VDPA_LOG(ERR, "Invalid vDPA device: %p.", vdev); return -ENODEV; } @@ -1048,7 +1048,7 @@ nfp_vdpa_get_vfio_device_fd(int vid) vdev = rte_vhost_get_vdpa_device(vid); node = nfp_vdpa_find_node_by_vdev(vdev); if (node == NULL) { - DRV_VDPA_LOG(ERR, "Invalid vDPA device: %p", vdev); + DRV_VDPA_LOG(ERR, "Invalid vDPA device: %p.", vdev); return -ENODEV; } @@ -1099,7 +1099,7 @@ nfp_vdpa_get_queue_num(struct rte_vdpa_device *vdev, node = nfp_vdpa_find_node_by_vdev(vdev); if (node == NULL) { - DRV_VDPA_LOG(ERR, "Invalid vDPA device: %p", vdev); + DRV_VDPA_LOG(ERR, "Invalid vDPA device: %p.", vdev); return -ENODEV; } @@ -1147,12 +1147,12 @@ nfp_vdpa_set_features(int32_t vid) struct rte_vdpa_device *vdev; struct nfp_vdpa_dev_node *node; - DRV_VDPA_LOG(DEBUG, "Start vid=%d", vid); + DRV_VDPA_LOG(DEBUG, "Start vid=%d.", vid); vdev = rte_vhost_get_vdpa_device(vid); node = nfp_vdpa_find_node_by_vdev(vdev); if (node == NULL) { - DRV_VDPA_LOG(ERR, "Invalid vDPA device: %p", vdev); + DRV_VDPA_LOG(ERR, "Invalid vDPA device: %p.", vdev); return -ENODEV; } @@ -1165,7 +1165,7 @@ nfp_vdpa_set_features(int32_t vid) if (device->hw.sw_lm) { ret = nfp_vdpa_sw_fallback(device); if (ret != 0) { - DRV_VDPA_LOG(ERR, "Software fallback start failed"); + DRV_VDPA_LOG(ERR, "Software fallback start failed."); return -1; } } @@ -1178,7 +1178,7 @@ nfp_vdpa_set_vring_state(int vid, int vring, int state) { - DRV_VDPA_LOG(DEBUG, "Start vid=%d, vring=%d, state=%d", vid, vring, state); + DRV_VDPA_LOG(DEBUG, "Start vid=%d, vring=%d, state=%d.", vid, vring, state); return 0; } @@ -1227,7 +1227,7 @@ nfp_vdpa_pci_probe(struct rte_pci_device *pci_dev) device->vdev = rte_vdpa_register_device(&pci_dev->device, &nfp_vdpa_ops); if (device->vdev == NULL) { - DRV_VDPA_LOG(ERR, "Failed to register device %s", pci_dev->name); + DRV_VDPA_LOG(ERR, "Failed to register device %s.", pci_dev->name); goto vfio_teardown; } @@ -1263,7 +1263,7 @@ nfp_vdpa_pci_remove(struct rte_pci_device *pci_dev) node = nfp_vdpa_find_node_by_pdev(pci_dev); if (node == NULL) { - DRV_VDPA_LOG(ERR, "Invalid device: %s", pci_dev->name); + DRV_VDPA_LOG(ERR, "Invalid device: %s.", pci_dev->name); return -ENODEV; } diff --git a/drivers/vdpa/nfp/nfp_vdpa_core.c b/drivers/vdpa/nfp/nfp_vdpa_core.c index bb5375bb5f..b3076104a0 100644 --- a/drivers/vdpa/nfp/nfp_vdpa_core.c +++ b/drivers/vdpa/nfp/nfp_vdpa_core.c @@ -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, "The 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