Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/115852/?format=api
{ "id": 115852, "url": "http://patches.dpdk.org/api/patches/115852/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220905083933.2506819-13-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": "<20220905083933.2506819-13-david.marchand@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220905083933.2506819-13-david.marchand@redhat.com", "date": "2022-09-05T08:39:18", "name": "[v5,12/27] bus/dpaa: make driver-only headers private", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "f0b6abe5230f2d520caa27bf91ae8013013ec4d2", "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/20220905083933.2506819-13-david.marchand@redhat.com/mbox/", "series": [ { "id": 24531, "url": "http://patches.dpdk.org/api/series/24531/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=24531", "date": "2022-09-05T08:39:07", "name": "[v5,01/27] devtools: forbid inclusions of driver only headers", "version": 5, "mbox": "http://patches.dpdk.org/series/24531/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/115852/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/115852/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 5C70EA054A;\n\tMon, 5 Sep 2022 10:40:58 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 599AA427F6;\n\tMon, 5 Sep 2022 10:40:28 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.133.124])\n by mails.dpdk.org (Postfix) with ESMTP id 8E0C042847\n for <dev@dpdk.org>; Mon, 5 Sep 2022 10:40:27 +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-628-CRZ1lK99NnqNijVxzQTBPg-1; Mon, 05 Sep 2022 04:40:21 -0400", "from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com\n [10.11.54.1])\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 419CD18812C0;\n Mon, 5 Sep 2022 08:40:21 +0000 (UTC)", "from fchome.redhat.com (unknown [10.40.193.251])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 08ADB40149B6;\n Mon, 5 Sep 2022 08:40:19 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1662367227;\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=0SCu+R3aBS8gtrOl15ZftN0gouavgHHIx1VzpHae0LI=;\n b=YKX/uu8P8gCDJ3bzCswOFP5ZOiuk+LoGPZm/oYz+UKL4h3KFCTGJkRpPBCatqTB7m/r4nx\n 0Mn31Zj0M8u+YeknLBjObbflidMuq4e/hn8/Cn/yYAqsfiP/BKUpw4rskJC3rBaVACBcpB\n +nEw3n9RmWN6lnxY57ohOm+Qub6ymCI=", "X-MC-Unique": "CRZ1lK99NnqNijVxzQTBPg-1", "From": "David Marchand <david.marchand@redhat.com>", "To": "dev@dpdk.org", "Cc": "thomas@monjalon.net, bruce.richardson@intel.com,\n Hemant Agrawal <hemant.agrawal@nxp.com>,\n Sachin Saxena <sachin.saxena@oss.nxp.com>,\n Gagandeep Singh <g.singh@nxp.com>", "Subject": "[PATCH v5 12/27] bus/dpaa: make driver-only headers private", "Date": "Mon, 5 Sep 2022 10:39:18 +0200", "Message-Id": "<20220905083933.2506819-13-david.marchand@redhat.com>", "In-Reply-To": "<20220905083933.2506819-1-david.marchand@redhat.com>", "References": "<20220628144643.1213026-1-david.marchand@redhat.com>\n <20220905083933.2506819-1-david.marchand@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 2.84 on 10.11.54.1", "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 dpaa 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>\nAcked-by: Hemant Agrawal <hemant.agrawal@nxp.com>\n---\nChanges since RFC v2: \n- squashed cleanup for this bus code from other patches,\n- updated release notes,\n\n---\n drivers/bus/dpaa/base/qbman/qman.c | 2 +-\n .../{rte_dpaa_bus.h => bus_dpaa_driver.h} | 25 ++++++-------------\n drivers/bus/dpaa/dpaa_bus.c | 20 +++++++--------\n drivers/crypto/dpaa_sec/dpaa_sec.c | 2 +-\n drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c | 2 +-\n drivers/dma/dpaa/dpaa_qdma.c | 2 +-\n drivers/event/dpaa/dpaa_eventdev.c | 2 +-\n drivers/mempool/dpaa/dpaa_mempool.h | 2 +-\n drivers/net/dpaa/dpaa_ethdev.c | 2 +-\n drivers/net/dpaa/dpaa_rxtx.c | 2 +-\n 10 files changed, 26 insertions(+), 35 deletions(-)\n rename drivers/bus/dpaa/{rte_dpaa_bus.h => bus_dpaa_driver.h} (92%)", "diff": "diff --git a/drivers/bus/dpaa/base/qbman/qman.c b/drivers/bus/dpaa/base/qbman/qman.c\nindex 447c091770..3949bf8712 100644\n--- a/drivers/bus/dpaa/base/qbman/qman.c\n+++ b/drivers/bus/dpaa/base/qbman/qman.c\n@@ -7,7 +7,7 @@\n \n #include \"qman.h\"\n #include <rte_branch_prediction.h>\n-#include <rte_dpaa_bus.h>\n+#include <bus_dpaa_driver.h>\n #include <rte_eventdev.h>\n #include <rte_byteorder.h>\n \ndiff --git a/drivers/bus/dpaa/rte_dpaa_bus.h b/drivers/bus/dpaa/bus_dpaa_driver.h\nsimilarity index 92%\nrename from drivers/bus/dpaa/rte_dpaa_bus.h\nrename to drivers/bus/dpaa/bus_dpaa_driver.h\nindex 1f04d9ebd3..cf66fc0c53 100644\n--- a/drivers/bus/dpaa/rte_dpaa_bus.h\n+++ b/drivers/bus/dpaa/bus_dpaa_driver.h\n@@ -3,12 +3,14 @@\n * Copyright 2017-2022 NXP\n *\n */\n-#ifndef __RTE_DPAA_BUS_H__\n-#define __RTE_DPAA_BUS_H__\n+#ifndef BUS_DPAA_DRIVER_H\n+#define BUS_DPAA_DRIVER_H\n \n-#include <rte_bus.h>\n+#include <rte_compat.h>\n+#include <rte_dev.h>\n #include <rte_mbuf_dyn.h>\n #include <rte_mempool.h>\n+\n #include <dpaax_iova_table.h>\n \n #include <dpaa_of.h>\n@@ -73,24 +75,12 @@ extern unsigned int dpaa_svr_family;\n struct rte_dpaa_device;\n struct rte_dpaa_driver;\n \n-/* DPAA Device and Driver lists for DPAA bus */\n-TAILQ_HEAD(rte_dpaa_device_list, rte_dpaa_device);\n-TAILQ_HEAD(rte_dpaa_driver_list, rte_dpaa_driver);\n-\n enum rte_dpaa_type {\n \tFSL_DPAA_ETH = 1,\n \tFSL_DPAA_CRYPTO,\n \tFSL_DPAA_QDMA\n };\n \n-struct rte_dpaa_bus {\n-\tstruct rte_bus bus;\n-\tstruct rte_dpaa_device_list device_list;\n-\tstruct rte_dpaa_driver_list driver_list;\n-\tint device_count;\n-\tint detected;\n-};\n-\n struct dpaa_device_id {\n \tuint8_t fman_id; /**< Fman interface ID, for ETH type device */\n \tuint8_t mac_id; /**< Fman MAC interface ID, for ETH type device */\n@@ -119,7 +109,6 @@ typedef int (*rte_dpaa_remove_t)(struct rte_dpaa_device *dpaa_dev);\n struct rte_dpaa_driver {\n \tTAILQ_ENTRY(rte_dpaa_driver) next;\n \tstruct rte_driver driver;\n-\tstruct rte_dpaa_bus *dpaa_bus;\n \tenum rte_dpaa_type drv_type;\n \trte_dpaa_probe_t probe;\n \trte_dpaa_remove_t remove;\n@@ -166,6 +155,7 @@ extern struct dpaa_memseg_list rte_dpaa_memsegs;\n /* Either iterate over the list of internal memseg references or fallback to\n * EAL memseg based iova2virt.\n */\n+__rte_internal\n static inline void *rte_dpaa_mem_ptov(phys_addr_t paddr)\n {\n \tstruct dpaa_memseg *ms;\n@@ -192,6 +182,7 @@ static inline void *rte_dpaa_mem_ptov(phys_addr_t paddr)\n \treturn va;\n }\n \n+__rte_internal\n static inline rte_iova_t\n rte_dpaa_mem_vtop(void *vaddr)\n {\n@@ -263,4 +254,4 @@ struct fm_eth_port_cfg *dpaa_get_eth_port_cfg(int dev_id);\n }\n #endif\n \n-#endif /* __RTE_DPAA_BUS_H__ */\n+#endif /* BUS_DPAA_DRIVER_H */\ndiff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c\nindex e442bc4c33..1ac6aa314f 100644\n--- a/drivers/bus/dpaa/dpaa_bus.c\n+++ b/drivers/bus/dpaa/dpaa_bus.c\n@@ -34,7 +34,7 @@\n #include <rte_mbuf_dyn.h>\n \n #include <dpaa_of.h>\n-#include <rte_dpaa_bus.h>\n+#include <bus_dpaa_driver.h>\n #include <rte_dpaa_logs.h>\n #include <dpaax_iova_table.h>\n \n@@ -43,6 +43,14 @@\n #include <fsl_bman.h>\n #include <netcfg.h>\n \n+struct rte_dpaa_bus {\n+\tstruct rte_bus bus;\n+\tTAILQ_HEAD(, rte_dpaa_device) device_list;\n+\tTAILQ_HEAD(, rte_dpaa_driver) driver_list;\n+\tint device_count;\n+\tint detected;\n+};\n+\n static struct rte_dpaa_bus rte_dpaa_bus;\n struct netcfg_info *dpaa_netcfg;\n \n@@ -520,23 +528,15 @@ rte_dpaa_driver_register(struct rte_dpaa_driver *driver)\n \tBUS_INIT_FUNC_TRACE();\n \n \tTAILQ_INSERT_TAIL(&rte_dpaa_bus.driver_list, driver, next);\n-\t/* Update Bus references */\n-\tdriver->dpaa_bus = &rte_dpaa_bus;\n }\n \n /* un-register a dpaa bus based dpaa driver */\n void\n rte_dpaa_driver_unregister(struct rte_dpaa_driver *driver)\n {\n-\tstruct rte_dpaa_bus *dpaa_bus;\n-\n \tBUS_INIT_FUNC_TRACE();\n \n-\tdpaa_bus = driver->dpaa_bus;\n-\n-\tTAILQ_REMOVE(&dpaa_bus->driver_list, driver, next);\n-\t/* Update Bus references */\n-\tdriver->dpaa_bus = NULL;\n+\tTAILQ_REMOVE(&rte_dpaa_bus.driver_list, driver, next);\n }\n \n static int\ndiff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c\nindex 05415dbf3b..7e554cb2b1 100644\n--- a/drivers/crypto/dpaa_sec/dpaa_sec.c\n+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c\n@@ -41,7 +41,7 @@\n #include <desc/pdcp.h>\n #include <desc/sdap.h>\n \n-#include <rte_dpaa_bus.h>\n+#include <bus_dpaa_driver.h>\n #include <dpaa_sec.h>\n #include <dpaa_sec_event.h>\n #include <dpaa_sec_log.h>\ndiff --git a/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c b/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c\nindex d081953e26..29c5935739 100644\n--- a/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c\n+++ b/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c\n@@ -15,7 +15,7 @@\n #include <desc/algo.h>\n #include <desc/ipsec.h>\n \n-#include <rte_dpaa_bus.h>\n+#include <bus_dpaa_driver.h>\n #include <dpaa_sec.h>\n #include <dpaa_sec_log.h>\n \ndiff --git a/drivers/dma/dpaa/dpaa_qdma.c b/drivers/dma/dpaa/dpaa_qdma.c\nindex 9386fe5698..10e65ef1d7 100644\n--- a/drivers/dma/dpaa/dpaa_qdma.c\n+++ b/drivers/dma/dpaa/dpaa_qdma.c\n@@ -2,7 +2,7 @@\n * Copyright 2021 NXP\n */\n \n-#include <rte_dpaa_bus.h>\n+#include <bus_dpaa_driver.h>\n #include <rte_dmadev_pmd.h>\n \n #include \"dpaa_qdma.h\"\ndiff --git a/drivers/event/dpaa/dpaa_eventdev.c b/drivers/event/dpaa/dpaa_eventdev.c\nindex ff6cc0be18..aa403f9e06 100644\n--- a/drivers/event/dpaa/dpaa_eventdev.c\n+++ b/drivers/event/dpaa/dpaa_eventdev.c\n@@ -29,7 +29,7 @@\n #include <rte_event_eth_rx_adapter.h>\n #include <rte_event_eth_tx_adapter.h>\n #include <cryptodev_pmd.h>\n-#include <rte_dpaa_bus.h>\n+#include <bus_dpaa_driver.h>\n #include <rte_dpaa_logs.h>\n #include <rte_cycles.h>\n #include <rte_kvargs.h>\ndiff --git a/drivers/mempool/dpaa/dpaa_mempool.h b/drivers/mempool/dpaa/dpaa_mempool.h\nindex dc0058e6dd..3f0eafa7dd 100644\n--- a/drivers/mempool/dpaa/dpaa_mempool.h\n+++ b/drivers/mempool/dpaa/dpaa_mempool.h\n@@ -14,7 +14,7 @@\n \n #include <rte_mempool.h>\n \n-#include <rte_dpaa_bus.h>\n+#include <bus_dpaa_driver.h>\n #include <rte_dpaa_logs.h>\n \n #include <fsl_usd.h>\ndiff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c\nindex e5a072cf49..f21cbba0d9 100644\n--- a/drivers/net/dpaa/dpaa_ethdev.c\n+++ b/drivers/net/dpaa/dpaa_ethdev.c\n@@ -33,7 +33,7 @@\n #include <rte_malloc.h>\n #include <rte_ring.h>\n \n-#include <rte_dpaa_bus.h>\n+#include <bus_dpaa_driver.h>\n #include <rte_dpaa_logs.h>\n #include <dpaa_mempool.h>\n \ndiff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c\nindex 956fe946fa..20b75efb63 100644\n--- a/drivers/net/dpaa/dpaa_rxtx.c\n+++ b/drivers/net/dpaa/dpaa_rxtx.c\n@@ -37,7 +37,7 @@\n \n #include \"dpaa_ethdev.h\"\n #include \"dpaa_rxtx.h\"\n-#include <rte_dpaa_bus.h>\n+#include <bus_dpaa_driver.h>\n #include <dpaa_mempool.h>\n \n #include <qman.h>\n", "prefixes": [ "v5", "12/27" ] }