Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/132375/?format=api
{ "id": 132375, "url": "http://patches.dpdk.org/api/patches/132375/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20231007023339.1546659-6-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20231007023339.1546659-6-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231007023339.1546659-6-chaoyong.he@corigine.com", "date": "2023-10-07T02:33:33", "name": "[05/11] net/nfp: adjust the log statement", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "0378d335f55e4a5b720cde43185e961548fc4367", "submitter": { "id": 2554, "url": "http://patches.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20231007023339.1546659-6-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29758, "url": "http://patches.dpdk.org/api/series/29758/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=29758", "date": "2023-10-07T02:33:28", "name": "Unify the PMD coding style", "version": 1, "mbox": "http://patches.dpdk.org/series/29758/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/132375/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/132375/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 07636426D6;\n\tSat, 7 Oct 2023 04:34:55 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id A3CAB40A89;\n\tSat, 7 Oct 2023 04:34:14 +0200 (CEST)", "from NAM10-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam10on2099.outbound.protection.outlook.com [40.107.94.99])\n by mails.dpdk.org (Postfix) with ESMTP id 60A4C40DCE\n for <dev@dpdk.org>; Sat, 7 Oct 2023 04:34:10 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by SA0PR13MB3936.namprd13.prod.outlook.com (2603:10b6:806:97::24)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.38; Sat, 7 Oct\n 2023 02:34:08 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::28c0:63e2:ecd1:9314]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::28c0:63e2:ecd1:9314%4]) with mapi id 15.20.6813.027; Sat, 7 Oct 2023\n 02:34:08 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=I2jTCd6NmVvMO5thiSIlLutlf2Sax6Ul1y/nU2ORASw4rahxzaaaX0PRbrBoSMRKBrhEC7rFhGo08fcfgk2F6alE00aPFlBXoaTr/lAPS/saWuQVhW/aOb64dIPuVRqJP9Oczhh8yuyv1qiak7RDwtoJbtIPHxjfb/yqN8A01loI3DabwFjxtaLeqi128b2ctphmZK0j0KED3dCEA6NEPxzkigv5IReyTHVgYkB7xw+xxu8+VHsYi+fnWZnYxjzJhUVlQJkNQ6WrLv6Y0i/YYMnwfsuC8a4fpse/OQUTOjjMJ4OyJRl1Gy2oGwK8HCxqoz1LYD9aMqRN5bKY5/ofnw==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n 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;\n bh=mB6kUrQ1OXZ8TOHbDfJmK0HiVfyBdEDj/+/Y8J11JGc=;\n b=TwbDNThe7WvRHn5dnPHBBwBtFHr4fS/H9wK0bV7xxO7ZhHzma8ira+aVe6Ir5NwT4prxAXFpu/7Ly1cBHvGau1SWYh9b8EItbTjgOYm3S05HVk1Ns5d+s6uOzNH7gn7/V9CQCYgYXF4C50HAjn9HlvMGhQkHIBGCFDKpsh9qQTYe4FwuPCwR92JkEWIykwUnKwyu0qIqBWLLFsMiauNASoPk9ivrxExpAd3n/KylULwFRXxRkq6JIsPqeNFH+6w76qCwhRjeCFFttoTW4+gNwJoNFKTMTQgmhtBGMtgcPN8JnjjTpIVN2raDM7mWKuNm+CdYDYh8A4pBePRl/dISyQ==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com;\n dkim=pass header.d=corigine.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=mB6kUrQ1OXZ8TOHbDfJmK0HiVfyBdEDj/+/Y8J11JGc=;\n b=gc8GhuzCT35sIyqCfdtiM3DilywnlGDBVH5N9b1hFTMvtNs4+Z3fl3ig6iLsacmU1TZjoasU0xGBu9eh13hUAvw7fz1TJ3q+CaJhnGmomeaAIMdXqBnVeUDUvy7JFXtUnJjBayMJnx71sj7XLmSI1DAes/zUDVmDoYU1dpThrU0=", "Authentication-Results": "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=corigine.com;", "From": "Chaoyong He <chaoyong.he@corigine.com>", "To": "dev@dpdk.org", "Cc": "oss-drivers@corigine.com, Chaoyong He <chaoyong.he@corigine.com>,\n Long Wu <long.wu@corigine.com>, Peng Zhang <peng.zhang@corigine.com>", "Subject": "[PATCH 05/11] net/nfp: adjust the log statement", "Date": "Sat, 7 Oct 2023 10:33:33 +0800", "Message-Id": "<20231007023339.1546659-6-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20231007023339.1546659-1-chaoyong.he@corigine.com>", "References": "<20231007023339.1546659-1-chaoyong.he@corigine.com>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "SJ0PR03CA0212.namprd03.prod.outlook.com\n (2603:10b6:a03:39f::7) To SJ0PR13MB5545.namprd13.prod.outlook.com\n (2603:10b6:a03:424::5)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "SJ0PR13MB5545:EE_|SA0PR13MB3936:EE_", "X-MS-Office365-Filtering-Correlation-Id": "64e632ea-7b00-47b9-7766-08dbc6dde188", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n WEziXw9mdcneVWnAuj6lFuLBQ8KTYVHEt+PH9EUS8HEBJJKGbFiDVL71ahb9vIaUlo2IoP5Vp5jSKd76xuwEKTpsZx5WG7+v+2e8mn2KrwR9Fb1h7Uo2aV6Oz+Y+9TYqXk1RVQgdFdXyBAMdQAFhoTfsCWXw+qLKL3rLKWhTQEB3eKqrQNP++8To17pL8WNFNNVpUKc/GBb0uwLOs1v5pweq0Sjvs6A/1m2CmX6cuYWAncxQ2mSsASDlyMcaDpwabOecr8+pU7VYclnk/pw0rS77qea9lZ2jKCHH1eASUPol7X2M4UIq238cf4Wd49C+AeakXVFYTisWkBVnWrAH5d0YP+M9wY0ETpqkbVYM7ar0NHbnkN+qx7WmthxDwwidRSdQWAUviVfZ91KdW8DVtti9lHAq8o+u07WA2Zr1Zh6CVIkrNZPely/v/vjR+WPKBlKBzv+HN4aAL+NhcK5MrjjBtMu6tSVXkNtWvSE69jTjJpGFflLxBb9FDQjiOSdsSoQ1vg05oEqSWztyGgZwn43tadO4c/BuqDqUlmtQGn+rtjov1PyDfqSfxNmZ/vO5b0SrNjUX3lUtqa4xnZvq+ZbOhpMkhma4iqD63aasyQojqSe7PjgNDtoamn39wfTf7b8wrDnGM2SJIfd3XYfMvVohCThJjXyLxSIekPnwZZQ=", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230031)(366004)(376002)(346002)(396003)(39830400003)(136003)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(6666004)(6506007)(52116002)(6512007)(478600001)(6486002)(26005)(107886003)(1076003)(6916009)(316002)(30864003)(41300700001)(2906002)(44832011)(66476007)(8936002)(5660300002)(4326008)(54906003)(66556008)(66946007)(36756003)(8676002)(86362001)(38350700002)(38100700002)(2616005)(83380400001);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n XDfG4GGguGt4ghnpH7KJiC8TSBpAMK8ZQFt+AppjoWu6ff5Qf3TBMbP46/Icj9Q3MTaCu/YmPzNICXIdRpls0JcyEOmIE92j/co+6ccN0rg6s5R6sVF49e/HUsN51MSmfkfEjoUgH4YIJfd6CSqE7qhnvO1/aiWVKMSoF6J9LHCcnTWxd/9UmJOnOMzHE3wrUhrTrAZwvd0u3fvz2lt1OZW2Dr/mliaYj5kF1nMtY75lWLW4wXLFdcyKO6YnPacGfGrt3vHlAi+1+ZauQWNRoO/DtYIr/wkcDQo72avZUuU4SmkanaxxHdKuql/mrE32QyA5hBqnu4jU6IeL+XNspAb76Xvcz7jxicWXcxDVBE61zR4MZlCjC+qExvgDqHHGevfpHSml1wVMd6aLtsLY0vNS3jOIk+XfyBnB93KHyeGxWLGv6KR/vRUkMFvqfd4bdl0q392Dok0WQaTz4lx+7YQNOpFVRmQhD1l23LTafD5ZfHtrgxDJWHEqSC4qFrlcyuxK2JBw2+ZysltDlRQ09TWREW+jrPy785LpY0YJcEnXgAaD3wT/lZ18eZWqhU8/vMgUX8HDvKaPk+lJHgGst7WvpcQQpdix2F6+fk2+Qzy2s/5Fp3mz1dn7UB0pOmbA8T8DENogv5lxM56U3sHXA9Vmu4Y6EcDlhuhiR72YxESx18wRL0Fnr3qWsvVLR+gDyyqj9O7c80AIpaYKQGlhEmiAsAAs4lo+DSILoMUhF+HyjPBfHne+IVGP0ujmYzg+4R8HweBHjj+vsSco+OYiQKFsZJy7VXSir2RTYyItRKbQZokEbQV51KHJq7oohqsHsshhPuKehOxXdD1xXrlEYvpdZib3TCnbsw0dabu1nr91+xx3klk2ZTgbGqu2WHs6+SAZ3USaSMTniqWrEdFEpBiRmElRmntIrpNBfh4lR7NwSWZ7VqgDhSve+s+wiERRoR6uy2Dd1mTER5yw/qKRq2haQrOKPkwpM3RUeUK/J9+SGoELy9FNN9VWPmRmirD2BzP87Qs50MvCxo/eCgMm2oBfKLCtHoDDO0cMB7AQZOic4JGJBi2O1r5iLjJOvqya+dSedk/u2kxlcJe4IvJE92vRDmVZTtuQy98+31NtPRd/h9Xy4D2r4ul2mH6yTVmO9UcZ0HnU9ODVXHc7tIVf67KATu8Ahjz0awJjMjWtTS4cMTN2Psov2Yn1uDwMOn4+2Jw1GZrtXMzSg31OqwhHzF9qksdpP+Rh64l7azNWZ+AQM/YeUv1ujnBirjXuXpdAJ+fhkCdy/x0+Gn2gWERIXCXiiHYfaPQdS8N+/7Qdql0bKxawhYDXF172I3XABM9NSmaN8L7n+ppiFkXjyZauLoOvNs0Mix93kWp2Tb6ouFMTiRdudXgYkZLby780BEUHNspKzY0c+hMIl9c1yAfMLLWCwxShCabgq9Q7e/Ep+kXlIoixQtjVj+yE3HyT3aXNZoyKfgNbfsBJQYgBAfAk4n7mnObHK/jjbOMqXJJa/8ErCKMxeVdOkGFxW8N4zEKw7FHNxQDwgUwjn2lDcvKxNtBLfPWYIF/gkKRa1hD4qQoKq70Zs/cyCG6a4IlLyg0mKt+pbkdO1CGjC6QaU87kwQ==", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 64e632ea-7b00-47b9-7766-08dbc6dde188", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "07 Oct 2023 02:34:07.9892 (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": "\n cKnX9ujSgqcPKhE/O5oh3N+4ymm62HU/KY2h/nRSXQ2C4zO80NAMr5W8phFZkz4Q1Xcg2o07XEUuoP57BDziv+9stfs5Qt//2RHO9MwHqNI=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "SA0PR13MB3936", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Add log statement to the important control logic, and remove verbose\ninfo log statement.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Long Wu <long.wu@corigine.com>\nReviewed-by: Peng Zhang <peng.zhang@corigine.com>\n---\n drivers/net/nfp/flower/nfp_flower_ctrl.c | 17 +++---\n .../net/nfp/flower/nfp_flower_representor.c | 4 +-\n drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 2 -\n drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 2 -\n drivers/net/nfp/nfp_common.c | 59 ++++++++-----------\n drivers/net/nfp/nfp_cpp_bridge.c | 28 ++++-----\n drivers/net/nfp/nfp_ethdev.c | 21 +------\n drivers/net/nfp/nfp_ethdev_vf.c | 17 +-----\n drivers/net/nfp/nfp_logs.h | 1 -\n drivers/net/nfp/nfp_rxtx.c | 17 ++----\n 10 files changed, 58 insertions(+), 110 deletions(-)", "diff": "diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c b/drivers/net/nfp/flower/nfp_flower_ctrl.c\nindex 4967cc2375..1f4c5fd7f9 100644\n--- a/drivers/net/nfp/flower/nfp_flower_ctrl.c\n+++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c\n@@ -88,15 +88,14 @@ nfp_flower_ctrl_vnic_recv(void *rx_queue,\n \t\t\t * responsibility of avoiding it. But we have\n \t\t\t * to give some info about the error\n \t\t\t */\n-\t\t\tPMD_RX_LOG(ERR,\n-\t\t\t\t\"mbuf overflow likely due to the RX offset.\\n\"\n-\t\t\t\t\"\\t\\tYour mbuf size should have extra space for\"\n-\t\t\t\t\" RX offset=%u bytes.\\n\"\n-\t\t\t\t\"\\t\\tCurrently you just have %u bytes available\"\n-\t\t\t\t\" but the received packet is %u bytes long\",\n-\t\t\t\thw->rx_offset,\n-\t\t\t\trxq->mbuf_size - hw->rx_offset,\n-\t\t\t\tmb->data_len);\n+\t\t\tPMD_RX_LOG(ERR, \"mbuf overflow likely due to the RX offset.\\n\"\n+\t\t\t\t\t\"\\t\\tYour mbuf size should have extra space for\"\n+\t\t\t\t\t\" RX offset=%u bytes.\\n\"\n+\t\t\t\t\t\"\\t\\tCurrently you just have %u bytes available\"\n+\t\t\t\t\t\" but the received packet is %u bytes long\",\n+\t\t\t\t\thw->rx_offset,\n+\t\t\t\t\trxq->mbuf_size - hw->rx_offset,\n+\t\t\t\t\tmb->data_len);\n \t\t\trte_pktmbuf_free(mb);\n \t\t\tbreak;\n \t\t}\ndiff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c\nindex 01c2c5a517..be0dfb2890 100644\n--- a/drivers/net/nfp/flower/nfp_flower_representor.c\n+++ b/drivers/net/nfp/flower/nfp_flower_representor.c\n@@ -464,7 +464,7 @@ nfp_flower_repr_rx_burst(void *rx_queue,\n \ttotal_dequeue = rte_ring_dequeue_burst(repr->ring, (void *)rx_pkts,\n \t\t\tnb_pkts, &available);\n \tif (total_dequeue != 0) {\n-\t\tPMD_RX_LOG(DEBUG, \"Representor Rx burst for %s, port_id: 0x%x, \"\n+\t\tPMD_RX_LOG(DEBUG, \"Representor Rx burst for %s, port_id: %#x, \"\n \t\t\t\t\"received: %u, available: %u\", repr->name,\n \t\t\t\trepr->port_id, total_dequeue, available);\n \n@@ -510,7 +510,7 @@ nfp_flower_repr_tx_burst(void *tx_queue,\n \tpf_tx_queue = dev->data->tx_queues[0];\n \tsent = nfp_flower_pf_xmit_pkts(pf_tx_queue, tx_pkts, nb_pkts);\n \tif (sent != 0) {\n-\t\tPMD_TX_LOG(DEBUG, \"Representor Tx burst for %s, port_id: 0x%x transmitted: %u\",\n+\t\tPMD_TX_LOG(DEBUG, \"Representor Tx burst for %s, port_id: %#x transmitted: %hu\",\n \t\t\t\trepr->name, repr->port_id, sent);\n \t\trepr->repr_stats.opackets += sent;\n \t}\ndiff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c\nindex 699f65ebef..51755f4324 100644\n--- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c\n+++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c\n@@ -381,8 +381,6 @@ nfp_net_nfd3_tx_queue_setup(struct rte_eth_dev *dev,\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n-\tPMD_INIT_FUNC_TRACE();\n-\n \tnfp_net_tx_desc_limits(hw, &min_tx_desc, &max_tx_desc);\n \n \t/* Validating number of descriptors */\ndiff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c\nindex 2426ffb261..dae87ac6df 100644\n--- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c\n+++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c\n@@ -455,8 +455,6 @@ nfp_net_nfdk_tx_queue_setup(struct rte_eth_dev *dev,\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n-\tPMD_INIT_FUNC_TRACE();\n-\n \tnfp_net_tx_desc_limits(hw, &min_tx_desc, &max_tx_desc);\n \n \t/* Validating number of descriptors */\ndiff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c\nindex 18291a1cde..f48e1930dc 100644\n--- a/drivers/net/nfp/nfp_common.c\n+++ b/drivers/net/nfp/nfp_common.c\n@@ -207,7 +207,7 @@ __nfp_net_reconfig(struct nfp_net_hw *hw,\n \t\t\thw->qcp_cfg);\n \n \tif (hw->qcp_cfg == NULL) {\n-\t\tPMD_INIT_LOG(ERR, \"Bad configuration queue pointer\");\n+\t\tPMD_DRV_LOG(ERR, \"Bad configuration queue pointer\");\n \t\treturn -ENXIO;\n \t}\n \n@@ -224,15 +224,15 @@ __nfp_net_reconfig(struct nfp_net_hw *hw,\n \t\tif (new == 0)\n \t\t\tbreak;\n \t\tif ((new & NFP_NET_CFG_UPDATE_ERR) != 0) {\n-\t\t\tPMD_INIT_LOG(ERR, \"Reconfig error: 0x%08x\", new);\n+\t\t\tPMD_DRV_LOG(ERR, \"Reconfig error: %#08x\", new);\n \t\t\treturn -1;\n \t\t}\n \t\tif (cnt >= NFP_NET_POLL_TIMEOUT) {\n-\t\t\tPMD_INIT_LOG(ERR, \"Reconfig timeout for 0x%08x after\"\n-\t\t\t\t\t\" %ums\", update, cnt);\n+\t\t\tPMD_DRV_LOG(ERR, \"Reconfig timeout for %#08x after %u ms\",\n+\t\t\t\t\tupdate, cnt);\n \t\t\treturn -EIO;\n \t\t}\n-\t\tnanosleep(&wait, 0); /* waiting for a 1ms */\n+\t\tnanosleep(&wait, 0); /* Waiting for a 1ms */\n \t}\n \tPMD_DRV_LOG(DEBUG, \"Ack DONE\");\n \treturn 0;\n@@ -390,8 +390,6 @@ nfp_net_configure(struct rte_eth_dev *dev)\n \t * called after that internal process\n \t */\n \n-\tPMD_INIT_LOG(DEBUG, \"Configure\");\n-\n \tdev_conf = &dev->data->dev_conf;\n \trxmode = &dev_conf->rxmode;\n \ttxmode = &dev_conf->txmode;\n@@ -401,20 +399,20 @@ nfp_net_configure(struct rte_eth_dev *dev)\n \n \t/* Checking TX mode */\n \tif (txmode->mq_mode != RTE_ETH_MQ_TX_NONE) {\n-\t\tPMD_INIT_LOG(INFO, \"TX mq_mode DCB and VMDq not supported\");\n+\t\tPMD_DRV_LOG(ERR, \"TX mq_mode DCB and VMDq not supported\");\n \t\treturn -EINVAL;\n \t}\n \n \t/* Checking RX mode */\n \tif ((rxmode->mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) != 0 &&\n \t\t\t(hw->cap & NFP_NET_CFG_CTRL_RSS_ANY) == 0) {\n-\t\tPMD_INIT_LOG(INFO, \"RSS not supported\");\n+\t\tPMD_DRV_LOG(ERR, \"RSS not supported\");\n \t\treturn -EINVAL;\n \t}\n \n \t/* Checking MTU set */\n \tif (rxmode->mtu > NFP_FRAME_SIZE_MAX) {\n-\t\tPMD_INIT_LOG(ERR, \"MTU (%u) larger than NFP_FRAME_SIZE_MAX (%u) not supported\",\n+\t\tPMD_DRV_LOG(ERR, \"MTU (%u) larger than NFP_FRAME_SIZE_MAX (%u)\",\n \t\t\t\trxmode->mtu, NFP_FRAME_SIZE_MAX);\n \t\treturn -ERANGE;\n \t}\n@@ -552,8 +550,7 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev,\n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tif ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 &&\n \t\t\t(hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0) {\n-\t\tPMD_INIT_LOG(INFO, \"MAC address unable to change when\"\n-\t\t\t\t\" port enabled\");\n+\t\tPMD_DRV_LOG(ERR, \"MAC address unable to change when port enabled\");\n \t\treturn -EBUSY;\n \t}\n \n@@ -567,7 +564,7 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev,\n \t\t\t(hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) != 0)\n \t\tctrl |= NFP_NET_CFG_CTRL_LIVE_ADDR;\n \tif (nfp_net_reconfig(hw, ctrl, update) != 0) {\n-\t\tPMD_INIT_LOG(INFO, \"MAC address update failed\");\n+\t\tPMD_DRV_LOG(ERR, \"MAC address update failed\");\n \t\treturn -EIO;\n \t}\n \treturn 0;\n@@ -582,21 +579,21 @@ nfp_configure_rx_interrupt(struct rte_eth_dev *dev,\n \n \tif (rte_intr_vec_list_alloc(intr_handle, \"intr_vec\",\n \t\t\t\tdev->data->nb_rx_queues) != 0) {\n-\t\tPMD_INIT_LOG(ERR, \"Failed to allocate %d rx_queues\"\n-\t\t\t\t\" intr_vec\", dev->data->nb_rx_queues);\n+\t\tPMD_DRV_LOG(ERR, \"Failed to allocate %d rx_queues intr_vec\",\n+\t\t\t\tdev->data->nb_rx_queues);\n \t\treturn -ENOMEM;\n \t}\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n \tif (rte_intr_type_get(intr_handle) == RTE_INTR_HANDLE_UIO) {\n-\t\tPMD_INIT_LOG(INFO, \"VF: enabling RX interrupt with UIO\");\n+\t\tPMD_DRV_LOG(INFO, \"VF: enabling RX interrupt with UIO\");\n \t\t/* UIO just supports one queue and no LSC*/\n \t\tnn_cfg_writeb(hw, NFP_NET_CFG_RXR_VEC(0), 0);\n \t\tif (rte_intr_vec_list_index_set(intr_handle, 0, 0) != 0)\n \t\t\treturn -1;\n \t} else {\n-\t\tPMD_INIT_LOG(INFO, \"VF: enabling RX interrupt with VFIO\");\n+\t\tPMD_DRV_LOG(INFO, \"VF: enabling RX interrupt with VFIO\");\n \t\tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n \t\t\t/*\n \t\t\t * The first msix vector is reserved for non\n@@ -605,8 +602,6 @@ nfp_configure_rx_interrupt(struct rte_eth_dev *dev,\n \t\t\tnn_cfg_writeb(hw, NFP_NET_CFG_RXR_VEC(i), i + 1);\n \t\t\tif (rte_intr_vec_list_index_set(intr_handle, i, i + 1) != 0)\n \t\t\t\treturn -1;\n-\t\t\tPMD_INIT_LOG(DEBUG, \"intr_vec[%d]= %d\", i,\n-\t\t\t\t\trte_intr_vec_list_index_get(intr_handle, i));\n \t\t}\n \t}\n \n@@ -691,8 +686,6 @@ nfp_net_promisc_enable(struct rte_eth_dev *dev)\n \tstruct nfp_net_hw *hw;\n \tstruct nfp_flower_representor *repr;\n \n-\tPMD_DRV_LOG(DEBUG, \"Promiscuous mode enable\");\n-\n \tif ((dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) != 0) {\n \t\trepr = dev->data->dev_private;\n \t\thw = repr->app_fw_flower->pf_hw;\n@@ -701,7 +694,7 @@ nfp_net_promisc_enable(struct rte_eth_dev *dev)\n \t}\n \n \tif ((hw->cap & NFP_NET_CFG_CTRL_PROMISC) == 0) {\n-\t\tPMD_INIT_LOG(INFO, \"Promiscuous mode not supported\");\n+\t\tPMD_DRV_LOG(ERR, \"Promiscuous mode not supported\");\n \t\treturn -ENOTSUP;\n \t}\n \n@@ -774,9 +767,6 @@ nfp_net_link_update(struct rte_eth_dev *dev,\n \tstruct rte_eth_link link;\n \tstruct nfp_eth_table *nfp_eth_table;\n \n-\n-\tPMD_DRV_LOG(DEBUG, \"Link update\");\n-\n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n \t/* Read link status */\n@@ -1636,9 +1626,9 @@ nfp_net_rss_reta_write(struct rte_eth_dev *dev,\n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n \tif (reta_size != NFP_NET_CFG_RSS_ITBL_SZ) {\n-\t\tPMD_DRV_LOG(ERR, \"The size of hash lookup table configured \"\n-\t\t\t\t\"(%d) doesn't match the number hardware can supported \"\n-\t\t\t\t\"(%d)\", reta_size, NFP_NET_CFG_RSS_ITBL_SZ);\n+\t\tPMD_DRV_LOG(ERR, \"The size of hash lookup table configured (%hu)\"\n+\t\t\t\t\" doesn't match hardware can supported (%d)\",\n+\t\t\t\treta_size, NFP_NET_CFG_RSS_ITBL_SZ);\n \t\treturn -EINVAL;\n \t}\n \n@@ -1719,9 +1709,9 @@ nfp_net_reta_query(struct rte_eth_dev *dev,\n \t\treturn -EINVAL;\n \n \tif (reta_size != NFP_NET_CFG_RSS_ITBL_SZ) {\n-\t\tPMD_DRV_LOG(ERR, \"The size of hash lookup table configured \"\n-\t\t\t\t\"(%d) doesn't match the number hardware can supported \"\n-\t\t\t\t\"(%d)\", reta_size, NFP_NET_CFG_RSS_ITBL_SZ);\n+\t\tPMD_DRV_LOG(ERR, \"The size of hash lookup table configured (%d)\"\n+\t\t\t\t\" doesn't match hardware can supported (%d)\",\n+\t\t\t\treta_size, NFP_NET_CFG_RSS_ITBL_SZ);\n \t\treturn -EINVAL;\n \t}\n \n@@ -1827,7 +1817,7 @@ nfp_net_rss_hash_update(struct rte_eth_dev *dev,\n \t}\n \n \tif (rss_conf->rss_key_len > NFP_NET_CFG_RSS_KEY_SZ) {\n-\t\tPMD_DRV_LOG(ERR, \"hash key too long\");\n+\t\tPMD_DRV_LOG(ERR, \"RSS hash key too long\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -1910,9 +1900,6 @@ nfp_net_rss_config_default(struct rte_eth_dev *dev)\n \tuint16_t rx_queues = dev->data->nb_rx_queues;\n \tstruct rte_eth_rss_reta_entry64 nfp_reta_conf[2];\n \n-\tPMD_DRV_LOG(INFO, \"setting default RSS conf for %u queues\",\n-\t\t\trx_queues);\n-\n \tnfp_reta_conf[0].mask = ~0x0;\n \tnfp_reta_conf[1].mask = ~0x0;\n \n@@ -1929,7 +1916,7 @@ nfp_net_rss_config_default(struct rte_eth_dev *dev)\n \n \tdev_conf = &dev->data->dev_conf;\n \tif (dev_conf == NULL) {\n-\t\tPMD_DRV_LOG(INFO, \"wrong rss conf\");\n+\t\tPMD_DRV_LOG(ERR, \"Wrong rss conf\");\n \t\treturn -EINVAL;\n \t}\n \trss_conf = dev_conf->rx_adv_conf.rss_conf;\ndiff --git a/drivers/net/nfp/nfp_cpp_bridge.c b/drivers/net/nfp/nfp_cpp_bridge.c\nindex 727ec7a7b2..222cfdcbc3 100644\n--- a/drivers/net/nfp/nfp_cpp_bridge.c\n+++ b/drivers/net/nfp/nfp_cpp_bridge.c\n@@ -130,7 +130,7 @@ nfp_cpp_bridge_serve_write(int sockfd,\n \tuint32_t tmpbuf[16];\n \tstruct nfp_cpp_area *area;\n \n-\tPMD_CPP_LOG(DEBUG, \"%s: offset size %zu, count_size: %zu\\n\", __func__,\n+\tPMD_CPP_LOG(DEBUG, \"%s: offset size %zu, count_size: %zu\", __func__,\n \t\t\tsizeof(off_t), sizeof(size_t));\n \n \t/* Reading the count param */\n@@ -149,9 +149,9 @@ nfp_cpp_bridge_serve_write(int sockfd,\n \tcpp_id = (offset >> 40) << 8;\n \tnfp_offset = offset & ((1ull << 40) - 1);\n \n-\tPMD_CPP_LOG(DEBUG, \"%s: count %zu and offset %jd\\n\", __func__, count,\n+\tPMD_CPP_LOG(DEBUG, \"%s: count %zu and offset %jd\", __func__, count,\n \t\t\toffset);\n-\tPMD_CPP_LOG(DEBUG, \"%s: cpp_id %08x and nfp_offset %jd\\n\", __func__,\n+\tPMD_CPP_LOG(DEBUG, \"%s: cpp_id %08x and nfp_offset %jd\", __func__,\n \t\t\tcpp_id, nfp_offset);\n \n \t/* Adjust length if not aligned */\n@@ -162,7 +162,7 @@ nfp_cpp_bridge_serve_write(int sockfd,\n \t}\n \n \twhile (count > 0) {\n-\t\t/* configure a CPP PCIe2CPP BAR for mapping the CPP target */\n+\t\t/* Configure a CPP PCIe2CPP BAR for mapping the CPP target */\n \t\tarea = nfp_cpp_area_alloc_with_name(cpp, cpp_id, \"nfp.cdev\",\n \t\t\t\tnfp_offset, curlen);\n \t\tif (area == NULL) {\n@@ -170,7 +170,7 @@ nfp_cpp_bridge_serve_write(int sockfd,\n \t\t\treturn -EIO;\n \t\t}\n \n-\t\t/* mapping the target */\n+\t\t/* Mapping the target */\n \t\terr = nfp_cpp_area_acquire(area);\n \t\tif (err < 0) {\n \t\t\tPMD_CPP_LOG(ERR, \"area acquire failed\");\n@@ -183,7 +183,7 @@ nfp_cpp_bridge_serve_write(int sockfd,\n \t\t\tif (len > sizeof(tmpbuf))\n \t\t\t\tlen = sizeof(tmpbuf);\n \n-\t\t\tPMD_CPP_LOG(DEBUG, \"%s: Receive %u of %zu\\n\", __func__,\n+\t\t\tPMD_CPP_LOG(DEBUG, \"%s: Receive %u of %zu\", __func__,\n \t\t\t\t\tlen, count);\n \t\t\terr = recv(sockfd, tmpbuf, len, MSG_WAITALL);\n \t\t\tif (err != (int)len) {\n@@ -235,7 +235,7 @@ nfp_cpp_bridge_serve_read(int sockfd,\n \tuint32_t tmpbuf[16];\n \tstruct nfp_cpp_area *area;\n \n-\tPMD_CPP_LOG(DEBUG, \"%s: offset size %zu, count_size: %zu\\n\", __func__,\n+\tPMD_CPP_LOG(DEBUG, \"%s: offset size %zu, count_size: %zu\", __func__,\n \t\t\tsizeof(off_t), sizeof(size_t));\n \n \t/* Reading the count param */\n@@ -254,9 +254,9 @@ nfp_cpp_bridge_serve_read(int sockfd,\n \tcpp_id = (offset >> 40) << 8;\n \tnfp_offset = offset & ((1ull << 40) - 1);\n \n-\tPMD_CPP_LOG(DEBUG, \"%s: count %zu and offset %jd\\n\", __func__, count,\n+\tPMD_CPP_LOG(DEBUG, \"%s: count %zu and offset %jd\", __func__, count,\n \t\t\toffset);\n-\tPMD_CPP_LOG(DEBUG, \"%s: cpp_id %08x and nfp_offset %jd\\n\", __func__,\n+\tPMD_CPP_LOG(DEBUG, \"%s: cpp_id %08x and nfp_offset %jd\", __func__,\n \t\t\tcpp_id, nfp_offset);\n \n \t/* Adjust length if not aligned */\n@@ -293,7 +293,7 @@ nfp_cpp_bridge_serve_read(int sockfd,\n \t\t\t\tnfp_cpp_area_free(area);\n \t\t\t\treturn -EIO;\n \t\t\t}\n-\t\t\tPMD_CPP_LOG(DEBUG, \"%s: sending %u of %zu\\n\", __func__,\n+\t\t\tPMD_CPP_LOG(DEBUG, \"%s: sending %u of %zu\", __func__,\n \t\t\t\t\tlen, count);\n \n \t\t\terr = send(sockfd, tmpbuf, len, 0);\n@@ -353,7 +353,7 @@ nfp_cpp_bridge_serve_ioctl(int sockfd,\n \n \ttmp = nfp_cpp_model(cpp);\n \n-\tPMD_CPP_LOG(DEBUG, \"%s: sending NFP model %08x\\n\", __func__, tmp);\n+\tPMD_CPP_LOG(DEBUG, \"%s: sending NFP model %08x\", __func__, tmp);\n \n \terr = send(sockfd, &tmp, 4, 0);\n \tif (err != 4) {\n@@ -363,7 +363,7 @@ nfp_cpp_bridge_serve_ioctl(int sockfd,\n \n \ttmp = nfp_cpp_interface(cpp);\n \n-\tPMD_CPP_LOG(DEBUG, \"%s: sending NFP interface %08x\\n\", __func__, tmp);\n+\tPMD_CPP_LOG(DEBUG, \"%s: sending NFP interface %08x\", __func__, tmp);\n \n \terr = send(sockfd, &tmp, 4, 0);\n \tif (err != 4) {\n@@ -440,11 +440,11 @@ nfp_cpp_bridge_service_func(void *args)\n \t\twhile (1) {\n \t\t\tret = recv(datafd, &op, 4, 0);\n \t\t\tif (ret <= 0) {\n-\t\t\t\tPMD_CPP_LOG(DEBUG, \"%s: socket close\\n\", __func__);\n+\t\t\t\tPMD_CPP_LOG(DEBUG, \"%s: socket close\", __func__);\n \t\t\t\tbreak;\n \t\t\t}\n \n-\t\t\tPMD_CPP_LOG(DEBUG, \"%s: getting op %u\\n\", __func__, op);\n+\t\t\tPMD_CPP_LOG(DEBUG, \"%s: getting op %u\", __func__, op);\n \n \t\t\tif (op == NFP_BRIDGE_OP_READ)\n \t\t\t\tnfp_cpp_bridge_serve_read(datafd, cpp);\ndiff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c\nindex 7d149decfb..72abc4c16e 100644\n--- a/drivers/net/nfp/nfp_ethdev.c\n+++ b/drivers/net/nfp/nfp_ethdev.c\n@@ -60,8 +60,6 @@ nfp_net_start(struct rte_eth_dev *dev)\n \tpf_dev = NFP_NET_DEV_PRIVATE_TO_PF(dev->data->dev_private);\n \tapp_fw_nic = NFP_PRIV_TO_APP_FW_NIC(pf_dev->app_fw_priv);\n \n-\tPMD_INIT_LOG(DEBUG, \"Start\");\n-\n \t/* Disabling queues just in case... */\n \tnfp_net_disable_queues(dev);\n \n@@ -194,8 +192,6 @@ nfp_net_stop(struct rte_eth_dev *dev)\n {\n \tstruct nfp_net_hw *hw;\n \n-\tPMD_INIT_LOG(DEBUG, \"Stop\");\n-\n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n \tnfp_net_disable_queues(dev);\n@@ -220,8 +216,6 @@ nfp_net_set_link_up(struct rte_eth_dev *dev)\n {\n \tstruct nfp_net_hw *hw;\n \n-\tPMD_DRV_LOG(DEBUG, \"Set link up\");\n-\n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n \tif (rte_eal_process_type() == RTE_PROC_PRIMARY)\n@@ -237,8 +231,6 @@ nfp_net_set_link_down(struct rte_eth_dev *dev)\n {\n \tstruct nfp_net_hw *hw;\n \n-\tPMD_DRV_LOG(DEBUG, \"Set link down\");\n-\n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n \tif (rte_eal_process_type() == RTE_PROC_PRIMARY)\n@@ -261,8 +253,6 @@ nfp_net_close(struct rte_eth_dev *dev)\n \tif (rte_eal_process_type() != RTE_PROC_PRIMARY)\n \t\treturn 0;\n \n-\tPMD_INIT_LOG(DEBUG, \"Close\");\n-\n \tpf_dev = NFP_NET_DEV_PRIVATE_TO_PF(dev->data->dev_private);\n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tpci_dev = RTE_ETH_DEV_TO_PCI(dev);\n@@ -491,8 +481,6 @@ nfp_net_init(struct rte_eth_dev *eth_dev)\n \tstruct nfp_app_fw_nic *app_fw_nic;\n \tstruct rte_ether_addr *tmp_ether_addr;\n \n-\tPMD_INIT_FUNC_TRACE();\n-\n \tpci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);\n \n \t/* Use backpointer here to the PF of this eth_dev */\n@@ -513,7 +501,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)\n \t */\n \thw = app_fw_nic->ports[port];\n \n-\tPMD_INIT_LOG(DEBUG, \"Working with physical port number: %d, \"\n+\tPMD_INIT_LOG(DEBUG, \"Working with physical port number: %hu, \"\n \t\t\t\"NFP internal port number: %d\", port, hw->nfp_idx);\n \n \trte_eth_copy_pci_info(eth_dev, pci_dev);\n@@ -579,9 +567,6 @@ nfp_net_init(struct rte_eth_dev *eth_dev)\n \ttx_base = nn_cfg_readl(hw, NFP_NET_CFG_START_TXQ);\n \trx_base = nn_cfg_readl(hw, NFP_NET_CFG_START_RXQ);\n \n-\tPMD_INIT_LOG(DEBUG, \"tx_base: 0x%\" PRIx64 \"\", tx_base);\n-\tPMD_INIT_LOG(DEBUG, \"rx_base: 0x%\" PRIx64 \"\", rx_base);\n-\n \thw->tx_bar = pf_dev->qc_bar + tx_base * NFP_QCP_QUEUE_ADDR_SZ;\n \thw->rx_bar = pf_dev->qc_bar + rx_base * NFP_QCP_QUEUE_ADDR_SZ;\n \teth_dev->data->dev_private = hw;\n@@ -627,7 +612,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)\n \n \teth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;\n \n-\tPMD_INIT_LOG(INFO, \"port %d VendorID=0x%x DeviceID=0x%x \"\n+\tPMD_INIT_LOG(INFO, \"port %d VendorID=%#x DeviceID=%#x \"\n \t\t\t\"mac=\" RTE_ETHER_ADDR_PRT_FMT,\n \t\t\teth_dev->data->port_id, pci_dev->id.vendor_id,\n \t\t\tpci_dev->id.device_id,\n@@ -997,7 +982,7 @@ nfp_pf_init(struct rte_pci_device *pci_dev)\n \t\tgoto pf_cleanup;\n \t}\n \n-\tPMD_INIT_LOG(DEBUG, \"qc_bar address: 0x%p\", pf_dev->qc_bar);\n+\tPMD_INIT_LOG(DEBUG, \"qc_bar address: %p\", pf_dev->qc_bar);\n \n \t/*\n \t * PF initialization has been done at this point. Call app specific\ndiff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c\nindex aaef6ea91a..d3c3c9e953 100644\n--- a/drivers/net/nfp/nfp_ethdev_vf.c\n+++ b/drivers/net/nfp/nfp_ethdev_vf.c\n@@ -41,8 +41,6 @@ nfp_netvf_start(struct rte_eth_dev *dev)\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n-\tPMD_INIT_LOG(DEBUG, \"Start\");\n-\n \t/* Disabling queues just in case... */\n \tnfp_net_disable_queues(dev);\n \n@@ -136,8 +134,6 @@ nfp_netvf_start(struct rte_eth_dev *dev)\n static int\n nfp_netvf_stop(struct rte_eth_dev *dev)\n {\n-\tPMD_INIT_LOG(DEBUG, \"Stop\");\n-\n \tnfp_net_disable_queues(dev);\n \n \t/* Clear queues */\n@@ -170,8 +166,6 @@ nfp_netvf_close(struct rte_eth_dev *dev)\n \tif (rte_eal_process_type() != RTE_PROC_PRIMARY)\n \t\treturn 0;\n \n-\tPMD_INIT_LOG(DEBUG, \"Close\");\n-\n \tpci_dev = RTE_ETH_DEV_TO_PCI(dev);\n \n \t/*\n@@ -265,8 +259,6 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)\n \tconst struct nfp_dev_info *dev_info;\n \tstruct rte_ether_addr *tmp_ether_addr;\n \n-\tPMD_INIT_FUNC_TRACE();\n-\n \tpci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);\n \n \tdev_info = nfp_dev_info_get(pci_dev->id.device_id);\n@@ -301,7 +293,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)\n \thw->eth_xstats_base = rte_malloc(\"rte_eth_xstat\",\n \t\t\tsizeof(struct rte_eth_xstat) * nfp_net_xstats_size(eth_dev), 0);\n \tif (hw->eth_xstats_base == NULL) {\n-\t\tPMD_INIT_LOG(ERR, \"no memory for xstats base values on device %s!\",\n+\t\tPMD_INIT_LOG(ERR, \"No memory for xstats base values on device %s!\",\n \t\t\t\tpci_dev->device.name);\n \t\treturn -ENOMEM;\n \t}\n@@ -312,9 +304,6 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)\n \tstart_q = nn_cfg_readl(hw, NFP_NET_CFG_START_RXQ);\n \trx_bar_off = nfp_qcp_queue_offset(dev_info, start_q);\n \n-\tPMD_INIT_LOG(DEBUG, \"tx_bar_off: 0x%\" PRIx64 \"\", tx_bar_off);\n-\tPMD_INIT_LOG(DEBUG, \"rx_bar_off: 0x%\" PRIx64 \"\", rx_bar_off);\n-\n \thw->tx_bar = (uint8_t *)pci_dev->mem_resource[2].addr + tx_bar_off;\n \thw->rx_bar = (uint8_t *)pci_dev->mem_resource[2].addr + rx_bar_off;\n \n@@ -345,7 +334,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)\n \n \ttmp_ether_addr = &hw->mac_addr;\n \tif (rte_is_valid_assigned_ether_addr(tmp_ether_addr) == 0) {\n-\t\tPMD_INIT_LOG(INFO, \"Using random mac address for port %d\", port);\n+\t\tPMD_INIT_LOG(INFO, \"Using random mac address for port %hu\", port);\n \t\t/* Using random mac addresses for VFs */\n \t\trte_eth_random_addr(&hw->mac_addr.addr_bytes[0]);\n \t\tnfp_net_write_mac(hw, &hw->mac_addr.addr_bytes[0]);\n@@ -359,7 +348,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)\n \n \teth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;\n \n-\tPMD_INIT_LOG(INFO, \"port %d VendorID=0x%x DeviceID=0x%x \"\n+\tPMD_INIT_LOG(INFO, \"port %hu VendorID=%#x DeviceID=%#x \"\n \t\t\t\"mac=\" RTE_ETHER_ADDR_PRT_FMT,\n \t\t\teth_dev->data->port_id, pci_dev->id.vendor_id,\n \t\t\tpci_dev->id.device_id,\ndiff --git a/drivers/net/nfp/nfp_logs.h b/drivers/net/nfp/nfp_logs.h\nindex 315a57811c..16ff61700b 100644\n--- a/drivers/net/nfp/nfp_logs.h\n+++ b/drivers/net/nfp/nfp_logs.h\n@@ -12,7 +12,6 @@ extern int nfp_logtype_init;\n #define PMD_INIT_LOG(level, fmt, args...) \\\n \trte_log(RTE_LOG_ ## level, nfp_logtype_init, \\\n \t\t\"%s(): \" fmt \"\\n\", __func__, ## args)\n-#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, \" >>\")\n \n #ifdef RTE_ETHDEV_DEBUG_RX\n extern int nfp_logtype_rx;\ndiff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c\nindex db6122eac3..5bfdfd28b3 100644\n--- a/drivers/net/nfp/nfp_rxtx.c\n+++ b/drivers/net/nfp/nfp_rxtx.c\n@@ -192,7 +192,7 @@ nfp_net_rx_fill_freelist(struct nfp_net_rxq *rxq)\n \tuint64_t dma_addr;\n \tstruct nfp_net_dp_buf *rxe = rxq->rxbufs;\n \n-\tPMD_RX_LOG(DEBUG, \"Fill Rx Freelist for %u descriptors\",\n+\tPMD_RX_LOG(DEBUG, \"Fill Rx Freelist for %hu descriptors\",\n \t\t\trxq->rx_count);\n \n \tfor (i = 0; i < rxq->rx_count; i++) {\n@@ -212,14 +212,13 @@ nfp_net_rx_fill_freelist(struct nfp_net_rxq *rxq)\n \t\trxd->fld.dma_addr_hi = (dma_addr >> 32) & 0xffff;\n \t\trxd->fld.dma_addr_lo = dma_addr & 0xffffffff;\n \t\trxe[i].mbuf = mbuf;\n-\t\tPMD_RX_LOG(DEBUG, \"[%d]: %\" PRIx64, i, dma_addr);\n \t}\n \n \t/* Make sure all writes are flushed before telling the hardware */\n \trte_wmb();\n \n \t/* Not advertising the whole ring as the firmware gets confused if so */\n-\tPMD_RX_LOG(DEBUG, \"Increment FL write pointer in %u\", rxq->rx_count - 1);\n+\tPMD_RX_LOG(DEBUG, \"Increment FL write pointer in %hu\", rxq->rx_count - 1);\n \n \tnfp_qcp_ptr_add(rxq->qcp_fl, NFP_QCP_WRITE_PTR, rxq->rx_count - 1);\n \n@@ -432,7 +431,7 @@ nfp_net_parse_meta_qinq(const struct nfp_meta_parsed *meta,\n \tif (meta->vlan[0].offload == 0)\n \t\tmb->vlan_tci = rte_cpu_to_le_16(meta->vlan[0].tci);\n \tmb->vlan_tci_outer = rte_cpu_to_le_16(meta->vlan[1].tci);\n-\tPMD_RX_LOG(DEBUG, \"Received outer vlan is %u inter vlan is %u\",\n+\tPMD_RX_LOG(DEBUG, \"Received outer vlan TCI is %u inner vlan TCI is %u\",\n \t\t\tmb->vlan_tci_outer, mb->vlan_tci);\n \tmb->ol_flags |= RTE_MBUF_F_RX_QINQ | RTE_MBUF_F_RX_QINQ_STRIPPED;\n }\n@@ -754,12 +753,11 @@ nfp_net_recv_pkts(void *rx_queue,\n \t\t\t * responsibility of avoiding it. But we have\n \t\t\t * to give some info about the error\n \t\t\t */\n-\t\t\tPMD_RX_LOG(ERR,\n-\t\t\t\t\t\"mbuf overflow likely due to the RX offset.\\n\"\n+\t\t\tPMD_RX_LOG(ERR, \"mbuf overflow likely due to the RX offset.\\n\"\n \t\t\t\t\t\"\\t\\tYour mbuf size should have extra space for\"\n \t\t\t\t\t\" RX offset=%u bytes.\\n\"\n \t\t\t\t\t\"\\t\\tCurrently you just have %u bytes available\"\n-\t\t\t\t\t\" but the received packet is %u bytes long\",\n+\t\t\t\t\t\" but the received packet is %hu bytes long\",\n \t\t\t\t\thw->rx_offset,\n \t\t\t\t\trxq->mbuf_size - hw->rx_offset,\n \t\t\t\t\tmb->data_len);\n@@ -888,8 +886,6 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n-\tPMD_INIT_FUNC_TRACE();\n-\n \tnfp_net_rx_desc_limits(hw, &min_rx_desc, &max_rx_desc);\n \n \t/* Validating number of descriptors */\n@@ -965,9 +961,6 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,\n \t\treturn -ENOMEM;\n \t}\n \n-\tPMD_RX_LOG(DEBUG, \"rxbufs=%p hw_ring=%p dma_addr=0x%\" PRIx64,\n-\t\t\trxq->rxbufs, rxq->rxds, (unsigned long)rxq->dma);\n-\n \tnfp_net_reset_rx_queue(rxq);\n \n \trxq->hw = hw;\n", "prefixes": [ "05/11" ] }