Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/112979/?format=api
{ "id": 112979, "url": "http://patches.dpdk.org/api/patches/112979/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220617093444.2004000-6-jin.liu@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": "<20220617093444.2004000-6-jin.liu@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220617093444.2004000-6-jin.liu@corigine.com", "date": "2022-06-17T09:34:36", "name": "[v3,05/13] net/nfp: rename function and struct", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "d9a4ffe5e2cc5fb1f63eb5da9a3f4afb4068d81e", "submitter": { "id": 2670, "url": "http://patches.dpdk.org/api/people/2670/?format=api", "name": "Jin Liu", "email": "jin.liu@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/20220617093444.2004000-6-jin.liu@corigine.com/mbox/", "series": [ { "id": 23606, "url": "http://patches.dpdk.org/api/series/23606/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=23606", "date": "2022-06-17T09:34:31", "name": "Add support of NFP3800 chip and firmware with NFDk", "version": 3, "mbox": "http://patches.dpdk.org/series/23606/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/112979/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/112979/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 E7BF4A0093;\n\tFri, 17 Jun 2022 11:35:52 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 245F6427F9;\n\tFri, 17 Jun 2022 11:35:28 +0200 (CEST)", "from NAM10-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam10on2136.outbound.protection.outlook.com [40.107.94.136])\n by mails.dpdk.org (Postfix) with ESMTP id BF855427F3\n for <dev@dpdk.org>; Fri, 17 Jun 2022 11:35:22 +0200 (CEST)", "from DM6PR13MB3004.namprd13.prod.outlook.com (2603:10b6:5:191::21)\n by CO3PR13MB5671.namprd13.prod.outlook.com (2603:10b6:303:17a::16) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.9; Fri, 17 Jun\n 2022 09:35:21 +0000", "from DM6PR13MB3004.namprd13.prod.outlook.com\n ([fe80::ac31:a36a:cc15:cd35]) by DM6PR13MB3004.namprd13.prod.outlook.com\n ([fe80::ac31:a36a:cc15:cd35%7]) with mapi id 15.20.5373.009; Fri, 17 Jun 2022\n 09:35:21 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=Q6jp6K3Yv+86xVRKxvE69UjGm4o4BsKgD/zMeEkTVgRSZ18sDQR+a9aMrybPGDyHEaaC5KCn4JRN+PfSER6GG/pRAIx/g3FXXFUO9kE+RIQMRZH1EtpgKiIEv9XPk/1qWlsHthKaaTwhmPZ0chmJF9YliDZWo7JyZuLbV7YTHLYbZNfpYoUgEVhX9Z8H9p4ENsDeZ+ePnM5+7PCVncsGthNvA7LAiewg3WxTXxdBqNWOSCG+dc6YDkcqYRrpum6xSpiaAmMn8hF2vwPi9CKaHXJGmR32g3tIbuFUVrcV5OxB8p0pD6QRefMyyt2ljxcf+zfviRnco23LfJcqzWKLJQ==", "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=8i3tIAISLgeP2g66yVp8LOoOojfrZBjxUk9Fp4H/RkE=;\n b=KkqEgf0jwEyQ45CJHndfILh3In4tNRWfACV4a1vIssPpD3mLzpaKjvogc2uIuHmfkR1qcI5IotlBeDkzTKCWZjdN1ECc0Lq8RieADSPPBTuqpo1dtQMvALBPlvmL5TqMeW6YcqLwHaRZtM1mde3w5MKpZaO31yoHouItW0A+qT08yoG5h4JmWPLTILyef049H/Up8sLO/01j3SrzVxeNikt6FmXCO9ioZ+7NTv0YsQpjeb9behqBqQcKI3o/BPBll/IzUMlm21KQ/3wpg/Zv64+hfI6txZHHcr3LjmbYmJVvY15HXlddxNd5tQPRD0NETfkPCCEfshfbY3GmLNjTWQ==", "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=8i3tIAISLgeP2g66yVp8LOoOojfrZBjxUk9Fp4H/RkE=;\n b=HdiQKTid6GfQwCxfwZ53NhfaBZw9jFgUMjqJO5FqUaQ15SXv8UVlnSKLA92DvrLwuOqbVXqYb7OGvPVlujkN/b5Ye1VnqXnHchcKv2IChmrq41cZmnm0iJX1UMWpNPnEl3yWwnYsxlqftqPQq3Iyrie79qPEH/eEerChJUBa6hA=", "Authentication-Results": "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=corigine.com;", "From": "Jin Liu <jin.liu@corigine.com>", "To": "dev@dpdk.org", "Cc": "niklas.soderlund@corigine.com, Jin Liu <jin.liu@corigine.com>,\n Diana Wang <na.wang@corigine.com>, Peng Zhang <peng.zhang@corigine.com>,\n Chaoyong He <chaoyong.he@corigine.com>", "Subject": "[PATCH v3 05/13] net/nfp: rename function and struct", "Date": "Fri, 17 Jun 2022 11:34:36 +0200", "Message-Id": "<20220617093444.2004000-6-jin.liu@corigine.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20220617093444.2004000-1-jin.liu@corigine.com>", "References": "<20220616023939.1798769-1-jin.liu@corigine.com>\n <20220617093444.2004000-1-jin.liu@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "LO4P123CA0192.GBRP123.PROD.OUTLOOK.COM\n (2603:10a6:600:1a4::17) To DM6PR13MB3004.namprd13.prod.outlook.com\n (2603:10b6:5:191::21)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "4d6e5007-0da8-45c7-5161-08da5044b28f", "X-MS-TrafficTypeDiagnostic": "CO3PR13MB5671:EE_", "X-Microsoft-Antispam-PRVS": "\n <CO3PR13MB56718D7969320F29D0F9497B94AF9@CO3PR13MB5671.namprd13.prod.outlook.com>", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n gP/sCYPkYFpa2Ghtsozr16rYeOBCoXuS17WIa4VLRBBu8TAee/TzOKoWGhIMqvXCGauNcu5g7zZygy+slXPV1iV/e8XmFqjm/rEb3KXldP/pONpy0wf2/4behKfGJNQhcQrI59TnJ29b2DCUH7LttNGZXcS2ysZGjEhBqtYVvMI178a2UdTvN93OXZeOVI+cIQUDwZNoo1Z6doCT19SIYX5DShgSfuSjzZ4dNt8xYec0mQFHhvuj+lvetkak5VpRjfunbVZHNRkSiTa+qoHHL1MAuk8J2O/iGXjBJv/LDPUABgLF6XV1eg+gpDyI4onGz+c/Avj/ufNz4Ku75TvoRmJqnztmo+Zu63qlYoTuqPtWc1Y8Bmzw9C17r5S/UOxtjrI1nwpZohYFMTHfbCFjvAAxxloTchMC0l8iaD7vkEr4GVeGE9aQiSBdrwmzI3RfZH60hPGEkLpcBdsj183hN1EenQK3/dyYuQY2SwXns7w11yavIDqco6ehayi0XwuxcasIDVwX9988YZo22TKmfxo2RDo8DDmWphFlV4A9QpHu0orOINi4ZiWBWAEqVZLSEO5FvUkdlVhoat5b7dfowT1No/PScvB4ndchQpZOibkbl9ZTDJ3Hz/JYbH03AA35My8rKyfIuPh0yJn34k/2p5RVhqEXZz/GXI+b1bZ/aeYHmbopZ5/Y/P63GR4bFVqurGk6Khn0v/CBjju3Jhd+U/EzvMs3+4L/dcGOq++AVDWTKw+y7+jVgXcIdQypoFVJ", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:DM6PR13MB3004.namprd13.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230016)(4636009)(346002)(136003)(366004)(396003)(39840400004)(66476007)(66556008)(26005)(8676002)(66574015)(6666004)(107886003)(66946007)(6506007)(6916009)(44832011)(2906002)(316002)(4326008)(38350700002)(186003)(508600001)(54906003)(5660300002)(6486002)(6512007)(1076003)(8936002)(2616005)(36756003)(52116002)(83380400001)(86362001)(38100700002)(41300700001);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?9IfnoDf5F5kgyj8JbzT5OYyuulEP?=\n\t=?utf-8?q?SsBbcOMfajdQ1eqAbT8kigDVSYJeIHQQqS2+ZqGx7lR1SUlzjb1W1zeLkaXcMmal/?=\n\t=?utf-8?q?H64N47CBdQrZGF0PctZ2qHVHyb/tIPPAKjSTa9VJCXqGdprGHQkNep8ESokhE+r6n?=\n\t=?utf-8?q?GZP+6eItfgBWrxVD9G81i0/dyyrEiYu/7xtbaePVuYVZtW8HPBxxZx6NqJebVCsJw?=\n\t=?utf-8?q?ScVfQ+ofC68/ByUY6GggSXu9F060C8/YrL7mZccR9LoH1pOCrxVIQpwyuG9i0wwur?=\n\t=?utf-8?q?cYqnCxb1hxnLYzvd6KA5FfL1w+zAMahadj9+FFK4K2wzm7bSKlArQyjiMAQr5ztPB?=\n\t=?utf-8?q?MszMpMwcsx3HkLngTC7lUGOIrO2Tua+ozzKs+U0PTUZ2BOx+4j/6pV735EaGvX6Ib?=\n\t=?utf-8?q?owFqKz7BJa1OjY5l8Nyw0KswVA1SsYwHXwvBkFB3VSxoBHJCn0SmhpJ9pr/dfqSUq?=\n\t=?utf-8?q?lf4EDig0udpiyzZe8Di8zNOx2LM4YkNs8uhfhmHA2112SCxrDGimuNqaFNsJvqKTb?=\n\t=?utf-8?q?gCZSpwfmE4ZLjWrI5hsAy0wbRJ2x31BDof8aaOXDW0qeFyEMy4BIr1HshJZn2kP2S?=\n\t=?utf-8?q?8uZetL2E5CGRyLOLY3J134byrEwOH67BBtQKm0hNdxtvtGeEC50W62PVqBeRGt7JH?=\n\t=?utf-8?q?lSElDYJuOWQNkM8RP+BiGDvCUcjrMRI3J4QeTSSNlJYqJPuYwnhS1+aSx6RRO/VSe?=\n\t=?utf-8?q?xMB33cWYsRb9a5trzh476ADTkoU4PP1YSNE8nf0grVjPJXnzFa/ht08sLsxfHBC8D?=\n\t=?utf-8?q?fVuSvxU5yEfQFhMWzDxyM6Bx1JadTsFlmIr8IhV6bhemMyINzSzg4TNQnKa4yl6FH?=\n\t=?utf-8?q?LEVWS0bbHMklYKAp9F8cYSUfVn3tVFL+ChwpxYhXvbZEppwInryFg8FgeVf7V4mL9?=\n\t=?utf-8?q?vz77kn5TCTI0KdKO4eJ/XAdRD5KsnsiqmthfImDUCfIbOcdtyWRJfwVmFaMPqgMyX?=\n\t=?utf-8?q?sto13b756Cpm1lomUE3GjpwJrg5gB850MxSnPbZlS53hsC50VLZt97erCUaOxuToA?=\n\t=?utf-8?q?VrkPbkhV+TbaMyYfYN2/gnj1mE7uqKfWcwnLLfc+08pnvNmKHM/X5QzCf4s6rThkL?=\n\t=?utf-8?q?y7co9ik6cg7R5THyHXQVOBxDAW1yWU6WaTAB0xSNnlX6hiZly+I/hDr2BLtJ+Rrad?=\n\t=?utf-8?q?x7Ewu2lKjND02HYWEZdLlT86uI5VpafPFByWO5/FpBr2SEHitGDzel1xBb7dRpC5o?=\n\t=?utf-8?q?Kknl/BVNu3VRKnMmuwRyHFoQaNh68XJvOoPY2vPgpCjKs97XFS5+k8z5OtBYXNJNJ?=\n\t=?utf-8?q?RyauYs556Xr5zk0DfeKhWYBXosGQjmqfzZGxPCAFqXYYI08MXe6oBc2DqCFwawqhO?=\n\t=?utf-8?q?lmki13HETCw/OOfKQCy8Gb3zzxTOwrHvzReVCJW9/rk0rL+Tt/XPMmnLa2C8u92NI?=\n\t=?utf-8?q?shiiIKHqv4kLAkSgNghZQ1+ITfavufTncf4BcBuoXsq7bSualKdhzJ/9Cs81eGSjA?=\n\t=?utf-8?q?JLY2cuL4zVzRAupV0d9OqSdNejm+6izhrdQp5yqDkeKqisLfqpHweA8yH8/zPvdkG?=\n\t=?utf-8?q?w3IF186VKxCGioEQADhx/Y1y8UjsRuI5P2+CG2s38xc+w4x2yS0rU7f8AJ/Yuh+Hr?=\n\t=?utf-8?q?DAP6++T/o8WB1DXNxqVGOB63eRHrs0KRH/Yg/ms69Yl/qOz5mYjof4OvVC9pwAJ5H?=\n\t=?utf-8?q?YkW3nkHT7TOoX2sZ4GuW5jgYzmAK2I7e3cYb0EoIuljeGuSXKJ3Qg=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 4d6e5007-0da8-45c7-5161-08da5044b28f", "X-MS-Exchange-CrossTenant-AuthSource": "DM6PR13MB3004.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "17 Jun 2022 09:35:21.3675 (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 fgsvVqM3Z1x7OlUq+xrkdPq4pTCykYC1jqlDuaKv3IOtDYBkiyUz2xiYf7q7mA5ROyzygF8sDWfnNjsdvM/wTQ==", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "CO3PR13MB5671", "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 'nfd3' into the firmware with NFD3 eth driver function name,\npreparation for the next work, as we will support another version\nfirmware with NFDk.\n\nSigned-off-by: Jin Liu <jin.liu@corigine.com>\nSigned-off-by: Diana Wang <na.wang@corigine.com>\nSigned-off-by: Peng Zhang <peng.zhang@corigine.com>\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nSigned-off-by: Niklas Söderlund <niklas.soderlund@corigine.com>\n---\n drivers/net/nfp/nfp_ethdev.c | 12 ++++++------\n drivers/net/nfp/nfp_ethdev_vf.c | 8 ++++----\n drivers/net/nfp/nfp_rxtx.c | 30 +++++++++++++++---------------\n drivers/net/nfp/nfp_rxtx.h | 8 ++++----\n 4 files changed, 29 insertions(+), 29 deletions(-)", "diff": "diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c\nindex b80109ec37..ae6cb5943f 100644\n--- a/drivers/net/nfp/nfp_ethdev.c\n+++ b/drivers/net/nfp/nfp_ethdev.c\n@@ -329,7 +329,7 @@ nfp_net_close(struct rte_eth_dev *dev)\n }\n \n /* Initialise and register driver with DPDK Application */\n-static const struct eth_dev_ops nfp_net_eth_dev_ops = {\n+static const struct eth_dev_ops nfp_net_nfd3_eth_dev_ops = {\n \t.dev_configure\t\t= nfp_net_configure,\n \t.dev_start\t\t= nfp_net_start,\n \t.dev_stop\t\t= nfp_net_stop,\n@@ -352,7 +352,7 @@ static const struct eth_dev_ops nfp_net_eth_dev_ops = {\n \t.rss_hash_conf_get\t= nfp_net_rss_hash_conf_get,\n \t.rx_queue_setup\t\t= nfp_net_rx_queue_setup,\n \t.rx_queue_release\t= nfp_net_rx_queue_release,\n-\t.tx_queue_setup\t\t= nfp_net_tx_queue_setup,\n+\t.tx_queue_setup\t\t= nfp_net_nfd3_tx_queue_setup,\n \t.tx_queue_release\t= nfp_net_tx_queue_release,\n \t.rx_queue_intr_enable = nfp_rx_queue_intr_enable,\n \t.rx_queue_intr_disable = nfp_rx_queue_intr_disable,\n@@ -402,10 +402,10 @@ nfp_net_init(struct rte_eth_dev *eth_dev)\n \tPMD_INIT_LOG(DEBUG, \"Working with physical port number: %d, \"\n \t\t\t\"NFP internal port number: %d\", port, hw->nfp_idx);\n \n-\teth_dev->dev_ops = &nfp_net_eth_dev_ops;\n+\teth_dev->dev_ops = &nfp_net_nfd3_eth_dev_ops;\n \teth_dev->rx_queue_count = nfp_net_rx_queue_count;\n \teth_dev->rx_pkt_burst = &nfp_net_recv_pkts;\n-\teth_dev->tx_pkt_burst = &nfp_net_xmit_pkts;\n+\teth_dev->tx_pkt_burst = &nfp_net_nfd3_xmit_pkts;\n \n \t/* For secondary processes, the primary has done all the work */\n \tif (rte_eal_process_type() != RTE_PROC_PRIMARY)\n@@ -971,10 +971,10 @@ nfp_pf_secondary_init(struct rte_pci_device *pci_dev)\n \t\t\treturn -ENODEV;\n \t\t}\n \t\teth_dev->process_private = cpp;\n-\t\teth_dev->dev_ops = &nfp_net_eth_dev_ops;\n+\t\teth_dev->dev_ops = &nfp_net_nfd3_eth_dev_ops;\n \t\teth_dev->rx_queue_count = nfp_net_rx_queue_count;\n \t\teth_dev->rx_pkt_burst = &nfp_net_recv_pkts;\n-\t\teth_dev->tx_pkt_burst = &nfp_net_xmit_pkts;\n+\t\teth_dev->tx_pkt_burst = &nfp_net_nfd3_xmit_pkts;\n \t\trte_eth_dev_probing_finish(eth_dev);\n \t}\n \ndiff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c\nindex 08077632c6..d0fa1df24d 100644\n--- a/drivers/net/nfp/nfp_ethdev_vf.c\n+++ b/drivers/net/nfp/nfp_ethdev_vf.c\n@@ -236,7 +236,7 @@ nfp_netvf_close(struct rte_eth_dev *dev)\n }\n \n /* Initialise and register VF driver with DPDK Application */\n-static const struct eth_dev_ops nfp_netvf_eth_dev_ops = {\n+static const struct eth_dev_ops nfp_netvf_nfd3_eth_dev_ops = {\n \t.dev_configure\t\t= nfp_net_configure,\n \t.dev_start\t\t= nfp_netvf_start,\n \t.dev_stop\t\t= nfp_netvf_stop,\n@@ -259,7 +259,7 @@ static const struct eth_dev_ops nfp_netvf_eth_dev_ops = {\n \t.rss_hash_conf_get\t= nfp_net_rss_hash_conf_get,\n \t.rx_queue_setup\t\t= nfp_net_rx_queue_setup,\n \t.rx_queue_release\t= nfp_net_rx_queue_release,\n-\t.tx_queue_setup\t\t= nfp_net_tx_queue_setup,\n+\t.tx_queue_setup\t\t= nfp_net_nfd3_tx_queue_setup,\n \t.tx_queue_release\t= nfp_net_tx_queue_release,\n \t.rx_queue_intr_enable = nfp_rx_queue_intr_enable,\n \t.rx_queue_intr_disable = nfp_rx_queue_intr_disable,\n@@ -292,10 +292,10 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);\n \n-\teth_dev->dev_ops = &nfp_netvf_eth_dev_ops;\n+\teth_dev->dev_ops = &nfp_netvf_nfd3_eth_dev_ops;\n \teth_dev->rx_queue_count = nfp_net_rx_queue_count;\n \teth_dev->rx_pkt_burst = &nfp_net_recv_pkts;\n-\teth_dev->tx_pkt_burst = &nfp_net_xmit_pkts;\n+\teth_dev->tx_pkt_burst = &nfp_net_nfd3_xmit_pkts;\n \n \t/* For secondary processes, the primary has done all the work */\n \tif (rte_eal_process_type() != RTE_PROC_PRIMARY)\ndiff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c\nindex cd7faa2c58..9b769c9775 100644\n--- a/drivers/net/nfp/nfp_rxtx.c\n+++ b/drivers/net/nfp/nfp_rxtx.c\n@@ -655,7 +655,7 @@ nfp_net_reset_tx_queue(struct nfp_net_txq *txq)\n }\n \n int\n-nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,\n+nfp_net_nfd3_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,\n \t\t uint16_t nb_desc, unsigned int socket_id,\n \t\t const struct rte_eth_txconf *tx_conf)\n {\n@@ -670,7 +670,7 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,\n \tPMD_INIT_FUNC_TRACE();\n \n \t/* Validating number of descriptors */\n-\ttx_desc_sz = nb_desc * sizeof(struct nfp_net_tx_desc);\n+\ttx_desc_sz = nb_desc * sizeof(struct nfp_net_nfd3_tx_desc);\n \tif (tx_desc_sz % NFP_ALIGN_RING_DESC != 0 ||\n \t nb_desc > NFP_NET_MAX_TX_DESC ||\n \t nb_desc < NFP_NET_MIN_TX_DESC) {\n@@ -718,7 +718,7 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,\n \t * resizing in later calls to the queue setup function.\n \t */\n \ttz = rte_eth_dma_zone_reserve(dev, \"tx_ring\", queue_idx,\n-\t\t\t\t sizeof(struct nfp_net_tx_desc) *\n+\t\t\t\t sizeof(struct nfp_net_nfd3_tx_desc) *\n \t\t\t\t NFP_NET_MAX_TX_DESC, NFP_MEMZONE_ALIGN,\n \t\t\t\t socket_id);\n \tif (tz == NULL) {\n@@ -743,7 +743,7 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,\n \n \t/* Saving physical and virtual addresses for the TX ring */\n \ttxq->dma = (uint64_t)tz->iova;\n-\ttxq->txds = (struct nfp_net_tx_desc *)tz->addr;\n+\ttxq->txds = (struct nfp_net_nfd3_tx_desc *)tz->addr;\n \n \t/* mbuf pointers array for referencing mbufs linked to TX descriptors */\n \ttxq->txbufs = rte_zmalloc_socket(\"txq->txbufs\",\n@@ -773,7 +773,7 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,\n \n /* Leaving always free descriptors for avoiding wrapping confusion */\n static inline\n-uint32_t nfp_free_tx_desc(struct nfp_net_txq *txq)\n+uint32_t nfp_net_nfd3_free_tx_desc(struct nfp_net_txq *txq)\n {\n \tif (txq->wr_p >= txq->rd_p)\n \t\treturn txq->tx_count - (txq->wr_p - txq->rd_p) - 8;\n@@ -790,14 +790,14 @@ uint32_t nfp_free_tx_desc(struct nfp_net_txq *txq)\n * This function uses the host copy* of read/write pointers\n */\n static inline\n-uint32_t nfp_net_txq_full(struct nfp_net_txq *txq)\n+uint32_t nfp_net_nfd3_txq_full(struct nfp_net_txq *txq)\n {\n-\treturn (nfp_free_tx_desc(txq) < txq->tx_free_thresh);\n+\treturn (nfp_net_nfd3_free_tx_desc(txq) < txq->tx_free_thresh);\n }\n \n /* nfp_net_tx_tso - Set TX descriptor for TSO */\n static inline void\n-nfp_net_tx_tso(struct nfp_net_txq *txq, struct nfp_net_tx_desc *txd,\n+nfp_net_nfd3_tx_tso(struct nfp_net_txq *txq, struct nfp_net_nfd3_tx_desc *txd,\n \t struct rte_mbuf *mb)\n {\n \tuint64_t ol_flags;\n@@ -828,7 +828,7 @@ nfp_net_tx_tso(struct nfp_net_txq *txq, struct nfp_net_tx_desc *txd,\n \n /* nfp_net_tx_cksum - Set TX CSUM offload flags in TX descriptor */\n static inline void\n-nfp_net_tx_cksum(struct nfp_net_txq *txq, struct nfp_net_tx_desc *txd,\n+nfp_net_nfd3_tx_cksum(struct nfp_net_txq *txq, struct nfp_net_nfd3_tx_desc *txd,\n \t\t struct rte_mbuf *mb)\n {\n \tuint64_t ol_flags;\n@@ -857,11 +857,11 @@ nfp_net_tx_cksum(struct nfp_net_txq *txq, struct nfp_net_tx_desc *txd,\n }\n \n uint16_t\n-nfp_net_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n+nfp_net_nfd3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n {\n \tstruct nfp_net_txq *txq;\n \tstruct nfp_net_hw *hw;\n-\tstruct nfp_net_tx_desc *txds, txd;\n+\tstruct nfp_net_nfd3_tx_desc *txds, txd;\n \tstruct rte_mbuf *pkt;\n \tuint64_t dma_addr;\n \tint pkt_size, dma_size;\n@@ -876,10 +876,10 @@ nfp_net_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \tPMD_TX_LOG(DEBUG, \"working for queue %u at pos %d and %u packets\",\n \t\t txq->qidx, txq->wr_p, nb_pkts);\n \n-\tif ((nfp_free_tx_desc(txq) < nb_pkts) || (nfp_net_txq_full(txq)))\n+\tif ((nfp_net_nfd3_free_tx_desc(txq) < nb_pkts) || (nfp_net_nfd3_txq_full(txq)))\n \t\tnfp_net_tx_free_bufs(txq);\n \n-\tfree_descs = (uint16_t)nfp_free_tx_desc(txq);\n+\tfree_descs = (uint16_t)nfp_net_nfd3_free_tx_desc(txq);\n \tif (unlikely(free_descs == 0))\n \t\treturn 0;\n \n@@ -913,8 +913,8 @@ nfp_net_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \t\t * multisegment packet, but TSO info needs to be in all of them.\n \t\t */\n \t\ttxd.data_len = pkt->pkt_len;\n-\t\tnfp_net_tx_tso(txq, &txd, pkt);\n-\t\tnfp_net_tx_cksum(txq, &txd, pkt);\n+\t\tnfp_net_nfd3_tx_tso(txq, &txd, pkt);\n+\t\tnfp_net_nfd3_tx_cksum(txq, &txd, pkt);\n \n \t\tif ((pkt->ol_flags & RTE_MBUF_F_TX_VLAN) &&\n \t\t (hw->cap & NFP_NET_CFG_CTRL_TXVLAN)) {\ndiff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h\nindex dec1857da3..d784f52b66 100644\n--- a/drivers/net/nfp/nfp_rxtx.h\n+++ b/drivers/net/nfp/nfp_rxtx.h\n@@ -53,7 +53,7 @@\n #define PCIE_DESC_TX_ENCAP_VXLAN (1 << 1)\n #define PCIE_DESC_TX_ENCAP_GRE (1 << 0)\n \n-struct nfp_net_tx_desc {\n+struct nfp_net_nfd3_tx_desc {\n \tunion {\n \t\tstruct {\n \t\t\tuint8_t dma_addr_hi; /* High bits of host buf address */\n@@ -124,7 +124,7 @@ struct nfp_net_txq {\n \t * of the queue and @size is the size in bytes for the queue\n \t * (needed for free)\n \t */\n-\tstruct nfp_net_tx_desc *txds;\n+\tstruct nfp_net_nfd3_tx_desc *txds;\n \n \t/*\n \t * At this point 48 bytes have been used for all the fields in the\n@@ -286,10 +286,10 @@ int nfp_net_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,\n \t\t\t\t struct rte_mempool *mp);\n void nfp_net_tx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx);\n void nfp_net_reset_tx_queue(struct nfp_net_txq *txq);\n-int nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,\n+int nfp_net_nfd3_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,\n \t\t\t\t uint16_t nb_desc, unsigned int socket_id,\n \t\t\t\t const struct rte_eth_txconf *tx_conf);\n-uint16_t nfp_net_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n+uint16_t nfp_net_nfd3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\t\t\t uint16_t nb_pkts);\n \n #endif /* _NFP_RXTX_H_ */\n", "prefixes": [ "v3", "05/13" ] }