Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/114384/?format=api
{ "id": 114384, "url": "http://patches.dpdk.org/api/patches/114384/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220728152640.547725-14-david.marchand@redhat.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": "<20220728152640.547725-14-david.marchand@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220728152640.547725-14-david.marchand@redhat.com", "date": "2022-07-28T15:26:27", "name": "[RFC,v3,13/26] bus/fslmc: make driver-only headers private", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "deeb9f32d3ca7ebc9d078cdf2bef8ff8c7d2e22e", "submitter": { "id": 1173, "url": "http://patches.dpdk.org/api/people/1173/?format=api", "name": "David Marchand", "email": "david.marchand@redhat.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20220728152640.547725-14-david.marchand@redhat.com/mbox/", "series": [ { "id": 24118, "url": "http://patches.dpdk.org/api/series/24118/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=24118", "date": "2022-07-28T15:26:14", "name": "Bus and device cleanup for 22.11", "version": 3, "mbox": "http://patches.dpdk.org/series/24118/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/114384/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/114384/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 E4EBCA00C5;\n\tThu, 28 Jul 2022 17:28:07 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 18D4942BFF;\n\tThu, 28 Jul 2022 17:27:36 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.129.124])\n by mails.dpdk.org (Postfix) with ESMTP id 0B7FD42BBE\n for <dev@dpdk.org>; Thu, 28 Jul 2022 17:27:33 +0200 (CEST)", "from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-443-1UgtA4c4O1Saz7CbJg5kvg-1; Thu, 28 Jul 2022 11:27:32 -0400", "from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com\n [10.11.54.7])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E1F40811E7A;\n Thu, 28 Jul 2022 15:27:31 +0000 (UTC)", "from fchome.redhat.com (unknown [10.40.195.18])\n by smtp.corp.redhat.com (Postfix) with ESMTP id CE4CB1415118;\n Thu, 28 Jul 2022 15:27:30 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1659022053;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=2kdMxcus5h2CRrr5xxsfWoqM6pkpOL519iOSqAZDVQA=;\n b=evmcwrUy0ULVTvPbc22wFQZMsZ3H5u06VN5tlJwQUagiEuWv37Rnh5OnsjPDusS+YgcO+P\n fdPEIiZcvTQbmbuBsmcLoeDX5iwYEdRVxLZvmUVhkvwdlHbaMUVnQurMnfp5LOEYfPLCnH\n c0q6UaSCLMSb23Oc2ISZAnXymqoVxXk=", "X-MC-Unique": "1UgtA4c4O1Saz7CbJg5kvg-1", "From": "David Marchand <david.marchand@redhat.com>", "To": "dev@dpdk.org", "Cc": "Hemant Agrawal <hemant.agrawal@nxp.com>,\n Sachin Saxena <sachin.saxena@oss.nxp.com>,\n Gagandeep Singh <g.singh@nxp.com>", "Subject": "[RFC v3 13/26] bus/fslmc: make driver-only headers private", "Date": "Thu, 28 Jul 2022 17:26:27 +0200", "Message-Id": "<20220728152640.547725-14-david.marchand@redhat.com>", "In-Reply-To": "<20220728152640.547725-1-david.marchand@redhat.com>", "References": "<20220628144643.1213026-1-david.marchand@redhat.com>\n <20220728152640.547725-1-david.marchand@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 2.85 on 10.11.54.7", "Authentication-Results": "relay.mimecast.com;\n auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"; x-default=true", "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": "The fslmc bus interface is for drivers only.\nMark as internal and move the header in the driver headers list.\n\nWhile at it, cleanup internal structures:\n- remove unneeded reference to bus specific singleton object,\n- remove unneeded list head structure type,\n- reorder the definitions and macro manipulating the bus singleton object,\n- remove inclusion of rte_bus.h and update code that relied on it,\n\nSigned-off-by: David Marchand <david.marchand@redhat.com>\n---\nChanges since RFC v2: \n- squashed cleanup for this bus code from other patches,\n- updated release notes,\n\n---\n .../fslmc/{rte_fslmc.h => bus_fslmc_driver.h} | 28 +++----------------\n drivers/bus/fslmc/fslmc_bus.c | 12 ++------\n drivers/bus/fslmc/fslmc_vfio.c | 3 +-\n drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c | 2 +-\n drivers/bus/fslmc/portal/dpaa2_hw_dpci.c | 2 +-\n drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 2 +-\n drivers/bus/fslmc/portal/dpaa2_hw_dprc.c | 2 +-\n drivers/bus/fslmc/private.h | 27 ++++++++++++++++++\n drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 2 +-\n drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c | 2 +-\n drivers/dma/dpaa2/dpaa2_qdma.c | 2 +-\n drivers/event/dpaa2/dpaa2_eventdev.c | 2 +-\n drivers/event/dpaa2/dpaa2_eventdev_selftest.c | 2 +-\n drivers/event/dpaa2/dpaa2_hw_dpcon.c | 2 +-\n drivers/net/dpaa2/dpaa2_ethdev.c | 2 +-\n drivers/net/dpaa2/dpaa2_ethdev.h | 2 +-\n drivers/net/dpaa2/dpaa2_mux.c | 2 +-\n drivers/net/dpaa2/dpaa2_ptp.c | 2 +-\n drivers/net/dpaa2/dpaa2_recycle.c | 2 +-\n drivers/net/dpaa2/dpaa2_rxtx.c | 2 +-\n 20 files changed, 50 insertions(+), 52 deletions(-)\n rename drivers/bus/fslmc/{rte_fslmc.h => bus_fslmc_driver.h} (89%)\n create mode 100644 drivers/bus/fslmc/private.h", "diff": "diff --git a/drivers/bus/fslmc/rte_fslmc.h b/drivers/bus/fslmc/bus_fslmc_driver.h\nsimilarity index 89%\nrename from drivers/bus/fslmc/rte_fslmc.h\nrename to drivers/bus/fslmc/bus_fslmc_driver.h\nindex 8c67bfba55..798ddebf3a 100644\n--- a/drivers/bus/fslmc/rte_fslmc.h\n+++ b/drivers/bus/fslmc/bus_fslmc_driver.h\n@@ -4,8 +4,8 @@\n *\n */\n \n-#ifndef _RTE_FSLMC_H_\n-#define _RTE_FSLMC_H_\n+#ifndef BUS_FSLMC_DRIVER_H\n+#define BUS_FSLMC_DRIVER_H\n \n /**\n * @file\n@@ -26,10 +26,10 @@ extern \"C\" {\n #include <inttypes.h>\n #include <linux/vfio.h>\n \n+#include <rte_compat.h>\n #include <rte_debug.h>\n #include <rte_interrupts.h>\n #include <rte_dev.h>\n-#include <rte_bus.h>\n #include <rte_tailq.h>\n #include <rte_devargs.h>\n #include <rte_mbuf.h>\n@@ -69,15 +69,9 @@ dpaa2_seqn(struct rte_mbuf *mbuf)\n \n struct rte_dpaa2_driver;\n \n-/* DPAA2 Device and Driver lists for FSLMC bus */\n-TAILQ_HEAD(rte_fslmc_device_list, rte_dpaa2_device);\n-TAILQ_HEAD(rte_fslmc_driver_list, rte_dpaa2_driver);\n-\n #define RTE_DEV_TO_FSLMC_CONST(ptr) \\\n \tcontainer_of(ptr, const struct rte_dpaa2_device, device)\n \n-extern struct rte_fslmc_bus rte_fslmc_bus;\n-\n enum rte_dpaa2_dev_type {\n \t/* Devices backed by DPDK driver */\n \tDPAA2_ETH,\t/**< DPNI type device*/\n@@ -146,26 +140,12 @@ typedef int (*rte_dpaa2_remove_t)(struct rte_dpaa2_device *dpaa2_dev);\n struct rte_dpaa2_driver {\n \tTAILQ_ENTRY(rte_dpaa2_driver) next; /**< Next in list. */\n \tstruct rte_driver driver; /**< Inherit core driver. */\n-\tstruct rte_fslmc_bus *fslmc_bus; /**< FSLMC bus reference */\n \tuint32_t drv_flags; /**< Flags for controlling device.*/\n \tenum rte_dpaa2_dev_type drv_type; /**< Driver Type */\n \trte_dpaa2_probe_t probe;\n \trte_dpaa2_remove_t remove;\n };\n \n-/*\n- * FSLMC bus\n- */\n-struct rte_fslmc_bus {\n-\tstruct rte_bus bus; /**< Generic Bus object */\n-\tstruct rte_fslmc_device_list device_list;\n-\t\t\t\t/**< FSLMC DPAA2 Device list */\n-\tstruct rte_fslmc_driver_list driver_list;\n-\t\t\t\t/**< FSLMC DPAA2 Driver list */\n-\tint device_count[DPAA2_DEVTYPE_MAX];\n-\t\t\t\t/**< Count of all devices scanned */\n-};\n-\n /**\n * Register a DPAA2 driver.\n *\n@@ -230,4 +210,4 @@ RTE_PMD_EXPORT_NAME(nm, __COUNTER__)\n }\n #endif\n \n-#endif /* _RTE_FSLMC_H_ */\n+#endif /* BUS_FSLMC_DRIVER_H */\ndiff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c\nindex e9edc27e0a..b9b0981329 100644\n--- a/drivers/bus/fslmc/fslmc_bus.c\n+++ b/drivers/bus/fslmc/fslmc_bus.c\n@@ -16,7 +16,7 @@\n #include <ethdev_driver.h>\n #include <rte_mbuf_dyn.h>\n \n-#include <rte_fslmc.h>\n+#include \"private.h\"\n #include <fslmc_vfio.h>\n #include \"fslmc_logs.h\"\n \n@@ -530,27 +530,19 @@ rte_fslmc_driver_register(struct rte_dpaa2_driver *driver)\n \tRTE_VERIFY(driver);\n \n \tTAILQ_INSERT_TAIL(&rte_fslmc_bus.driver_list, driver, next);\n-\t/* Update Bus references */\n-\tdriver->fslmc_bus = &rte_fslmc_bus;\n }\n \n /*un-register a fslmc bus based dpaa2 driver */\n void\n rte_fslmc_driver_unregister(struct rte_dpaa2_driver *driver)\n {\n-\tstruct rte_fslmc_bus *fslmc_bus;\n-\n-\tfslmc_bus = driver->fslmc_bus;\n-\n \t/* Cleanup the PA->VA Translation table; From wherever this function\n \t * is called from.\n \t */\n \tif (rte_eal_iova_mode() == RTE_IOVA_PA)\n \t\tdpaax_iova_table_depopulate();\n \n-\tTAILQ_REMOVE(&fslmc_bus->driver_list, driver, next);\n-\t/* Update Bus references */\n-\tdriver->fslmc_bus = NULL;\n+\tTAILQ_REMOVE(&rte_fslmc_bus.driver_list, driver, next);\n }\n \n /*\ndiff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c\nindex 3d4e71a80a..8604e43947 100644\n--- a/drivers/bus/fslmc/fslmc_vfio.c\n+++ b/drivers/bus/fslmc/fslmc_vfio.c\n@@ -29,10 +29,9 @@\n #include <rte_cycles.h>\n #include <rte_kvargs.h>\n #include <rte_dev.h>\n-#include <rte_bus.h>\n #include <rte_eal_memconfig.h>\n \n-#include \"rte_fslmc.h\"\n+#include \"private.h\"\n #include \"fslmc_vfio.h\"\n #include \"fslmc_logs.h\"\n #include <mc/fsl_dpmng.h>\ndiff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c\nindex 122aa1740d..cfe4280f87 100644\n--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c\n+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c\n@@ -23,7 +23,7 @@\n #include <rte_mbuf_pool_ops.h>\n \n #include <fslmc_logs.h>\n-#include <rte_fslmc.h>\n+#include <bus_fslmc_driver.h>\n #include <mc/fsl_dpbp.h>\n #include \"portal/dpaa2_hw_pvt.h\"\n #include \"portal/dpaa2_hw_dpio.h\"\ndiff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c\nindex 8ed969c7c0..b7d81b518c 100644\n--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c\n+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c\n@@ -21,7 +21,7 @@\n #include <ethdev_driver.h>\n \n #include <fslmc_logs.h>\n-#include <rte_fslmc.h>\n+#include <bus_fslmc_driver.h>\n #include <mc/fsl_dpci.h>\n #include \"portal/dpaa2_hw_pvt.h\"\n #include \"portal/dpaa2_hw_dpio.h\"\ndiff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c\nindex 22c51c1a82..071b0d297d 100644\n--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c\n+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c\n@@ -33,7 +33,7 @@\n #include <rte_dev.h>\n \n #include <fslmc_logs.h>\n-#include <rte_fslmc.h>\n+#include <bus_fslmc_driver.h>\n #include \"dpaa2_hw_pvt.h\"\n #include \"dpaa2_hw_dpio.h\"\n #include <mc/fsl_dpmng.h>\ndiff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c b/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c\nindex ca1d0304d5..223e34bcba 100644\n--- a/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c\n+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c\n@@ -12,8 +12,8 @@\n #include <rte_malloc.h>\n #include <rte_dev.h>\n \n+#include \"private.h\"\n #include <fslmc_logs.h>\n-#include <rte_fslmc.h>\n #include <mc/fsl_dprc.h>\n #include \"portal/dpaa2_hw_pvt.h\"\n \ndiff --git a/drivers/bus/fslmc/private.h b/drivers/bus/fslmc/private.h\nnew file mode 100644\nindex 0000000000..60d68155e1\n--- /dev/null\n+++ b/drivers/bus/fslmc/private.h\n@@ -0,0 +1,27 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright 2016,2021 NXP\n+ */\n+\n+#ifndef BUS_FSLMC_PRIVATE_H\n+#define BUS_FSLMC_PRIVATE_H\n+\n+#include <rte_bus.h>\n+\n+#include <bus_fslmc_driver.h>\n+\n+/*\n+ * FSLMC bus\n+ */\n+struct rte_fslmc_bus {\n+\tstruct rte_bus bus; /**< Generic Bus object */\n+\tTAILQ_HEAD(, rte_dpaa2_device) device_list;\n+\t\t\t\t/**< FSLMC DPAA2 Device list */\n+\tTAILQ_HEAD(, rte_dpaa2_driver) driver_list;\n+\t\t\t\t/**< FSLMC DPAA2 Driver list */\n+\tint device_count[DPAA2_DEVTYPE_MAX];\n+\t\t\t\t/**< Count of all devices scanned */\n+};\n+\n+extern struct rte_fslmc_bus rte_fslmc_bus;\n+\n+#endif /* BUS_FSLMC_PRIVATE_H */\ndiff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c\nindex 8444f1a795..0cce861899 100644\n--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c\n+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c\n@@ -20,7 +20,7 @@\n #include <rte_dev.h>\n #include <cryptodev_pmd.h>\n #include <rte_common.h>\n-#include <rte_fslmc.h>\n+#include <bus_fslmc_driver.h>\n #include <fslmc_vfio.h>\n #include <dpaa2_hw_pvt.h>\n #include <dpaa2_hw_dpio.h>\ndiff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c\nindex e68a4875dd..b3242791ac 100644\n--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c\n+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c\n@@ -3,7 +3,7 @@\n */\n \n #include <cryptodev_pmd.h>\n-#include <rte_fslmc.h>\n+#include <bus_fslmc_driver.h>\n #include <fslmc_vfio.h>\n #include <dpaa2_hw_pvt.h>\n #include <dpaa2_hw_dpio.h>\ndiff --git a/drivers/dma/dpaa2/dpaa2_qdma.c b/drivers/dma/dpaa2/dpaa2_qdma.c\nindex 0500e8c225..d5a5f08ecc 100644\n--- a/drivers/dma/dpaa2/dpaa2_qdma.c\n+++ b/drivers/dma/dpaa2/dpaa2_qdma.c\n@@ -3,7 +3,7 @@\n */\n \n #include <rte_eal.h>\n-#include <rte_fslmc.h>\n+#include <bus_fslmc_driver.h>\n #include <rte_dmadev.h>\n #include <rte_dmadev_pmd.h>\n #include <rte_kvargs.h>\ndiff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c\nindex ffc7b8b073..5de3e9e5f5 100644\n--- a/drivers/event/dpaa2/dpaa2_eventdev.c\n+++ b/drivers/event/dpaa2/dpaa2_eventdev.c\n@@ -16,7 +16,7 @@\n #include <rte_debug.h>\n #include <rte_dev.h>\n #include <rte_eal.h>\n-#include <rte_fslmc.h>\n+#include <bus_fslmc_driver.h>\n #include <rte_lcore.h>\n #include <rte_log.h>\n #include <rte_malloc.h>\ndiff --git a/drivers/event/dpaa2/dpaa2_eventdev_selftest.c b/drivers/event/dpaa2/dpaa2_eventdev_selftest.c\nindex b549bdfcbb..941fb8fc43 100644\n--- a/drivers/event/dpaa2/dpaa2_eventdev_selftest.c\n+++ b/drivers/event/dpaa2/dpaa2_eventdev_selftest.c\n@@ -19,7 +19,7 @@\n #include <rte_random.h>\n #include <rte_bus_vdev.h>\n #include <rte_test.h>\n-#include <rte_fslmc.h>\n+#include <bus_fslmc_driver.h>\n \n #include \"dpaa2_eventdev.h\"\n #include \"dpaa2_eventdev_logs.h\"\ndiff --git a/drivers/event/dpaa2/dpaa2_hw_dpcon.c b/drivers/event/dpaa2/dpaa2_hw_dpcon.c\nindex acc1fde771..3882a9cf1d 100644\n--- a/drivers/event/dpaa2/dpaa2_hw_dpcon.c\n+++ b/drivers/event/dpaa2/dpaa2_hw_dpcon.c\n@@ -20,7 +20,7 @@\n #include <rte_dev.h>\n #include <ethdev_driver.h>\n \n-#include <rte_fslmc.h>\n+#include <bus_fslmc_driver.h>\n #include <mc/fsl_dpcon.h>\n #include <portal/dpaa2_hw_pvt.h>\n #include \"dpaa2_eventdev.h\"\ndiff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c\nindex 52eb6df310..f876f4790c 100644\n--- a/drivers/net/dpaa2/dpaa2_ethdev.c\n+++ b/drivers/net/dpaa2/dpaa2_ethdev.c\n@@ -16,7 +16,7 @@\n #include <rte_cycles.h>\n #include <rte_kvargs.h>\n #include <rte_dev.h>\n-#include <rte_fslmc.h>\n+#include <bus_fslmc_driver.h>\n #include <rte_flow_driver.h>\n #include \"rte_dpaa2_mempool.h\"\n \ndiff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h\nindex a459181139..f69df95253 100644\n--- a/drivers/net/dpaa2/dpaa2_ethdev.h\n+++ b/drivers/net/dpaa2/dpaa2_ethdev.h\n@@ -11,7 +11,7 @@\n #include <rte_event_eth_rx_adapter.h>\n #include <rte_pmd_dpaa2.h>\n \n-#include <rte_fslmc.h>\n+#include <bus_fslmc_driver.h>\n #include <dpaa2_hw_pvt.h>\n #include \"dpaa2_tm.h\"\n \ndiff --git a/drivers/net/dpaa2/dpaa2_mux.c b/drivers/net/dpaa2/dpaa2_mux.c\nindex e8689a7832..3289f388e1 100644\n--- a/drivers/net/dpaa2/dpaa2_mux.c\n+++ b/drivers/net/dpaa2/dpaa2_mux.c\n@@ -16,7 +16,7 @@\n #include <rte_flow_driver.h>\n #include <rte_tailq.h>\n \n-#include <rte_fslmc.h>\n+#include <bus_fslmc_driver.h>\n #include <fsl_dpdmux.h>\n #include <fsl_dpkg.h>\n \ndiff --git a/drivers/net/dpaa2/dpaa2_ptp.c b/drivers/net/dpaa2/dpaa2_ptp.c\nindex 4e6d375d1c..c08aa0f3bf 100644\n--- a/drivers/net/dpaa2/dpaa2_ptp.c\n+++ b/drivers/net/dpaa2/dpaa2_ptp.c\n@@ -16,7 +16,7 @@\n #include <rte_malloc.h>\n #include <rte_time.h>\n \n-#include <rte_fslmc.h>\n+#include <bus_fslmc_driver.h>\n #include <fsl_dprtc.h>\n #include <fsl_dpkg.h>\n \ndiff --git a/drivers/net/dpaa2/dpaa2_recycle.c b/drivers/net/dpaa2/dpaa2_recycle.c\nindex 336506dc0d..932570c6e0 100644\n--- a/drivers/net/dpaa2/dpaa2_recycle.c\n+++ b/drivers/net/dpaa2/dpaa2_recycle.c\n@@ -15,7 +15,7 @@\n #include <rte_cycles.h>\n #include <rte_kvargs.h>\n #include <rte_dev.h>\n-#include <rte_fslmc.h>\n+#include <bus_fslmc_driver.h>\n #include <rte_flow_driver.h>\n \n #include \"dpaa2_pmd_logs.h\"\ndiff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c\nindex c17f6ebda9..7b9c528d13 100644\n--- a/drivers/net/dpaa2/dpaa2_rxtx.c\n+++ b/drivers/net/dpaa2/dpaa2_rxtx.c\n@@ -16,7 +16,7 @@\n #include <rte_dev.h>\n #include <rte_hexdump.h>\n \n-#include <rte_fslmc.h>\n+#include <bus_fslmc_driver.h>\n #include <fslmc_vfio.h>\n #include <dpaa2_hw_pvt.h>\n #include <dpaa2_hw_dpio.h>\n", "prefixes": [ "RFC", "v3", "13/26" ] }