Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/114870/?format=api
{ "id": 114870, "url": "http://patches.dpdk.org/api/patches/114870/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1660296133-35266-5-git-send-email-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": "<1660296133-35266-5-git-send-email-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1660296133-35266-5-git-send-email-chaoyong.he@corigine.com", "date": "2022-08-12T09:22:05", "name": "[v6,04/12] net/nfp: add initial flower firmware support", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "353024cc241ef3edfa330d4713bf986f23d3e7e9", "submitter": { "id": 2554, "url": "http://patches.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 3961, "url": "http://patches.dpdk.org/api/users/3961/?format=api", "username": "arybchenko", "first_name": "Andrew", "last_name": "Rybchenko", "email": "andrew.rybchenko@oktetlabs.ru" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1660296133-35266-5-git-send-email-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 24287, "url": "http://patches.dpdk.org/api/series/24287/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=24287", "date": "2022-08-12T09:22:01", "name": "preparation for the rte_flow offload of nfp PMD", "version": 6, "mbox": "http://patches.dpdk.org/series/24287/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/114870/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/114870/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 33E9BA0543;\n\tFri, 12 Aug 2022 11:23:04 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id A56F342C1E;\n\tFri, 12 Aug 2022 11:22:46 +0200 (CEST)", "from NAM11-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam11on2137.outbound.protection.outlook.com [40.107.223.137])\n by mails.dpdk.org (Postfix) with ESMTP id 2125442B96\n for <dev@dpdk.org>; Fri, 12 Aug 2022 11:22:45 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by PH0PR13MB5284.namprd13.prod.outlook.com (2603:10b6:510:f5::12)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.9; Fri, 12 Aug\n 2022 09:22:43 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::402d:6abc:83a8:2431]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::402d:6abc:83a8:2431%5]) with mapi id 15.20.5525.009; Fri, 12 Aug 2022\n 09:22:43 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=N9MY3btpS10Wt5E2HT3+4sLkiD94ViSYyw3iJ4+g4udu2RB28Ow28gf5ocUSpdV8Pz/MzU+tPninnmwfYz47FJ4VOLVyi7Nq0Hfxxb9ZO8m9VCcO7svjP3cfIeWqZvZSty9/BDONHbjw3xGxjOnQlYdlh7QUHKcvoy617p+ZvbQEpIc+R/BaUsTOonrfakM5JItmEexDd2UMM3f50law+PlOIAAZxB5IVTe3vsC1k9B7lyH0ectJoWr+sSRUpdzeaoQMITO/5JBMvfcgENoY1kSmrLm+V/bomCrxoKetoROIb5c7k1aB+Kh9CIBeE7Ax5ayWqe6YtF4Y8THMHFFwFw==", "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=6vg9mBL25Fxi8w90rGRWrhrhpiNEWbERyL6qj9qS6uQ=;\n b=V9vtRcUPyQ4JF7RB0jPo8ew0Qgu/baoW6K9xTwOdYYrRoWweHcUWtKQcoEHMqefCWdwN2AhxFaaIKbqVKNk0T76sF/uBcnUA8vTMsqQz8GPGKB2jZoLDFQKSvd3d9HdON+QsKX3TrCyeal5mu5vW8r6l3EDzDcyPYkm0piMuBfVraqF/YBh6yFp5dWB5YngORBjjzPrTXhPQqaBcaSjFcfNMw5YotiAOu4K53R3SopV2urGYIJtAD5DN3prl7V98Qfzc4XbPapiP9C7Tuj6pQgzemDkxUwU0geGBaNrXaPZ/TgtxLux4fMARIZDmcJkTE29FbGVCQaOGkGbc01eYrA==", "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=6vg9mBL25Fxi8w90rGRWrhrhpiNEWbERyL6qj9qS6uQ=;\n b=WCO9D5cHTb9+L6bUnZoXlH4hO2QIpxjaOZrdcDV0mQb8bDJw9fgqUQbA9lspMiX0YIdX7u4xfbVk4B9eseETJcae1xxvPb/KJ1u7ek8CVEkNZDWFW23CPR5ZKSk9VPd9m+FwOLgIYTAHd2iJEqlum9G+WDMuT+mkp+liX48iCqM=", "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, niklas.soderlund@corigine.com,\n Chaoyong He <chaoyong.he@corigine.com>,\n Heinrich Kuhn <heinrich.kuhn@corigine.com>", "Subject": "[PATCH v6 04/12] net/nfp: add initial flower firmware support", "Date": "Fri, 12 Aug 2022 17:22:05 +0800", "Message-Id": "<1660296133-35266-5-git-send-email-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1660296133-35266-1-git-send-email-chaoyong.he@corigine.com>", "References": "<1660296133-35266-1-git-send-email-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "SI2PR01CA0046.apcprd01.prod.exchangelabs.com\n (2603:1096:4:193::18) To SJ0PR13MB5545.namprd13.prod.outlook.com\n (2603:10b6:a03:424::5)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "1799cc34-94f3-48d4-3d86-08da7c44362d", "X-MS-TrafficTypeDiagnostic": "PH0PR13MB5284:EE_", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n Us0EXsgg/pesErogk9SJd6VZBUdN8aQnYi+7/mQW/6i6JL8fRXxLuxLjX6JXFg6In7fBxDhm4aS7lY+0MlNX9LTxcl0VvqMIoCjnMD11tpUKLONo7ohRJ5gOfDffzJ9rGsFBGnkMqtuSmQX5aRBCq520Mcj3uJ+cB+sRjymDU9RvAuWfJQJEhEmY2cIlmQSkkxUrDBPL+HojcMOC6eorPAMdt5Pikejm6iSC67Q8N/gwiWTLB9q3M5ca/53GlxJ6TTs6YbsejxnCYAZ3kN6wVS3dDBUXb/xcSYa/7zPXjgF5sUnVt3rIvq7DTvVKCB4F1kmkRpnyh4sb18RyFXqzld018UcA0GJHK2Tmiji9Wy8fkvSnGwbUb8Ccpf8QYz+dknVouyMhwJaf9GP/QFFQeVUqa7wRTfd5vNpPu737Ufch+9DHRev4f1svjR6tYLjk6hpCTL7Sr1gUvbYO/4ZPMpCMZZEd3xcTT2y8FZwV3weo+6kTLBEXQgVoGiPu1mgd1vMv4KvYIu2isby9sAOFzFf9BfyGugO/5EcLQOHmDI04KyQtdgcVG3vDQEaxMbWdGpy+pwWURLJ0YMIdLGX3OhxsUKTuIArodYYzjBryFIZlAjkNXFh0dF9oiA4cdH2Ceb2XfQQXpoo3YyMjdXa2g3aIhuZlD2gNTT418G28VBZ4JTqLjIfSsctLdULYKMre4wHi6l1DUJBPGRnlF8+wXFWKEIlOInfZnKcv+QvRCHZYmiH2YHTWB9n1JLnxemwKIFbu2DFkK8mOE9aJpe0/qa28ZPlzdi5iIdQFKE6DvHomNgCzHHOspJbxI1xo9oYLIHFaZtqldyHTigYOiJcF97B++nRPCW9+pa0gcaHlmNc=", "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:(13230016)(4636009)(346002)(376002)(39850400004)(136003)(396003)(366004)(86362001)(36756003)(6666004)(41300700001)(30864003)(44832011)(38100700002)(38350700002)(83380400001)(186003)(6506007)(66574015)(6916009)(26005)(107886003)(6512007)(2616005)(5660300002)(8936002)(478600001)(52116002)(2906002)(6486002)(8676002)(316002)(54906003)(66476007)(4326008)(66946007)(66556008);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?OjaniPOuidB124BadH6BwOlCUVu2?=\n\t=?utf-8?q?zl5aaiVr5LS4ksV0aT6Ter/P1+g1u0RVuyrBnk6V6hzlJiAifDpqSzyYBh9nKHIbe?=\n\t=?utf-8?q?UMN7zmUiQ1ZaA6NGDlpjVp6OSLjQylVhliZknrDfPMVXRcjjcJVEdFZ5r7avbaKjw?=\n\t=?utf-8?q?1YIZjPqR8j4MSHQsc+yd4NrGbpF23iPJijyffKlciM3dyhtPkGJgMvaB5QY6DpnMW?=\n\t=?utf-8?q?QeJWm62I/yrSyBSwGLIjg7neoj/NteiNkENRbSB49bbNVL8y+pq5aYRQd0KoeXHAE?=\n\t=?utf-8?q?TpX3mOXtRUJrHUUy9G7BuUFHJtG68iop6mYpt8Iia8Gu/2HAGX6grcRNEJ363+lNZ?=\n\t=?utf-8?q?S3dQdh/j/XQVgzCpoHpqo6cPNjddvFZg1b2u09nZDy7yb6TMen7zvqKn2k8kMQ2RE?=\n\t=?utf-8?q?QDIp8RYFpN2U9/8NJz1+RA1zOZdL+m+WHeO/Nurx9pftIwyK2nBH2ZXjUdXg7xf0u?=\n\t=?utf-8?q?mgSYCRiMQ0xfwQfc0i5fYWCgI1RM9WlYDz6SQXs+X6sSDv2moxU8+TW1mab7jL1G0?=\n\t=?utf-8?q?HYsuue2cVgyERp9NzCwmnKXrlUjQaBXGnQzR3Oi5EodD1ZXdHtuX+Zlvk+kgXzdvT?=\n\t=?utf-8?q?3dVxUO+Pa3hi0jz3WBnRYQMieHci4zF/MquMQ6flXYIE3x6Td9tfp7ZqyDZQ91QLP?=\n\t=?utf-8?q?l3Dco15q3aasQKU6RgIU74zXl3kEcxHNeVqSAlCmo0r5xiKSdzosKt3h8RA7yeaae?=\n\t=?utf-8?q?wfUIBGqw+xQd2ksd5YxnTzS/6BL6Wmt46rcH4wMd1t1YZgUIpTgl2IEz75aPrf/BH?=\n\t=?utf-8?q?CzDWNvq9QrF0+qnWtJzM9VEUOxAwI3ndHeCRqA83/saoTJjIPOyuzv4NdS7PyusyB?=\n\t=?utf-8?q?5GB7MqFTSwd4m2q8OJWUYfdC2+TBWmZQ6Hfjg39ZlsYZCF1jQ7EWSCgUpWT4QPOqU?=\n\t=?utf-8?q?r27VtTcD/4qC1GYaCCBMnn7CBGaAPeXli0Jo+mG1jGZcY3MHAIhroV/mdZ+kHDp+Y?=\n\t=?utf-8?q?hwsHe8KA9ji8J2cQEhuuvyTH1XYV6i/4Vl0kKbt5pVAFvz4MXl5F0Ie9TDj/RsinT?=\n\t=?utf-8?q?czws3TUlt6NWxNU6O758UtWiWhAzICGL5cizqqZHFOcYQqPnCTh0JyabekVpe2dZz?=\n\t=?utf-8?q?8Md+bYAAoYTKy/padOfh8+RM51G0YFRCwGqXm8RiZ/BiOsuHoq995ybl4txq6nKC8?=\n\t=?utf-8?q?/m9a2Dt5oqozC/S0YTQyueJ0B66mVss/RXXEDBJC5JCIGE9uqzY450pmoYIjdnYim?=\n\t=?utf-8?q?TRt7t+litc58tzqAx3uJvB8e3anGhDurhFI8/3+/QLnY5bzABBaHK/syFdvkyX/he?=\n\t=?utf-8?q?Tm8gq4/DSDXByXEP+8eyRPbVbvnD2ynnMu5A+3Wvn9y4Hlqh6Puygxq52pE7ogkgr?=\n\t=?utf-8?q?fJUB49Q6AHZlddDy18HhYglZzctwoz67wzuibLCsuHc4SgnIh1DyNIGpuo/bEqq9L?=\n\t=?utf-8?q?cj01Xle+bwJ+O00Wfs7Ox8pBDFRiMo7irfzbKElXoSqmhuDjI2HlrXTaqvHeHlhA7?=\n\t=?utf-8?q?a/0ov1Ir9VQVyW5Dq/hmjo36r6XZMhc4jfoTny7U21j66EtxBPpYdB7DMC/WJaS7f?=\n\t=?utf-8?q?zwhk9m1sn5uSOTTq+4niwpVH8jEDqzdMHg=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 1799cc34-94f3-48d4-3d86-08da7c44362d", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "12 Aug 2022 09:22:43.5525 (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 coYxiP7Af7scTuz1hRWQ0nw16gXOsa33N7+NRn4QfwcVKMkkg0JFvZ5wOksB4EuUHakqOHbYvRjSHRkjr7Gn6Ltel/y3/ypSjg215+nrAx4=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "PH0PR13MB5284", "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": "Adds the basic probing infrastructure to support the flower firmware.\nThis firmware is geared towards offloading OVS and can generally be\nfound in /lib/firmware/netronome/flower. It is also used by the NFP\nkernel driver when OVS offload with TC is desired.\n\nAdds the basic infrastructure needed by the flower firmware to operate.\nThe firmware requires threads to service both the PF vNIC and the ctrl\nvNIC. The PF is responsible for handling any fallback traffic and the\nctrl vNIC is used to communicate OVS flows and flow statistics to and\nfrom the smartNIC. rte_services are used to facilitate this logic.\n\nAdds the cpp service, used for some user tools.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nSigned-off-by: Heinrich Kuhn <heinrich.kuhn@corigine.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>\n---\n drivers/net/nfp/flower/nfp_flower.c | 102 ++++++++++++++++++++++++++++++++++++\n drivers/net/nfp/flower/nfp_flower.h | 22 ++++++++\n drivers/net/nfp/meson.build | 1 +\n drivers/net/nfp/nfp_common.h | 1 +\n drivers/net/nfp/nfp_cpp_bridge.c | 88 ++++++++++++++++++++++++++-----\n drivers/net/nfp/nfp_cpp_bridge.h | 6 ++-\n drivers/net/nfp/nfp_ethdev.c | 40 ++++++++++++--\n 7 files changed, 241 insertions(+), 19 deletions(-)\n create mode 100644 drivers/net/nfp/flower/nfp_flower.c\n create mode 100644 drivers/net/nfp/flower/nfp_flower.h", "diff": "diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c\nnew file mode 100644\nindex 0000000..1e12f49\n--- /dev/null\n+++ b/drivers/net/nfp/flower/nfp_flower.c\n@@ -0,0 +1,102 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2022 Corigine, Inc.\n+ * All rights reserved.\n+ */\n+\n+#include <rte_common.h>\n+#include <ethdev_driver.h>\n+#include <rte_service_component.h>\n+#include <rte_malloc.h>\n+#include <ethdev_pci.h>\n+#include <ethdev_driver.h>\n+\n+#include \"../nfp_common.h\"\n+#include \"../nfp_logs.h\"\n+#include \"../nfp_ctrl.h\"\n+#include \"../nfp_cpp_bridge.h\"\n+#include \"nfp_flower.h\"\n+\n+static struct rte_service_spec flower_services[NFP_FLOWER_SERVICE_MAX] = {\n+};\n+\n+static int\n+nfp_flower_enable_services(struct nfp_app_flower *app_flower)\n+{\n+\tint i;\n+\tint ret = 0;\n+\n+\tfor (i = 0; i < NFP_FLOWER_SERVICE_MAX; i++) {\n+\t\t/* Pass a pointer to the flower app to the service */\n+\t\tflower_services[i].callback_userdata = (void *)app_flower;\n+\n+\t\t/* Register the flower services */\n+\t\tret = rte_service_component_register(&flower_services[i],\n+\t\t\t\t&app_flower->flower_services_ids[i]);\n+\t\tif (ret != 0) {\n+\t\t\tPMD_INIT_LOG(WARNING,\n+\t\t\t\t\"Could not register Flower PF vNIC service\");\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tPMD_INIT_LOG(INFO, \"Flower PF vNIC service registered\");\n+\n+\t\t/* Map them to available service cores*/\n+\t\tret = nfp_map_service(app_flower->flower_services_ids[i]);\n+\t\tif (ret != 0)\n+\t\t\tbreak;\n+\t}\n+\n+\treturn ret;\n+}\n+\n+int\n+nfp_init_app_flower(struct nfp_pf_dev *pf_dev)\n+{\n+\tint ret;\n+\tunsigned int numa_node;\n+\tstruct nfp_net_hw *pf_hw;\n+\tstruct nfp_app_flower *app_flower;\n+\n+\tnuma_node = rte_socket_id();\n+\n+\t/* Allocate memory for the Flower app */\n+\tapp_flower = rte_zmalloc_socket(\"nfp_app_flower\", sizeof(*app_flower),\n+\t\t\tRTE_CACHE_LINE_SIZE, numa_node);\n+\tif (app_flower == NULL) {\n+\t\tret = -ENOMEM;\n+\t\tgoto done;\n+\t}\n+\n+\tpf_dev->app_priv = app_flower;\n+\n+\t/* Allocate memory for the PF AND ctrl vNIC here (hence the * 2) */\n+\tpf_hw = rte_zmalloc_socket(\"nfp_pf_vnic\", 2 * sizeof(struct nfp_net_adapter),\n+\t\t\tRTE_CACHE_LINE_SIZE, numa_node);\n+\tif (pf_hw == NULL) {\n+\t\tret = -ENOMEM;\n+\t\tgoto app_cleanup;\n+\t}\n+\n+\t/* Start up flower services */\n+\tret = nfp_flower_enable_services(app_flower);\n+\tif (ret != 0) {\n+\t\tret = -ESRCH;\n+\t\tgoto vnic_cleanup;\n+\t}\n+\n+\treturn 0;\n+\n+vnic_cleanup:\n+\trte_free(pf_hw);\n+app_cleanup:\n+\trte_free(app_flower);\n+done:\n+\treturn ret;\n+}\n+\n+int\n+nfp_secondary_init_app_flower(__rte_unused struct nfp_cpp *cpp)\n+{\n+\tPMD_INIT_LOG(ERR, \"Flower firmware not supported\");\n+\treturn -ENOTSUP;\n+}\ndiff --git a/drivers/net/nfp/flower/nfp_flower.h b/drivers/net/nfp/flower/nfp_flower.h\nnew file mode 100644\nindex 0000000..4a9b302\n--- /dev/null\n+++ b/drivers/net/nfp/flower/nfp_flower.h\n@@ -0,0 +1,22 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2022 Corigine, Inc.\n+ * All rights reserved.\n+ */\n+\n+#ifndef _NFP_FLOWER_H_\n+#define _NFP_FLOWER_H_\n+\n+enum nfp_flower_service {\n+\tNFP_FLOWER_SERVICE_MAX\n+};\n+\n+/* The flower application's private structure */\n+struct nfp_app_flower {\n+\t/* List of rte_service ID's for the flower app */\n+\tuint32_t flower_services_ids[NFP_FLOWER_SERVICE_MAX];\n+};\n+\n+int nfp_init_app_flower(struct nfp_pf_dev *pf_dev);\n+int nfp_secondary_init_app_flower(struct nfp_cpp *cpp);\n+\n+#endif /* _NFP_FLOWER_H_ */\ndiff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build\nindex 810f02a..7ae3115 100644\n--- a/drivers/net/nfp/meson.build\n+++ b/drivers/net/nfp/meson.build\n@@ -6,6 +6,7 @@ if not is_linux or not dpdk_conf.get('RTE_ARCH_64')\n reason = 'only supported on 64-bit Linux'\n endif\n sources = files(\n+ 'flower/nfp_flower.c',\n 'nfpcore/nfp_cpp_pcie_ops.c',\n 'nfpcore/nfp_nsp.c',\n 'nfpcore/nfp_cppcore.c',\ndiff --git a/drivers/net/nfp/nfp_common.h b/drivers/net/nfp/nfp_common.h\nindex b99971b..8d721bd 100644\n--- a/drivers/net/nfp/nfp_common.h\n+++ b/drivers/net/nfp/nfp_common.h\n@@ -114,6 +114,7 @@\n /* Firmware application ID's */\n enum nfp_app_id {\n \tNFP_APP_CORE_NIC = 0x1,\n+\tNFP_APP_FLOWER_NIC = 0x3,\n };\n \n /* nfp_qcp_ptr - Read or Write Pointer of a queue */\ndiff --git a/drivers/net/nfp/nfp_cpp_bridge.c b/drivers/net/nfp/nfp_cpp_bridge.c\nindex 0922ea9..ac14029 100644\n--- a/drivers/net/nfp/nfp_cpp_bridge.c\n+++ b/drivers/net/nfp/nfp_cpp_bridge.c\n@@ -28,22 +28,86 @@\n static int nfp_cpp_bridge_serve_write(int sockfd, struct nfp_cpp *cpp);\n static int nfp_cpp_bridge_serve_read(int sockfd, struct nfp_cpp *cpp);\n static int nfp_cpp_bridge_serve_ioctl(int sockfd, struct nfp_cpp *cpp);\n+static int nfp_cpp_bridge_service_func(void *args);\n \n-void nfp_register_cpp_service(struct nfp_cpp *cpp)\n+static struct rte_service_spec cpp_service = {\n+\t.name = \"nfp_cpp_service\",\n+\t.callback = nfp_cpp_bridge_service_func,\n+};\n+\n+int\n+nfp_map_service(uint32_t service_id)\n {\n-\tuint32_t *cpp_service_id = NULL;\n-\tstruct rte_service_spec service;\n+\tint32_t ret;\n+\tuint32_t slcore = 0;\n+\tint32_t slcore_count;\n+\tuint8_t service_count;\n+\tconst char *service_name;\n+\tuint32_t slcore_array[RTE_MAX_LCORE];\n+\tuint8_t min_service_count = UINT8_MAX;\n+\n+\tslcore_count = rte_service_lcore_list(slcore_array, RTE_MAX_LCORE);\n+\tif (slcore_count <= 0) {\n+\t\tPMD_INIT_LOG(DEBUG, \"No service cores found\");\n+\t\treturn -ENOENT;\n+\t}\n+\n+\t/*\n+\t * Find a service core with the least number of services already\n+\t * registered to it\n+\t */\n+\twhile (slcore_count--) {\n+\t\tservice_count = rte_service_lcore_count_services(slcore_array[slcore_count]);\n+\t\tif (service_count < min_service_count) {\n+\t\t\tslcore = slcore_array[slcore_count];\n+\t\t\tmin_service_count = service_count;\n+\t\t}\n+\t}\n \n-\tmemset(&service, 0, sizeof(struct rte_service_spec));\n-\tsnprintf(service.name, sizeof(service.name), \"nfp_cpp_service\");\n-\tservice.callback = nfp_cpp_bridge_service_func;\n-\tservice.callback_userdata = (void *)cpp;\n+\tservice_name = rte_service_get_name(service_id);\n+\tPMD_INIT_LOG(INFO, \"Mapping service %s to core %u\", service_name, slcore);\n+\tret = rte_service_map_lcore_set(service_id, slcore, 1);\n+\tif (ret != 0) {\n+\t\tPMD_INIT_LOG(DEBUG, \"Could not map flower service\");\n+\t\treturn -ENOENT;\n+\t}\n \n-\tif (rte_service_component_register(&service,\n-\t\t\t\t\t cpp_service_id))\n-\t\tRTE_LOG(WARNING, PMD, \"NFP CPP bridge service register() failed\");\n+\trte_service_runstate_set(service_id, 1);\n+\trte_service_component_runstate_set(service_id, 1);\n+\trte_service_lcore_start(slcore);\n+\tif (rte_service_may_be_active(slcore))\n+\t\tRTE_LOG(INFO, PMD, \"The service %s is running\", service_name);\n \telse\n-\t\tRTE_LOG(DEBUG, PMD, \"NFP CPP bridge service registered\");\n+\t\tRTE_LOG(INFO, PMD, \"The service %s is not running\", service_name);\n+\n+\treturn 0;\n+}\n+\n+int nfp_enable_cpp_service(struct nfp_cpp *cpp, enum nfp_app_id app_id)\n+{\n+\tint ret = 0;\n+\tuint32_t id = 0;\n+\n+\tcpp_service.callback_userdata = (void *)cpp;\n+\n+\t/* Register the cpp service */\n+\tret = rte_service_component_register(&cpp_service, &id);\n+\tif (ret != 0) {\n+\t\tPMD_INIT_LOG(WARNING, \"Could not register nfp cpp service\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tPMD_INIT_LOG(INFO, \"NFP cpp service registered\");\n+\n+\t/* Map it to available service core*/\n+\tret = nfp_map_service(id);\n+\tif (ret != 0) {\n+\t\tPMD_INIT_LOG(DEBUG, \"Could not map nfp cpp service\");\n+\t\tif (app_id == NFP_APP_FLOWER_NIC)\n+\t\t\treturn -EINVAL;\n+\t}\n+\n+\treturn 0;\n }\n \n /*\n@@ -307,7 +371,7 @@ void nfp_register_cpp_service(struct nfp_cpp *cpp)\n * unaware of the CPP bridge performing the NFP kernel char driver for CPP\n * accesses.\n */\n-int32_t\n+static int\n nfp_cpp_bridge_service_func(void *args)\n {\n \tstruct sockaddr address;\ndiff --git a/drivers/net/nfp/nfp_cpp_bridge.h b/drivers/net/nfp/nfp_cpp_bridge.h\nindex aea5fdc..dde50d7 100644\n--- a/drivers/net/nfp/nfp_cpp_bridge.h\n+++ b/drivers/net/nfp/nfp_cpp_bridge.h\n@@ -16,6 +16,8 @@\n #ifndef _NFP_CPP_BRIDGE_H_\n #define _NFP_CPP_BRIDGE_H_\n \n+#include \"nfp_common.h\"\n+\n #define NFP_CPP_MEMIO_BOUNDARY\t(1 << 20)\n #define NFP_BRIDGE_OP_READ\t20\n #define NFP_BRIDGE_OP_WRITE\t30\n@@ -24,8 +26,8 @@\n #define NFP_IOCTL 'n'\n #define NFP_IOCTL_CPP_IDENTIFICATION _IOW(NFP_IOCTL, 0x8f, uint32_t)\n \n-void nfp_register_cpp_service(struct nfp_cpp *cpp);\n-int32_t nfp_cpp_bridge_service_func(void *args);\n+int nfp_map_service(uint32_t service_id);\n+int nfp_enable_cpp_service(struct nfp_cpp *cpp, enum nfp_app_id app_id);\n \n #endif /* _NFP_CPP_BRIDGE_H_ */\n /*\ndiff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c\nindex ec4f408..8dad575 100644\n--- a/drivers/net/nfp/nfp_ethdev.c\n+++ b/drivers/net/nfp/nfp_ethdev.c\n@@ -38,6 +38,8 @@\n #include \"nfp_ctrl.h\"\n #include \"nfp_cpp_bridge.h\"\n \n+#include \"flower/nfp_flower.h\"\n+\n static int\n nfp_net_pf_read_mac(struct nfp_app_nic *app_nic, int port)\n {\n@@ -837,7 +839,8 @@\n }\n \n static int\n-nfp_pf_init(struct rte_pci_device *pci_dev)\n+nfp_pf_init(struct rte_pci_device *pci_dev,\n+\t\tstruct rte_pci_driver *pci_drv)\n {\n \tint ret;\n \tint err = 0;\n@@ -964,6 +967,16 @@\n \t\t\tgoto hwqueues_cleanup;\n \t\t}\n \t\tbreak;\n+\tcase NFP_APP_FLOWER_NIC:\n+\t\tPMD_INIT_LOG(INFO, \"Initializing Flower\");\n+\t\tpci_dev->device.driver = &pci_drv->driver;\n+\t\tret = nfp_init_app_flower(pf_dev);\n+\t\tif (ret != 0) {\n+\t\t\tPMD_INIT_LOG(ERR, \"Could not initialize Flower!\");\n+\t\t\tpci_dev->device.driver = NULL;\n+\t\t\tgoto hwqueues_cleanup;\n+\t\t}\n+\t\tbreak;\n \tdefault:\n \t\tPMD_INIT_LOG(ERR, \"Unsupported Firmware loaded\");\n \t\tret = -EINVAL;\n@@ -971,7 +984,12 @@\n \t}\n \n \t/* register the CPP bridge service here for primary use */\n-\tnfp_register_cpp_service(pf_dev->cpp);\n+\tret = nfp_enable_cpp_service(pf_dev->cpp, pf_dev->app_id);\n+\tif (ret != 0) {\n+\t\tPMD_INIT_LOG(ERR, \"Enable cpp service failed.\");\n+\t\tret = -EINVAL;\n+\t\tgoto hwqueues_cleanup;\n+\t}\n \n \treturn 0;\n \n@@ -1095,6 +1113,14 @@\n \t\t\tgoto sym_tbl_cleanup;\n \t\t}\n \t\tbreak;\n+\tcase NFP_APP_FLOWER_NIC:\n+\t\tPMD_INIT_LOG(INFO, \"Initializing Flower\");\n+\t\tret = nfp_secondary_init_app_flower(cpp);\n+\t\tif (ret != 0) {\n+\t\t\tPMD_INIT_LOG(ERR, \"Could not initialize Flower!\");\n+\t\t\tgoto sym_tbl_cleanup;\n+\t\t}\n+\t\tbreak;\n \tdefault:\n \t\tPMD_INIT_LOG(ERR, \"Unsupported Firmware loaded\");\n \t\tret = -EINVAL;\n@@ -1105,7 +1131,11 @@\n \t\tgoto sym_tbl_cleanup;\n \n \t/* Register the CPP bridge service for the secondary too */\n-\tnfp_register_cpp_service(cpp);\n+\tret = nfp_enable_cpp_service(cpp, app_id);\n+\tif (ret != 0) {\n+\t\tPMD_INIT_LOG(ERR, \"Enable cpp service failed.\");\n+\t\tret = -EINVAL;\n+\t}\n \n sym_tbl_cleanup:\n \tfree(sym_tbl);\n@@ -1114,11 +1144,11 @@\n }\n \n static int\n-nfp_pf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,\n+nfp_pf_pci_probe(struct rte_pci_driver *pci_drv,\n \t\tstruct rte_pci_device *dev)\n {\n \tif (rte_eal_process_type() == RTE_PROC_PRIMARY)\n-\t\treturn nfp_pf_init(dev);\n+\t\treturn nfp_pf_init(dev, pci_drv);\n \telse\n \t\treturn nfp_pf_secondary_init(dev);\n }\n", "prefixes": [ "v6", "04/12" ] }