Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/105704/?format=api
{ "id": 105704, "url": "http://patchwork.dpdk.org/api/patches/105704/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20220110052627.22577-2-rohit.raj@nxp.com/", "project": { "id": 1, "url": "http://patchwork.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": "<20220110052627.22577-2-rohit.raj@nxp.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220110052627.22577-2-rohit.raj@nxp.com", "date": "2022-01-10T05:26:27", "name": "[v5,2/2] bus/fslmc: support bus close API", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "7a671795d608b55c28d3d6f9282ffbeac43b3368", "submitter": { "id": 1845, "url": "http://patchwork.dpdk.org/api/people/1845/?format=api", "name": "Rohit Raj", "email": "rohit.raj@nxp.com" }, "delegate": { "id": 1, "url": "http://patchwork.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20220110052627.22577-2-rohit.raj@nxp.com/mbox/", "series": [ { "id": 21104, "url": "http://patchwork.dpdk.org/api/series/21104/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=21104", "date": "2022-01-10T05:26:26", "name": "[v5,1/2] eal: add API for bus close", "version": 5, "mbox": "http://patchwork.dpdk.org/series/21104/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/105704/comments/", "check": "warning", "checks": "http://patchwork.dpdk.org/api/patches/105704/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 30BFCA0351;\n\tMon, 10 Jan 2022 06:26:38 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 81332411B2;\n\tMon, 10 Jan 2022 06:26:32 +0100 (CET)", "from inva021.nxp.com (inva021.nxp.com [92.121.34.21])\n by mails.dpdk.org (Postfix) with ESMTP id CCA064013F\n for <dev@dpdk.org>; Mon, 10 Jan 2022 06:26:30 +0100 (CET)", "from inva021.nxp.com (localhost [127.0.0.1])\n by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id A60C320113E;\n Mon, 10 Jan 2022 06:26:30 +0100 (CET)", "from aprdc01srsp001v.ap-rdc01.nxp.com\n (aprdc01srsp001v.ap-rdc01.nxp.com [165.114.16.16])\n by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 439B1201137;\n Mon, 10 Jan 2022 06:26:30 +0100 (CET)", "from lsv03196.swis.in-blr01.nxp.com (lsv03196.swis.in-blr01.nxp.com\n [92.120.146.192])\n by aprdc01srsp001v.ap-rdc01.nxp.com (Postfix) with ESMTP id 2D182183AD0B;\n Mon, 10 Jan 2022 13:26:29 +0800 (+08)" ], "From": "rohit.raj@nxp.com", "To": "Hemant Agrawal <hemant.agrawal@nxp.com>,\n Sachin Saxena <sachin.saxena@oss.nxp.com>, Ray Kinsella <mdr@ashroe.eu>,\n Nipun Gupta <nipun.gupta@nxp.com>,\n Anatoly Burakov <anatoly.burakov@intel.com>", "Cc": "dev@dpdk.org,\n\tsachin.saxena@nxp.com,\n\tRohit Raj <rohit.raj@nxp.com>", "Subject": "[PATCH v5 2/2] bus/fslmc: support bus close API", "Date": "Mon, 10 Jan 2022 10:56:27 +0530", "Message-Id": "<20220110052627.22577-2-rohit.raj@nxp.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20220110052627.22577-1-rohit.raj@nxp.com>", "References": "<20201008153048.19369-1-rohit.raj@nxp.com>\n <20220110052627.22577-1-rohit.raj@nxp.com>", "X-Virus-Scanned": "ClamAV using ClamSMTP", "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": "From: Rohit Raj <rohit.raj@nxp.com>\n\nThis patch add support for closing the bus objects which\nwere acquired In the bus probe.\n\nSome devices need to be cleaned while in both primary and\nsecondary process and while some need to be cleaned only in\ncase of primary process.\n\nThe devices are closed as per the white list used while\ncreating the objects in a particular process.\n\nSigned-off-by: Rohit Raj <rohit.raj@nxp.com>\n---\n drivers/bus/fslmc/fslmc_bus.c | 15 +++-\n drivers/bus/fslmc/fslmc_vfio.c | 89 +++++++++++++++++++++++-\n drivers/bus/fslmc/fslmc_vfio.h | 3 +-\n drivers/bus/fslmc/mc/fsl_dpcon.h | 3 +-\n drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c | 30 +++++++-\n drivers/bus/fslmc/portal/dpaa2_hw_dpci.c | 30 +++++++-\n drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 36 +++++++++-\n drivers/bus/fslmc/portal/dpaa2_hw_dprc.c | 31 ++++++++-\n drivers/bus/fslmc/rte_fslmc.h | 5 +-\n drivers/bus/fslmc/version.map | 1 +\n drivers/event/dpaa2/dpaa2_hw_dpcon.c | 31 ++++++++-\n drivers/net/dpaa2/dpaa2_mux.c | 20 +++++-\n 12 files changed, 282 insertions(+), 12 deletions(-)", "diff": "diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c\nindex a3c0d838c4..79053233a1 100644\n--- a/drivers/bus/fslmc/fslmc_bus.c\n+++ b/drivers/bus/fslmc/fslmc_bus.c\n@@ -1,6 +1,6 @@\n /* SPDX-License-Identifier: BSD-3-Clause\n *\n- * Copyright 2016,2018-2021 NXP\n+ * Copyright 2016,2018-2022 NXP\n *\n */\n \n@@ -493,6 +493,18 @@ rte_fslmc_probe(void)\n \treturn 0;\n }\n \n+static int\n+rte_fslmc_close(void)\n+{\n+\tint ret = 0;\n+\n+\tret = fslmc_vfio_close_group();\n+\tif (ret)\n+\t\tDPAA2_BUS_ERR(\"Unable to close devices %d\", ret);\n+\n+\treturn 0;\n+}\n+\n static struct rte_device *\n rte_fslmc_find_device(const struct rte_device *start, rte_dev_cmp_t cmp,\n \t\t const void *data)\n@@ -668,6 +680,7 @@ struct rte_fslmc_bus rte_fslmc_bus = {\n \t.bus = {\n \t\t.scan = rte_fslmc_scan,\n \t\t.probe = rte_fslmc_probe,\n+\t\t.close = rte_fslmc_close,\n \t\t.parse = rte_fslmc_parse,\n \t\t.find_device = rte_fslmc_find_device,\n \t\t.get_iommu_class = rte_dpaa2_get_iommu_class,\ndiff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c\nindex 1b89a56bbc..59bb0f0171 100644\n--- a/drivers/bus/fslmc/fslmc_vfio.c\n+++ b/drivers/bus/fslmc/fslmc_vfio.c\n@@ -1,7 +1,7 @@\n /* SPDX-License-Identifier: BSD-3-Clause\n *\n * Copyright (c) 2015-2016 Freescale Semiconductor, Inc. All rights reserved.\n- * Copyright 2016-2021 NXP\n+ * Copyright 2016-2022 NXP\n *\n */\n \n@@ -1066,3 +1066,90 @@ fslmc_vfio_setup_group(void)\n \n \treturn 0;\n }\n+\n+static void\n+fslmc_close_iodevices(struct rte_dpaa2_device *dev)\n+{\n+\tstruct rte_dpaa2_object *object = NULL;\n+\tstruct rte_dpaa2_driver *drv;\n+\tint ret, probe_all;\n+\n+\tswitch (dev->dev_type) {\n+\tcase DPAA2_IO:\n+\tcase DPAA2_CON:\n+\tcase DPAA2_CI:\n+\tcase DPAA2_BPOOL:\n+\tcase DPAA2_MUX:\n+\t\tTAILQ_FOREACH(object, &dpaa2_obj_list, next) {\n+\t\t\tif (dev->dev_type == object->dev_type)\n+\t\t\t\tobject->close(dev->object_id);\n+\t\t\telse\n+\t\t\t\tcontinue;\n+\t\t}\n+\t\tbreak;\n+\tcase DPAA2_ETH:\n+\tcase DPAA2_CRYPTO:\n+\tcase DPAA2_QDMA:\n+\t\tprobe_all = rte_fslmc_bus.bus.conf.scan_mode !=\n+\t\t\t RTE_BUS_SCAN_ALLOWLIST;\n+\t\tTAILQ_FOREACH(drv, &rte_fslmc_bus.driver_list, next) {\n+\t\t\tif (drv->drv_type != dev->dev_type)\n+\t\t\t\tcontinue;\n+\t\t\tif (rte_dev_is_probed(&dev->device))\n+\t\t\t\tcontinue;\n+\t\t\tif (probe_all ||\n+\t\t\t (dev->device.devargs &&\n+\t\t\t dev->device.devargs->policy ==\n+\t\t\t RTE_DEV_ALLOWED)) {\n+\t\t\t\tret = drv->remove(dev);\n+\t\t\t\tif (ret)\n+\t\t\t\t\tDPAA2_BUS_ERR(\"Unable to remove\");\n+\t\t\t}\n+\t\t}\n+\t\tbreak;\n+\tdefault:\n+\t\tbreak;\n+\t}\n+\n+\tDPAA2_BUS_LOG(DEBUG, \"Device (%s) Closed\",\n+\t\t dev->device.name);\n+}\n+\n+int\n+fslmc_vfio_close_group(void)\n+{\n+\tstruct rte_dpaa2_device *dev, *dev_temp;\n+\n+\tRTE_TAILQ_FOREACH_SAFE(dev, &rte_fslmc_bus.device_list, next, dev_temp) {\n+\t\tif (dev->device.devargs &&\n+\t\t dev->device.devargs->policy == RTE_DEV_BLOCKED) {\n+\t\t\tDPAA2_BUS_LOG(DEBUG, \"%s Blacklisted, skipping\",\n+\t\t\t\t dev->device.name);\n+\t\t\tTAILQ_REMOVE(&rte_fslmc_bus.device_list, dev, next);\n+\t\t\t\tcontinue;\n+\t\t}\n+\t\tswitch (dev->dev_type) {\n+\t\tcase DPAA2_ETH:\n+\t\tcase DPAA2_CRYPTO:\n+\t\tcase DPAA2_QDMA:\n+\t\tcase DPAA2_IO:\n+\t\t\tfslmc_close_iodevices(dev);\n+\t\t\tbreak;\n+\t\tcase DPAA2_CON:\n+\t\tcase DPAA2_CI:\n+\t\tcase DPAA2_BPOOL:\n+\t\tcase DPAA2_MUX:\n+\t\t\tif (rte_eal_process_type() == RTE_PROC_SECONDARY)\n+\t\t\t\tcontinue;\n+\n+\t\t\tfslmc_close_iodevices(dev);\n+\t\t\tbreak;\n+\t\tcase DPAA2_DPRTC:\n+\t\tdefault:\n+\t\t\tDPAA2_BUS_DEBUG(\"Device cannot be closed: Not supported (%s)\",\n+\t\t\t\t\tdev->device.name);\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\ndiff --git a/drivers/bus/fslmc/fslmc_vfio.h b/drivers/bus/fslmc/fslmc_vfio.h\nindex 133606a9fd..5f2f8119fb 100644\n--- a/drivers/bus/fslmc/fslmc_vfio.h\n+++ b/drivers/bus/fslmc/fslmc_vfio.h\n@@ -1,7 +1,7 @@\n /* SPDX-License-Identifier: BSD-3-Clause\n *\n * Copyright (c) 2015-2016 Freescale Semiconductor, Inc. All rights reserved.\n- * Copyright 2016,2019 NXP\n+ * Copyright 2016,2019,2021-2022 NXP\n *\n */\n \n@@ -55,6 +55,7 @@ int rte_dpaa2_vfio_setup_intr(struct rte_intr_handle *intr_handle,\n \n int fslmc_vfio_setup_group(void);\n int fslmc_vfio_process_group(void);\n+int fslmc_vfio_close_group(void);\n char *fslmc_get_container(void);\n int fslmc_get_container_group(int *gropuid);\n int rte_fslmc_vfio_dmamap(void);\ndiff --git a/drivers/bus/fslmc/mc/fsl_dpcon.h b/drivers/bus/fslmc/mc/fsl_dpcon.h\nindex 7caa6c68a1..a158f576b5 100644\n--- a/drivers/bus/fslmc/mc/fsl_dpcon.h\n+++ b/drivers/bus/fslmc/mc/fsl_dpcon.h\n@@ -1,7 +1,7 @@\n /* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0)\n *\n * Copyright 2013-2016 Freescale Semiconductor Inc.\n- * Copyright 2017-2019 NXP\n+ * Copyright 2017-2019,2021-2022 NXP\n *\n */\n #ifndef __FSL_DPCON_H\n@@ -26,6 +26,7 @@ int dpcon_open(struct fsl_mc_io *mc_io,\n \t int dpcon_id,\n \t uint16_t *token);\n \n+__rte_internal\n int dpcon_close(struct fsl_mc_io *mc_io,\n \t\tuint32_t cmd_flags,\n \t\tuint16_t token);\ndiff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c\nindex 122aa1740d..4cde4890d9 100644\n--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c\n+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c\n@@ -1,7 +1,7 @@\n /* SPDX-License-Identifier: BSD-3-Clause\n *\n * Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved.\n- * Copyright 2016 NXP\n+ * Copyright 2016,2021-2022 NXP\n *\n */\n \n@@ -33,6 +33,19 @@ TAILQ_HEAD(dpbp_dev_list, dpaa2_dpbp_dev);\n static struct dpbp_dev_list dpbp_dev_list\n \t= TAILQ_HEAD_INITIALIZER(dpbp_dev_list); /*!< DPBP device list */\n \n+static struct dpaa2_dpbp_dev *get_dpbp_from_id(uint32_t dpbp_id)\n+{\n+\tstruct dpaa2_dpbp_dev *dpbp_dev = NULL;\n+\n+\t/* Get DPBP dev handle from list using index */\n+\tTAILQ_FOREACH(dpbp_dev, &dpbp_dev_list, next) {\n+\t\tif (dpbp_dev->dpbp_id == dpbp_id)\n+\t\t\tbreak;\n+\t}\n+\n+\treturn dpbp_dev;\n+}\n+\n static int\n dpaa2_create_dpbp_device(int vdev_fd __rte_unused,\n \t\t\t struct vfio_device_info *obj_info __rte_unused,\n@@ -109,6 +122,20 @@ void dpaa2_free_dpbp_dev(struct dpaa2_dpbp_dev *dpbp)\n \t}\n }\n \n+static void dpaa2_close_dpbp_device(int object_id)\n+{\n+\tstruct dpaa2_dpbp_dev *dpbp_dev = NULL;\n+\n+\tdpbp_dev = get_dpbp_from_id((uint32_t)object_id);\n+\n+\tif (dpbp_dev) {\n+\t\tdpaa2_free_dpbp_dev(dpbp_dev);\n+\t\tdpbp_close(&dpbp_dev->dpbp, CMD_PRI_LOW, dpbp_dev->token);\n+\t\tTAILQ_REMOVE(&dpbp_dev_list, dpbp_dev, next);\n+\t\trte_free(dpbp_dev);\n+\t}\n+}\n+\n int dpaa2_dpbp_supported(void)\n {\n \tif (TAILQ_EMPTY(&dpbp_dev_list))\n@@ -119,6 +146,7 @@ int dpaa2_dpbp_supported(void)\n static struct rte_dpaa2_object rte_dpaa2_dpbp_obj = {\n \t.dev_type = DPAA2_BPOOL,\n \t.create = dpaa2_create_dpbp_device,\n+\t.close = dpaa2_close_dpbp_device,\n };\n \n RTE_PMD_REGISTER_DPAA2_OBJECT(dpbp, rte_dpaa2_dpbp_obj);\ndiff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c\nindex 8ed969c7c0..5eae63a6fd 100644\n--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c\n+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c\n@@ -1,6 +1,6 @@\n /* SPDX-License-Identifier: BSD-3-Clause\n *\n- * Copyright 2017 NXP\n+ * Copyright 2017,2021-2022 NXP\n *\n */\n \n@@ -30,6 +30,19 @@ TAILQ_HEAD(dpci_dev_list, dpaa2_dpci_dev);\n static struct dpci_dev_list dpci_dev_list\n \t= TAILQ_HEAD_INITIALIZER(dpci_dev_list); /*!< DPCI device list */\n \n+static struct dpaa2_dpci_dev *get_dpci_from_id(uint32_t dpci_id)\n+{\n+\tstruct dpaa2_dpci_dev *dpci_dev = NULL;\n+\n+\t/* Get DPCI dev handle from list using index */\n+\tTAILQ_FOREACH(dpci_dev, &dpci_dev_list, next) {\n+\t\tif (dpci_dev->dpci_id == dpci_id)\n+\t\t\tbreak;\n+\t}\n+\n+\treturn dpci_dev;\n+}\n+\n static int\n rte_dpaa2_create_dpci_device(int vdev_fd __rte_unused,\n \t\t\t struct vfio_device_info *obj_info __rte_unused,\n@@ -179,9 +192,24 @@ void rte_dpaa2_free_dpci_dev(struct dpaa2_dpci_dev *dpci)\n \t}\n }\n \n+static void rte_dpaa2_close_dpci_device(int object_id)\n+{\n+\tstruct dpaa2_dpci_dev *dpci_dev = NULL;\n+\n+\tdpci_dev = get_dpci_from_id((uint32_t)object_id);\n+\n+\tif (dpci_dev) {\n+\t\trte_dpaa2_free_dpci_dev(dpci_dev);\n+\t\tdpci_close(&dpci_dev->dpci, CMD_PRI_LOW, dpci_dev->token);\n+\t\tTAILQ_REMOVE(&dpci_dev_list, dpci_dev, next);\n+\t\trte_free(dpci_dev);\n+\t}\n+}\n+\n static struct rte_dpaa2_object rte_dpaa2_dpci_obj = {\n \t.dev_type = DPAA2_CI,\n \t.create = rte_dpaa2_create_dpci_device,\n+\t.close = rte_dpaa2_close_dpci_device,\n };\n \n RTE_PMD_REGISTER_DPAA2_OBJECT(dpci, rte_dpaa2_dpci_obj);\ndiff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c\nindex 2210a0fa4a..f8676ec53b 100644\n--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c\n+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c\n@@ -1,7 +1,7 @@\n /* SPDX-License-Identifier: BSD-3-Clause\n *\n * Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved.\n- * Copyright 2016-2019 NXP\n+ * Copyright 2016-2019,2021-2022 NXP\n *\n */\n #include <unistd.h>\n@@ -86,6 +86,19 @@ static int dpaa2_cluster_sz = 2;\n * Cluster 4 (ID = x07) : CPU14, CPU15;\n */\n \n+static struct dpaa2_dpio_dev *get_dpio_dev_from_id(int32_t dpio_id)\n+{\n+\tstruct dpaa2_dpio_dev *dpio_dev = NULL;\n+\n+\t/* Get DPIO dev handle from list using index */\n+\tTAILQ_FOREACH(dpio_dev, &dpio_dev_list, next) {\n+\t\tif (dpio_dev->hw_id == dpio_id)\n+\t\t\tbreak;\n+\t}\n+\n+\treturn dpio_dev;\n+}\n+\n static int\n dpaa2_get_core_id(void)\n {\n@@ -634,9 +647,30 @@ dpaa2_free_eq_descriptors(void)\n \t\t\tMAX_EQ_RESP_ENTRIES - 1;\n }\n \n+static void\n+dpaa2_close_dpio_device(int object_id)\n+{\n+\tstruct dpaa2_dpio_dev *dpio_dev = NULL;\n+\n+\tdpio_dev = get_dpio_dev_from_id((int32_t)object_id);\n+\n+\tif (dpio_dev) {\n+\t\tif (dpio_dev->dpio) {\n+\t\t\tdpio_disable(dpio_dev->dpio, CMD_PRI_LOW,\n+\t\t\t\t dpio_dev->token);\n+\t\t\tdpio_close(dpio_dev->dpio, CMD_PRI_LOW,\n+\t\t\t\t dpio_dev->token);\n+\t\t\trte_free(dpio_dev->dpio);\n+\t\t}\n+\t\tTAILQ_REMOVE(&dpio_dev_list, dpio_dev, next);\n+\t\trte_free(dpio_dev);\n+\t}\n+}\n+\n static struct rte_dpaa2_object rte_dpaa2_dpio_obj = {\n \t.dev_type = DPAA2_IO,\n \t.create = dpaa2_create_dpio_device,\n+\t.close = dpaa2_close_dpio_device,\n };\n \n RTE_PMD_REGISTER_DPAA2_OBJECT(dpio, rte_dpaa2_dpio_obj);\ndiff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c b/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c\nindex ca1d0304d5..ec35fdc65a 100644\n--- a/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c\n+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c\n@@ -1,6 +1,6 @@\n /* SPDX-License-Identifier: BSD-3-Clause\n *\n- * Copyright 2021 NXP\n+ * Copyright 2021-2022 NXP\n *\n */\n \n@@ -92,9 +92,38 @@ rte_dpaa2_create_dprc_device(int vdev_fd __rte_unused,\n \treturn 0;\n }\n \n+static struct dpaa2_dprc_dev *\n+get_dprc_from_id(uint32_t dprc_id)\n+{\n+\tstruct dpaa2_dprc_dev *dprc_dev = NULL;\n+\n+\t/* Get DPRC dev handle from list using index */\n+\tTAILQ_FOREACH(dprc_dev, &dprc_dev_list, next) {\n+\t\tif (dprc_dev->dprc_id == dprc_id)\n+\t\t\tbreak;\n+\t}\n+\n+\treturn dprc_dev;\n+}\n+\n+static void\n+rte_dpaa2_close_dprc_device(int object_id)\n+{\n+\tstruct dpaa2_dprc_dev *dprc_dev = NULL;\n+\n+\tdprc_dev = get_dprc_from_id((uint32_t)object_id);\n+\n+\tif (dprc_dev) {\n+\t\tdprc_close(&dprc_dev->dprc, CMD_PRI_LOW, dprc_dev->token);\n+\t\tTAILQ_REMOVE(&dprc_dev_list, dprc_dev, next);\n+\t\trte_free(dprc_dev);\n+\t}\n+}\n+\n static struct rte_dpaa2_object rte_dpaa2_dprc_obj = {\n \t.dev_type = DPAA2_DPRC,\n \t.create = rte_dpaa2_create_dprc_device,\n+\t.close = rte_dpaa2_close_dprc_device,\n };\n \n RTE_PMD_REGISTER_DPAA2_OBJECT(dprc, rte_dpaa2_dprc_obj);\ndiff --git a/drivers/bus/fslmc/rte_fslmc.h b/drivers/bus/fslmc/rte_fslmc.h\nindex 12b586b13b..f9753d8af2 100644\n--- a/drivers/bus/fslmc/rte_fslmc.h\n+++ b/drivers/bus/fslmc/rte_fslmc.h\n@@ -1,6 +1,6 @@\n /* SPDX-License-Identifier: BSD-3-Clause\n *\n- * Copyright 2016,2021 NXP\n+ * Copyright 2016,2021-2022 NXP\n *\n */\n \n@@ -104,6 +104,8 @@ typedef int (*rte_dpaa2_obj_create_t)(int vdev_fd,\n \t\t\t\t struct vfio_device_info *obj_info,\n \t\t\t\t int object_id);\n \n+typedef void (*rte_dpaa2_obj_close_t)(int object_id);\n+\n /**\n * A structure describing a DPAA2 object.\n */\n@@ -112,6 +114,7 @@ struct rte_dpaa2_object {\n \tconst char *name; /**< Name of Object. */\n \tenum rte_dpaa2_dev_type dev_type; /**< Type of device */\n \trte_dpaa2_obj_create_t create;\n+\trte_dpaa2_obj_close_t close;\n };\n \n /**\ndiff --git a/drivers/bus/fslmc/version.map b/drivers/bus/fslmc/version.map\nindex 79b29746b6..465c4d10e6 100644\n--- a/drivers/bus/fslmc/version.map\n+++ b/drivers/bus/fslmc/version.map\n@@ -34,6 +34,7 @@ INTERNAL {\n \tdpci_get_opr;\n \tdpci_set_opr;\n \tdpci_set_rx_queue;\n+\tdpcon_close;\n \tdpcon_get_attributes;\n \tdpcon_open;\n \tdpdmai_close;\ndiff --git a/drivers/event/dpaa2/dpaa2_hw_dpcon.c b/drivers/event/dpaa2/dpaa2_hw_dpcon.c\nindex acc1fde771..1de3ec9a81 100644\n--- a/drivers/event/dpaa2/dpaa2_hw_dpcon.c\n+++ b/drivers/event/dpaa2/dpaa2_hw_dpcon.c\n@@ -1,6 +1,6 @@\n /* SPDX-License-Identifier: BSD-3-Clause\n *\n- * Copyright 2017 NXP\n+ * Copyright 2017,2022 NXP\n *\n */\n \n@@ -30,6 +30,19 @@ TAILQ_HEAD(dpcon_dev_list, dpaa2_dpcon_dev);\n static struct dpcon_dev_list dpcon_dev_list\n \t= TAILQ_HEAD_INITIALIZER(dpcon_dev_list); /*!< DPCON device list */\n \n+static struct dpaa2_dpcon_dev *get_dpcon_from_id(uint32_t dpcon_id)\n+{\n+\tstruct dpaa2_dpcon_dev *dpcon_dev = NULL;\n+\n+\t/* Get DPCONC dev handle from list using index */\n+\tTAILQ_FOREACH(dpcon_dev, &dpcon_dev_list, next) {\n+\t\tif (dpcon_dev->dpcon_id == dpcon_id)\n+\t\t\tbreak;\n+\t}\n+\n+\treturn dpcon_dev;\n+}\n+\n static int\n rte_dpaa2_create_dpcon_device(int dev_fd __rte_unused,\n \t\t\t struct vfio_device_info *obj_info __rte_unused,\n@@ -105,9 +118,25 @@ void rte_dpaa2_free_dpcon_dev(struct dpaa2_dpcon_dev *dpcon)\n \t}\n }\n \n+static void\n+rte_dpaa2_close_dpcon_device(int object_id)\n+{\n+\tstruct dpaa2_dpcon_dev *dpcon_dev = NULL;\n+\n+\tdpcon_dev = get_dpcon_from_id((uint32_t)object_id);\n+\n+\tif (dpcon_dev) {\n+\t\trte_dpaa2_free_dpcon_dev(dpcon_dev);\n+\t\tdpcon_close(&dpcon_dev->dpcon, CMD_PRI_LOW, dpcon_dev->token);\n+\t\tTAILQ_REMOVE(&dpcon_dev_list, dpcon_dev, next);\n+\t\trte_free(dpcon_dev);\n+\t}\n+}\n+\n static struct rte_dpaa2_object rte_dpaa2_dpcon_obj = {\n \t.dev_type = DPAA2_CON,\n \t.create = rte_dpaa2_create_dpcon_device,\n+\t.close = rte_dpaa2_close_dpcon_device,\n };\n \n RTE_PMD_REGISTER_DPAA2_OBJECT(dpcon, rte_dpaa2_dpcon_obj);\ndiff --git a/drivers/net/dpaa2/dpaa2_mux.c b/drivers/net/dpaa2/dpaa2_mux.c\nindex d347f4df51..e9289ca808 100644\n--- a/drivers/net/dpaa2/dpaa2_mux.c\n+++ b/drivers/net/dpaa2/dpaa2_mux.c\n@@ -1,5 +1,5 @@\n /* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright 2018-2021 NXP\n+ * Copyright 2018-2022 NXP\n */\n \n #include <sys/queue.h>\n@@ -44,7 +44,7 @@ static struct dpaa2_dpdmux_dev *get_dpdmux_from_id(uint32_t dpdmux_id)\n {\n \tstruct dpaa2_dpdmux_dev *dpdmux_dev = NULL;\n \n-\t/* Get DPBP dev handle from list using index */\n+\t/* Get DPDMUX dev handle from list using index */\n \tTAILQ_FOREACH(dpdmux_dev, &dpdmux_dev_list, next) {\n \t\tif (dpdmux_dev->dpdmux_id == dpdmux_id)\n \t\t\tbreak;\n@@ -359,9 +359,25 @@ dpaa2_create_dpdmux_device(int vdev_fd __rte_unused,\n \treturn -1;\n }\n \n+static void\n+dpaa2_close_dpdmux_device(int object_id)\n+{\n+\tstruct dpaa2_dpdmux_dev *dpdmux_dev;\n+\n+\tdpdmux_dev = get_dpdmux_from_id((uint32_t)object_id);\n+\n+\tif (dpdmux_dev) {\n+\t\tdpdmux_close(&dpdmux_dev->dpdmux, CMD_PRI_LOW,\n+\t\t\t dpdmux_dev->token);\n+\t\tTAILQ_REMOVE(&dpdmux_dev_list, dpdmux_dev, next);\n+\t\trte_free(dpdmux_dev);\n+\t}\n+}\n+\n static struct rte_dpaa2_object rte_dpaa2_dpdmux_obj = {\n \t.dev_type = DPAA2_MUX,\n \t.create = dpaa2_create_dpdmux_device,\n+\t.close = dpaa2_close_dpdmux_device,\n };\n \n RTE_PMD_REGISTER_DPAA2_OBJECT(dpdmux, rte_dpaa2_dpdmux_obj);\n", "prefixes": [ "v5", "2/2" ] }