From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0055.outbound.protection.outlook.com [104.47.42.55]) by dpdk.org (Postfix) with ESMTP id 9BCE61B012 for ; Thu, 4 Jan 2018 10:51:28 +0100 (CET) Received: from BLUPR0301CA0019.namprd03.prod.outlook.com (10.162.113.157) by CO2PR03MB2358.namprd03.prod.outlook.com (10.166.93.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.366.8; Thu, 4 Jan 2018 09:51:26 +0000 Received: from BN1BFFO11FD044.protection.gbl (2a01:111:f400:7c10::1:175) by BLUPR0301CA0019.outlook.office365.com (2a01:111:e400:5259::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.386.5 via Frontend Transport; Thu, 4 Jan 2018 09:51:26 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; NXP1.onmicrosoft.com; dkim=none (message not signed) header.d=none;NXP1.onmicrosoft.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD044.mail.protection.outlook.com (10.58.144.107) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Thu, 4 Jan 2018 09:51:00 +0000 Received: from b27504-OptiPlex-790.ap.freescale.net (b27504-OptiPlex-790.ap.freescale.net [10.232.132.60]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id w049pInI019077; Thu, 4 Jan 2018 02:51:24 -0700 From: Nipun Gupta To: CC: , , Nipun Gupta Date: Thu, 4 Jan 2018 21:36:19 +0530 Message-ID: <1515081985-19351-2-git-send-email-nipun.gupta@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1515081985-19351-1-git-send-email-nipun.gupta@nxp.com> References: <1515081985-19351-1-git-send-email-nipun.gupta@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131595330605845329; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(336005)(396003)(376002)(39380400002)(346002)(39860400002)(2980300002)(1110001)(1109001)(339900001)(199004)(189003)(47776003)(68736007)(296002)(305945005)(85426001)(51416003)(48376002)(59450400001)(5890100001)(2351001)(104016004)(105606002)(54906003)(16586007)(316002)(50466002)(356003)(8656006)(6916009)(498600001)(81156014)(8676002)(53936002)(77096006)(2906002)(86362001)(6666003)(76176011)(106466001)(97736004)(5660300001)(81166006)(50226002)(4326008)(8936002)(2950100002)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2358; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD044; 1:UZe3dFh9EkVhVmSUf5xkJFmX7mRiAEe5CNQHCR1lecMnJIOz789SO0rzeilu9KjTEboDkOZqbXfmeN3EuJtN8QWQwiilI8n8Tkn5nJQNJsjKIaWQX13h+K2aGfhuw5WI MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bebe21b3-4410-4ced-8b51-08d55358a953 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4628075)(201703131517081)(5600026)(4604075)(2017052603307); SRVR:CO2PR03MB2358; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2358; 3:LAJhTi3NSEdFdUYIaWFN4LyifTUJU4Uvv4CqBSAh3fotG46+RFT+fIg8sEcWQtr+h5HVB38cLVGrojwsqyZFsCo5Gn6PzLartXUfgchwvwOcdemOZGaUQBpQfThd/vzSKd8ISRLc0MLviA4thexhrPaP5jp6NI+yi+6sPBneYgJVYrlarx1yPvXmuKGn9rTxaZWpJQOFqo7kzp7uxCBWdAZUKSYnDQA3hptrAeFUDqeP2HVE5ERlop7r2xWJOlK1UVO6B3vH1ksYs6ytmJ/Ix4ToUSMnb8Y7EgREWZaqwxtXChra3Rxmc6blHl7rB/gTuiwI2j/K8TlDeUU6Tmv/8aGv8AF3491aXTNhxYMI0+o=; 25:p8OlcLYmCMS4Ar4I2dZKUZIe8yhcm9/crJq0cWrz09wX21YWvKNyMKPQC8u9xcb1KclokoV6r4zs2xlf6hGuLYcOZqem6wrc3myLYRNSVAFePjX6AWEwpfWzQm7mzr5FCM4Fql03Ep7uMzX1lUBpswnurNpaykFP+y9BWsd8v6rnnOsSsTpe9hDTmywRoYpH22DoNwTby7n8l6hM5ghtkmr+YP3O1pwXn4y1kK3Vc3XJJzcyaM1l5iPVXdSdBLyS3La5s4y9Z1rOI+Mx5/AEJaEUa9VhsQHNS2Am/B4IpnsgUTYbYqkt6TXcdmeWq34WGlPqdBc6M3SiRge7LKjf+Q== X-MS-TrafficTypeDiagnostic: CO2PR03MB2358: X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2358; 31:z+w5chpAoIQ194jnbPUnUzQXBw2480FO9S5q86CuNBrL1jZiLgrBPxBLyY+TD6vxP/1w99iLEOmMOy9jNTWvcz4ud1o4kiGRMRMiAqTsBucpkpKcaF7F9HqaxQqJbM6jng+zh29Wb/YW4bmDWQ4i5uv3aywCgbNNI0mUd4W8PXIuHm2GP5AZGrcKS+iWeYhPcwWSjyozD2ElMaKZM6c3twsBHIqYvgR5elRffz9rcrE=; 4:J2b0kbDjKr49Hsfj67M9ftjcMphiX+XWrObvEAbi48BEVJRQRFROCILbg+wawm73F04hHIMN2bm+0p7C2Usus6UXepidOuerBep13ju7neH+uusnCJP/6k+Z4P2Y9CkKB/VF8vg+WjFn+0Nl/Ahh5x/w1o1UoFOUg3WnUyI+8YdslfE+axfwukf+J6u/hvOTx6EWEpQanz1c1ZxF3fgsnRjEPmXyqYt+wFBiuaYbXXQ2VZPEFaeW8F+OH20pCyheBZ4sp9Hk7WBTybLxxlgaSoVOUarpXLGwxHGR4xY4qIJFfghfaeoUqShCxXOWNAawrtGYg420kg8wMVGC/aldwiOpM9YaPMhk71jOjPIcO5GBvgKVwggZRrmtEqHOgCXK X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(788757137089)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(8121501046)(5005006)(3002001)(3231023)(944510075)(944921075)(946801075)(946901075)(93006095)(93001095)(10201501046)(6055026)(6096035)(20161123559100)(201703131430075)(201703131520075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123556025)(20161123563025)(20161123565025)(20161123561025)(201708071742011); SRVR:CO2PR03MB2358; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:CO2PR03MB2358; X-Forefront-PRVS: 054231DC40 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR03MB2358; 23:DGAOzuUIWeKjs5JSQ0r2XYAxtCJAwYuOPCOcKbdAS?= =?us-ascii?Q?LTsfobfey5Rw4+Vb6uTwEgkWcaCJ7vE81j45gcrW/aRZpUIb2W4wqfpQEhyg?= =?us-ascii?Q?ztOZj58QiEhY+WnDWi2/g6HkBakL9BDaRCiQiSQQtxi7ml0sj3XK8MkQEPX/?= =?us-ascii?Q?2fcEe3RxQfW7D/9n9s7jpJtOheYFo+ipumQTvd1s/gjnUkkcsjpZaF7nV1DC?= =?us-ascii?Q?YIfEzmMyOltTTyBehT7apsNjivFpNLPlJypKHLMLtN3P/ezClfNGevHUQ0cN?= =?us-ascii?Q?2hHebzQieYigsxEVuGRA9Y6eKtvcNsa6C7oip6/ayqaKJIFmPHJcWuldXeOO?= =?us-ascii?Q?TF2V7D/zgqHKrtOjpKlXYMACvFTMaBlwW/iE5stU1Ly3ED5/T7yQK7tLWgOc?= =?us-ascii?Q?IMbL5FvLlpuJfLixo/o+IJhAzmjtWM90BrMHluOkPn/yQ/bFhfGnhaE5+tZu?= =?us-ascii?Q?cUBUwRIjRTpO72rhqX+Yp85ofK9BwP+j1ltWhcF1vLWADK7aSoTZG1MkxEWg?= =?us-ascii?Q?9/a3YoJH8xu4DkZoQfTI43w1UyVMgQRMFJRQcRivDcrVwAxPe5HhZ4Yel7lJ?= =?us-ascii?Q?a3m0i4qWrejOzGlWxbj7hl63ZYhrh2UPiIRv5LakIFvULa2iHQTTGGXRgAms?= =?us-ascii?Q?oS0cXsphgtoCbG5B2aL5OWIDSZKWEoDOEx3JEXjcgCTqeYpuebZNlcSbk43z?= =?us-ascii?Q?yO91dLFzy+3eyENtcEa/DtCLLOW9hrJbELhqtZpbwnAifZOHMLAShPPLxQgo?= =?us-ascii?Q?g/ypMjLLGnwBVaLkXbdeqRk1S5SU+s92jnzrXghLmUna6k0UEQNlGjeugMr/?= =?us-ascii?Q?Wkns7sy94BnznhyhPKORh9iplLStA1R1Iv+BEEfg11nq0MFiYAU2AnP7yeOw?= =?us-ascii?Q?UPQL1BF14QFn16q/Hr7CyYcFSNdSB6WjcnXFuXFLC2Aqq6Qpdsvg58cE2bPR?= =?us-ascii?Q?eKPot4YfwBOPpwuBTfXvrtlxTwyiQP24APIPbg5+Rfd32CpIrUC/1SB56woh?= =?us-ascii?Q?a7jwNTUAEk5e/+en8VSLRYMsdm3ECIX/aDhjfkY5RQZts8CAiytQC/fK8/J5?= =?us-ascii?Q?//lhdlnMa6EmK9DALIkFGY3+dZAr7EBIizUu3lckbosaPLFtMlJgfQSM9gwC?= =?us-ascii?Q?7xzPCuqu/JErXEaDDO4pWAbwLAKBIiG/Y2Kxpzk5UHyaZQC3ffMhA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2358; 6:OFoSPEI9bOLSwcLrcu0GNaOUrNkwEz2buc2563yXDQL2Y4wRMrq3i6UxdQSX7hH1Y+WRFd4KlhzvIn+6aEsvuO5tDCVBTcOr0h/O96bZmdBnm1v/oyXR+W4xvEx3XdP9Q4rbPHRY1ezf/5AMhJJzd0Q8DRimxZ9n6p2sY2sSV0hLqiUtlV7C4LUbSgHpohlH4gZc99wcX6yRb1swd7SlK/nc1j9j5L2ETDathZ7wjV32i134a+aagi/T8BOVDh3vxuW1U6DCsJfqsc4lQYOob1J2pXKQ8SOYAwa0HRg+4HdrItsemk/7U2geoF3QDXRP0s64sMVRNGl5VSk0lfXwVaAjxYxzf65ybeaDQZVwX00=; 5:ZsLUyVP6rKJKkHclCysc4BxVZKUtVZOcsy65FMdeuQ4UC2Fc7vq01pWlUNMj5B9540hkabMDze4dj5nRW6oH+Ue6KMwr8eNJISpxWfsHSE7LoCu3jPoLlzadd7Sl5GJnCn7IGAJeHa36a43A3jcddjL8crW2rIa6OdUjoGvJco8=; 24:jRz72NDWoPmj5b61JTc+UxDtR5JLKGOO3QIEMzhFvShKJcGdDPR1aBRdVIgo0NMChLEWC30QPwciTTIY1fSPipNBcMqXWgUf26+6NIx7K/8=; 7:SZciwtLR6/1fLkX+Qy6fAf1F/rXxQoZIzobOs2Yk8yZj7e3GLoPvz+ISriQsXMxMNexX2qvePmDHMwSJvrZ5Vch/yYJ8VYwdPlyla8x99GP8lefz7X0bwJ24ENFNGEKOKF2TKz34AW30Q2ngJju/zbvyJfJf6HyYaRgqRLqoZqqFtpPqdkVANQkcpcTag5oUwweNGfG4/e0KVoz01xQTvnx/sv5Ci241q8Dsyi0mABMbUWv1QROkFT/Hhoaphjf7 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2018 09:51:00.4129 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bebe21b3-4410-4ced-8b51-08d55358a953 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR03MB2358 Subject: [dpdk-dev] [PATCH 1/6] event/dpaa2: replace static with dynamic logging X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jan 2018 09:51:29 -0000 Signed-off-by: Nipun Gupta --- drivers/event/dpaa2/dpaa2_eventdev.c | 83 ++++++++++++++++--------------- drivers/event/dpaa2/dpaa2_eventdev.h | 12 ----- drivers/event/dpaa2/dpaa2_eventdev_logs.h | 37 ++++++++++++++ drivers/event/dpaa2/dpaa2_hw_dpcon.c | 1 + 4 files changed, 82 insertions(+), 51 deletions(-) create mode 100644 drivers/event/dpaa2/dpaa2_eventdev_logs.h diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c index 49ac46e..c6dc5a2 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev.c +++ b/drivers/event/dpaa2/dpaa2_eventdev.c @@ -61,6 +61,7 @@ #include #include #include "dpaa2_eventdev.h" +#include "dpaa2_eventdev_logs.h" #include #include @@ -72,6 +73,9 @@ * Soft Event Flow is DPCI Instance */ +/* Dynamic logging identified for mempool */ +int dpaa2_logtype_event; + static uint16_t dpaa2_eventdev_enqueue_burst(void *port, const struct rte_event ev[], uint16_t nb_events) @@ -94,7 +98,7 @@ if (unlikely(!DPAA2_PER_LCORE_DPIO)) { ret = dpaa2_affine_qbman_swp(); if (ret) { - PMD_DRV_LOG(ERR, "Failure in affining portal\n"); + DPAA2_EVENTDEV_ERR("Failure in affining portal\n"); return 0; } } @@ -144,7 +148,7 @@ if (!loop) return num_tx; frames_to_send = loop; - PMD_DRV_LOG(ERR, "Unable to allocate memory"); + DPAA2_EVENTDEV_ERR("Unable to allocate memory"); goto send_partial; } rte_memcpy(ev_temp, event, sizeof(struct rte_event)); @@ -189,9 +193,9 @@ static void dpaa2_eventdev_dequeue_wait(uint64_t timeout_ticks) * case to avoid the problem. */ if (errno == EINTR) { - PMD_DRV_LOG(DEBUG, "epoll_wait fails\n"); + DPAA2_EVENTDEV_DEBUG("epoll_wait fails\n"); if (i++ > 10) - PMD_DRV_LOG(DEBUG, "Dequeue burst Failed\n"); + DPAA2_EVENTDEV_DEBUG("Dequeue burst Failed\n"); goto RETRY; } } @@ -249,7 +253,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, if (unlikely(!DPAA2_PER_LCORE_DPIO)) { ret = dpaa2_affine_qbman_swp(); if (ret) { - PMD_DRV_LOG(ERR, "Failure in affining portal\n"); + DPAA2_EVENTDEV_ERR("Failure in affining portal\n"); return 0; } } @@ -285,7 +289,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, rxq->cb(swp, fd, dq, rxq, &ev[num_pkts]); } else { qbman_swp_dqrr_consume(swp, dq); - PMD_DRV_LOG(ERR, "Null Return VQ received\n"); + DPAA2_EVENTDEV_ERR("Null Return VQ received\n"); return 0; } @@ -308,7 +312,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, { struct dpaa2_eventdev *priv = dev->data->dev_private; - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); @@ -342,7 +346,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, struct dpaa2_eventdev *priv = dev->data->dev_private; struct rte_event_dev_config *conf = &dev->data->dev_conf; - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); priv->dequeue_timeout_ns = conf->dequeue_timeout_ns; priv->nb_event_queues = conf->nb_event_queues; @@ -352,14 +356,15 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, priv->nb_event_port_enqueue_depth = conf->nb_event_port_enqueue_depth; priv->event_dev_cfg = conf->event_dev_cfg; - PMD_DRV_LOG(DEBUG, "Configured eventdev devid=%d", dev->data->dev_id); + DPAA2_EVENTDEV_DEBUG("Configured eventdev devid=%d", + dev->data->dev_id); return 0; } static int dpaa2_eventdev_start(struct rte_eventdev *dev) { - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); @@ -369,7 +374,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, static void dpaa2_eventdev_stop(struct rte_eventdev *dev) { - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); } @@ -377,7 +382,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, static int dpaa2_eventdev_close(struct rte_eventdev *dev) { - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); @@ -388,7 +393,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, dpaa2_eventdev_queue_def_conf(struct rte_eventdev *dev, uint8_t queue_id, struct rte_event_queue_conf *queue_conf) { - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); RTE_SET_USED(queue_id); @@ -403,7 +408,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, static void dpaa2_eventdev_queue_release(struct rte_eventdev *dev, uint8_t queue_id) { - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); RTE_SET_USED(queue_id); @@ -417,7 +422,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, struct evq_info_t *evq_info = &priv->evq_info[queue_id]; - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); evq_info->event_queue_cfg = queue_conf->event_queue_cfg; @@ -428,7 +433,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, dpaa2_eventdev_port_def_conf(struct rte_eventdev *dev, uint8_t port_id, struct rte_event_port_conf *port_conf) { - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); RTE_SET_USED(port_id); @@ -445,7 +450,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, static void dpaa2_eventdev_port_release(void *port) { - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(port); } @@ -454,7 +459,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, dpaa2_eventdev_port_setup(struct rte_eventdev *dev, uint8_t port_id, const struct rte_event_port_conf *port_conf) { - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(port_conf); @@ -480,7 +485,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, struct evq_info_t *evq_info; int i; - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); for (i = 0; i < nb_unlinks; i++) { evq_info = &priv->evq_info[queues[i]]; @@ -506,7 +511,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, uint8_t channel_index; int ret, i, n; - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); for (i = 0; i < nb_links; i++) { evq_info = &priv->evq_info[queues[i]]; @@ -518,7 +523,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, CMD_PRI_LOW, dpaa2_portal->dpio_dev->token, evq_info->dpcon->dpcon_id, &channel_index); if (ret < 0) { - PMD_DRV_ERR("Static dequeue cfg failed with ret: %d\n", + DPAA2_EVENTDEV_ERR("Static dequeue cfg failed with ret: %d\n", ret); goto err; } @@ -551,7 +556,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, { uint32_t scale = 1; - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); *timeout_ticks = ns * scale; @@ -562,7 +567,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, static void dpaa2_eventdev_dump(struct rte_eventdev *dev, FILE *f) { - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); RTE_SET_USED(f); @@ -575,7 +580,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, { const char *ethdev_driver = eth_dev->device->driver->name; - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); @@ -597,13 +602,13 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, uint16_t dpcon_id = priv->evq_info[ev_qid].dpcon->dpcon_id; int i, ret; - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); for (i = 0; i < eth_dev->data->nb_rx_queues; i++) { ret = dpaa2_eth_eventq_attach(eth_dev, i, dpcon_id, queue_conf); if (ret) { - PMD_DRV_ERR("dpaa2_eth_eventq_attach failed: ret %d\n", + DPAA2_EVENTDEV_ERR("dpaa2_eth_eventq_attach failed: ret %d\n", ret); goto fail; } @@ -627,7 +632,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, uint16_t dpcon_id = priv->evq_info[ev_qid].dpcon->dpcon_id; int ret; - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); if (rx_queue_id == -1) return dpaa2_eventdev_eth_queue_add_all(dev, @@ -636,7 +641,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, ret = dpaa2_eth_eventq_attach(eth_dev, rx_queue_id, dpcon_id, queue_conf); if (ret) { - PMD_DRV_ERR("dpaa2_eth_eventq_attach failed: ret: %d\n", ret); + DPAA2_EVENTDEV_ERR("dpaa2_eth_eventq_attach failed: ret: %d\n", ret); return ret; } return 0; @@ -648,14 +653,14 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, { int i, ret; - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); for (i = 0; i < eth_dev->data->nb_rx_queues; i++) { ret = dpaa2_eth_eventq_detach(eth_dev, i); if (ret) { - PMD_DRV_ERR("dpaa2_eth_eventq_detach failed: ret %d\n", + DPAA2_EVENTDEV_ERR("dpaa2_eth_eventq_detach failed: ret %d\n", ret); return ret; } @@ -671,14 +676,14 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, { int ret; - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); if (rx_queue_id == -1) return dpaa2_eventdev_eth_queue_del_all(dev, eth_dev); ret = dpaa2_eth_eventq_detach(eth_dev, rx_queue_id); if (ret) { - PMD_DRV_ERR("dpaa2_eth_eventq_detach failed: ret: %d\n", ret); + DPAA2_EVENTDEV_ERR("dpaa2_eth_eventq_detach failed: ret: %d\n", ret); return ret; } @@ -689,7 +694,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, dpaa2_eventdev_eth_start(const struct rte_eventdev *dev, const struct rte_eth_dev *eth_dev) { - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); RTE_SET_USED(eth_dev); @@ -701,7 +706,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, dpaa2_eventdev_eth_stop(const struct rte_eventdev *dev, const struct rte_eth_dev *eth_dev) { - PMD_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); RTE_SET_USED(eth_dev); @@ -758,7 +763,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, dpci_dev->token, i, &rx_queue_cfg); if (ret) { - PMD_DRV_LOG(ERR, + DPAA2_EVENTDEV_ERR( "set_rx_q failed with err code: %d", ret); return ret; } @@ -779,7 +784,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, sizeof(struct dpaa2_eventdev), rte_socket_id()); if (eventdev == NULL) { - PMD_DRV_ERR("Failed to create eventdev vdev %s", name); + DPAA2_EVENTDEV_ERR("Failed to create eventdev vdev %s", name); goto fail; } @@ -813,7 +818,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, ret = dpaa2_eventdev_setup_dpci(dpci_dev, dpcon_dev); if (ret) { - PMD_DRV_LOG(ERR, + DPAA2_EVENTDEV_ERR( "dpci setup failed with err code: %d", ret); return ret; } @@ -831,7 +836,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, const char *name; name = rte_vdev_device_name(vdev); - PMD_DRV_LOG(INFO, "Initializing %s", name); + DPAA2_EVENTDEV_INFO("Initializing %s", name); return dpaa2_eventdev_create(name); } @@ -841,7 +846,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, const char *name; name = rte_vdev_device_name(vdev); - PMD_DRV_LOG(INFO, "Closing %s", name); + DPAA2_EVENTDEV_INFO("Closing %s", name); return rte_event_pmd_vdev_uninit(name); } diff --git a/drivers/event/dpaa2/dpaa2_eventdev.h b/drivers/event/dpaa2/dpaa2_eventdev.h index ae8e07e..274335d 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev.h +++ b/drivers/event/dpaa2/dpaa2_eventdev.h @@ -41,18 +41,6 @@ #define EVENTDEV_NAME_DPAA2_PMD event_dpaa2 -#ifdef RTE_LIBRTE_PMD_DPAA2_EVENTDEV_DEBUG -#define PMD_DRV_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) -#define PMD_DRV_FUNC_TRACE() PMD_DRV_LOG(DEBUG, ">>") -#else -#define PMD_DRV_LOG(level, fmt, args...) do { } while (0) -#define PMD_DRV_FUNC_TRACE() do { } while (0) -#endif - -#define PMD_DRV_ERR(fmt, args...) \ - RTE_LOG(ERR, PMD, "%s(): " fmt "\n", __func__, ## args) - #define DPAA2_EVENT_DEFAULT_DPCI_PRIO 0 #define DPAA2_EVENT_MAX_QUEUES 16 diff --git a/drivers/event/dpaa2/dpaa2_eventdev_logs.h b/drivers/event/dpaa2/dpaa2_eventdev_logs.h new file mode 100644 index 0000000..7d250c3 --- /dev/null +++ b/drivers/event/dpaa2/dpaa2_eventdev_logs.h @@ -0,0 +1,37 @@ +/*- + * SPDX-License-Identifier: BSD-3-Clause + * Copyright 2018 NXP + */ + +#ifndef _DPAA2_EVENTDEV_LOGS_H_ +#define _DPAA2_EVENTDEV_LOGS_H_ + +extern int dpaa2_logtype_event; + +#define DPAA2_EVENTDEV_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, dpaa2_logtype_event, "%s(): " fmt "\n", \ + __func__, ##args) + +#define EVENTDEV_INIT_FUNC_TRACE() DPAA2_EVENTDEV_LOG(DEBUG, " >>") + +#define DPAA2_EVENTDEV_DEBUG(fmt, args...) \ + DPAA2_EVENTDEV_LOG(DEBUG, fmt, ## args) +#define DPAA2_EVENTDEV_INFO(fmt, args...) \ + DPAA2_EVENTDEV_LOG(INFO, fmt, ## args) +#define DPAA2_EVENTDEV_ERR(fmt, args...) \ + DPAA2_EVENTDEV_LOG(ERR, fmt, ## args) +#define DPAA2_EVENTDEV_WARN(fmt, args...) \ + DPAA2_EVENTDEV_LOG(WARNING, fmt, ## args) + +/* DP Logs, toggled out at compile time if level lower than current level */ +#define DPAA2_EVENTDEV_DP_LOG(level, fmt, args...) \ + RTE_LOG_DP(level, PMD, fmt, ## args) + +#define DPAA2_EVENTDEV_DP_DEBUG(fmt, args...) \ + DPAA2_EVENTDEV_DP_LOG(DEBUG, fmt, ## args) +#define DPAA2_EVENTDEV_DP_INFO(fmt, args...) \ + DPAA2_EVENTDEV_DP_LOG(INFO, fmt, ## args) +#define DPAA2_EVENTDEV_DP_WARN(fmt, args...) \ + DPAA2_EVENTDEV_DP_LOG(WARNING, fmt, ## args) + +#endif /* _DPAA2_EVENTDEV_LOGS_H_ */ diff --git a/drivers/event/dpaa2/dpaa2_hw_dpcon.c b/drivers/event/dpaa2/dpaa2_hw_dpcon.c index 005e623..4e6ca7c 100644 --- a/drivers/event/dpaa2/dpaa2_hw_dpcon.c +++ b/drivers/event/dpaa2/dpaa2_hw_dpcon.c @@ -46,6 +46,7 @@ #include #include +#include #include #include #include -- 1.9.1