Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/70122/?format=api
{ "id": 70122, "url": "https://patches.dpdk.org/api/patches/70122/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200512140100.26803-11-hemant.agrawal@nxp.com/", "project": { "id": 1, "url": "https://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": "<20200512140100.26803-11-hemant.agrawal@nxp.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200512140100.26803-11-hemant.agrawal@nxp.com", "date": "2020-05-12T14:00:59", "name": "[v2,11/12] bus/dpaa: move log into to respective dpaa drivers", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "4bcaf1ebd86e32f00de80b9801a96fad090893cc", "submitter": { "id": 477, "url": "https://patches.dpdk.org/api/people/477/?format=api", "name": "Hemant Agrawal", "email": "hemant.agrawal@nxp.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20200512140100.26803-11-hemant.agrawal@nxp.com/mbox/", "series": [ { "id": 10002, "url": "https://patches.dpdk.org/api/series/10002/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=10002", "date": "2020-05-12T14:00:49", "name": "[v2,01/12] common/dpaax: move internal symbols into INTERNAL section", "version": 2, "mbox": "https://patches.dpdk.org/series/10002/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/70122/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/70122/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 3C36BA04A2;\n\tTue, 12 May 2020 16:05:38 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id DA18F1C1B1;\n\tTue, 12 May 2020 16:03:44 +0200 (CEST)", "from inva021.nxp.com (inva021.nxp.com [92.121.34.21])\n by dpdk.org (Postfix) with ESMTP id D5E7E1BFE4\n for <dev@dpdk.org>; Tue, 12 May 2020 16:03:29 +0200 (CEST)", "from inva021.nxp.com (localhost [127.0.0.1])\n by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id B9DE320166D;\n Tue, 12 May 2020 16:03:29 +0200 (CEST)", "from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com\n [165.114.16.14])\n by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id E0A56201020;\n Tue, 12 May 2020 16:03:27 +0200 (CEST)", "from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net\n [10.232.133.63])\n by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 8DADB402E0;\n Tue, 12 May 2020 22:03:25 +0800 (SGT)" ], "From": "Hemant Agrawal <hemant.agrawal@nxp.com>", "To": "dev@dpdk.org,\n\tdavid.marchand@redhat.com", "Cc": "Hemant Agrawal <hemant.agrawal@nxp.com>", "Date": "Tue, 12 May 2020 19:30:59 +0530", "Message-Id": "<20200512140100.26803-11-hemant.agrawal@nxp.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20200512140100.26803-1-hemant.agrawal@nxp.com>", "References": "<20200505140832.646-1-hemant.agrawal@nxp.com>\n <20200512140100.26803-1-hemant.agrawal@nxp.com>", "X-Virus-Scanned": "ClamAV using ClamSMTP", "Subject": "[dpdk-dev] [PATCH v2 11/12] bus/dpaa: move log into to respective\n\tdpaa drivers", "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 <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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "This is to reduce the number of variables getting exposed\nfrom the dpaa bus. They are not required to be in bus.\n\nSigned-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>\n---\n drivers/bus/dpaa/dpaa_bus.c | 19 +-------\n drivers/bus/dpaa/rte_bus_dpaa_version.map | 4 --\n drivers/bus/dpaa/rte_dpaa_logs.h | 58 -----------------------\n drivers/event/dpaa/dpaa_eventdev.c | 7 +++\n drivers/event/dpaa/dpaa_eventdev.h | 16 +++++++\n drivers/mempool/dpaa/dpaa_mempool.c | 8 ++++\n drivers/mempool/dpaa/dpaa_mempool.h | 19 ++++++++\n drivers/net/dpaa/dpaa_ethdev.c | 10 +++-\n drivers/net/dpaa/dpaa_ethdev.h | 22 +++++++++\n 9 files changed, 83 insertions(+), 80 deletions(-)", "diff": "diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c\nindex f27820db37..41d42b0c30 100644\n--- a/drivers/bus/dpaa/dpaa_bus.c\n+++ b/drivers/bus/dpaa/dpaa_bus.c\n@@ -43,9 +43,6 @@\n #include <netcfg.h>\n \n int dpaa_logtype_bus;\n-int dpaa_logtype_mempool;\n-int dpaa_logtype_pmd;\n-int dpaa_logtype_eventdev;\n \n static struct rte_dpaa_bus rte_dpaa_bus;\n struct netcfg_info *dpaa_netcfg;\n@@ -567,13 +564,13 @@ rte_dpaa_bus_probe(void)\n \t\t\t/* One time load of Qman/Bman drivers */\n \t\t\tret = qman_global_init();\n \t\t\tif (ret) {\n-\t\t\t\tDPAA_PMD_ERR(\"QMAN initialization failed: %d\",\n+\t\t\t\tDPAA_BUS_ERR(\"QMAN initialization failed: %d\",\n \t\t\t\t\t ret);\n \t\t\t\treturn ret;\n \t\t\t}\n \t\t\tret = bman_global_init();\n \t\t\tif (ret) {\n-\t\t\t\tDPAA_PMD_ERR(\"BMAN initialization failed: %d\",\n+\t\t\t\tDPAA_BUS_ERR(\"BMAN initialization failed: %d\",\n \t\t\t\t\t ret);\n \t\t\t\treturn ret;\n \t\t\t}\n@@ -752,16 +749,4 @@ RTE_INIT(dpaa_init_log)\n \tdpaa_logtype_bus = rte_log_register(\"bus.dpaa\");\n \tif (dpaa_logtype_bus >= 0)\n \t\trte_log_set_level(dpaa_logtype_bus, RTE_LOG_NOTICE);\n-\n-\tdpaa_logtype_mempool = rte_log_register(\"mempool.dpaa\");\n-\tif (dpaa_logtype_mempool >= 0)\n-\t\trte_log_set_level(dpaa_logtype_mempool, RTE_LOG_NOTICE);\n-\n-\tdpaa_logtype_pmd = rte_log_register(\"pmd.net.dpaa\");\n-\tif (dpaa_logtype_pmd >= 0)\n-\t\trte_log_set_level(dpaa_logtype_pmd, RTE_LOG_NOTICE);\n-\n-\tdpaa_logtype_eventdev = rte_log_register(\"pmd.event.dpaa\");\n-\tif (dpaa_logtype_eventdev >= 0)\n-\t\trte_log_set_level(dpaa_logtype_eventdev, RTE_LOG_NOTICE);\n }\ndiff --git a/drivers/bus/dpaa/rte_bus_dpaa_version.map b/drivers/bus/dpaa/rte_bus_dpaa_version.map\nindex 220fc32da1..9b02cc674c 100644\n--- a/drivers/bus/dpaa/rte_bus_dpaa_version.map\n+++ b/drivers/bus/dpaa/rte_bus_dpaa_version.map\n@@ -10,10 +10,6 @@ INTERNAL {\n \tbman_thread_irq;\n \tdpaa_get_qm_channel_caam;\n \tdpaa_get_qm_channel_pool;\n-\tdpaa_logtype_eventdev;\n-\tdpaa_logtype_mempool;\n-\tdpaa_logtype_pmd;\n-\tdpaa_netcfg;\n \tdpaa_svr_family;\n \tfman_dealloc_bufs_mask_hi;\n \tfman_dealloc_bufs_mask_lo;\ndiff --git a/drivers/bus/dpaa/rte_dpaa_logs.h b/drivers/bus/dpaa/rte_dpaa_logs.h\nindex e414354320..149b127434 100644\n--- a/drivers/bus/dpaa/rte_dpaa_logs.h\n+++ b/drivers/bus/dpaa/rte_dpaa_logs.h\n@@ -10,9 +10,6 @@\n #include <rte_log.h>\n \n extern int dpaa_logtype_bus;\n-extern int dpaa_logtype_mempool;\n-extern int dpaa_logtype_pmd;\n-extern int dpaa_logtype_eventdev;\n \n #define DPAA_BUS_LOG(level, fmt, args...) \\\n \trte_log(RTE_LOG_ ## level, dpaa_logtype_bus, \"dpaa: \" fmt \"\\n\", ##args)\n@@ -40,59 +37,4 @@ extern int dpaa_logtype_eventdev;\n #define DPAA_BUS_WARN(fmt, args...) \\\n \tDPAA_BUS_LOG(WARNING, fmt, ## args)\n \n-/* Mempool related logs */\n-\n-#define DPAA_MEMPOOL_LOG(level, fmt, args...) \\\n-\trte_log(RTE_LOG_ ## level, dpaa_logtype_mempool, \"%s(): \" fmt \"\\n\", \\\n-\t\t__func__, ##args)\n-\n-#define MEMPOOL_INIT_FUNC_TRACE() DPAA_MEMPOOL_LOG(DEBUG, \" >>\")\n-\n-#define DPAA_MEMPOOL_DPDEBUG(fmt, args...) \\\n-\tRTE_LOG_DP(DEBUG, PMD, fmt, ## args)\n-#define DPAA_MEMPOOL_DEBUG(fmt, args...) \\\n-\tDPAA_MEMPOOL_LOG(DEBUG, fmt, ## args)\n-#define DPAA_MEMPOOL_ERR(fmt, args...) \\\n-\tDPAA_MEMPOOL_LOG(ERR, fmt, ## args)\n-#define DPAA_MEMPOOL_INFO(fmt, args...) \\\n-\tDPAA_MEMPOOL_LOG(INFO, fmt, ## args)\n-#define DPAA_MEMPOOL_WARN(fmt, args...) \\\n-\tDPAA_MEMPOOL_LOG(WARNING, fmt, ## args)\n-\n-/* PMD related logs */\n-\n-#define DPAA_PMD_LOG(level, fmt, args...) \\\n-\trte_log(RTE_LOG_ ## level, dpaa_logtype_pmd, \"%s(): \" fmt \"\\n\", \\\n-\t\t__func__, ##args)\n-\n-#define PMD_INIT_FUNC_TRACE() DPAA_PMD_LOG(DEBUG, \" >>\")\n-\n-#define DPAA_PMD_DEBUG(fmt, args...) \\\n-\tDPAA_PMD_LOG(DEBUG, fmt, ## args)\n-#define DPAA_PMD_ERR(fmt, args...) \\\n-\tDPAA_PMD_LOG(ERR, fmt, ## args)\n-#define DPAA_PMD_INFO(fmt, args...) \\\n-\tDPAA_PMD_LOG(INFO, fmt, ## args)\n-#define DPAA_PMD_WARN(fmt, args...) \\\n-\tDPAA_PMD_LOG(WARNING, fmt, ## args)\n-\n-#define DPAA_EVENTDEV_LOG(level, fmt, args...) \\\n-\trte_log(RTE_LOG_ ## level, dpaa_logtype_eventdev, \"%s(): \" fmt \"\\n\", \\\n-\t\t__func__, ##args)\n-\n-#define EVENTDEV_INIT_FUNC_TRACE() DPAA_EVENTDEV_LOG(DEBUG, \" >>\")\n-\n-#define DPAA_EVENTDEV_DEBUG(fmt, args...) \\\n-\tDPAA_EVENTDEV_LOG(DEBUG, fmt, ## args)\n-#define DPAA_EVENTDEV_ERR(fmt, args...) \\\n-\tDPAA_EVENTDEV_LOG(ERR, fmt, ## args)\n-#define DPAA_EVENTDEV_INFO(fmt, args...) \\\n-\tDPAA_EVENTDEV_LOG(INFO, fmt, ## args)\n-#define DPAA_EVENTDEV_WARN(fmt, args...) \\\n-\tDPAA_EVENTDEV_LOG(WARNING, fmt, ## args)\n-\n-/* DP Logs, toggled out at compile time if level lower than current level */\n-#define DPAA_DP_LOG(level, fmt, args...) \\\n-\tRTE_LOG_DP(level, PMD, fmt, ## args)\n-\n #endif /* _DPAA_LOGS_H_ */\ndiff --git a/drivers/event/dpaa/dpaa_eventdev.c b/drivers/event/dpaa/dpaa_eventdev.c\nindex a7d57edce7..5a018d4871 100644\n--- a/drivers/event/dpaa/dpaa_eventdev.c\n+++ b/drivers/event/dpaa/dpaa_eventdev.c\n@@ -46,6 +46,7 @@\n * Eventqueue = Channel Instance\n * 1 Eventdev can have N Eventqueue\n */\n+int dpaa_logtype_eventdev;\n \n #define DISABLE_INTR_MODE \"disable_intr\"\n \n@@ -1068,3 +1069,9 @@ static struct rte_vdev_driver vdev_eventdev_dpaa_pmd = {\n RTE_PMD_REGISTER_VDEV(EVENTDEV_NAME_DPAA_PMD, vdev_eventdev_dpaa_pmd);\n RTE_PMD_REGISTER_PARAM_STRING(EVENTDEV_NAME_DPAA_PMD,\n \t\tDISABLE_INTR_MODE \"=<int>\");\n+RTE_INIT(dpaa_event_init_log)\n+{\n+\tdpaa_logtype_eventdev = rte_log_register(\"pmd.event.dpaa\");\n+\tif (dpaa_logtype_eventdev >= 0)\n+\t\trte_log_set_level(dpaa_logtype_eventdev, RTE_LOG_NOTICE);\n+}\ndiff --git a/drivers/event/dpaa/dpaa_eventdev.h b/drivers/event/dpaa/dpaa_eventdev.h\nindex 5ce15a3db9..0b3da83a4f 100644\n--- a/drivers/event/dpaa/dpaa_eventdev.h\n+++ b/drivers/event/dpaa/dpaa_eventdev.h\n@@ -76,4 +76,20 @@ struct dpaa_eventdev {\n \tuint32_t nb_event_port_enqueue_depth;\n \tuint32_t event_dev_cfg;\n };\n+\n+#define DPAA_EVENTDEV_LOG(level, fmt, args...) \\\n+\trte_log(RTE_LOG_ ## level, dpaa_logtype_eventdev, \"%s(): \" fmt \"\\n\", \\\n+\t\t__func__, ##args)\n+\n+#define EVENTDEV_INIT_FUNC_TRACE() DPAA_EVENTDEV_LOG(DEBUG, \" >>\")\n+\n+#define DPAA_EVENTDEV_DEBUG(fmt, args...) \\\n+\tDPAA_EVENTDEV_LOG(DEBUG, fmt, ## args)\n+#define DPAA_EVENTDEV_ERR(fmt, args...) \\\n+\tDPAA_EVENTDEV_LOG(ERR, fmt, ## args)\n+#define DPAA_EVENTDEV_INFO(fmt, args...) \\\n+\tDPAA_EVENTDEV_LOG(INFO, fmt, ## args)\n+#define DPAA_EVENTDEV_WARN(fmt, args...) \\\n+\tDPAA_EVENTDEV_LOG(WARNING, fmt, ## args)\n+\n #endif /* __DPAA_EVENTDEV_H__ */\ndiff --git a/drivers/mempool/dpaa/dpaa_mempool.c b/drivers/mempool/dpaa/dpaa_mempool.c\nindex 3a2528331c..451e2d5d56 100644\n--- a/drivers/mempool/dpaa/dpaa_mempool.c\n+++ b/drivers/mempool/dpaa/dpaa_mempool.c\n@@ -36,6 +36,7 @@ struct dpaa_memseg_list rte_dpaa_memsegs\n \t= TAILQ_HEAD_INITIALIZER(rte_dpaa_memsegs);\n \n struct dpaa_bp_info *rte_dpaa_bpid_info;\n+int dpaa_logtype_mempool;\n \n static int\n dpaa_mbuf_create_pool(struct rte_mempool *mp)\n@@ -356,3 +357,10 @@ static const struct rte_mempool_ops dpaa_mpool_ops = {\n };\n \n MEMPOOL_REGISTER_OPS(dpaa_mpool_ops);\n+\n+RTE_INIT(dpaa_mp_init_log)\n+{\n+\tdpaa_logtype_mempool = rte_log_register(\"mempool.dpaa\");\n+\tif (dpaa_logtype_mempool >= 0)\n+\t\trte_log_set_level(dpaa_logtype_mempool, RTE_LOG_NOTICE);\n+}\ndiff --git a/drivers/mempool/dpaa/dpaa_mempool.h b/drivers/mempool/dpaa/dpaa_mempool.h\nindex f69e11f011..dc0058e6dd 100644\n--- a/drivers/mempool/dpaa/dpaa_mempool.h\n+++ b/drivers/mempool/dpaa/dpaa_mempool.h\n@@ -58,4 +58,23 @@ extern struct dpaa_bp_info *rte_dpaa_bpid_info;\n \n #define DPAA_BPID_TO_POOL_INFO(__bpid) (&rte_dpaa_bpid_info[__bpid])\n \n+/* Mempool related logs */\n+\n+#define DPAA_MEMPOOL_LOG(level, fmt, args...) \\\n+\trte_log(RTE_LOG_ ## level, dpaa_logtype_mempool, \"%s(): \" fmt \"\\n\", \\\n+\t\t__func__, ##args)\n+\n+#define MEMPOOL_INIT_FUNC_TRACE() DPAA_MEMPOOL_LOG(DEBUG, \" >>\")\n+\n+#define DPAA_MEMPOOL_DPDEBUG(fmt, args...) \\\n+\tRTE_LOG_DP(DEBUG, PMD, fmt, ## args)\n+#define DPAA_MEMPOOL_DEBUG(fmt, args...) \\\n+\tDPAA_MEMPOOL_LOG(DEBUG, fmt, ## args)\n+#define DPAA_MEMPOOL_ERR(fmt, args...) \\\n+\tDPAA_MEMPOOL_LOG(ERR, fmt, ## args)\n+#define DPAA_MEMPOOL_INFO(fmt, args...) \\\n+\tDPAA_MEMPOOL_LOG(INFO, fmt, ## args)\n+#define DPAA_MEMPOOL_WARN(fmt, args...) \\\n+\tDPAA_MEMPOOL_LOG(WARNING, fmt, ## args)\n+\n #endif\ndiff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c\nindex 56eb5ec47c..c97f3042be 100644\n--- a/drivers/net/dpaa/dpaa_ethdev.c\n+++ b/drivers/net/dpaa/dpaa_ethdev.c\n@@ -46,6 +46,8 @@\n #include <fsl_bman.h>\n #include <fsl_fman.h>\n \n+int dpaa_logtype_pmd;\n+\n /* Supported Rx offloads */\n static uint64_t dev_rx_offloads_sup =\n \t\tDEV_RX_OFFLOAD_JUMBO_FRAME |\n@@ -1058,7 +1060,7 @@ static int dpaa_dev_queue_intr_disable(struct rte_eth_dev *dev,\n \n \ttemp1 = read(rxq->q_fd, &temp, sizeof(temp));\n \tif (temp1 != sizeof(temp))\n-\t\tDPAA_EVENTDEV_ERR(\"irq read error\");\n+\t\tDPAA_PMD_ERR(\"irq read error\");\n \n \tqman_fq_portal_thread_irq(rxq->qp);\n \n@@ -1664,3 +1666,9 @@ static struct rte_dpaa_driver rte_dpaa_pmd = {\n };\n \n RTE_PMD_REGISTER_DPAA(net_dpaa, rte_dpaa_pmd);\n+RTE_INIT(dpaa_net_init_log)\n+{\n+\tdpaa_logtype_pmd = rte_log_register(\"pmd.net.dpaa\");\n+\tif (dpaa_logtype_pmd >= 0)\n+\t\trte_log_set_level(dpaa_logtype_pmd, RTE_LOG_NOTICE);\n+}\ndiff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h\nindex 7393a9df05..6a6477ac87 100644\n--- a/drivers/net/dpaa/dpaa_ethdev.h\n+++ b/drivers/net/dpaa/dpaa_ethdev.h\n@@ -185,4 +185,26 @@ dpaa_rx_cb_atomic(void *event,\n \t\t const struct qm_dqrr_entry *dqrr,\n \t\t void **bufs);\n \n+/* PMD related logs */\n+extern int dpaa_logtype_pmd;\n+\n+#define DPAA_PMD_LOG(level, fmt, args...) \\\n+\trte_log(RTE_LOG_ ## level, dpaa_logtype_pmd, \"%s(): \" fmt \"\\n\", \\\n+\t\t__func__, ##args)\n+\n+#define PMD_INIT_FUNC_TRACE() DPAA_PMD_LOG(DEBUG, \" >>\")\n+\n+#define DPAA_PMD_DEBUG(fmt, args...) \\\n+\tDPAA_PMD_LOG(DEBUG, fmt, ## args)\n+#define DPAA_PMD_ERR(fmt, args...) \\\n+\tDPAA_PMD_LOG(ERR, fmt, ## args)\n+#define DPAA_PMD_INFO(fmt, args...) \\\n+\tDPAA_PMD_LOG(INFO, fmt, ## args)\n+#define DPAA_PMD_WARN(fmt, args...) \\\n+\tDPAA_PMD_LOG(WARNING, fmt, ## args)\n+\n+/* DP Logs, toggled out at compile time if level lower than current level */\n+#define DPAA_DP_LOG(level, fmt, args...) \\\n+\tRTE_LOG_DP(level, PMD, fmt, ## args)\n+\n #endif\n", "prefixes": [ "v2", "11/12" ] }