Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/110011/?format=api
{ "id": 110011, "url": "http://patchwork.dpdk.org/api/patches/110011/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20220421151900.703467-6-john.miller@atomicrules.com/", "project": { "id": 1, "url": "http://patchwork.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": "<20220421151900.703467-6-john.miller@atomicrules.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220421151900.703467-6-john.miller@atomicrules.com", "date": "2022-04-21T15:18:56", "name": "[06/10] net/ark: add ark PMD log interface", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "4706df40847c1416751937f78c79b6e1889d7ddb", "submitter": { "id": 719, "url": "http://patchwork.dpdk.org/api/people/719/?format=api", "name": "John Miller", "email": "john.miller@atomicrules.com" }, "delegate": { "id": 6690, "url": "http://patchwork.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20220421151900.703467-6-john.miller@atomicrules.com/mbox/", "series": [ { "id": 22596, "url": "http://patchwork.dpdk.org/api/series/22596/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=22596", "date": "2022-04-21T15:18:51", "name": "[01/10] doc/guides/bbdevs: add ark baseband device documentation", "version": 1, "mbox": "http://patchwork.dpdk.org/series/22596/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/110011/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/110011/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 9FA83A0093;\n\tThu, 21 Apr 2022 17:19:50 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 770C042802;\n\tThu, 21 Apr 2022 17:19:25 +0200 (CEST)", "from mail-pj1-f50.google.com (mail-pj1-f50.google.com\n [209.85.216.50]) by mails.dpdk.org (Postfix) with ESMTP id C4AB140040\n for <dev@dpdk.org>; Thu, 21 Apr 2022 17:19:23 +0200 (CEST)", "by mail-pj1-f50.google.com with SMTP id\n m14-20020a17090a34ce00b001d5fe250e23so2147775pjf.3\n for <dev@dpdk.org>; Thu, 21 Apr 2022 08:19:23 -0700 (PDT)", "from john-All-Series.tds\n (h75-100-85-216.cntcnh.broadband.dynamic.tds.net. [75.100.85.216])\n by smtp.gmail.com with ESMTPSA id\n q5-20020a056a00084500b0050ace4a699dsm6463465pfk.95.2022.04.21.08.19.21\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 21 Apr 2022 08:19:22 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=atomicrules-com.20210112.gappssmtp.com; s=20210112;\n h=from:to:cc:subject:date:message-id:in-reply-to:references\n :mime-version:content-transfer-encoding;\n bh=jZSHTWfhGlOkEMOc/uL2I3QKIRkesfnfv2I3pJIsrrQ=;\n b=yn3P2/44thXBxjEHcDzWkqLMh0x3pj6sdM+S3H19S7SuAxCYhjlxIClgGA8cMirb6p\n LSyZC+D6CyF+IQWjih9SQ9bRZbIp97JplvPMNLqBU+icbCmvk2QdRdMXpAA/JTgH4r48\n 52EWLzoygK3QIiCmv2SVH4naRtMEec+K5Q8oOSF5/h314r8maIyQUSMld/sLaVQPNmtV\n lByrCdp1IEX26jE1xZpT4W1iRC53aA+lS8MyV4qQye3MWCWgqhRY6aKN7oh7VbRgZrpU\n tf/i7kQ9+kLYc7sxRiVcek+qbm2zXAiKr7IOt9nhPNXiZJg4+9R9D4zCc0FdTtZDtXGe\n UFPQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20210112;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n :references:mime-version:content-transfer-encoding;\n bh=jZSHTWfhGlOkEMOc/uL2I3QKIRkesfnfv2I3pJIsrrQ=;\n b=ji2gKuT0oKNK4ptL8yBI9XMD9syj7ytohbKteO12npzQV+TicgAc9cDQfoPRfJVmIH\n vdrCPqn+8mGmqbNq8XBKhrEIYW5X+naSSppte/QUPnC0/HkS3pYsW7LRo+137Jvez/2G\n wRCTW+5Q6CvIUYuTyNWr82xCsx6G00PTQwX5Sk6HLLksfkwjFRn70MNe+M0WKCqx4BwU\n 75T9VEaEjL9TELesQerJosutAKRLHd5T2e9AuMHPjlX/pJp6kf5llZx4d61KE73hvwf3\n stxd6lbHHWIPAvI1NCTBw3a5MnHHA9Ir+3XDVuaHcRoe3gys4uRUSBHMM3VoYdgDg+v1\n E+uw==", "X-Gm-Message-State": "AOAM532HmuZ3CZmXsthb4Jb3WKm+jkLZjUyuQO3VGoUsJieBCXVzVqIM\n B6pj9w+1X8eySqd1rtouwgLmJsoRf4qTMQ==", "X-Google-Smtp-Source": "\n ABdhPJyizedX5E4aFhM0DlczFdqsqZwzHrI86RwlUAHIiW+EUAIdICRs7JrBHROIJvpOLs+mKx0wZQ==", "X-Received": "by 2002:a17:902:a9c2:b0:156:1859:2d05 with SMTP id\n b2-20020a170902a9c200b0015618592d05mr26812731plr.86.1650554362537;\n Thu, 21 Apr 2022 08:19:22 -0700 (PDT)", "From": "John Miller <john.miller@atomicrules.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@xilinx.com, ed.czeck@atomicrules.com,\n John Miller <john.miller@atomicrules.com>", "Subject": "[PATCH 06/10] net/ark: add ark PMD log interface", "Date": "Thu, 21 Apr 2022 10:18:56 -0500", "Message-Id": "<20220421151900.703467-6-john.miller@atomicrules.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20220421151900.703467-1-john.miller@atomicrules.com>", "References": "<20220421151900.703467-1-john.miller@atomicrules.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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": "Added ark PMD log interface for use in arkville devices.\n\nSigned-off-by: John Miller <john.miller@atomicrules.com>\n---\n drivers/net/ark/ark_ethdev.c | 93 ++++++++++++-------------------\n drivers/net/ark/ark_ethdev_logs.c | 7 +++\n drivers/net/ark/ark_ethdev_logs.h | 25 +++++++++\n drivers/net/ark/ark_ethdev_rx.c | 40 ++++++-------\n drivers/net/ark/ark_ethdev_tx.c | 10 ++--\n drivers/net/ark/ark_logs.h | 34 -----------\n 6 files changed, 94 insertions(+), 115 deletions(-)\n create mode 100644 drivers/net/ark/ark_ethdev_logs.c\n create mode 100644 drivers/net/ark/ark_ethdev_logs.h\n delete mode 100644 drivers/net/ark/ark_logs.h", "diff": "diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c\nindex 76b88c62d0..22cf598593 100644\n--- a/drivers/net/ark/ark_ethdev.c\n+++ b/drivers/net/ark/ark_ethdev.c\n@@ -11,7 +11,7 @@\n #include <rte_kvargs.h>\n \n #include \"ark_global.h\"\n-#include \"ark_logs.h\"\n+#include \"ark_ethdev_logs.h\"\n #include \"ark_ethdev_tx.h\"\n #include \"ark_ethdev_rx.h\"\n #include \"ark_mpu.h\"\n@@ -99,25 +99,6 @@ static const struct rte_pci_id pci_id_ark_map[] = {\n \t{.vendor_id = 0, /* sentinel */ },\n };\n \n-/*\n- * This structure is used to statically define the capabilities\n- * of supported devices.\n- * Capabilities:\n- * rqpacing -\n- * Some HW variants require that PCIe read-requests be correctly throttled.\n- * This is called \"rqpacing\" and has to do with credit and flow control\n- * on certain Arkville implementations.\n- */\n-struct ark_caps {\n-\tbool rqpacing;\n-};\n-struct ark_dev_caps {\n-\tuint32_t device_id;\n-\tstruct ark_caps caps;\n-};\n-#define SET_DEV_CAPS(id, rqp) \\\n-\t{id, {.rqpacing = rqp} }\n-\n static const struct ark_dev_caps\n ark_device_caps[] = {\n \t\t SET_DEV_CAPS(0x100d, true),\n@@ -204,26 +185,26 @@ check_for_ext(struct ark_adapter *ark)\n \tconst char *dllpath = getenv(\"ARK_EXT_PATH\");\n \n \tif (dllpath == NULL) {\n-\t\tARK_PMD_LOG(DEBUG, \"EXT NO dll path specified\\n\");\n+\t\tARK_ETHDEV_LOG(DEBUG, \"EXT NO dll path specified\\n\");\n \t\treturn 0;\n \t}\n-\tARK_PMD_LOG(NOTICE, \"EXT found dll path at %s\\n\", dllpath);\n+\tARK_ETHDEV_LOG(NOTICE, \"EXT found dll path at %s\\n\", dllpath);\n \n \t/* Open and load the .so */\n \tark->d_handle = dlopen(dllpath, RTLD_LOCAL | RTLD_LAZY);\n \tif (ark->d_handle == NULL) {\n-\t\tARK_PMD_LOG(ERR, \"Could not load user extension %s\\n\",\n+\t\tARK_ETHDEV_LOG(ERR, \"Could not load user extension %s\\n\",\n \t\t\t dllpath);\n \t\treturn -1;\n \t}\n-\tARK_PMD_LOG(DEBUG, \"SUCCESS: loaded user extension %s\\n\",\n+\tARK_ETHDEV_LOG(DEBUG, \"SUCCESS: loaded user extension %s\\n\",\n \t\t\t dllpath);\n \n \t/* Get the entry points */\n \tark->user_ext.dev_init =\n \t\t(void *(*)(struct rte_eth_dev *, void *, int))\n \t\tdlsym(ark->d_handle, \"rte_pmd_ark_dev_init\");\n-\tARK_PMD_LOG(DEBUG, \"device ext init pointer = %p\\n\",\n+\tARK_ETHDEV_LOG(DEBUG, \"device ext init pointer = %p\\n\",\n \t\t ark->user_ext.dev_init);\n \tark->user_ext.dev_get_port_count =\n \t\t(int (*)(struct rte_eth_dev *, void *))\n@@ -296,7 +277,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev)\n \n \tark->eth_dev = dev;\n \n-\tARK_PMD_LOG(DEBUG, \"\\n\");\n+\tARK_ETHDEV_LOG(DEBUG, \"\\n\");\n \n \t/* Check to see if there is an extension that we need to load */\n \tret = check_for_ext(ark);\n@@ -343,15 +324,15 @@ eth_ark_dev_init(struct rte_eth_dev *dev)\n \tark->started = 0;\n \tark->pkt_dir_v = ARK_PKT_DIR_INIT_VAL;\n \n-\tARK_PMD_LOG(INFO, \"Sys Ctrl Const = 0x%x HW Commit_ID: %08x\\n\",\n+\tARK_ETHDEV_LOG(INFO, \"Sys Ctrl Const = 0x%x HW Commit_ID: %08x\\n\",\n \t\t ark->sysctrl.t32[4],\n \t\t rte_be_to_cpu_32(ark->sysctrl.t32[0x20 / 4]));\n-\tARK_PMD_LOG(NOTICE, \"Arkville HW Commit_ID: %08x\\n\",\n+\tARK_ETHDEV_LOG(NOTICE, \"Arkville HW Commit_ID: %08x\\n\",\n \t\t rte_be_to_cpu_32(ark->sysctrl.t32[0x20 / 4]));\n \n \t/* If HW sanity test fails, return an error */\n \tif (ark->sysctrl.t32[4] != 0xcafef00d) {\n-\t\tARK_PMD_LOG(ERR,\n+\t\tARK_ETHDEV_LOG(ERR,\n \t\t\t \"HW Sanity test has failed, expected constant\"\n \t\t\t \" 0x%x, read 0x%x (%s)\\n\",\n \t\t\t 0xcafef00d,\n@@ -361,16 +342,16 @@ eth_ark_dev_init(struct rte_eth_dev *dev)\n \tif (ark->sysctrl.t32[3] != 0) {\n \t\tif (ark->rqpacing) {\n \t\t\tif (ark_rqp_lasped(ark->rqpacing)) {\n-\t\t\t\tARK_PMD_LOG(ERR, \"Arkville Evaluation System - \"\n+\t\t\t\tARK_ETHDEV_LOG(ERR, \"Arkville Evaluation System - \"\n \t\t\t\t\t \"Timer has Expired\\n\");\n \t\t\t\treturn -1;\n \t\t\t}\n-\t\t\tARK_PMD_LOG(WARNING, \"Arkville Evaluation System - \"\n+\t\t\tARK_ETHDEV_LOG(WARNING, \"Arkville Evaluation System - \"\n \t\t\t\t \"Timer is Running\\n\");\n \t\t}\n \t}\n \n-\tARK_PMD_LOG(DEBUG,\n+\tARK_ETHDEV_LOG(DEBUG,\n \t\t \"HW Sanity test has PASSED, expected constant\"\n \t\t \" 0x%x, read 0x%x (%s)\\n\",\n \t\t 0xcafef00d, ark->sysctrl.t32[4], __func__);\n@@ -385,7 +366,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev)\n \n \tdev->data->mac_addrs = rte_zmalloc(\"ark\", RTE_ETHER_ADDR_LEN, 0);\n \tif (!dev->data->mac_addrs) {\n-\t\tARK_PMD_LOG(ERR,\n+\t\tARK_ETHDEV_LOG(ERR,\n \t\t\t \"Failed to allocated memory for storing mac address\"\n \t\t\t );\n \t}\n@@ -394,7 +375,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev)\n \t\tark->user_data[dev->data->port_id] =\n \t\t\tark->user_ext.dev_init(dev, ark->a_bar, 0);\n \t\tif (!ark->user_data[dev->data->port_id]) {\n-\t\t\tARK_PMD_LOG(WARNING,\n+\t\t\tARK_ETHDEV_LOG(WARNING,\n \t\t\t\t \"Failed to initialize PMD extension!\"\n \t\t\t\t \" continuing without it\\n\");\n \t\t\tmemset(&ark->user_ext, 0, sizeof(struct ark_user_ext));\n@@ -405,7 +386,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev)\n \tif (pci_dev->device.devargs)\n \t\tret = eth_ark_check_args(ark, pci_dev->device.devargs->args);\n \telse\n-\t\tARK_PMD_LOG(INFO, \"No Device args found\\n\");\n+\t\tARK_ETHDEV_LOG(INFO, \"No Device args found\\n\");\n \n \tif (ret)\n \t\tgoto error;\n@@ -436,7 +417,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev)\n \t\t/* reserve an ethdev entry */\n \t\teth_dev = rte_eth_dev_allocate(name);\n \t\tif (!eth_dev) {\n-\t\t\tARK_PMD_LOG(ERR,\n+\t\t\tARK_ETHDEV_LOG(ERR,\n \t\t\t\t \"Could not allocate eth_dev for port %d\\n\",\n \t\t\t\t p);\n \t\t\tgoto error;\n@@ -454,7 +435,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev)\n \t\teth_dev->data->mac_addrs = rte_zmalloc(name,\n \t\t\t\t\t\tRTE_ETHER_ADDR_LEN, 0);\n \t\tif (!eth_dev->data->mac_addrs) {\n-\t\t\tARK_PMD_LOG(ERR,\n+\t\t\tARK_ETHDEV_LOG(ERR,\n \t\t\t\t \"Memory allocation for MAC failed!\"\n \t\t\t\t \" Exiting.\\n\");\n \t\t\tgoto error;\n@@ -514,7 +495,7 @@ ark_config_device(struct rte_eth_dev *dev)\n \n \t/* UDM */\n \tif (ark_udm_reset(ark->udm.v)) {\n-\t\tARK_PMD_LOG(ERR, \"Unable to stop and reset UDM\\n\");\n+\t\tARK_ETHDEV_LOG(ERR, \"Unable to stop and reset UDM\\n\");\n \t\treturn -1;\n \t}\n \t/* Keep in reset until the MPU are cleared */\n@@ -530,7 +511,7 @@ ark_config_device(struct rte_eth_dev *dev)\n \n \t/* TX -- DDM */\n \tif (ark_ddm_stop(ark->ddm.v, 1))\n-\t\tARK_PMD_LOG(ERR, \"Unable to stop DDM\\n\");\n+\t\tARK_ETHDEV_LOG(ERR, \"Unable to stop DDM\\n\");\n \n \tmpu = ark->mputx.v;\n \tnum_q = ark_api_num_queues(mpu);\n@@ -620,7 +601,7 @@ eth_ark_dev_start(struct rte_eth_dev *dev)\n \n \t\tif (rte_ctrl_thread_create(&thread, tname, NULL,\n \t\t\t\t\t ark_pktgen_delay_start, ark->pg)) {\n-\t\t\tARK_PMD_LOG(ERR, \"Could not create pktgen \"\n+\t\t\tARK_ETHDEV_LOG(ERR, \"Could not create pktgen \"\n \t\t\t\t \"starter thread\\n\");\n \t\t\treturn -1;\n \t\t}\n@@ -666,7 +647,7 @@ eth_ark_dev_stop(struct rte_eth_dev *dev)\n \t\tstatus = eth_ark_tx_queue_stop(dev, i);\n \t\tif (status != 0) {\n \t\t\tuint16_t port = dev->data->port_id;\n-\t\t\tARK_PMD_LOG(ERR,\n+\t\t\tARK_ETHDEV_LOG(ERR,\n \t\t\t\t \"tx_queue stop anomaly\"\n \t\t\t\t \" port %u, queue %u\\n\",\n \t\t\t\t port, i);\n@@ -681,7 +662,7 @@ eth_ark_dev_stop(struct rte_eth_dev *dev)\n \t\t\tbreak;\n \t}\n \tif (status || i != 0) {\n-\t\tARK_PMD_LOG(ERR, \"DDM stop anomaly. status:\"\n+\t\tARK_ETHDEV_LOG(ERR, \"DDM stop anomaly. status:\"\n \t\t\t \" %d iter: %u. (%s)\\n\",\n \t\t\t status,\n \t\t\t i,\n@@ -703,7 +684,7 @@ eth_ark_dev_stop(struct rte_eth_dev *dev)\n \t\t\tbreak;\n \t}\n \tif (status || i != 0) {\n-\t\tARK_PMD_LOG(ERR, \"UDM stop anomaly. status %d iter: %u. (%s)\\n\",\n+\t\tARK_ETHDEV_LOG(ERR, \"UDM stop anomaly. status %d iter: %u. (%s)\\n\",\n \t\t\t status, i, __func__);\n \t\tark_udm_dump(ark->udm.v, \"Stop anomaly\");\n \n@@ -805,7 +786,7 @@ eth_ark_dev_info_get(struct rte_eth_dev *dev,\n static int\n eth_ark_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete)\n {\n-\tARK_PMD_LOG(DEBUG, \"link status = %d\\n\",\n+\tARK_ETHDEV_LOG(DEBUG, \"link status = %d\\n\",\n \t\t\tdev->data->dev_link.link_status);\n \tstruct ark_adapter *ark = dev->data->dev_private;\n \n@@ -940,20 +921,20 @@ static inline int\n process_pktdir_arg(const char *key, const char *value,\n \t\t void *extra_args)\n {\n-\tARK_PMD_LOG(DEBUG, \"key = %s, value = %s\\n\",\n+\tARK_ETHDEV_LOG(DEBUG, \"key = %s, value = %s\\n\",\n \t\t key, value);\n \tstruct ark_adapter *ark =\n \t\t(struct ark_adapter *)extra_args;\n \n \tark->pkt_dir_v = strtol(value, NULL, 16);\n-\tARK_PMD_LOG(DEBUG, \"pkt_dir_v = 0x%x\\n\", ark->pkt_dir_v);\n+\tARK_ETHDEV_LOG(DEBUG, \"pkt_dir_v = 0x%x\\n\", ark->pkt_dir_v);\n \treturn 0;\n }\n \n static inline int\n process_file_args(const char *key, const char *value, void *extra_args)\n {\n-\tARK_PMD_LOG(DEBUG, \"key = %s, value = %s\\n\",\n+\tARK_ETHDEV_LOG(DEBUG, \"key = %s, value = %s\\n\",\n \t\t key, value);\n \tchar *args = (char *)extra_args;\n \n@@ -964,7 +945,7 @@ process_file_args(const char *key, const char *value, void *extra_args)\n \tint first = 1;\n \n \tif (file == NULL) {\n-\t\tARK_PMD_LOG(ERR, \"Unable to open \"\n+\t\tARK_ETHDEV_LOG(ERR, \"Unable to open \"\n \t\t\t \"config file %s\\n\", value);\n \t\treturn -1;\n \t}\n@@ -972,7 +953,7 @@ process_file_args(const char *key, const char *value, void *extra_args)\n \twhile (fgets(line, sizeof(line), file)) {\n \t\tsize += strlen(line);\n \t\tif (size >= ARK_MAX_ARG_LEN) {\n-\t\t\tARK_PMD_LOG(ERR, \"Unable to parse file %s args, \"\n+\t\t\tARK_ETHDEV_LOG(ERR, \"Unable to parse file %s args, \"\n \t\t\t\t \"parameter list is too long\\n\", value);\n \t\t\tfclose(file);\n \t\t\treturn -1;\n@@ -984,7 +965,7 @@ process_file_args(const char *key, const char *value, void *extra_args)\n \t\t\tstrncat(args, line, ARK_MAX_ARG_LEN);\n \t\t}\n \t}\n-\tARK_PMD_LOG(DEBUG, \"file = %s\\n\", args);\n+\tARK_ETHDEV_LOG(DEBUG, \"file = %s\\n\", args);\n \tfclose(file);\n \treturn 0;\n }\n@@ -1006,7 +987,7 @@ eth_ark_check_args(struct ark_adapter *ark, const char *params)\n \n \tfor (k_idx = 0; k_idx < kvlist->count; k_idx++) {\n \t\tpair = &kvlist->pairs[k_idx];\n-\t\tARK_PMD_LOG(DEBUG, \"**** Arg passed to PMD = %s:%s\\n\",\n+\t\tARK_ETHDEV_LOG(DEBUG, \"**** Arg passed to PMD = %s:%s\\n\",\n \t\t\t pair->key,\n \t\t\t pair->value);\n \t}\n@@ -1015,7 +996,7 @@ eth_ark_check_args(struct ark_adapter *ark, const char *params)\n \t\t\t ARK_PKTDIR_ARG,\n \t\t\t &process_pktdir_arg,\n \t\t\t ark) != 0) {\n-\t\tARK_PMD_LOG(ERR, \"Unable to parse arg %s\\n\", ARK_PKTDIR_ARG);\n+\t\tARK_ETHDEV_LOG(ERR, \"Unable to parse arg %s\\n\", ARK_PKTDIR_ARG);\n \t\tgoto free_kvlist;\n \t}\n \n@@ -1023,7 +1004,7 @@ eth_ark_check_args(struct ark_adapter *ark, const char *params)\n \t\t\t ARK_PKTGEN_ARG,\n \t\t\t &process_file_args,\n \t\t\t ark->pkt_gen_args) != 0) {\n-\t\tARK_PMD_LOG(ERR, \"Unable to parse arg %s\\n\", ARK_PKTGEN_ARG);\n+\t\tARK_ETHDEV_LOG(ERR, \"Unable to parse arg %s\\n\", ARK_PKTGEN_ARG);\n \t\tgoto free_kvlist;\n \t}\n \n@@ -1031,17 +1012,17 @@ eth_ark_check_args(struct ark_adapter *ark, const char *params)\n \t\t\t ARK_PKTCHKR_ARG,\n \t\t\t &process_file_args,\n \t\t\t ark->pkt_chkr_args) != 0) {\n-\t\tARK_PMD_LOG(ERR, \"Unable to parse arg %s\\n\", ARK_PKTCHKR_ARG);\n+\t\tARK_ETHDEV_LOG(ERR, \"Unable to parse arg %s\\n\", ARK_PKTCHKR_ARG);\n \t\tgoto free_kvlist;\n \t}\n \n-\tARK_PMD_LOG(INFO, \"packet director set to 0x%x\\n\", ark->pkt_dir_v);\n+\tARK_ETHDEV_LOG(INFO, \"packet director set to 0x%x\\n\", ark->pkt_dir_v);\n \t/* Setup the packet director */\n \tark_pktdir_setup(ark->pd, ark->pkt_dir_v);\n \n \t/* Setup the packet generator */\n \tif (ark->pkt_gen_args[0]) {\n-\t\tARK_PMD_LOG(DEBUG, \"Setting up the packet generator\\n\");\n+\t\tARK_ETHDEV_LOG(DEBUG, \"Setting up the packet generator\\n\");\n \t\tark_pktgen_parse(ark->pkt_gen_args);\n \t\tark_pktgen_reset(ark->pg);\n \t\tark_pktgen_setup(ark->pg);\ndiff --git a/drivers/net/ark/ark_ethdev_logs.c b/drivers/net/ark/ark_ethdev_logs.c\nnew file mode 100644\nindex 0000000000..2ae2a5720e\n--- /dev/null\n+++ b/drivers/net/ark/ark_ethdev_logs.c\n@@ -0,0 +1,7 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright (c) 2020-2021 Atomic Rules LLC\n+ */\n+\n+#include \"ark_ethdev_logs.h\"\n+\n+int ark_ethdev_logtype;\ndiff --git a/drivers/net/ark/ark_ethdev_logs.h b/drivers/net/ark/ark_ethdev_logs.h\nnew file mode 100644\nindex 0000000000..6db80655d7\n--- /dev/null\n+++ b/drivers/net/ark/ark_ethdev_logs.h\n@@ -0,0 +1,25 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright (c) 2015-2018 Atomic Rules LLC\n+ */\n+\n+#ifndef _ARK_ETHDEV_LOG_H_\n+#define _ARK_ETHDEV_LOG_H_\n+\n+#include <inttypes.h>\n+#include <rte_log.h>\n+#include \"ark_common.h\"\n+\n+extern int ark_ethdev_logtype;\n+\n+#define ARK_ETHDEV_LOG(level, fmt, args...)\t\\\n+\trte_log(RTE_LOG_ ##level, ark_ethdev_logtype, \"ARK: \" fmt, ## args)\n+\n+\n+/* Debug macro to enable core debug code */\n+#ifdef RTE_LIBRTE_ETHDEV_DEBUG\n+#define ARK_DEBUG_CORE 1\n+#else\n+#define ARK_DEBUG_CORE 0\n+#endif\n+\n+#endif\ndiff --git a/drivers/net/ark/ark_ethdev_rx.c b/drivers/net/ark/ark_ethdev_rx.c\nindex 0fbb2603db..e599e1f70d 100644\n--- a/drivers/net/ark/ark_ethdev_rx.c\n+++ b/drivers/net/ark/ark_ethdev_rx.c\n@@ -6,7 +6,7 @@\n \n #include \"ark_ethdev_rx.h\"\n #include \"ark_global.h\"\n-#include \"ark_logs.h\"\n+#include \"ark_ethdev_logs.h\"\n #include \"ark_mpu.h\"\n #include \"ark_udm.h\"\n \n@@ -82,7 +82,7 @@ eth_ark_rx_hw_setup(struct rte_eth_dev *dev,\n \n \t/* Verify HW */\n \tif (ark_mpu_verify(queue->mpu, sizeof(rte_iova_t))) {\n-\t\tARK_PMD_LOG(ERR, \"Illegal configuration rx queue\\n\");\n+\t\tARK_ETHDEV_LOG(ERR, \"Illegal configuration rx queue\\n\");\n \t\treturn -1;\n \t}\n \n@@ -137,19 +137,19 @@ eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \n \tif (rx_conf != NULL && warning1 == 0) {\n \t\twarning1 = 1;\n-\t\tARK_PMD_LOG(NOTICE,\n+\t\tARK_ETHDEV_LOG(NOTICE,\n \t\t\t \"Arkville ignores rte_eth_rxconf argument.\\n\");\n \t}\n \n \tif (RTE_PKTMBUF_HEADROOM < ARK_RX_META_SIZE) {\n-\t\tARK_PMD_LOG(ERR,\n+\t\tARK_ETHDEV_LOG(ERR,\n \t\t\t \"Error: DPDK Arkville requires head room > %d bytes (%s)\\n\",\n \t\t\t ARK_RX_META_SIZE, __func__);\n \t\treturn -1;\t\t/* ERROR CODE */\n \t}\n \n \tif (!rte_is_power_of_2(nb_desc)) {\n-\t\tARK_PMD_LOG(ERR,\n+\t\tARK_ETHDEV_LOG(ERR,\n \t\t\t \"DPDK Arkville configuration queue size must be power of two %u (%s)\\n\",\n \t\t\t nb_desc, __func__);\n \t\treturn -1;\t\t/* ERROR CODE */\n@@ -161,7 +161,7 @@ eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t\t 64,\n \t\t\t\t socket_id);\n \tif (queue == 0) {\n-\t\tARK_PMD_LOG(ERR, \"Failed to allocate memory in %s\\n\", __func__);\n+\t\tARK_ETHDEV_LOG(ERR, \"Failed to allocate memory in %s\\n\", __func__);\n \t\treturn -ENOMEM;\n \t}\n \n@@ -189,7 +189,7 @@ eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t\t socket_id);\n \n \tif (queue->reserve_q == 0 || queue->paddress_q == 0) {\n-\t\tARK_PMD_LOG(ERR,\n+\t\tARK_ETHDEV_LOG(ERR,\n \t\t\t \"Failed to allocate queue memory in %s\\n\",\n \t\t\t __func__);\n \t\trte_free(queue->reserve_q);\n@@ -215,7 +215,7 @@ eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \tstatus = eth_ark_rx_seed_mbufs(queue);\n \n \tif (queue->seed_index != nb_desc) {\n-\t\tARK_PMD_LOG(ERR, \"Failed to allocate %u mbufs for RX queue %d\\n\",\n+\t\tARK_ETHDEV_LOG(ERR, \"Failed to allocate %u mbufs for RX queue %d\\n\",\n \t\t\t nb_desc, qidx);\n \t\tstatus = -1;\n \t}\n@@ -226,7 +226,7 @@ eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \tif (unlikely(status != 0)) {\n \t\tstruct rte_mbuf **mbuf;\n \n-\t\tARK_PMD_LOG(ERR, \"Failed to initialize RX queue %d %s\\n\",\n+\t\tARK_ETHDEV_LOG(ERR, \"Failed to initialize RX queue %d %s\\n\",\n \t\t\t qidx,\n \t\t\t __func__);\n \t\t/* Free the mbufs allocated */\n@@ -285,7 +285,7 @@ eth_ark_recv_pkts(void *rx_queue,\n \n \t\t\tif ((meta->pkt_len > (1024 * 16)) ||\n \t\t\t (meta->pkt_len == 0)) {\n-\t\t\t\tARK_PMD_LOG(DEBUG, \"RX: Bad Meta Q: %u\"\n+\t\t\t\tARK_ETHDEV_LOG(DEBUG, \"RX: Bad Meta Q: %u\"\n \t\t\t\t\t \" cons: %\" PRIU32\n \t\t\t\t\t \" prod: %\" PRIU32\n \t\t\t\t\t \" seed_index %\" PRIU32\n@@ -296,7 +296,7 @@ eth_ark_recv_pkts(void *rx_queue,\n \t\t\t\t\t queue->seed_index);\n \n \n-\t\t\t\tARK_PMD_LOG(DEBUG, \" : UDM\"\n+\t\t\t\tARK_ETHDEV_LOG(DEBUG, \" : UDM\"\n \t\t\t\t\t \" prod: %\" PRIU32\n \t\t\t\t\t \" len: %u\\n\",\n \t\t\t\t\t queue->udm->rt_cfg.prod_idx,\n@@ -464,7 +464,7 @@ eth_ark_rx_seed_mbufs(struct ark_rx_queue *queue)\n \tint status = rte_pktmbuf_alloc_bulk(queue->mb_pool, mbufs, nb);\n \n \tif (unlikely(status != 0)) {\n-\t\tARK_PMD_LOG(NOTICE,\n+\t\tARK_ETHDEV_LOG(NOTICE,\n \t\t\t \"Could not allocate %u mbufs from pool\"\n \t\t\t \" for RX queue %u;\"\n \t\t\t \" %u free buffers remaining in queue\\n\",\n@@ -603,7 +603,7 @@ eth_ark_udm_force_close(struct rte_eth_dev *dev)\n \n \tif (!ark_udm_is_flushed(ark->udm.v)) {\n \t\t/* restart the MPUs */\n-\t\tARK_PMD_LOG(NOTICE, \"UDM not flushed -- forcing flush\\n\");\n+\t\tARK_ETHDEV_LOG(NOTICE, \"UDM not flushed -- forcing flush\\n\");\n \t\tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n \t\t\tqueue = (struct ark_rx_queue *)dev->data->rx_queues[i];\n \t\t\tif (queue == 0)\n@@ -617,7 +617,7 @@ eth_ark_udm_force_close(struct rte_eth_dev *dev)\n \t\t/* Wait to allow data to pass */\n \t\tusleep(100);\n \n-\t\tARK_PMD_LOG(NOTICE, \"UDM forced flush attempt, stopped = %d\\n\",\n+\t\tARK_ETHDEV_LOG(NOTICE, \"UDM forced flush attempt, stopped = %d\\n\",\n \t\t\t ark_udm_is_flushed(ark->udm.v));\n \t}\n \tark_udm_reset(ark->udm.v);\n@@ -628,8 +628,8 @@ ark_ethdev_rx_dump(const char *name, struct ark_rx_queue *queue)\n {\n \tif (queue == NULL)\n \t\treturn;\n-\tARK_PMD_LOG(DEBUG, \"RX QUEUE %d -- %s\", queue->phys_qid, name);\n-\tARK_PMD_LOG(DEBUG, ARK_SU32 ARK_SU32 ARK_SU32 ARK_SU32 \"\\n\",\n+\tARK_ETHDEV_LOG(DEBUG, \"RX QUEUE %d -- %s\", queue->phys_qid, name);\n+\tARK_ETHDEV_LOG(DEBUG, ARK_SU32 ARK_SU32 ARK_SU32 ARK_SU32 \"\\n\",\n \t\t\t\"queue_size\", queue->queue_size,\n \t\t\t\"seed_index\", queue->seed_index,\n \t\t\t\"prod_index\", queue->prod_index,\n@@ -653,15 +653,15 @@ dump_mbuf_data(struct rte_mbuf *mbuf, uint16_t lo, uint16_t hi)\n {\n \tuint16_t i, j;\n \n-\tARK_PMD_LOG(DEBUG, \" MBUF: %p len %d, off: %d\\n\",\n+\tARK_ETHDEV_LOG(DEBUG, \" MBUF: %p len %d, off: %d\\n\",\n \t\t mbuf, mbuf->pkt_len, mbuf->data_off);\n \tfor (i = lo; i < hi; i += 16) {\n \t\tuint8_t *dp = RTE_PTR_ADD(mbuf->buf_addr, i);\n \n-\t\tARK_PMD_LOG(DEBUG, \" %6d: \", i);\n+\t\tARK_ETHDEV_LOG(DEBUG, \" %6d: \", i);\n \t\tfor (j = 0; j < 16; j++)\n-\t\t\tARK_PMD_LOG(DEBUG, \" %02x\", dp[j]);\n+\t\t\tARK_ETHDEV_LOG(DEBUG, \" %02x\", dp[j]);\n \n-\t\tARK_PMD_LOG(DEBUG, \"\\n\");\n+\t\tARK_ETHDEV_LOG(DEBUG, \"\\n\");\n \t}\n }\ndiff --git a/drivers/net/ark/ark_ethdev_tx.c b/drivers/net/ark/ark_ethdev_tx.c\nindex abdce6a8cc..66ea10735e 100644\n--- a/drivers/net/ark/ark_ethdev_tx.c\n+++ b/drivers/net/ark/ark_ethdev_tx.c\n@@ -8,7 +8,7 @@\n #include \"ark_global.h\"\n #include \"ark_mpu.h\"\n #include \"ark_ddm.h\"\n-#include \"ark_logs.h\"\n+#include \"ark_ethdev_logs.h\"\n \n #define ARK_TX_META_SIZE 32\n #define ARK_TX_META_OFFSET (RTE_PKTMBUF_HEADROOM - ARK_TX_META_SIZE)\n@@ -172,7 +172,7 @@ eth_ark_xmit_pkts(void *vtxq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \t}\n \n \tif (ARK_DEBUG_CORE && nb != nb_pkts) {\n-\t\tARK_PMD_LOG(DEBUG, \"TX: Failure to send:\"\n+\t\tARK_ETHDEV_LOG(DEBUG, \"TX: Failure to send:\"\n \t\t\t \" req: %\" PRIU32\n \t\t\t \" sent: %\" PRIU32\n \t\t\t \" prod: %\" PRIU32\n@@ -238,7 +238,7 @@ eth_ark_tx_queue_setup(struct rte_eth_dev *dev,\n \tint qidx = queue_idx;\n \n \tif (!rte_is_power_of_2(nb_desc)) {\n-\t\tARK_PMD_LOG(ERR,\n+\t\tARK_ETHDEV_LOG(ERR,\n \t\t\t \"DPDK Arkville configuration queue size\"\n \t\t\t \" must be power of two %u (%s)\\n\",\n \t\t\t nb_desc, __func__);\n@@ -254,7 +254,7 @@ eth_ark_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t\t 64,\n \t\t\t\t socket_id);\n \tif (queue == 0) {\n-\t\tARK_PMD_LOG(ERR, \"Failed to allocate tx \"\n+\t\tARK_ETHDEV_LOG(ERR, \"Failed to allocate tx \"\n \t\t\t \"queue memory in %s\\n\",\n \t\t\t __func__);\n \t\treturn -ENOMEM;\n@@ -281,7 +281,7 @@ eth_ark_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t\t socket_id);\n \n \tif (queue->meta_q == 0 || queue->bufs == 0) {\n-\t\tARK_PMD_LOG(ERR, \"Failed to allocate \"\n+\t\tARK_ETHDEV_LOG(ERR, \"Failed to allocate \"\n \t\t\t \"queue memory in %s\\n\", __func__);\n \t\trte_free(queue->meta_q);\n \t\trte_free(queue->bufs);\ndiff --git a/drivers/net/ark/ark_logs.h b/drivers/net/ark/ark_logs.h\ndeleted file mode 100644\nindex ca46d86c99..0000000000\n--- a/drivers/net/ark/ark_logs.h\n+++ /dev/null\n@@ -1,34 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright (c) 2015-2018 Atomic Rules LLC\n- */\n-\n-#ifndef _ARK_DEBUG_H_\n-#define _ARK_DEBUG_H_\n-\n-#include <inttypes.h>\n-#include <rte_log.h>\n-\n-/* system camel case definition changed to upper case */\n-#define PRIU32 PRIu32\n-#define PRIU64 PRIu64\n-\n-/* Format specifiers for string data pairs */\n-#define ARK_SU32 \"\\n\\t%-20s %'20\" PRIU32\n-#define ARK_SU64 \"\\n\\t%-20s %'20\" PRIU64\n-#define ARK_SU64X \"\\n\\t%-20s %#20\" PRIx64\n-#define ARK_SPTR \"\\n\\t%-20s %20p\"\n-\n-extern int ark_logtype;\n-\n-#define ARK_PMD_LOG(level, fmt, args...)\t\\\n-\trte_log(RTE_LOG_ ##level, ark_logtype, \"ARK: \" fmt, ## args)\n-\n-\n-/* Debug macro to enable core debug code */\n-#ifdef RTE_LIBRTE_ETHDEV_DEBUG\n-#define ARK_DEBUG_CORE 1\n-#else\n-#define ARK_DEBUG_CORE 0\n-#endif\n-\n-#endif\n", "prefixes": [ "06/10" ] }