Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/77364/?format=api
{ "id": 77364, "url": "http://patches.dpdk.org/api/patches/77364/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200911083520.24020-5-sachin.saxena@oss.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": "<20200911083520.24020-5-sachin.saxena@oss.nxp.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200911083520.24020-5-sachin.saxena@oss.nxp.com", "date": "2020-09-11T08:35:16", "name": "[v2,4/8] bus/dpaa: RX/TX error queues", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "dc21eec1b5ca94672dc8a995a2285befbd33bd49", "submitter": { "id": 1782, "url": "http://patches.dpdk.org/api/people/1782/?format=api", "name": "Sachin Saxena (OSS)", "email": "sachin.saxena@oss.nxp.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200911083520.24020-5-sachin.saxena@oss.nxp.com/mbox/", "series": [ { "id": 12138, "url": "http://patches.dpdk.org/api/series/12138/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=12138", "date": "2020-09-11T08:35:12", "name": "enhancement and fixes for nxp dpaax platform", "version": 2, "mbox": "http://patches.dpdk.org/series/12138/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/77364/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/77364/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 DB114A04B5;\n\tFri, 11 Sep 2020 10:36:16 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id E7B821C128;\n\tFri, 11 Sep 2020 10:35:44 +0200 (CEST)", "from EUR05-AM6-obe.outbound.protection.outlook.com\n (mail-am6eur05on2086.outbound.protection.outlook.com [40.107.22.86])\n by dpdk.org (Postfix) with ESMTP id 1AE7F1C11B\n for <dev@dpdk.org>; Fri, 11 Sep 2020 10:35:42 +0200 (CEST)", "from VI1PR04MB5837.eurprd04.prod.outlook.com (2603:10a6:803:ec::28)\n by VI1PR04MB6973.eurprd04.prod.outlook.com (2603:10a6:803:13d::9)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16; Fri, 11 Sep\n 2020 08:35:41 +0000", "from VI1PR04MB5837.eurprd04.prod.outlook.com\n ([fe80::cc01:9fe2:2544:8a4b]) by VI1PR04MB5837.eurprd04.prod.outlook.com\n ([fe80::cc01:9fe2:2544:8a4b%7]) with mapi id 15.20.3348.019; Fri, 11 Sep 2020\n 08:35:41 +0000", "from lsv03161.swis.in-blr01.nxp.com (14.142.151.118) by\n SG2PR04CA0178.apcprd04.prod.outlook.com (2603:1096:4:14::16) with Microsoft\n SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id\n 15.20.3370.16 via Frontend Transport; Fri, 11 Sep 2020 08:35:39 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=k7ratDa6/ybFvzOUTPrycM1xuVBzloS74v7TiPUlmgcvEhNiIJNzQ9lCQ5tN3PZp1YVPkQkvDeEEJnBkfZEW4JbOx3nUWY1aAqKpgkL5iyVXpXT2lI/w0utXG7622JreLEpP0rTqvCRF9lBYPh5qhzG6hSTTtOr1lOe6FkHRfZ32AItkwzfvcz72LgpU2nBnwTYvVwsnWmiw7ddLdUsfKj0XIYsVxpU6ehYj5yilXgRi5dKaI29v1W9Ys1hu2DGEzCiagLxC6mB19XNFosqwMiMeH8GhnyqTb8a1YE3qAFMx130f0w0oYly9M5qhzgPKIJ59VnSAU62aUAgwV/tuHg==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=lhsNYSQiuyUz+arZAL6+K1ChdpfMtsRKOLVT3S4mxo0=;\n b=jZ7ebXTQ2zL2NJgj6Ds0JnXcr+YYDx/TQGO6sB5MeHWXeFzQtpz+WjIS+RR585Mwcin844gM0uT/tjCGsYoRC59IUe2vUAsnebb8SuTVwlJq8mB5TbCxICgG+JuH6A5bRt1Mg4Ecylov/sVc2l0MlTNoLL0U69T0RBZvxUXYxPF3QYL7uhd2QBK8K3RvU6UIyllDJDyVvie+SADEQxPXqlyo1sshngT+ZF1ALj7uRZG8ImP7lf/1oiHSxQtVS3NnWB3NHVtFsONJ85hA8xykwlUrJhXKz0UVA4B52Q74/srPnGhxRLOMkqjAPUjoBuHt/PL7X3PJaw0izd0RiPTjqA==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com;\n dkim=pass header.d=oss.nxp.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com;\n s=selector2-NXP1-onmicrosoft-com;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=lhsNYSQiuyUz+arZAL6+K1ChdpfMtsRKOLVT3S4mxo0=;\n b=EuYCq4BDmM0vBfC9rVY2czQRni7GmOF4tgyz4IUpUuCtlx+SZrn/fdZp75UAbk4VOdGVBO5Ge9TqVy59Dx5vAnCndppHshYqkq9VdHP2+MPqUBJefiVlrjF9EPBp7V0TJT3JwyzVQFc4wOO7hDmsSC5nCSWetIrexyS930XehF4=", "Authentication-Results": "dpdk.org; dkim=none (message not signed)\n header.d=none;dpdk.org; dmarc=none action=none header.from=oss.nxp.com;", "From": "\"Sachin Saxena (OSS)\" <sachin.saxena@oss.nxp.com>", "To": "dev@dpdk.org,\n\tferruh.yigit@intel.com", "Date": "Fri, 11 Sep 2020 14:05:16 +0530", "Message-Id": "<20200911083520.24020-5-sachin.saxena@oss.nxp.com>", "X-Mailer": [ "git-send-email 2.28.0", "git-send-email 2.28.0" ], "In-Reply-To": "<20200911083520.24020-1-sachin.saxena@oss.nxp.com>", "References": "<20200911083520.24020-1-sachin.saxena@oss.nxp.com>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "SG2PR04CA0178.apcprd04.prod.outlook.com\n (2603:1096:4:14::16) To VI1PR04MB5837.eurprd04.prod.outlook.com\n (2603:10a6:803:ec::28)", "MIME-Version": "1.0", "X-MS-Exchange-MessageSentRepresentingType": "1", "X-Originating-IP": "[14.142.151.118]", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-HT": "Tenant", "X-MS-Office365-Filtering-Correlation-Id": "1c39988b-6849-42bb-0522-08d8562daa69", "X-MS-TrafficTypeDiagnostic": "VI1PR04MB6973:", "X-MS-Exchange-SharedMailbox-RoutingAgent-Processed": "True", "X-MS-Exchange-Transport-Forked": "True", "X-Microsoft-Antispam-PRVS": "\n <VI1PR04MB6973364C6601A72472D29460A2240@VI1PR04MB6973.eurprd04.prod.outlook.com>", "X-MS-Oob-TLC-OOBClassifiers": "OLM:389;", "X-MS-Exchange-SenderADCheck": "1", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n QYcjfiV0GgOeUSJVj0TASCg8RVmDgxzG5WEds0gXOZt2Ltlpj2Bqozqfu5dnl4uQlKmUQVNsT2r9RED8XVDuD+qQSZgQgg0JHOBdPceKPeC6dP7aakm3ex5bvP3WvyeEw5Cj51oxr667YiFkK9OXoW9Ic4TSSewv3UehVXNJZvHoWR1T3DtN5Dbu7oPb7sziFEZYYGPKdAK/471jx0WqcfTwI0nId/hPQNCE822sMdgcDiuvtsBAecqY9YqcpjrXm3pa7bj8L7TBAoegkP4IENVPS7mlCKcbBnvUBEGV3f7X2EDYyg4YZcmpsMP4PkyuQYqOg1Xvc/RsNl+MyeS3xttcZ0kfPeFK2XhcPWsAuKuGDMDjrgGEm45CyNwrOZ6O", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:VI1PR04MB5837.eurprd04.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(4636009)(346002)(376002)(136003)(396003)(39860400002)(366004)(52116002)(86362001)(1076003)(66556008)(66946007)(2906002)(66476007)(8936002)(5660300002)(83380400001)(316002)(8676002)(2616005)(956004)(6512007)(16526019)(186003)(6486002)(1006002)(6666004)(26005)(6506007)(478600001)(55236004)(110426005);\n DIR:OUT; SFP:1101;", "X-MS-Exchange-AntiSpam-MessageData": "\n z2NBOK51l6mGj5FiY6KhrdlbdImurCAU1FqnwzSKz1FtDp9/IgG3Ucn32mffyLv+OQUXgSHjDOY4J/lEfvVoeKonCGd/8YKuBRa3Z/Kt6Y7yr3MZweTei6Njr6ILrKestU85ybWT0oKo+8StKMsAdy+j94Tp7qWinjYvkD1M5NuR2hGkNpzqEOgjvOQnPAvztIWCMo1h7nh9zlF5e1TPvJ5X/5shuMYQm59LRa9ddIdsi5zzSVuPGLeYojPdfHWyYpQGci93/3kvrz2y2izMcDr9RUkb4hkX+9FeYudk4FwhisiN4BlFL6LCw2rJrx/4Z7uIMYgfn5d7ZxC/BO+TZl+H3aaBsHT3E6LUwawWFRX2WvNarVdDc0sJ+IqLt+/39Im+WyvX4PLQ1wqiTb1zZ9jkS11ifJsfc+YSOnOPCW4r4xcRzIjX+CGQOxA+jOlKZ9dTRfQHtpTXEJ1UJ1K2NJywQY0nR6qx9h+LjaE+5ymBDRK4L4OwYUgOpT16x9tUXvPW2BmkSGWapdxxZ7WY99ocUkIZWaIfdepBsl3f2TYJSa9pukQEo9maVcvwN7GFljSIq41lTu11G1v4sQyHGXKiu7DZxUP/5QF+aMKuqDIFxcevoxujkQsPsiTtipAmxq84+6ahnF7Ep80CluhNaw==", "X-OriginatorOrg": "oss.nxp.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 1c39988b-6849-42bb-0522-08d8562daa69", "X-MS-Exchange-CrossTenant-AuthSource": "VI1PR04MB5837.eurprd04.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "11 Sep 2020 08:35:41.0958 (UTC)", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "686ea1d3-bc2b-4c6f-a92c-d99c5c301635", "X-MS-Exchange-CrossTenant-MailboxType": "HOSTED", "X-MS-Exchange-CrossTenant-UserPrincipalName": "\n oUOraFFRflSd4bNi6fTATg5PylUk31VgDsZ8wsrY2tUy+vg/MD5dAvcfUIcjKCPuHq7slxy1ihske/2JEXXm/A==", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "VI1PR04MB6973", "Subject": "[dpdk-dev] [PATCH v2 4/8] bus/dpaa: RX/TX error queues", "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": "From: Sachin Saxena <sachin.saxena@oss.nxp.com>\n\nCONFIG_RTE_LIBRTE_DPAA_DEBUG_DRIVER=y\n\n1) Enable TX/RX error queues to check the errors.\n2) Display error frame information(payload, status, paresr result).\n\nSigned-off-by: Jun Yang <jun.yang@nxp.com>\nSigned-off-by: Rohit Raj <rohit.raj@nxp.com>\nSigned-off-by: Sachin Saxena <sachin.saxena@oss.nxp.com>\n---\n drivers/bus/dpaa/base/fman/fman_hw.c | 19 ++++\n drivers/bus/dpaa/include/fman.h | 2 +\n drivers/bus/dpaa/include/fsl_fman.h | 4 +\n drivers/bus/dpaa/rte_bus_dpaa_version.map | 1 +\n drivers/net/dpaa/dpaa_ethdev.c | 22 ++++-\n drivers/net/dpaa/dpaa_rxtx.c | 109 ++++++++++++++++++----\n 6 files changed, 137 insertions(+), 20 deletions(-)", "diff": "diff --git a/drivers/bus/dpaa/base/fman/fman_hw.c b/drivers/bus/dpaa/base/fman/fman_hw.c\nindex 9ab8e835d..4ab49f785 100644\n--- a/drivers/bus/dpaa/base/fman/fman_hw.c\n+++ b/drivers/bus/dpaa/base/fman/fman_hw.c\n@@ -609,3 +609,22 @@ fman_if_discard_rx_errors(struct fman_if *fm_if)\n \tfmbm_rfsdm = &((struct rx_bmi_regs *)__if->bmi_map)->fmbm_rfsdm;\n \tout_be32(fmbm_rfsdm, 0x010EE3F0);\n }\n+\n+void\n+fman_if_receive_rx_errors(struct fman_if *fm_if,\n+\tunsigned int err_eq)\n+{\n+\tstruct __fman_if *__if = container_of(fm_if, struct __fman_if, __if);\n+\tunsigned int *fmbm_rcfg, *fmbm_rfsdm, *fmbm_rfsem;\n+\tunsigned int val;\n+\n+\tfmbm_rcfg = &((struct rx_bmi_regs *)__if->bmi_map)->fmbm_rcfg;\n+\tfmbm_rfsdm = &((struct rx_bmi_regs *)__if->bmi_map)->fmbm_rfsdm;\n+\tfmbm_rfsem = &((struct rx_bmi_regs *)__if->bmi_map)->fmbm_rfsem;\n+\n+\tval = in_be32(fmbm_rcfg);\n+\tout_be32(fmbm_rcfg, val | BMI_PORT_CFG_FDOVR);\n+\n+\tout_be32(fmbm_rfsdm, 0);\n+\tout_be32(fmbm_rfsem, err_eq);\n+}\ndiff --git a/drivers/bus/dpaa/include/fman.h b/drivers/bus/dpaa/include/fman.h\nindex dcf408372..f2b0bf91e 100644\n--- a/drivers/bus/dpaa/include/fman.h\n+++ b/drivers/bus/dpaa/include/fman.h\n@@ -226,6 +226,8 @@ struct memac_regs {\n \tuint32_t thm;\t\t\t/**< 0x37C tx messages counter */\n };\n \n+#define BMI_PORT_CFG_FDOVR 0x02000000\n+\n struct rx_bmi_regs {\n \tuint32_t fmbm_rcfg;\t\t/**< Rx Configuration */\n \tuint32_t fmbm_rst;\t\t/**< Rx Status */\ndiff --git a/drivers/bus/dpaa/include/fsl_fman.h b/drivers/bus/dpaa/include/fsl_fman.h\nindex 6c87c8db0..3b759c365 100644\n--- a/drivers/bus/dpaa/include/fsl_fman.h\n+++ b/drivers/bus/dpaa/include/fsl_fman.h\n@@ -151,6 +151,10 @@ void fman_if_set_dnia(struct fman_if *fm_if, uint32_t nia);\n __rte_internal\n void fman_if_discard_rx_errors(struct fman_if *fm_if);\n \n+__rte_internal\n+void fman_if_receive_rx_errors(struct fman_if *fm_if,\n+\tunsigned int err_eq);\n+\n __rte_internal\n void fman_if_set_mcast_filter_table(struct fman_if *p);\n \ndiff --git a/drivers/bus/dpaa/rte_bus_dpaa_version.map b/drivers/bus/dpaa/rte_bus_dpaa_version.map\nindex f47922c6a..5b97b6eb2 100644\n--- a/drivers/bus/dpaa/rte_bus_dpaa_version.map\n+++ b/drivers/bus/dpaa/rte_bus_dpaa_version.map\n@@ -44,6 +44,7 @@ INTERNAL {\n \tfman_if_stats_get_all;\n \tfman_if_stats_reset;\n \tfman_ip_rev;\n+\tfman_if_receive_rx_errors;\n \tfsl_qman_fq_portal_create;\n \tnetcfg_acquire;\n \tnetcfg_release;\ndiff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c\nindex a077b98c3..d5eeb280a 100644\n--- a/drivers/net/dpaa/dpaa_ethdev.c\n+++ b/drivers/net/dpaa/dpaa_ethdev.c\n@@ -47,6 +47,7 @@\n #include <fsl_bman.h>\n #include <fsl_fman.h>\n #include <process.h>\n+#include <fmlib/fm_ext.h>\n \n /* Supported Rx offloads */\n static uint64_t dev_rx_offloads_sup =\n@@ -1895,11 +1896,19 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)\n \tdpaa_intf->nb_tx_queues = MAX_DPAA_CORES;\n \n #ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER\n-\tdpaa_debug_queue_init(&dpaa_intf->debug_queues[\n-\t\tDPAA_DEBUG_FQ_RX_ERROR], fman_intf->fqid_rx_err);\n+\tret = dpaa_debug_queue_init(&dpaa_intf->debug_queues\n+\t\t\t[DPAA_DEBUG_FQ_RX_ERROR], fman_intf->fqid_rx_err);\n+\tif (ret) {\n+\t\tDPAA_PMD_ERR(\"DPAA RX ERROR queue init failed!\");\n+\t\tgoto free_tx;\n+\t}\n \tdpaa_intf->debug_queues[DPAA_DEBUG_FQ_RX_ERROR].dpaa_intf = dpaa_intf;\n-\tdpaa_debug_queue_init(&dpaa_intf->debug_queues[\n-\t\tDPAA_DEBUG_FQ_TX_ERROR], fman_intf->fqid_tx_err);\n+\tret = dpaa_debug_queue_init(&dpaa_intf->debug_queues\n+\t\t\t[DPAA_DEBUG_FQ_TX_ERROR], fman_intf->fqid_tx_err);\n+\tif (ret) {\n+\t\tDPAA_PMD_ERR(\"DPAA TX ERROR queue init failed!\");\n+\t\tgoto free_tx;\n+\t}\n \tdpaa_intf->debug_queues[DPAA_DEBUG_FQ_TX_ERROR].dpaa_intf = dpaa_intf;\n #endif\n \n@@ -1945,7 +1954,12 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)\n \n \tif (!fman_intf->is_shared_mac) {\n \t\t/* Disable RX mode */\n+#ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER\n+\t\tfman_if_receive_rx_errors(fman_intf,\n+\t\t\tFM_FD_RX_STATUS_ERR_MASK);\n+#else\n \t\tfman_if_discard_rx_errors(fman_intf);\n+#endif\n \t\tfman_if_disable_rx(fman_intf);\n \t\t/* Disable promiscuous mode */\n \t\tfman_if_promiscuous_disable(fman_intf);\ndiff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c\nindex 5303c9b76..6eadbfa14 100644\n--- a/drivers/net/dpaa/dpaa_rxtx.c\n+++ b/drivers/net/dpaa/dpaa_rxtx.c\n@@ -58,29 +58,57 @@\n \t\t(_fd)->bpid = _bpid; \\\n \t} while (0)\n \n-#if (defined RTE_LIBRTE_DPAA_DEBUG_DRIVER)\n-static void dpaa_display_frame(const struct qm_fd *fd)\n+#ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER\n+#define DISPLAY_PRINT printf\n+static void dpaa_display_frame_info(const struct qm_fd *fd,\n+\t\t\tuint32_t fqid, bool rx)\n {\n \tint ii;\n \tchar *ptr;\n+\tstruct annotations_t *annot = rte_dpaa_mem_ptov(fd->addr);\n+\tuint8_t format;\n+\n+\tif (!fd->status) {\n+\t\t/* Do not display correct packets.*/\n+\t\treturn;\n+\t}\n+\n+\tformat = (fd->opaque & DPAA_FD_FORMAT_MASK) >>\n+\t\t\t\tDPAA_FD_FORMAT_SHIFT;\n+\n+\tDISPLAY_PRINT(\"fqid %d bpid %d addr 0x%lx, format %d\\r\\n\",\n+\t\t fqid, fd->bpid, (unsigned long)fd->addr, fd->format);\n+\tDISPLAY_PRINT(\"off %d, len %d stat 0x%x\\r\\n\",\n+\t\t fd->offset, fd->length20, fd->status);\n+\tif (rx) {\n+\t\tptr = (char *)&annot->parse;\n+\t\tDISPLAY_PRINT(\"RX parser result:\\r\\n\");\n+\t\tfor (ii = 0; ii < (int)sizeof(struct dpaa_eth_parse_results_t);\n+\t\t\tii++) {\n+\t\t\tDISPLAY_PRINT(\"%02x \", ptr[ii]);\n+\t\t\tif (((ii + 1) % 16) == 0)\n+\t\t\t\tDISPLAY_PRINT(\"\\n\");\n+\t\t}\n+\t\tDISPLAY_PRINT(\"\\n\");\n+\t}\n \n-\tprintf(\"%s::bpid %x addr %08x%08x, format %d off %d, len %d stat %x\\n\",\n-\t __func__, fd->bpid, fd->addr_hi, fd->addr_lo, fd->format,\n-\t\tfd->offset, fd->length20, fd->status);\n+\tif (unlikely(format == qm_fd_sg)) {\n+\t\t/*TBD:S/G display: to be implemented*/\n+\t\treturn;\n+\t}\n \n-\tptr = (char *)rte_dpaa_mem_ptov(fd->addr);\n+\tDISPLAY_PRINT(\"Frame payload:\\r\\n\");\n+\tptr = (char *)annot;\n \tptr += fd->offset;\n-\tprintf(\"%02x \", *ptr);\n-\tfor (ii = 1; ii < fd->length20; ii++) {\n-\t\tprintf(\"%02x \", *ptr);\n-\t\tif ((ii % 16) == 0)\n+\tfor (ii = 0; ii < fd->length20; ii++) {\n+\t\tDISPLAY_PRINT(\"%02x \", ptr[ii]);\n+\t\tif (((ii + 1) % 16) == 0)\n \t\t\tprintf(\"\\n\");\n-\t\tptr++;\n \t}\n-\tprintf(\"\\n\");\n+\tDISPLAY_PRINT(\"\\n\");\n }\n #else\n-#define dpaa_display_frame(a)\n+#define dpaa_display_frame_info(a, b, c)\n #endif\n \n static inline void dpaa_slow_parsing(struct rte_mbuf *m __rte_unused,\n@@ -377,7 +405,6 @@ dpaa_eth_fd_to_mbuf(const struct qm_fd *fd, uint32_t ifid)\n \tDPAA_DP_LOG(DEBUG, \" FD--->MBUF off %d len = %d\", offset, length);\n \n \t/* Ignoring case when format != qm_fd_contig */\n-\tdpaa_display_frame(fd);\n \tptr = DPAA_MEMPOOL_PTOV(bp_info, qm_fd_addr(fd));\n \n \tmbuf = (struct rte_mbuf *)((char *)ptr - bp_info->meta_data_size);\n@@ -492,7 +519,6 @@ dpaa_rx_cb_no_prefetch(struct qman_fq **fq, struct qm_dqrr_entry **dqrr,\n \n \t\tfd = &dqrr[i]->fd;\n \t\tdpaa_intf = fq[0]->dpaa_intf;\n-\n \t\tformat = (fd->opaque & DPAA_FD_FORMAT_MASK) >>\n \t\t\t\tDPAA_FD_FORMAT_SHIFT;\n \t\tif (unlikely(format == qm_fd_sg)) {\n@@ -515,6 +541,7 @@ dpaa_rx_cb_no_prefetch(struct qman_fq **fq, struct qm_dqrr_entry **dqrr,\n \t\tmbuf->next = NULL;\n \t\trte_mbuf_refcnt_set(mbuf, 1);\n \t\tdpaa_eth_packet_info(mbuf, mbuf->buf_addr);\n+\t\tdpaa_display_frame_info(fd, fq[0]->fqid, true);\n \t}\n }\n \n@@ -532,7 +559,6 @@ dpaa_rx_cb(struct qman_fq **fq, struct qm_dqrr_entry **dqrr,\n \tfor (i = 0; i < num_bufs; i++) {\n \t\tfd = &dqrr[i]->fd;\n \t\tdpaa_intf = fq[0]->dpaa_intf;\n-\n \t\tformat = (fd->opaque & DPAA_FD_FORMAT_MASK) >>\n \t\t\t\tDPAA_FD_FORMAT_SHIFT;\n \t\tif (unlikely(format == qm_fd_sg)) {\n@@ -555,6 +581,7 @@ dpaa_rx_cb(struct qman_fq **fq, struct qm_dqrr_entry **dqrr,\n \t\tmbuf->next = NULL;\n \t\trte_mbuf_refcnt_set(mbuf, 1);\n \t\tdpaa_eth_packet_info(mbuf, mbuf->buf_addr);\n+\t\tdpaa_display_frame_info(fd, fq[0]->fqid, true);\n \t}\n }\n \n@@ -653,6 +680,50 @@ dpaa_rx_cb_atomic(void *event,\n \treturn qman_cb_dqrr_defer;\n }\n \n+#ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER\n+static inline void dpaa_eth_err_queue(struct dpaa_if *dpaa_intf)\n+{\n+\tstruct rte_mbuf *mbuf;\n+\tstruct qman_fq *debug_fq;\n+\tint ret, i;\n+\tstruct qm_dqrr_entry *dq;\n+\tstruct qm_fd *fd;\n+\n+\tif (unlikely(!RTE_PER_LCORE(dpaa_io))) {\n+\t\tret = rte_dpaa_portal_init((void *)0);\n+\t\tif (ret) {\n+\t\t\tDPAA_PMD_ERR(\"Failure in affining portal\");\n+\t\t\treturn;\n+\t\t}\n+\t}\n+\tfor (i = 0; i <= DPAA_DEBUG_FQ_TX_ERROR; i++) {\n+\t\tdebug_fq = &dpaa_intf->debug_queues[i];\n+\t\tret = qman_set_vdq(debug_fq, 4, QM_VDQCR_EXACT);\n+\t\tif (ret)\n+\t\t\treturn;\n+\n+\t\tdo {\n+\t\t\tdq = qman_dequeue(debug_fq);\n+\t\t\tif (!dq)\n+\t\t\t\tcontinue;\n+\t\t\tfd = &dq->fd;\n+\t\t\tif (i == DPAA_DEBUG_FQ_RX_ERROR)\n+\t\t\t\tDPAA_PMD_ERR(\"RX ERROR status: 0x%08x\",\n+\t\t\t\t\tfd->status);\n+\t\t\telse\n+\t\t\t\tDPAA_PMD_ERR(\"TX ERROR status: 0x%08x\",\n+\t\t\t\t\tfd->status);\n+\t\t\tdpaa_display_frame_info(fd, debug_fq->fqid,\n+\t\t\t\ti == DPAA_DEBUG_FQ_RX_ERROR);\n+\n+\t\t\tmbuf = dpaa_eth_fd_to_mbuf(fd, dpaa_intf->ifid);\n+\t\t\trte_pktmbuf_free(mbuf);\n+\t\t\tqman_dqrr_consume(debug_fq, dq);\n+\t\t} while (debug_fq->flags & QMAN_FQ_STATE_VDQCR);\n+\t}\n+}\n+#endif\n+\n uint16_t dpaa_eth_queue_rx(void *q,\n \t\t\t struct rte_mbuf **bufs,\n \t\t\t uint16_t nb_bufs)\n@@ -667,6 +738,11 @@ uint16_t dpaa_eth_queue_rx(void *q,\n \t\t\t\trte_eal_process_type() == RTE_PROC_SECONDARY))\n \t\trte_dpaa_bpid_info = fq->bp_array;\n \n+#ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER\n+\tif (fq->fqid == ((struct dpaa_if *)fq->dpaa_intf)->rx_queues[0].fqid)\n+\t\tdpaa_eth_err_queue((struct dpaa_if *)fq->dpaa_intf);\n+#endif\n+\n \tif (likely(fq->is_static))\n \t\treturn dpaa_eth_queue_portal_rx(fq, bufs, nb_bufs);\n \n@@ -699,6 +775,7 @@ uint16_t dpaa_eth_queue_rx(void *q,\n \t\tif (!dq)\n \t\t\tcontinue;\n \t\tbufs[num_rx++] = dpaa_eth_fd_to_mbuf(&dq->fd, ifid);\n+\t\tdpaa_display_frame_info(&dq->fd, fq->fqid, true);\n \t\tqman_dqrr_consume(fq, dq);\n \t} while (fq->flags & QMAN_FQ_STATE_VDQCR);\n \n", "prefixes": [ "v2", "4/8" ] }