From patchwork Fri Sep 17 14:43:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zhang X-Patchwork-Id: 99191 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id 343ECA0C46; Fri, 17 Sep 2021 16:40:38 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2661E41154; Fri, 17 Sep 2021 16:40:26 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id 6C0A341134 for ; Fri, 17 Sep 2021 16:40:22 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10110"; a="210039981" X-IronPort-AV: E=Sophos;i="5.85,301,1624345200"; d="scan'208";a="210039981" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Sep 2021 07:40:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,301,1624345200"; d="scan'208";a="546445357" Received: from dpdk51.sh.intel.com ([10.67.111.142]) by FMSMGA003.fm.intel.com with ESMTP; 17 Sep 2021 07:40:20 -0700 From: Qi Zhang To: qiming.yang@intel.com Cc: junfeng.guo@intel.com, dev@dpdk.org, Qi Zhang Date: Fri, 17 Sep 2021 22:43:05 +0800 Message-Id: <20210917144322.3141886-4-qi.z.zhang@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210917144322.3141886-1-qi.z.zhang@intel.com> References: <20210917144322.3141886-1-qi.z.zhang@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 03/20] net/ice/base: init metainit table for parser X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Parse DDP section ICE_SID_RXPARSER_METADATA_INIT into an array of struct ice_metainit_item. Signed-off-by: Qi Zhang --- drivers/net/ice/base/ice_metainit.c | 143 +++++++++++++++++++++++++ drivers/net/ice/base/ice_metainit.h | 46 ++++++++ drivers/net/ice/base/ice_parser.c | 15 ++- drivers/net/ice/base/ice_parser.h | 2 + drivers/net/ice/base/ice_parser_util.h | 1 + drivers/net/ice/base/meson.build | 1 + 6 files changed, 206 insertions(+), 2 deletions(-) create mode 100644 drivers/net/ice/base/ice_metainit.c create mode 100644 drivers/net/ice/base/ice_metainit.h diff --git a/drivers/net/ice/base/ice_metainit.c b/drivers/net/ice/base/ice_metainit.c new file mode 100644 index 0000000000..5d49c6861d --- /dev/null +++ b/drivers/net/ice/base/ice_metainit.c @@ -0,0 +1,143 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2001-2021 Intel Corporation + */ + +#include "ice_common.h" +#include "ice_parser_util.h" + +#define ICE_METAINIT_TABLE_SIZE 16 + +/** + * ice_metainit_dump - dump an metainit item info + * @ice_hw: pointer to the hardware structure + * @item: metainit item to dump + */ +void ice_metainit_dump(struct ice_hw *hw, struct ice_metainit_item *item) +{ + ice_info(hw, "index = %d\n", item->idx); + ice_info(hw, "tsr = %d\n", item->tsr); + ice_info(hw, "ho = %d\n", item->ho); + ice_info(hw, "pc = %d\n", item->pc); + ice_info(hw, "pg_rn = %d\n", item->pg_rn); + ice_info(hw, "cd = %d\n", item->cd); + ice_info(hw, "gpr_a_ctrl = %d\n", item->gpr_a_ctrl); + ice_info(hw, "gpr_a_data_mdid = %d\n", item->gpr_a_data_mdid); + ice_info(hw, "gpr_a_data_start = %d\n", item->gpr_a_data_start); + ice_info(hw, "gpr_a_data_len = %d\n", item->gpr_a_data_len); + ice_info(hw, "gpr_a_id = %d\n", item->gpr_a_id); + ice_info(hw, "gpr_b_ctrl = %d\n", item->gpr_b_ctrl); + ice_info(hw, "gpr_b_data_mdid = %d\n", item->gpr_b_data_mdid); + ice_info(hw, "gpr_b_data_start = %d\n", item->gpr_b_data_start); + ice_info(hw, "gpr_b_data_len = %d\n", item->gpr_b_data_len); + ice_info(hw, "gpr_b_id = %d\n", item->gpr_b_id); + ice_info(hw, "gpr_c_ctrl = %d\n", item->gpr_c_ctrl); + ice_info(hw, "gpr_c_data_mdid = %d\n", item->gpr_c_data_mdid); + ice_info(hw, "gpr_c_data_start = %d\n", item->gpr_c_data_start); + ice_info(hw, "gpr_c_data_len = %d\n", item->gpr_c_data_len); + ice_info(hw, "gpr_c_id = %d\n", item->gpr_c_id); + ice_info(hw, "gpr_d_ctrl = %d\n", item->gpr_d_ctrl); + ice_info(hw, "gpr_d_data_mdid = %d\n", item->gpr_d_data_mdid); + ice_info(hw, "gpr_d_data_start = %d\n", item->gpr_d_data_start); + ice_info(hw, "gpr_d_data_len = %d\n", item->gpr_d_data_len); + ice_info(hw, "gpr_d_id = %d\n", item->gpr_d_id); + ice_info(hw, "flags = 0x%016" PRIx64 "\n", item->flags); +} + +/** The function parses a 192 bits Metadata Init entry with below format: + * BIT 0-7: TCAM Search Key Register (mi->tsr) + * BIT 8-16: Header Offset (mi->ho) + * BIT 17-24: Program Counter (mi->pc) + * BIT 25-35: Parse Graph Root Node (mi->pg_rn) + * BIT 36-38: Control Domain (mi->cd) + * BIT 39: GPR_A Data Control (mi->gpr_a_ctrl) + * BIT 40-44: GPR_A MDID.ID (mi->gpr_a_data_mdid) + * BIT 45-48: GPR_A MDID.START (mi->gpr_a_data_start) + * BIT 49-53: GPR_A MDID.LEN (mi->gpr_a_data_len) + * BIT 54-55: reserved + * BIT 56-59: GPR_A ID (mi->gpr_a_id) + * BIT 60: GPR_B Data Control (mi->gpr_b_ctrl) + * BIT 61-65: GPR_B MDID.ID (mi->gpr_b_data_mdid) + * BIT 66-69: GPR_B MDID.START (mi->gpr_b_data_start) + * BIT 70-74: GPR_B MDID.LEN (mi->gpr_b_data_len) + * BIT 75-76: reserved + * BIT 77-80: GPR_B ID (mi->gpr_a_id) + * BIT 81: GPR_C Data Control (mi->gpr_c_ctrl) + * BIT 82-86: GPR_C MDID.ID (mi->gpr_c_data_mdid) + * BIT 87-90: GPR_C MDID.START (mi->gpr_c_data_start) + * BIT 91-95: GPR_C MDID.LEN (mi->gpr_c_data_len) + * BIT 96-97: reserved + * BIT 98-101: GPR_C ID (mi->gpr_c_id) + * BIT 102: GPR_D Data Control (mi->gpr_d_ctrl) + * BIT 103-107:GPR_D MDID.ID (mi->gpr_d_data_mdid) + * BIT 108-111:GPR_D MDID.START (mi->gpr_d_data_start) + * BIT 112-116:GPR_D MDID.LEN (mi->gpr_d_data_len) + * BIT 117-118:reserved + * BIT 119-122:GPR_D ID (mi->gpr_d_id) + * BIT 123-186:Flags (mi->flags) + * BIT 187-191:rserved + */ +static void _metainit_parse_item(struct ice_hw *hw, u16 idx, void *item, + void *data, int size) +{ + struct ice_metainit_item *mi = (struct ice_metainit_item *)item; + u8 *buf = (u8 *)data; + u64 d64; + + mi->idx = idx; + d64 = *(u64 *)buf; + + mi->tsr = (u8)(d64 & 0xff); + mi->ho = (u16)((d64 >> 8) & 0x1ff); + mi->pc = (u16)((d64 >> 17) & 0xff); + mi->pg_rn = (u16)((d64 >> 25) & 0x3ff); + mi->cd = (u16)((d64 >> 36) & 0x7); + mi->gpr_a_ctrl = ((d64 >> 39) & 0x1) != 0; + mi->gpr_a_data_mdid = (u8)((d64 >> 40) & 0x1f); + mi->gpr_a_data_start = (u8)((d64 >> 45) & 0xf); + mi->gpr_a_data_len = (u8)((d64 >> 49) & 0x1f); + mi->gpr_a_id = (u8)((d64 >> 56) & 0xf); + + d64 = *(u64 *)&buf[7] >> 4; + mi->gpr_b_ctrl = (d64 & 0x1) != 0; + mi->gpr_b_data_mdid = (u8)((d64 >> 1) & 0x1f); + mi->gpr_b_data_start = (u8)((d64 >> 6) & 0xf); + mi->gpr_b_data_len = (u8)((d64 >> 10) & 0x1f); + mi->gpr_b_id = (u8)((d64 >> 17) & 0xf); + + mi->gpr_c_ctrl = ((d64 >> 21) & 0x1) != 0; + mi->gpr_c_data_mdid = (u8)((d64 >> 22) & 0x1f); + mi->gpr_c_data_start = (u8)((d64 >> 27) & 0xf); + mi->gpr_c_data_len = (u8)((d64 >> 31) & 0x1f); + mi->gpr_c_id = (u8)((d64 >> 38) & 0xf); + + mi->gpr_d_ctrl = ((d64 >> 42) & 0x1) != 0; + mi->gpr_d_data_mdid = (u8)((d64 >> 43) & 0x1f); + mi->gpr_d_data_start = (u8)((d64 >> 48) & 0xf); + mi->gpr_d_data_len = (u8)((d64 >> 52) & 0x1f); + + d64 = *(u64 *)&buf[14] >> 7; + mi->gpr_d_id = (u8)(d64 & 0xf); + + d64 = *(u64 *)&buf[15] >> 3; + mi->flags = d64; + + d64 = ((*(u64 *)&buf[16] >> 56) & 0x7); + mi->flags |= (d64 << 61); + + if (hw->debug_mask & ICE_DBG_PARSER) + ice_metainit_dump(hw, mi); +} + +/** + * ice_metainit_table_get - create a metainit table + * @ice_hw: pointer to the hardware structure + */ +struct ice_metainit_item *ice_metainit_table_get(struct ice_hw *hw) +{ + return (struct ice_metainit_item *) + ice_parser_create_table(hw, ICE_SID_RXPARSER_METADATA_INIT, + sizeof(struct ice_metainit_item), + ICE_METAINIT_TABLE_SIZE, + ice_parser_sect_item_get, + _metainit_parse_item); +} diff --git a/drivers/net/ice/base/ice_metainit.h b/drivers/net/ice/base/ice_metainit.h new file mode 100644 index 0000000000..d46f1d7b47 --- /dev/null +++ b/drivers/net/ice/base/ice_metainit.h @@ -0,0 +1,46 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2001-2021 Intel Corporation + */ + +#ifndef _ICE_METAINIT_H_ +#define _ICE_METAINIT_H_ + +struct ice_metainit_item { + u16 idx; + + u8 tsr; + u16 ho; + u16 pc; + u16 pg_rn; + u8 cd; + + bool gpr_a_ctrl; + u8 gpr_a_data_mdid; + u8 gpr_a_data_start; + u8 gpr_a_data_len; + u8 gpr_a_id; + + bool gpr_b_ctrl; + u8 gpr_b_data_mdid; + u8 gpr_b_data_start; + u8 gpr_b_data_len; + u8 gpr_b_id; + + bool gpr_c_ctrl; + u8 gpr_c_data_mdid; + u8 gpr_c_data_start; + u8 gpr_c_data_len; + u8 gpr_c_id; + + bool gpr_d_ctrl; + u8 gpr_d_data_mdid; + u8 gpr_d_data_start; + u8 gpr_d_data_len; + u8 gpr_d_id; + + u64 flags; +}; + +void ice_metainit_dump(struct ice_hw *hw, struct ice_metainit_item *item); +struct ice_metainit_item *ice_metainit_table_get(struct ice_hw *hw); +#endif /*_ICE_METAINIT_H_ */ diff --git a/drivers/net/ice/base/ice_parser.c b/drivers/net/ice/base/ice_parser.c index 6d9aaec911..c12301727d 100644 --- a/drivers/net/ice/base/ice_parser.c +++ b/drivers/net/ice/base/ice_parser.c @@ -5,8 +5,9 @@ #include "ice_common.h" #include "ice_parser_util.h" -#define ICE_SEC_DATA_OFFSET 4 -#define ICE_SID_RXPARSER_IMEM_ENTRY_SIZE 48 +#define ICE_SEC_DATA_OFFSET 4 +#define ICE_SID_RXPARSER_IMEM_ENTRY_SIZE 48 +#define ICE_SID_RXPARSER_METADATA_INIT_ENTRY_SIZE 24 /** * ice_parser_sect_item_get - parse a item from a section @@ -29,6 +30,9 @@ void *ice_parser_sect_item_get(u32 sect_type, void *section, case ICE_SID_RXPARSER_IMEM: size = ICE_SID_RXPARSER_IMEM_ENTRY_SIZE; break; + case ICE_SID_RXPARSER_METADATA_INIT: + size = ICE_SID_RXPARSER_METADATA_INIT_ENTRY_SIZE; + break; default: return NULL; } @@ -115,6 +119,12 @@ enum ice_status ice_parser_create(struct ice_hw *hw, struct ice_parser **psr) goto err; } + p->mi_table = ice_metainit_table_get(hw); + if (!p->mi_table) { + status = ICE_ERR_PARAM; + goto err; + } + *psr = p; return ICE_SUCCESS; err: @@ -129,6 +139,7 @@ enum ice_status ice_parser_create(struct ice_hw *hw, struct ice_parser **psr) void ice_parser_destroy(struct ice_parser *psr) { ice_free(psr->hw, psr->imem_table); + ice_free(psr->hw, psr->mi_table); ice_free(psr->hw, psr); } diff --git a/drivers/net/ice/base/ice_parser.h b/drivers/net/ice/base/ice_parser.h index 13dd83cbda..b7d0b23ded 100644 --- a/drivers/net/ice/base/ice_parser.h +++ b/drivers/net/ice/base/ice_parser.h @@ -10,6 +10,8 @@ struct ice_parser { /* load data from section ICE_SID_RX_PARSER_IMEM */ struct ice_imem_item *imem_table; + /* load data from section ICE_SID_RXPARSER_METADATA_INIT */ + struct ice_metainit_item *mi_table; }; enum ice_status ice_parser_create(struct ice_hw *hw, struct ice_parser **psr); diff --git a/drivers/net/ice/base/ice_parser_util.h b/drivers/net/ice/base/ice_parser_util.h index 5941a293e0..e2054cb7d4 100644 --- a/drivers/net/ice/base/ice_parser_util.h +++ b/drivers/net/ice/base/ice_parser_util.h @@ -6,6 +6,7 @@ #define _ICE_PARSER_UTIL_H_ #include "ice_imem.h" +#include "ice_metainit.h" struct ice_pkg_sect_hdr { __le16 count; diff --git a/drivers/net/ice/base/meson.build b/drivers/net/ice/base/meson.build index d5170d972d..8b8efd815f 100644 --- a/drivers/net/ice/base/meson.build +++ b/drivers/net/ice/base/meson.build @@ -17,6 +17,7 @@ sources = [ 'ice_ptp_hw.c', 'ice_parser.c', 'ice_imem.c', + 'ice_metainit.c', ] error_cflags = [