Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/99355/?format=api
{ "id": 99355, "url": "http://patches.dpdk.org/api/patches/99355/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210921132009.3461020-4-qi.z.zhang@intel.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": "<20210921132009.3461020-4-qi.z.zhang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210921132009.3461020-4-qi.z.zhang@intel.com", "date": "2021-09-21T13:19:52", "name": "[v3,03/20] net/ice/base: init metainit table for parser", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "1fca019c7c1d22cd9403af02a8351ee0d93d3f4f", "submitter": { "id": 504, "url": "http://patches.dpdk.org/api/people/504/?format=api", "name": "Qi Zhang", "email": "qi.z.zhang@intel.com" }, "delegate": { "id": 1540, "url": "http://patches.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20210921132009.3461020-4-qi.z.zhang@intel.com/mbox/", "series": [ { "id": 19057, "url": "http://patches.dpdk.org/api/series/19057/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=19057", "date": "2021-09-21T13:19:49", "name": "ice/base: add parser module", "version": 3, "mbox": "http://patches.dpdk.org/series/19057/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/99355/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/99355/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 882D9A0C4C;\n\tTue, 21 Sep 2021 15:17:28 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 5C7D741139;\n\tTue, 21 Sep 2021 15:17:14 +0200 (CEST)", "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n by mails.dpdk.org (Postfix) with ESMTP id CBBE941120\n for <dev@dpdk.org>; Tue, 21 Sep 2021 15:17:09 +0200 (CEST)", "from orsmga008.jf.intel.com ([10.7.209.65])\n by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 21 Sep 2021 06:17:09 -0700", "from dpdk51.sh.intel.com ([10.67.111.142])\n by orsmga008.jf.intel.com with ESMTP; 21 Sep 2021 06:17:07 -0700" ], "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,10113\"; a=\"202847426\"", "E=Sophos;i=\"5.85,311,1624345200\"; d=\"scan'208\";a=\"202847426\"", "E=Sophos;i=\"5.85,311,1624345200\"; d=\"scan'208\";a=\"484173827\"" ], "X-ExtLoop1": "1", "From": "Qi Zhang <qi.z.zhang@intel.com>", "To": "qiming.yang@intel.com", "Cc": "junfeng.guo@intel.com,\n\tdev@dpdk.org,\n\tQi Zhang <qi.z.zhang@intel.com>", "Date": "Tue, 21 Sep 2021 21:19:52 +0800", "Message-Id": "<20210921132009.3461020-4-qi.z.zhang@intel.com>", "X-Mailer": "git-send-email 2.26.2", "In-Reply-To": "<20210921132009.3461020-1-qi.z.zhang@intel.com>", "References": "<20210921132009.3461020-1-qi.z.zhang@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v3 03/20] net/ice/base: init metainit table for\n parser", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Parse DDP section ICE_SID_RXPARSER_METADATA_INIT into an array of\nstruct ice_metainit_item.\n\nSigned-off-by: Qi Zhang <qi.z.zhang@intel.com>\nAcked-by: Junfeng Guo <junfeng.guo@intel.com>\n---\n drivers/net/ice/base/ice_metainit.c | 143 +++++++++++++++++++++++++\n drivers/net/ice/base/ice_metainit.h | 46 ++++++++\n drivers/net/ice/base/ice_parser.c | 15 ++-\n drivers/net/ice/base/ice_parser.h | 2 +\n drivers/net/ice/base/ice_parser_util.h | 1 +\n drivers/net/ice/base/meson.build | 1 +\n 6 files changed, 206 insertions(+), 2 deletions(-)\n create mode 100644 drivers/net/ice/base/ice_metainit.c\n create mode 100644 drivers/net/ice/base/ice_metainit.h", "diff": "diff --git a/drivers/net/ice/base/ice_metainit.c b/drivers/net/ice/base/ice_metainit.c\nnew file mode 100644\nindex 0000000000..5d49c6861d\n--- /dev/null\n+++ b/drivers/net/ice/base/ice_metainit.c\n@@ -0,0 +1,143 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2001-2021 Intel Corporation\n+ */\n+\n+#include \"ice_common.h\"\n+#include \"ice_parser_util.h\"\n+\n+#define ICE_METAINIT_TABLE_SIZE 16\n+\n+/**\n+ * ice_metainit_dump - dump an metainit item info\n+ * @ice_hw: pointer to the hardware structure\n+ * @item: metainit item to dump\n+ */\n+void ice_metainit_dump(struct ice_hw *hw, struct ice_metainit_item *item)\n+{\n+\tice_info(hw, \"index = %d\\n\", item->idx);\n+\tice_info(hw, \"tsr = %d\\n\", item->tsr);\n+\tice_info(hw, \"ho = %d\\n\", item->ho);\n+\tice_info(hw, \"pc = %d\\n\", item->pc);\n+\tice_info(hw, \"pg_rn = %d\\n\", item->pg_rn);\n+\tice_info(hw, \"cd = %d\\n\", item->cd);\n+\tice_info(hw, \"gpr_a_ctrl = %d\\n\", item->gpr_a_ctrl);\n+\tice_info(hw, \"gpr_a_data_mdid = %d\\n\", item->gpr_a_data_mdid);\n+\tice_info(hw, \"gpr_a_data_start = %d\\n\", item->gpr_a_data_start);\n+\tice_info(hw, \"gpr_a_data_len = %d\\n\", item->gpr_a_data_len);\n+\tice_info(hw, \"gpr_a_id = %d\\n\", item->gpr_a_id);\n+\tice_info(hw, \"gpr_b_ctrl = %d\\n\", item->gpr_b_ctrl);\n+\tice_info(hw, \"gpr_b_data_mdid = %d\\n\", item->gpr_b_data_mdid);\n+\tice_info(hw, \"gpr_b_data_start = %d\\n\", item->gpr_b_data_start);\n+\tice_info(hw, \"gpr_b_data_len = %d\\n\", item->gpr_b_data_len);\n+\tice_info(hw, \"gpr_b_id = %d\\n\", item->gpr_b_id);\n+\tice_info(hw, \"gpr_c_ctrl = %d\\n\", item->gpr_c_ctrl);\n+\tice_info(hw, \"gpr_c_data_mdid = %d\\n\", item->gpr_c_data_mdid);\n+\tice_info(hw, \"gpr_c_data_start = %d\\n\", item->gpr_c_data_start);\n+\tice_info(hw, \"gpr_c_data_len = %d\\n\", item->gpr_c_data_len);\n+\tice_info(hw, \"gpr_c_id = %d\\n\", item->gpr_c_id);\n+\tice_info(hw, \"gpr_d_ctrl = %d\\n\", item->gpr_d_ctrl);\n+\tice_info(hw, \"gpr_d_data_mdid = %d\\n\", item->gpr_d_data_mdid);\n+\tice_info(hw, \"gpr_d_data_start = %d\\n\", item->gpr_d_data_start);\n+\tice_info(hw, \"gpr_d_data_len = %d\\n\", item->gpr_d_data_len);\n+\tice_info(hw, \"gpr_d_id = %d\\n\", item->gpr_d_id);\n+\tice_info(hw, \"flags = 0x%016\" PRIx64 \"\\n\", item->flags);\n+}\n+\n+/** The function parses a 192 bits Metadata Init entry with below format:\n+ * BIT 0-7:\tTCAM Search Key Register (mi->tsr)\n+ * BIT 8-16:\tHeader Offset (mi->ho)\n+ * BIT 17-24:\tProgram Counter (mi->pc)\n+ * BIT 25-35:\tParse Graph Root Node (mi->pg_rn)\n+ * BIT 36-38:\tControl Domain (mi->cd)\n+ * BIT 39:\tGPR_A Data Control (mi->gpr_a_ctrl)\n+ * BIT 40-44:\tGPR_A MDID.ID (mi->gpr_a_data_mdid)\n+ * BIT 45-48:\tGPR_A MDID.START (mi->gpr_a_data_start)\n+ * BIT 49-53:\tGPR_A MDID.LEN (mi->gpr_a_data_len)\n+ * BIT 54-55:\treserved\n+ * BIT 56-59:\tGPR_A ID (mi->gpr_a_id)\n+ * BIT 60:\tGPR_B Data Control (mi->gpr_b_ctrl)\n+ * BIT 61-65:\tGPR_B MDID.ID (mi->gpr_b_data_mdid)\n+ * BIT 66-69:\tGPR_B MDID.START (mi->gpr_b_data_start)\n+ * BIT 70-74:\tGPR_B MDID.LEN (mi->gpr_b_data_len)\n+ * BIT 75-76:\treserved\n+ * BIT 77-80:\tGPR_B ID (mi->gpr_a_id)\n+ * BIT 81:\tGPR_C Data Control (mi->gpr_c_ctrl)\n+ * BIT 82-86:\tGPR_C MDID.ID (mi->gpr_c_data_mdid)\n+ * BIT 87-90:\tGPR_C MDID.START (mi->gpr_c_data_start)\n+ * BIT 91-95:\tGPR_C MDID.LEN (mi->gpr_c_data_len)\n+ * BIT 96-97:\treserved\n+ * BIT 98-101:\tGPR_C ID (mi->gpr_c_id)\n+ * BIT 102:\tGPR_D Data Control (mi->gpr_d_ctrl)\n+ * BIT 103-107:GPR_D MDID.ID (mi->gpr_d_data_mdid)\n+ * BIT 108-111:GPR_D MDID.START (mi->gpr_d_data_start)\n+ * BIT 112-116:GPR_D MDID.LEN (mi->gpr_d_data_len)\n+ * BIT 117-118:reserved\n+ * BIT 119-122:GPR_D ID (mi->gpr_d_id)\n+ * BIT 123-186:Flags (mi->flags)\n+ * BIT 187-191:rserved\n+ */\n+static void _metainit_parse_item(struct ice_hw *hw, u16 idx, void *item,\n+\t\t\t\t void *data, int size)\n+{\n+\tstruct ice_metainit_item *mi = (struct ice_metainit_item *)item;\n+\tu8 *buf = (u8 *)data;\n+\tu64 d64;\n+\n+\tmi->idx = idx;\n+\td64 = *(u64 *)buf;\n+\n+\tmi->tsr = (u8)(d64 & 0xff);\n+\tmi->ho = (u16)((d64 >> 8) & 0x1ff);\n+\tmi->pc = (u16)((d64 >> 17) & 0xff);\n+\tmi->pg_rn = (u16)((d64 >> 25) & 0x3ff);\n+\tmi->cd = (u16)((d64 >> 36) & 0x7);\n+\tmi->gpr_a_ctrl = ((d64 >> 39) & 0x1) != 0;\n+\tmi->gpr_a_data_mdid = (u8)((d64 >> 40) & 0x1f);\n+\tmi->gpr_a_data_start = (u8)((d64 >> 45) & 0xf);\n+\tmi->gpr_a_data_len = (u8)((d64 >> 49) & 0x1f);\n+\tmi->gpr_a_id = (u8)((d64 >> 56) & 0xf);\n+\n+\td64 = *(u64 *)&buf[7] >> 4;\n+\tmi->gpr_b_ctrl = (d64 & 0x1) != 0;\n+\tmi->gpr_b_data_mdid = (u8)((d64 >> 1) & 0x1f);\n+\tmi->gpr_b_data_start = (u8)((d64 >> 6) & 0xf);\n+\tmi->gpr_b_data_len = (u8)((d64 >> 10) & 0x1f);\n+\tmi->gpr_b_id = (u8)((d64 >> 17) & 0xf);\n+\n+\tmi->gpr_c_ctrl = ((d64 >> 21) & 0x1) != 0;\n+\tmi->gpr_c_data_mdid = (u8)((d64 >> 22) & 0x1f);\n+\tmi->gpr_c_data_start = (u8)((d64 >> 27) & 0xf);\n+\tmi->gpr_c_data_len = (u8)((d64 >> 31) & 0x1f);\n+\tmi->gpr_c_id = (u8)((d64 >> 38) & 0xf);\n+\n+\tmi->gpr_d_ctrl = ((d64 >> 42) & 0x1) != 0;\n+\tmi->gpr_d_data_mdid = (u8)((d64 >> 43) & 0x1f);\n+\tmi->gpr_d_data_start = (u8)((d64 >> 48) & 0xf);\n+\tmi->gpr_d_data_len = (u8)((d64 >> 52) & 0x1f);\n+\n+\td64 = *(u64 *)&buf[14] >> 7;\n+\tmi->gpr_d_id = (u8)(d64 & 0xf);\n+\n+\td64 = *(u64 *)&buf[15] >> 3;\n+\tmi->flags = d64;\n+\n+\td64 = ((*(u64 *)&buf[16] >> 56) & 0x7);\n+\tmi->flags |= (d64 << 61);\n+\n+\tif (hw->debug_mask & ICE_DBG_PARSER)\n+\t\tice_metainit_dump(hw, mi);\n+}\n+\n+/**\n+ * ice_metainit_table_get - create a metainit table\n+ * @ice_hw: pointer to the hardware structure\n+ */\n+struct ice_metainit_item *ice_metainit_table_get(struct ice_hw *hw)\n+{\n+\treturn (struct ice_metainit_item *)\n+\t\tice_parser_create_table(hw, ICE_SID_RXPARSER_METADATA_INIT,\n+\t\t\t\t\tsizeof(struct ice_metainit_item),\n+\t\t\t\t\tICE_METAINIT_TABLE_SIZE,\n+\t\t\t\t\tice_parser_sect_item_get,\n+\t\t\t\t\t_metainit_parse_item);\n+}\ndiff --git a/drivers/net/ice/base/ice_metainit.h b/drivers/net/ice/base/ice_metainit.h\nnew file mode 100644\nindex 0000000000..d46f1d7b47\n--- /dev/null\n+++ b/drivers/net/ice/base/ice_metainit.h\n@@ -0,0 +1,46 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2001-2021 Intel Corporation\n+ */\n+\n+#ifndef _ICE_METAINIT_H_\n+#define _ICE_METAINIT_H_\n+\n+struct ice_metainit_item {\n+\tu16 idx;\n+\n+\tu8 tsr;\n+\tu16 ho;\n+\tu16 pc;\n+\tu16 pg_rn;\n+\tu8 cd;\n+\n+\tbool gpr_a_ctrl;\n+\tu8 gpr_a_data_mdid;\n+\tu8 gpr_a_data_start;\n+\tu8 gpr_a_data_len;\n+\tu8 gpr_a_id;\n+\n+\tbool gpr_b_ctrl;\n+\tu8 gpr_b_data_mdid;\n+\tu8 gpr_b_data_start;\n+\tu8 gpr_b_data_len;\n+\tu8 gpr_b_id;\n+\n+\tbool gpr_c_ctrl;\n+\tu8 gpr_c_data_mdid;\n+\tu8 gpr_c_data_start;\n+\tu8 gpr_c_data_len;\n+\tu8 gpr_c_id;\n+\n+\tbool gpr_d_ctrl;\n+\tu8 gpr_d_data_mdid;\n+\tu8 gpr_d_data_start;\n+\tu8 gpr_d_data_len;\n+\tu8 gpr_d_id;\n+\n+\tu64 flags;\n+};\n+\n+void ice_metainit_dump(struct ice_hw *hw, struct ice_metainit_item *item);\n+struct ice_metainit_item *ice_metainit_table_get(struct ice_hw *hw);\n+#endif /*_ICE_METAINIT_H_ */\ndiff --git a/drivers/net/ice/base/ice_parser.c b/drivers/net/ice/base/ice_parser.c\nindex 0e52fd1ebf..0dd6bf137d 100644\n--- a/drivers/net/ice/base/ice_parser.c\n+++ b/drivers/net/ice/base/ice_parser.c\n@@ -5,8 +5,9 @@\n #include \"ice_common.h\"\n #include \"ice_parser_util.h\"\n \n-#define ICE_SEC_DATA_OFFSET\t\t\t4\n-#define ICE_SID_RXPARSER_IMEM_ENTRY_SIZE\t48\n+#define ICE_SEC_DATA_OFFSET\t\t\t\t4\n+#define ICE_SID_RXPARSER_IMEM_ENTRY_SIZE\t\t48\n+#define ICE_SID_RXPARSER_METADATA_INIT_ENTRY_SIZE\t24\n \n /**\n * ice_parser_sect_item_get - parse a item from a section\n@@ -29,6 +30,9 @@ void *ice_parser_sect_item_get(u32 sect_type, void *section,\n \tcase ICE_SID_RXPARSER_IMEM:\n \t\tsize = ICE_SID_RXPARSER_IMEM_ENTRY_SIZE;\n \t\tbreak;\n+\tcase ICE_SID_RXPARSER_METADATA_INIT:\n+\t\tsize = ICE_SID_RXPARSER_METADATA_INIT_ENTRY_SIZE;\n+\t\tbreak;\n \tdefault:\n \t\treturn NULL;\n \t}\n@@ -115,6 +119,12 @@ enum ice_status ice_parser_create(struct ice_hw *hw, struct ice_parser **psr)\n \t\tgoto err;\n \t}\n \n+\tp->mi_table = ice_metainit_table_get(hw);\n+\tif (!p->mi_table) {\n+\t\tstatus = ICE_ERR_PARAM;\n+\t\tgoto err;\n+\t}\n+\n \t*psr = p;\n \treturn ICE_SUCCESS;\n err:\n@@ -129,6 +139,7 @@ enum ice_status ice_parser_create(struct ice_hw *hw, struct ice_parser **psr)\n void ice_parser_destroy(struct ice_parser *psr)\n {\n \tice_free(psr->hw, psr->imem_table);\n+\tice_free(psr->hw, psr->mi_table);\n \n \tice_free(psr->hw, psr);\n }\ndiff --git a/drivers/net/ice/base/ice_parser.h b/drivers/net/ice/base/ice_parser.h\nindex 13dd83cbda..b7d0b23ded 100644\n--- a/drivers/net/ice/base/ice_parser.h\n+++ b/drivers/net/ice/base/ice_parser.h\n@@ -10,6 +10,8 @@ struct ice_parser {\n \n \t/* load data from section ICE_SID_RX_PARSER_IMEM */\n \tstruct ice_imem_item *imem_table;\n+\t/* load data from section ICE_SID_RXPARSER_METADATA_INIT */\n+\tstruct ice_metainit_item *mi_table;\n };\n \n enum ice_status ice_parser_create(struct ice_hw *hw, struct ice_parser **psr);\ndiff --git a/drivers/net/ice/base/ice_parser_util.h b/drivers/net/ice/base/ice_parser_util.h\nindex 5941a293e0..e2054cb7d4 100644\n--- a/drivers/net/ice/base/ice_parser_util.h\n+++ b/drivers/net/ice/base/ice_parser_util.h\n@@ -6,6 +6,7 @@\n #define _ICE_PARSER_UTIL_H_\n \n #include \"ice_imem.h\"\n+#include \"ice_metainit.h\"\n \n struct ice_pkg_sect_hdr {\n \t__le16 count;\ndiff --git a/drivers/net/ice/base/meson.build b/drivers/net/ice/base/meson.build\nindex d5170d972d..8b8efd815f 100644\n--- a/drivers/net/ice/base/meson.build\n+++ b/drivers/net/ice/base/meson.build\n@@ -17,6 +17,7 @@ sources = [\n 'ice_ptp_hw.c',\n \t'ice_parser.c',\n \t'ice_imem.c',\n+\t'ice_metainit.c',\n ]\n \n error_cflags = [\n", "prefixes": [ "v3", "03/20" ] }