Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 60312,
    "url": "http://patches.dpdk.org/api/patches/60312/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20191001110209.6047-2-g.singh@nxp.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": "<20191001110209.6047-2-g.singh@nxp.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20191001110209.6047-2-g.singh@nxp.com",
    "date": "2019-10-01T11:01:56",
    "name": "[v3,01/14] common/dpaax: moving OF lib code from dpaa bus",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "4e99c4609a944a233f92c149ee951f031b87e7d8",
    "submitter": {
        "id": 1068,
        "url": "http://patches.dpdk.org/api/people/1068/?format=api",
        "name": "Gagandeep Singh",
        "email": "g.singh@nxp.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/20191001110209.6047-2-g.singh@nxp.com/mbox/",
    "series": [
        {
            "id": 6647,
            "url": "http://patches.dpdk.org/api/series/6647/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=6647",
            "date": "2019-10-01T11:01:55",
            "name": "introduces ppfe network PMD",
            "version": 3,
            "mbox": "http://patches.dpdk.org/series/6647/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/60312/comments/",
    "check": "warning",
    "checks": "http://patches.dpdk.org/api/patches/60312/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@dpdk.org",
        "Delivered-To": "patchwork@dpdk.org",
        "Received": [
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 00D485681;\n\tTue,  1 Oct 2019 13:17:29 +0200 (CEST)",
            "from inva021.nxp.com (inva021.nxp.com [92.121.34.21])\n\tby dpdk.org (Postfix) with ESMTP id EAD42397D\n\tfor <dev@dpdk.org>; Tue,  1 Oct 2019 13:17:25 +0200 (CEST)",
            "from inva021.nxp.com (localhost [127.0.0.1])\n\tby inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 78C2A200540;\n\tTue,  1 Oct 2019 13:17:25 +0200 (CEST)",
            "from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com\n\t[165.114.16.14])\n\tby inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id DC4C3200536;\n\tTue,  1 Oct 2019 13:17:22 +0200 (CEST)",
            "from GDB1.ap.freescale.net (GDB1.ap.freescale.net [10.232.132.179])\n\tby invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 3A192402DA;\n\tTue,  1 Oct 2019 19:17:19 +0800 (SGT)"
        ],
        "From": "Gagandeep Singh <g.singh@nxp.com>",
        "To": "dev@dpdk.org,\n\tferruh.yigit@intel.com",
        "Cc": "thomas@monjalon.net,\n\tHemant Agrawal <hemant.agrawal@nxp.com>",
        "Date": "Tue,  1 Oct 2019 16:31:56 +0530",
        "Message-Id": "<20191001110209.6047-2-g.singh@nxp.com>",
        "X-Mailer": "git-send-email 2.17.1",
        "In-Reply-To": "<20191001110209.6047-1-g.singh@nxp.com>",
        "References": "<20190826130246.30485-1-g.singh@nxp.com>\n\t<20191001110209.6047-1-g.singh@nxp.com>",
        "X-Virus-Scanned": "ClamAV using ClamSMTP",
        "Subject": "[dpdk-dev] [PATCH v3 01/14] common/dpaax: moving OF lib code from\n\tdpaa bus",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "From: Hemant Agrawal <hemant.agrawal@nxp.com>\n\nThis code is being shared by more than 1 type of driver.\nCommon is most appropriate place for it.\n\nSigned-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>\n---\n drivers/bus/dpaa/Makefile                     |  2 +-\n drivers/bus/dpaa/base/fman/fman.c             |  2 +-\n drivers/bus/dpaa/base/fman/netcfg_layer.c     |  2 +-\n drivers/bus/dpaa/base/qbman/dpaa_sys.h        |  3 +-\n drivers/bus/dpaa/dpaa_bus.c                   |  2 +-\n drivers/bus/dpaa/include/compat.h             |  1 -\n drivers/bus/dpaa/include/fman.h               |  1 +\n drivers/bus/dpaa/include/fsl_usd.h            |  1 +\n drivers/bus/dpaa/meson.build                  |  1 -\n drivers/bus/dpaa/rte_dpaa_bus.h               |  2 +-\n drivers/bus/fslmc/Makefile                    |  1 +\n drivers/common/dpaax/Makefile                 | 10 +--\n .../dpaa/include => common/dpaax}/dpaa_list.h |  0\n .../base/fman/of.c => common/dpaax/dpaa_of.c} | 63 ++++++++++---------\n .../include/of.h => common/dpaax/dpaa_of.h}   | 27 ++++++--\n drivers/common/dpaax/dpaax_logs.h             | 10 +++\n drivers/common/dpaax/meson.build              |  5 +-\n .../common/dpaax/rte_common_dpaax_version.map | 18 ++++++\n drivers/crypto/caam_jr/Makefile               |  2 +\n drivers/crypto/caam_jr/caam_jr.c              |  2 +-\n drivers/crypto/dpaa2_sec/Makefile             |  2 +-\n drivers/crypto/dpaa_sec/Makefile              |  1 +\n drivers/crypto/dpaa_sec/dpaa_sec.c            |  2 +-\n drivers/event/dpaa/Makefile                   |  1 +\n drivers/event/dpaa2/Makefile                  |  1 +\n drivers/mempool/dpaa/Makefile                 |  1 +\n drivers/mempool/dpaa2/Makefile                |  1 +\n drivers/net/dpaa/Makefile                     |  1 +\n drivers/net/dpaa/dpaa_ethdev.h                |  2 +-\n drivers/net/dpaa/dpaa_rxtx.c                  |  2 +-\n drivers/net/dpaa2/Makefile                    |  1 +\n drivers/raw/dpaa2_cmdif/Makefile              |  1 +\n drivers/raw/dpaa2_qdma/Makefile               |  1 +\n 33 files changed, 118 insertions(+), 54 deletions(-)\n rename drivers/{bus/dpaa/include => common/dpaax}/dpaa_list.h (100%)\n rename drivers/{bus/dpaa/base/fman/of.c => common/dpaax/dpaa_of.c} (88%)\n rename drivers/{bus/dpaa/include/of.h => common/dpaax/dpaa_of.h} (86%)",
    "diff": "diff --git a/drivers/bus/dpaa/Makefile b/drivers/bus/dpaa/Makefile\nindex dfc2717a4..454ac12bf 100644\n--- a/drivers/bus/dpaa/Makefile\n+++ b/drivers/bus/dpaa/Makefile\n@@ -17,6 +17,7 @@ CFLAGS += -Wno-cast-qual\n CFLAGS += -I$(RTE_BUS_DPAA)/\n CFLAGS += -I$(RTE_BUS_DPAA)/include\n CFLAGS += -I$(RTE_BUS_DPAA)/base/qbman\n+CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax\n CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include\n \n # versioning export map\n@@ -32,7 +33,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += \\\n SRCS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += \\\n \tbase/fman/fman.c \\\n \tbase/fman/fman_hw.c \\\n-\tbase/fman/of.c \\\n \tbase/fman/netcfg_layer.c \\\n \tbase/qbman/process.c \\\n \tbase/qbman/bman.c \\\ndiff --git a/drivers/bus/dpaa/base/fman/fman.c b/drivers/bus/dpaa/base/fman/fman.c\nindex 8fa9b8cae..462efd2d4 100644\n--- a/drivers/bus/dpaa/base/fman/fman.c\n+++ b/drivers/bus/dpaa/base/fman/fman.c\n@@ -11,7 +11,7 @@\n \n /* This header declares the driver interface we implement */\n #include <fman.h>\n-#include <of.h>\n+#include <dpaa_of.h>\n #include <rte_malloc.h>\n #include <rte_dpaa_logs.h>\n #include <rte_string_fns.h>\ndiff --git a/drivers/bus/dpaa/base/fman/netcfg_layer.c b/drivers/bus/dpaa/base/fman/netcfg_layer.c\nindex bf8c77265..6affd2e92 100644\n--- a/drivers/bus/dpaa/base/fman/netcfg_layer.c\n+++ b/drivers/bus/dpaa/base/fman/netcfg_layer.c\n@@ -5,7 +5,7 @@\n  *\n  */\n #include <inttypes.h>\n-#include <of.h>\n+#include <dpaa_of.h>\n #include <net/if.h>\n #include <sys/ioctl.h>\n #include <error.h>\ndiff --git a/drivers/bus/dpaa/base/qbman/dpaa_sys.h b/drivers/bus/dpaa/base/qbman/dpaa_sys.h\nindex 034991ba1..9377738df 100644\n--- a/drivers/bus/dpaa/base/qbman/dpaa_sys.h\n+++ b/drivers/bus/dpaa/base/qbman/dpaa_sys.h\n@@ -8,7 +8,8 @@\n #ifndef __DPAA_SYS_H\n #define __DPAA_SYS_H\n \n-#include <of.h>\n+#include <compat.h>\n+#include <dpaa_of.h>\n \n /* For 2-element tables related to cache-inhibited and cache-enabled mappings */\n #define DPAA_PORTAL_CE 0\ndiff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c\nindex 07cc5c667..ec92cac79 100644\n--- a/drivers/bus/dpaa/dpaa_bus.c\n+++ b/drivers/bus/dpaa/dpaa_bus.c\n@@ -32,6 +32,7 @@\n #include <rte_bus.h>\n #include <rte_mbuf_pool_ops.h>\n \n+#include <dpaa_of.h>\n #include <rte_dpaa_bus.h>\n #include <rte_dpaa_logs.h>\n #include <dpaax_iova_table.h>\n@@ -39,7 +40,6 @@\n #include <fsl_usd.h>\n #include <fsl_qman.h>\n #include <fsl_bman.h>\n-#include <of.h>\n #include <netcfg.h>\n \n int dpaa_logtype_bus;\ndiff --git a/drivers/bus/dpaa/include/compat.h b/drivers/bus/dpaa/include/compat.h\nindex 277ce6369..fcc5b2e74 100644\n--- a/drivers/bus/dpaa/include/compat.h\n+++ b/drivers/bus/dpaa/include/compat.h\n@@ -390,7 +390,6 @@ static inline unsigned long get_zeroed_page(gfp_t __foo __rte_unused)\n #define atomic_dec_return(v)    rte_atomic32_sub_return(v, 1)\n #define atomic_sub_and_test(i, v) (rte_atomic32_sub_return(v, i) == 0)\n \n-#include <dpaa_list.h>\n #include <dpaa_bits.h>\n \n #endif /* __COMPAT_H */\ndiff --git a/drivers/bus/dpaa/include/fman.h b/drivers/bus/dpaa/include/fman.h\nindex d6eebc877..c02d32d22 100644\n--- a/drivers/bus/dpaa/include/fman.h\n+++ b/drivers/bus/dpaa/include/fman.h\n@@ -15,6 +15,7 @@\n #include <rte_ether.h>\n \n #include <compat.h>\n+#include <dpaa_list.h>\n \n #ifndef FMAN_DEVICE_PATH\n #define FMAN_DEVICE_PATH \"/dev/mem\"\ndiff --git a/drivers/bus/dpaa/include/fsl_usd.h b/drivers/bus/dpaa/include/fsl_usd.h\nindex ec1ab7cee..c18747256 100644\n--- a/drivers/bus/dpaa/include/fsl_usd.h\n+++ b/drivers/bus/dpaa/include/fsl_usd.h\n@@ -9,6 +9,7 @@\n #define __FSL_USD_H\n \n #include <compat.h>\n+#include <dpaa_list.h>\n #include <fsl_qman.h>\n \n #ifdef __cplusplus\ndiff --git a/drivers/bus/dpaa/meson.build b/drivers/bus/dpaa/meson.build\nindex 19daaa5b5..55338cfa7 100644\n--- a/drivers/bus/dpaa/meson.build\n+++ b/drivers/bus/dpaa/meson.build\n@@ -12,7 +12,6 @@ deps += ['common_dpaax', 'eventdev']\n sources = files('base/fman/fman.c',\n \t\t'base/fman/fman_hw.c',\n \t\t'base/fman/netcfg_layer.c',\n-\t\t'base/fman/of.c',\n \t\t'base/qbman/bman.c',\n \t\t'base/qbman/bman_driver.c',\n \t\t'base/qbman/dpaa_alloc.c',\ndiff --git a/drivers/bus/dpaa/rte_dpaa_bus.h b/drivers/bus/dpaa/rte_dpaa_bus.h\nindex 554a56f2e..e3135ecaf 100644\n--- a/drivers/bus/dpaa/rte_dpaa_bus.h\n+++ b/drivers/bus/dpaa/rte_dpaa_bus.h\n@@ -10,10 +10,10 @@\n #include <rte_mempool.h>\n #include <dpaax_iova_table.h>\n \n+#include <dpaa_of.h>\n #include <fsl_usd.h>\n #include <fsl_qman.h>\n #include <fsl_bman.h>\n-#include <of.h>\n #include <netcfg.h>\n \n #define DPAA_MEMPOOL_OPS_NAME\t\"dpaa\"\ndiff --git a/drivers/bus/fslmc/Makefile b/drivers/bus/fslmc/Makefile\nindex 218d9bd28..16f0a2ca4 100644\n--- a/drivers/bus/fslmc/Makefile\n+++ b/drivers/bus/fslmc/Makefile\n@@ -16,6 +16,7 @@ CFLAGS += $(WERROR_FLAGS)\n CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc\n CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc\n CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include\n+CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax\n CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common\n LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring\n LDLIBS += -lrte_ethdev\ndiff --git a/drivers/common/dpaax/Makefile b/drivers/common/dpaax/Makefile\nindex 94d2cf0ce..a0a1de028 100644\n--- a/drivers/common/dpaax/Makefile\n+++ b/drivers/common/dpaax/Makefile\n@@ -12,6 +12,10 @@ LIB = librte_common_dpaax.a\n CFLAGS += -DALLOW_EXPERIMENTAL_API\n CFLAGS += -O3\n CFLAGS += $(WERROR_FLAGS)\n+CFLAGS += -Wno-pointer-arith\n+CFLAGS += -Wno-cast-qual\n+\n+CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax\n \n # versioning export map\n EXPORT_MAP := rte_common_dpaax_version.map\n@@ -22,10 +26,8 @@ LIBABIVER := 1\n #\n # all source are stored in SRCS-y\n #\n-SRCS-y += dpaax_iova_table.c\n+SRCS-y += dpaax_iova_table.c dpaa_of.c\n \n LDLIBS += -lrte_eal\n \n-SYMLINK-y-include += dpaax_iova_table.h\n-\n-include $(RTE_SDK)/mk/rte.lib.mk\n\\ No newline at end of file\n+include $(RTE_SDK)/mk/rte.lib.mk\ndiff --git a/drivers/bus/dpaa/include/dpaa_list.h b/drivers/common/dpaax/dpaa_list.h\nsimilarity index 100%\nrename from drivers/bus/dpaa/include/dpaa_list.h\nrename to drivers/common/dpaax/dpaa_list.h\ndiff --git a/drivers/bus/dpaa/base/fman/of.c b/drivers/common/dpaax/dpaa_of.c\nsimilarity index 88%\nrename from drivers/bus/dpaa/base/fman/of.c\nrename to drivers/common/dpaax/dpaa_of.c\nindex 1e97be54e..bb2c8fc66 100644\n--- a/drivers/bus/dpaa/base/fman/of.c\n+++ b/drivers/common/dpaax/dpaa_of.c\n@@ -5,9 +5,10 @@\n  *\n  */\n \n-#include <of.h>\n+#include <dpaa_of.h>\n+#include <assert.h>\n #include <rte_string_fns.h>\n-#include <rte_dpaa_logs.h>\n+#include <dpaax_logs.h>\n \n static int alive;\n static struct dt_dir root_dir;\n@@ -23,7 +24,7 @@ of_open_dir(const char *relative_path, struct dirent ***d)\n \tsnprintf(full_path, PATH_MAX, \"%s/%s\", base_dir, relative_path);\n \tret = scandir(full_path, d, 0, versionsort);\n \tif (ret < 0)\n-\t\tDPAA_BUS_LOG(ERR, \"Failed to open directory %s\",\n+\t\tDPAAX_LOG(ERR, \"Failed to open directory %s\",\n \t\t\t     full_path);\n \treturn ret;\n }\n@@ -45,7 +46,7 @@ of_open_file(const char *relative_path)\n \tsnprintf(full_path, PATH_MAX, \"%s/%s\", base_dir, relative_path);\n \tret = open(full_path, O_RDONLY);\n \tif (ret < 0)\n-\t\tDPAA_BUS_LOG(ERR, \"Failed to open directory %s\",\n+\t\tDPAAX_LOG(ERR, \"Failed to open directory %s\",\n \t\t\t     full_path);\n \treturn ret;\n }\n@@ -57,7 +58,7 @@ process_file(struct dirent *dent, struct dt_dir *parent)\n \tstruct dt_file *f = malloc(sizeof(*f));\n \n \tif (!f) {\n-\t\tDPAA_BUS_LOG(DEBUG, \"Unable to allocate memory for file node\");\n+\t\tDPAAX_LOG(DEBUG, \"Unable to allocate memory for file node\");\n \t\treturn;\n \t}\n \tf->node.is_file = 1;\n@@ -67,14 +68,14 @@ process_file(struct dirent *dent, struct dt_dir *parent)\n \tf->parent = parent;\n \tfd = of_open_file(f->node.node.full_name);\n \tif (fd < 0) {\n-\t\tDPAA_BUS_LOG(DEBUG, \"Unable to open file node\");\n+\t\tDPAAX_LOG(DEBUG, \"Unable to open file node\");\n \t\tfree(f);\n \t\treturn;\n \t}\n \tf->len = read(fd, f->buf, OF_FILE_BUF_MAX);\n \tclose(fd);\n \tif (f->len < 0) {\n-\t\tDPAA_BUS_LOG(DEBUG, \"Unable to read file node\");\n+\t\tDPAAX_LOG(DEBUG, \"Unable to read file node\");\n \t\tfree(f);\n \t\treturn;\n \t}\n@@ -130,7 +131,7 @@ iterate_dir(struct dirent **d, int num, struct dt_dir *dt)\n \t\t\tlist_add_tail(&subdir->node.list, &dt->subdirs);\n \t\t\tbreak;\n \t\tdefault:\n-\t\t\tDPAA_BUS_LOG(DEBUG, \"Ignoring invalid dt entry %s/%s\",\n+\t\t\tDPAAX_LOG(DEBUG, \"Ignoring invalid dt entry %s/%s\",\n \t\t\t\t     dt->node.node.full_name, d[loop]->d_name);\n \t\t}\n \t}\n@@ -170,37 +171,37 @@ linear_dir(struct dt_dir *d)\n \tlist_for_each_entry(f, &d->files, node.list) {\n \t\tif (!strcmp(f->node.node.name, \"compatible\")) {\n \t\t\tif (d->compatible)\n-\t\t\t\tDPAA_BUS_LOG(DEBUG, \"Duplicate compatible in\"\n+\t\t\t\tDPAAX_LOG(DEBUG, \"Duplicate compatible in\"\n \t\t\t\t\t     \" %s\", d->node.node.full_name);\n \t\t\td->compatible = f;\n \t\t} else if (!strcmp(f->node.node.name, \"status\")) {\n \t\t\tif (d->status)\n-\t\t\t\tDPAA_BUS_LOG(DEBUG, \"Duplicate status in %s\",\n+\t\t\t\tDPAAX_LOG(DEBUG, \"Duplicate status in %s\",\n \t\t\t\t\t     d->node.node.full_name);\n \t\t\td->status = f;\n \t\t} else if (!strcmp(f->node.node.name, \"linux,phandle\")) {\n \t\t\tif (d->lphandle)\n-\t\t\t\tDPAA_BUS_LOG(DEBUG, \"Duplicate lphandle in %s\",\n+\t\t\t\tDPAAX_LOG(DEBUG, \"Duplicate lphandle in %s\",\n \t\t\t\t\t     d->node.node.full_name);\n \t\t\td->lphandle = f;\n \t\t} else if (!strcmp(f->node.node.name, \"phandle\")) {\n \t\t\tif (d->lphandle)\n-\t\t\t\tDPAA_BUS_LOG(DEBUG, \"Duplicate lphandle in %s\",\n+\t\t\t\tDPAAX_LOG(DEBUG, \"Duplicate lphandle in %s\",\n \t\t\t\t\t     d->node.node.full_name);\n \t\t\td->lphandle = f;\n \t\t} else if (!strcmp(f->node.node.name, \"#address-cells\")) {\n \t\t\tif (d->a_cells)\n-\t\t\t\tDPAA_BUS_LOG(DEBUG, \"Duplicate a_cells in %s\",\n+\t\t\t\tDPAAX_LOG(DEBUG, \"Duplicate a_cells in %s\",\n \t\t\t\t\t     d->node.node.full_name);\n \t\t\td->a_cells = f;\n \t\t} else if (!strcmp(f->node.node.name, \"#size-cells\")) {\n \t\t\tif (d->s_cells)\n-\t\t\t\tDPAA_BUS_LOG(DEBUG, \"Duplicate s_cells in %s\",\n+\t\t\t\tDPAAX_LOG(DEBUG, \"Duplicate s_cells in %s\",\n \t\t\t\t\t     d->node.node.full_name);\n \t\t\td->s_cells = f;\n \t\t} else if (!strcmp(f->node.node.name, \"reg\")) {\n \t\t\tif (d->reg)\n-\t\t\t\tDPAA_BUS_LOG(DEBUG, \"Duplicate reg in %s\",\n+\t\t\t\tDPAAX_LOG(DEBUG, \"Duplicate reg in %s\",\n \t\t\t\t\t     d->node.node.full_name);\n \t\t\td->reg = f;\n \t\t}\n@@ -220,7 +221,7 @@ of_init_path(const char *dt_path)\n \tbase_dir = dt_path;\n \n \t/* This needs to be singleton initialization */\n-\tDPAA_BUS_HWWARN(alive, \"Double-init of device-tree driver!\");\n+\tDPAAX_HWWARN(alive, \"Double-init of device-tree driver!\");\n \n \t/* Prepare root node (the remaining fields are set in process_dir()) */\n \troot_dir.node.node.name[0] = '\\0';\n@@ -231,7 +232,7 @@ of_init_path(const char *dt_path)\n \t/* Kick things off... */\n \tret = process_dir(\"\", &root_dir);\n \tif (ret) {\n-\t\tDPAA_BUS_LOG(ERR, \"Unable to parse device tree\");\n+\t\tDPAAX_LOG(ERR, \"Unable to parse device tree\");\n \t\treturn ret;\n \t}\n \n@@ -261,7 +262,7 @@ destroy_dir(struct dt_dir *d)\n void\n of_finish(void)\n {\n-\tDPAA_BUS_HWWARN(!alive, \"Double-finish of device-tree driver!\");\n+\tDPAAX_HWWARN(!alive, \"Double-finish of device-tree driver!\");\n \n \tdestroy_dir(&root_dir);\n \tINIT_LIST_HEAD(&linear);\n@@ -298,12 +299,12 @@ check_compatible(const struct dt_file *f, const char *compatible)\n \n const struct device_node *\n of_find_compatible_node(const struct device_node *from,\n-\t\t\tconst char *type __always_unused,\n+\t\t\tconst char *type __rte_unused,\n \t\t\tconst char *compatible)\n {\n \tconst struct dt_dir *d;\n \n-\tDPAA_BUS_HWWARN(!alive, \"Device-tree driver not initialised!\");\n+\tDPAAX_HWWARN(!alive, \"Device-tree driver not initialised!\");\n \n \tif (list_empty(&linear))\n \t\treturn NULL;\n@@ -328,7 +329,7 @@ of_get_property(const struct device_node *from, const char *name,\n \tconst struct dt_dir *d;\n \tconst struct dt_file *f;\n \n-\tDPAA_BUS_HWWARN(!alive, \"Device-tree driver not initialised!\");\n+\tDPAAX_HWWARN(!alive, \"Device-tree driver not initialised!\");\n \n \td = node2dir(from);\n \tlist_for_each_entry(f, &d->files, node.list)\n@@ -345,7 +346,7 @@ of_device_is_available(const struct device_node *dev_node)\n {\n \tconst struct dt_dir *d;\n \n-\tDPAA_BUS_HWWARN(!alive, \"Device-tree driver not initialised!\");\n+\tDPAAX_HWWARN(!alive, \"Device-tree driver not initialised!\");\n \td = node2dir(dev_node);\n \tif (!d->status)\n \t\treturn true;\n@@ -357,11 +358,11 @@ of_device_is_available(const struct device_node *dev_node)\n }\n \n const struct device_node *\n-of_find_node_by_phandle(phandle ph)\n+of_find_node_by_phandle(uint64_t ph)\n {\n \tconst struct dt_dir *d;\n \n-\tDPAA_BUS_HWWARN(!alive, \"Device-tree driver not initialised!\");\n+\tDPAAX_HWWARN(!alive, \"Device-tree driver not initialised!\");\n \tlist_for_each_entry(d, &linear, linear)\n \t\tif (d->lphandle && (d->lphandle->len == 4) &&\n \t\t    !memcmp(d->lphandle->buf, &ph, 4))\n@@ -374,7 +375,7 @@ of_get_parent(const struct device_node *dev_node)\n {\n \tconst struct dt_dir *d;\n \n-\tDPAA_BUS_HWWARN(!alive, \"Device-tree driver not initialised!\");\n+\tDPAAX_HWWARN(!alive, \"Device-tree driver not initialised!\");\n \n \tif (!dev_node)\n \t\treturn NULL;\n@@ -390,14 +391,14 @@ of_get_next_child(const struct device_node *dev_node,\n {\n \tconst struct dt_dir *p, *c;\n \n-\tDPAA_BUS_HWWARN(!alive, \"Device-tree driver not initialised!\");\n+\tDPAAX_HWWARN(!alive, \"Device-tree driver not initialised!\");\n \n \tif (!dev_node)\n \t\treturn NULL;\n \tp = node2dir(dev_node);\n \tif (prev) {\n \t\tc = node2dir(prev);\n-\t\tDPAA_BUS_HWWARN((c->parent != p), \"Parent/child mismatch\");\n+\t\tDPAAX_HWWARN((c->parent != p), \"Parent/child mismatch\");\n \t\tif (c->parent != p)\n \t\t\treturn NULL;\n \t\tif (c->node.list.next == &p->subdirs)\n@@ -418,7 +419,7 @@ of_n_addr_cells(const struct device_node *dev_node)\n {\n \tconst struct dt_dir *d;\n \n-\tDPAA_BUS_HWWARN(!alive, \"Device-tree driver not initialised\");\n+\tDPAAX_HWWARN(!alive, \"Device-tree driver not initialised\");\n \tif (!dev_node)\n \t\treturn OF_DEFAULT_NA;\n \td = node2dir(dev_node);\n@@ -440,7 +441,7 @@ of_n_size_cells(const struct device_node *dev_node)\n {\n \tconst struct dt_dir *d;\n \n-\tDPAA_BUS_HWWARN(!alive, \"Device-tree driver not initialised!\");\n+\tDPAAX_HWWARN(!alive, \"Device-tree driver not initialised!\");\n \tif (!dev_node)\n \t\treturn OF_DEFAULT_NA;\n \td = node2dir(dev_node);\n@@ -496,7 +497,7 @@ of_translate_address(const struct device_node *dev_node,\n \tsize_t rlen;\n \tuint32_t na, pna;\n \n-\tDPAA_BUS_HWWARN(!alive, \"Device-tree driver not initialised!\");\n+\tDPAAX_HWWARN(!alive, \"Device-tree driver not initialised!\");\n \tassert(dev_node != NULL);\n \n \tna = of_n_addr_cells(dev_node);\n@@ -538,7 +539,7 @@ of_device_is_compatible(const struct device_node *dev_node,\n {\n \tconst struct dt_dir *d;\n \n-\tDPAA_BUS_HWWARN(!alive, \"Device-tree driver not initialised!\");\n+\tDPAAX_HWWARN(!alive, \"Device-tree driver not initialised!\");\n \tif (!dev_node)\n \t\td = &root_dir;\n \telse\ndiff --git a/drivers/bus/dpaa/include/of.h b/drivers/common/dpaax/dpaa_of.h\nsimilarity index 86%\nrename from drivers/bus/dpaa/include/of.h\nrename to drivers/common/dpaax/dpaa_of.h\nindex 7ea7608fc..e9761ce0e 100644\n--- a/drivers/bus/dpaa/include/of.h\n+++ b/drivers/common/dpaax/dpaa_of.h\n@@ -8,7 +8,24 @@\n #ifndef __OF_H\n #define\t__OF_H\n \n-#include <compat.h>\n+#include <unistd.h>\n+#include <stdio.h>\n+#include <string.h>\n+#include <stdbool.h>\n+#include <stdlib.h>\n+#include <inttypes.h>\n+#include <sys/stat.h>\n+#include <sys/types.h>\n+#include <dirent.h>\n+#include <fcntl.h>\n+#include <glob.h>\n+#include <errno.h>\n+#include <ctype.h>\n+#include <unistd.h>\n+#include <limits.h>\n+#include <inttypes.h>\n+#include <rte_common.h>\n+#include <dpaa_list.h>\n \n #ifndef OF_INIT_DEFAULT_PATH\n #define OF_INIT_DEFAULT_PATH \"/proc/device-tree\"\n@@ -89,7 +106,7 @@ struct dt_file {\n \n const struct device_node *of_find_compatible_node(\n \t\t\t\t\tconst struct device_node *from,\n-\t\t\t\t\tconst char *type __always_unused,\n+\t\t\t\t\tconst char *type __rte_unused,\n \t\t\t\t\tconst char *compatible)\n \t__attribute__((nonnull(3)));\n \n@@ -102,7 +119,7 @@ const void *of_get_property(const struct device_node *from, const char *name,\n \t\t\t    size_t *lenp) __attribute__((nonnull(2)));\n bool of_device_is_available(const struct device_node *dev_node);\n \n-const struct device_node *of_find_node_by_phandle(phandle ph);\n+const struct device_node *of_find_node_by_phandle(uint64_t ph);\n \n const struct device_node *of_get_parent(const struct device_node *dev_node);\n \n@@ -122,7 +139,7 @@ const uint32_t *of_get_address(const struct device_node *dev_node, size_t idx,\n \t\t\t       uint64_t *size, uint32_t *flags);\n \n uint64_t of_translate_address(const struct device_node *dev_node,\n-\t\t\t      const u32 *addr) __attribute__((nonnull));\n+\t\t\t      const uint32_t *addr) __attribute__((nonnull));\n \n bool of_device_is_compatible(const struct device_node *dev_node,\n \t\t\t     const char *compatible);\n@@ -147,7 +164,7 @@ static inline int of_init(void)\n /* Read a numeric property according to its size and return it as a 64-bit\n  * value.\n  */\n-static inline uint64_t of_read_number(const __be32 *cell, int size)\n+static inline uint64_t of_read_number(const uint32_t *cell, int size)\n {\n \tuint64_t r = 0;\n \ndiff --git a/drivers/common/dpaax/dpaax_logs.h b/drivers/common/dpaax/dpaax_logs.h\nindex bf1b27cc1..180476f67 100644\n--- a/drivers/common/dpaax/dpaax_logs.h\n+++ b/drivers/common/dpaax/dpaax_logs.h\n@@ -9,6 +9,16 @@\n \n extern int dpaax_logger;\n \n+#ifdef RTE_LIBRTE_DPAAX_DEBUG\n+#define DPAAX_HWWARN(cond, fmt, args...) \\\n+\tdo {\\\n+\t\tif (cond) \\\n+\t\t\tDPAAX_LOG(DEBUG, \"WARN: \" fmt, ##args); \\\n+\t} while (0)\n+#else\n+#define DPAAX_HWWARN(cond, fmt, args...) do { } while (0)\n+#endif\n+\n #define DPAAX_LOG(level, fmt, args...) \\\n \trte_log(RTE_LOG_ ## level, dpaax_logger, \"dpaax: \" fmt \"\\n\", \\\n \t\t##args)\ndiff --git a/drivers/common/dpaax/meson.build b/drivers/common/dpaax/meson.build\nindex a315e7786..fb97be1c1 100644\n--- a/drivers/common/dpaax/meson.build\n+++ b/drivers/common/dpaax/meson.build\n@@ -8,6 +8,9 @@ if not is_linux\n \treason = 'only supported on linux'\n endif\n \n-sources = files('dpaax_iova_table.c')\n+sources = files('dpaax_iova_table.c', 'dpaa_of.c')\n \n cflags += ['-D_GNU_SOURCE']\n+if cc.has_argument('-Wno-cast-qual')\n+        cflags += '-Wno-cast-qual'\n+endif\ndiff --git a/drivers/common/dpaax/rte_common_dpaax_version.map b/drivers/common/dpaax/rte_common_dpaax_version.map\nindex 8131c9e30..a7699ae4d 100644\n--- a/drivers/common/dpaax/rte_common_dpaax_version.map\n+++ b/drivers/common/dpaax/rte_common_dpaax_version.map\n@@ -9,3 +9,21 @@ DPDK_18.11 {\n \n \tlocal: *;\n };\n+\n+DPDK_19.11 {\n+\tglobal:\n+\tof_device_is_available;\n+\tof_device_is_compatible;\n+\tof_find_compatible_node;\n+\tof_find_node_by_phandle;\n+\tof_get_address;\n+\tof_get_mac_address;\n+\tof_get_parent;\n+\tof_get_property;\n+\tof_init_path;\n+\tof_n_addr_cells;\n+\tof_translate_address;\n+\tof_get_next_child;\n+\n+\tlocal: *;\n+} DPDK_18.11;\ndiff --git a/drivers/crypto/caam_jr/Makefile b/drivers/crypto/caam_jr/Makefile\nindex cecfbbdc8..6eee8379f 100644\n--- a/drivers/crypto/caam_jr/Makefile\n+++ b/drivers/crypto/caam_jr/Makefile\n@@ -17,6 +17,7 @@ CFLAGS += -O3\n CFLAGS += $(WERROR_FLAGS)\n \n CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include\n+CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax\n CFLAGS += -I$(RTE_SDK)/drivers/crypto/caam_jr\n #sharing the hw flib headers from dpaa2_sec pmd\n CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/\n@@ -37,6 +38,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr_uio.c\n \n LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring\n LDLIBS += -lrte_cryptodev\n+LDLIBS += -lrte_common_dpaax\n LDLIBS += -lrte_bus_dpaa\n LDLIBS += -lrte_bus_vdev\n \ndiff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c\nindex 77c030347..f24513b43 100644\n--- a/drivers/crypto/caam_jr/caam_jr.c\n+++ b/drivers/crypto/caam_jr/caam_jr.c\n@@ -27,7 +27,7 @@\n /* RTA header files */\n #include <hw/desc/common.h>\n #include <hw/desc/algo.h>\n-#include <of.h>\n+#include <dpaa_of.h>\n \n #define CAAM_JR_DBG\t0\n #define CRYPTODEV_NAME_CAAM_JR_PMD\tcrypto_caam_jr\ndiff --git a/drivers/crypto/dpaa2_sec/Makefile b/drivers/crypto/dpaa2_sec/Makefile\nindex 9c6657e52..039901bec 100644\n--- a/drivers/crypto/dpaa2_sec/Makefile\n+++ b/drivers/crypto/dpaa2_sec/Makefile\n@@ -19,7 +19,7 @@ ifeq ($(shell test $(GCC_VERSION) -gt 70 && echo 1), 1)\n CFLAGS += -Wno-implicit-fallthrough\n endif\n endif\n-\n+CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax\n CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/\n CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/mc\n CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/\ndiff --git a/drivers/crypto/dpaa_sec/Makefile b/drivers/crypto/dpaa_sec/Makefile\nindex 1d8b7bec1..8d1706597 100644\n--- a/drivers/crypto/dpaa_sec/Makefile\n+++ b/drivers/crypto/dpaa_sec/Makefile\n@@ -16,6 +16,7 @@ CFLAGS += $(WERROR_FLAGS)\n \n CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa\n CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include\n+CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax\n CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa_sec/\n #sharing the hw flib headers from dpaa2_sec pmd\n CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/\ndiff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c\nindex 122c80a07..b0b6e57d4 100644\n--- a/drivers/crypto/dpaa_sec/dpaa_sec.c\n+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c\n@@ -27,7 +27,7 @@\n \n #include <fsl_usd.h>\n #include <fsl_qman.h>\n-#include <of.h>\n+#include <dpaa_of.h>\n \n /* RTA header files */\n #include <hw/desc/common.h>\ndiff --git a/drivers/event/dpaa/Makefile b/drivers/event/dpaa/Makefile\nindex cf9626495..a9f8648e7 100644\n--- a/drivers/event/dpaa/Makefile\n+++ b/drivers/event/dpaa/Makefile\n@@ -19,6 +19,7 @@ CFLAGS += -I$(RTE_SDK_DPAA)/include\n CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa\n CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include/\n CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa\n+CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax\n CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include\n \n EXPORT_MAP := rte_pmd_dpaa_event_version.map\ndiff --git a/drivers/event/dpaa2/Makefile b/drivers/event/dpaa2/Makefile\nindex 470157f25..647a8372d 100644\n--- a/drivers/event/dpaa2/Makefile\n+++ b/drivers/event/dpaa2/Makefile\n@@ -17,6 +17,7 @@ CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc\n CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal\n CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa2\n CFLAGS += -I$(RTE_SDK)/drivers/event/dpaa2\n+CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax\n LDLIBS += -lrte_eal -lrte_eventdev\n LDLIBS += -lrte_bus_fslmc -lrte_mempool_dpaa2 -lrte_pmd_dpaa2\n LDLIBS += -lrte_bus_vdev\ndiff --git a/drivers/mempool/dpaa/Makefile b/drivers/mempool/dpaa/Makefile\nindex ead5029fd..534e00733 100644\n--- a/drivers/mempool/dpaa/Makefile\n+++ b/drivers/mempool/dpaa/Makefile\n@@ -12,6 +12,7 @@ CFLAGS := -I$(SRCDIR) $(CFLAGS)\n CFLAGS += -O3 $(WERROR_FLAGS)\n CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa\n CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include/\n+CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax\n CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa\n CFLAGS += -I$(RTE_SDK)/lib/librte_mempool\n \ndiff --git a/drivers/mempool/dpaa2/Makefile b/drivers/mempool/dpaa2/Makefile\nindex c1df78a80..bdb941025 100644\n--- a/drivers/mempool/dpaa2/Makefile\n+++ b/drivers/mempool/dpaa2/Makefile\n@@ -12,6 +12,7 @@ LIB = librte_mempool_dpaa2.a\n CFLAGS += -O3\n CFLAGS += $(WERROR_FLAGS)\n CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc\n+CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax\n CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include\n \n # versioning export map\ndiff --git a/drivers/net/dpaa/Makefile b/drivers/net/dpaa/Makefile\nindex 4fb16bd9d..395e4d900 100644\n--- a/drivers/net/dpaa/Makefile\n+++ b/drivers/net/dpaa/Makefile\n@@ -19,6 +19,7 @@ CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa\n CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include/\n CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/base/qbman\n CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa\n+CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax\n CFLAGS += -I$(RTE_SDK)/drivers/event/dpaa\n CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include\n \ndiff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h\nindex f63a5f164..182becac1 100644\n--- a/drivers/net/dpaa/dpaa_ethdev.h\n+++ b/drivers/net/dpaa/dpaa_ethdev.h\n@@ -15,7 +15,7 @@\n #include <fsl_usd.h>\n #include <fsl_qman.h>\n #include <fsl_bman.h>\n-#include <of.h>\n+#include <dpaa_of.h>\n #include <netcfg.h>\n \n #define MAX_DPAA_CORES\t\t\t4\ndiff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c\nindex 30b183607..9e735cc83 100644\n--- a/drivers/net/dpaa/dpaa_rxtx.c\n+++ b/drivers/net/dpaa/dpaa_rxtx.c\n@@ -44,7 +44,7 @@\n #include <fsl_usd.h>\n #include <fsl_qman.h>\n #include <fsl_bman.h>\n-#include <of.h>\n+#include <dpaa_of.h>\n #include <netcfg.h>\n \n #define DPAA_MBUF_TO_CONTIG_FD(_mbuf, _fd, _bpid) \\\ndiff --git a/drivers/net/dpaa2/Makefile b/drivers/net/dpaa2/Makefile\nindex c7262ffd5..b8387706c 100644\n--- a/drivers/net/dpaa2/Makefile\n+++ b/drivers/net/dpaa2/Makefile\n@@ -12,6 +12,7 @@ LIB = librte_pmd_dpaa2.a\n \n CFLAGS += -O3\n CFLAGS += $(WERROR_FLAGS)\n+CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax\n CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2\n CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2/mc\n CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc\ndiff --git a/drivers/raw/dpaa2_cmdif/Makefile b/drivers/raw/dpaa2_cmdif/Makefile\nindex 2b4150c2d..a7c980247 100644\n--- a/drivers/raw/dpaa2_cmdif/Makefile\n+++ b/drivers/raw/dpaa2_cmdif/Makefile\n@@ -14,6 +14,7 @@ CFLAGS += $(WERROR_FLAGS)\n \n CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc\n CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include\n+CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax\n \n LDLIBS += -lrte_bus_fslmc\n LDLIBS += -lrte_bus_vdev\ndiff --git a/drivers/raw/dpaa2_qdma/Makefile b/drivers/raw/dpaa2_qdma/Makefile\nindex 0009fd4c6..057b2a81a 100644\n--- a/drivers/raw/dpaa2_qdma/Makefile\n+++ b/drivers/raw/dpaa2_qdma/Makefile\n@@ -14,6 +14,7 @@ CFLAGS += $(WERROR_FLAGS)\n \n CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc\n CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include\n+CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax\n \n LDLIBS += -lrte_bus_fslmc\n LDLIBS += -lrte_eal\n",
    "prefixes": [
        "v3",
        "01/14"
    ]
}