From patchwork Tue Sep 21 13:19:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zhang X-Patchwork-Id: 99357 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 4D3F4A0C4C; Tue, 21 Sep 2021 15:17:52 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5F0F641156; Tue, 21 Sep 2021 15:17:19 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 6B7B54113F for ; Tue, 21 Sep 2021 15:17:13 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10113"; a="202847438" X-IronPort-AV: E=Sophos;i="5.85,311,1624345200"; d="scan'208";a="202847438" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2021 06:17:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,311,1624345200"; d="scan'208";a="484173837" Received: from dpdk51.sh.intel.com ([10.67.111.142]) by orsmga008.jf.intel.com with ESMTP; 21 Sep 2021 06:17:11 -0700 From: Qi Zhang To: qiming.yang@intel.com Cc: junfeng.guo@intel.com, dev@dpdk.org, Qi Zhang Date: Tue, 21 Sep 2021 21:19:54 +0800 Message-Id: <20210921132009.3461020-6-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 Subject: [dpdk-dev] [PATCH v3 05/20] net/ice/base: init boost TCAM 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_CAM into an array of ice_bst_tcam_item. Parse DDP section ICE_SID_LBL_RXPARSER_TMEM into an array of ice_lbl_item. Signed-off-by: Qi Zhang Acked-by: Junfeng Guo --- drivers/net/ice/base/ice_bst_tcam.c | 241 +++++++++++++++++++++++++ drivers/net/ice/base/ice_bst_tcam.h | 28 +++ drivers/net/ice/base/ice_imem.c | 2 +- drivers/net/ice/base/ice_metainit.c | 2 +- drivers/net/ice/base/ice_parser.c | 48 ++++- drivers/net/ice/base/ice_parser.h | 5 + drivers/net/ice/base/ice_parser_util.h | 12 +- drivers/net/ice/base/ice_pg_cam.c | 8 +- drivers/net/ice/base/meson.build | 1 + 9 files changed, 337 insertions(+), 10 deletions(-) create mode 100644 drivers/net/ice/base/ice_bst_tcam.c create mode 100644 drivers/net/ice/base/ice_bst_tcam.h diff --git a/drivers/net/ice/base/ice_bst_tcam.c b/drivers/net/ice/base/ice_bst_tcam.c new file mode 100644 index 0000000000..1c82359681 --- /dev/null +++ b/drivers/net/ice/base/ice_bst_tcam.c @@ -0,0 +1,241 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2001-2021 Intel Corporation + */ + +#include "ice_common.h" +#include "ice_parser_util.h" + +#define ICE_BST_TCAM_TABLE_SIZE 256 + +static void _bst_np_kb_dump(struct ice_hw *hw, struct ice_np_keybuilder *kb) +{ + ice_info(hw, "next proto key builder:\n"); + ice_info(hw, "\tops = %d\n", kb->ops); + ice_info(hw, "\tstart_or_reg0 = %d\n", kb->start_or_reg0); + ice_info(hw, "\tlen_or_reg1 = %d\n", kb->len_or_reg1); +} + +static void _bst_pg_kb_dump(struct ice_hw *hw, struct ice_pg_keybuilder *kb) +{ + ice_info(hw, "parse graph key builder:\n"); + ice_info(hw, "\tflag0_ena = %d\n", kb->flag0_ena); + ice_info(hw, "\tflag1_ena = %d\n", kb->flag1_ena); + ice_info(hw, "\tflag2_ena = %d\n", kb->flag2_ena); + ice_info(hw, "\tflag3_ena = %d\n", kb->flag3_ena); + ice_info(hw, "\tflag0_idx = %d\n", kb->flag0_idx); + ice_info(hw, "\tflag1_idx = %d\n", kb->flag1_idx); + ice_info(hw, "\tflag2_idx = %d\n", kb->flag2_idx); + ice_info(hw, "\tflag3_idx = %d\n", kb->flag3_idx); + ice_info(hw, "\talu_reg_idx = %d\n", kb->alu_reg_idx); +} + +static void _bst_alu_dump(struct ice_hw *hw, struct ice_alu *alu, int index) +{ + ice_info(hw, "alu%d:\n", index); + ice_info(hw, "\topc = %d\n", alu->opc); + ice_info(hw, "\tsrc_start = %d\n", alu->src_start); + ice_info(hw, "\tsrc_len = %d\n", alu->src_len); + ice_info(hw, "\tshift_xlate_select = %d\n", alu->shift_xlate_select); + ice_info(hw, "\tshift_xlate_key = %d\n", alu->shift_xlate_key); + ice_info(hw, "\tsrc_reg_id = %d\n", alu->src_reg_id); + ice_info(hw, "\tdst_reg_id = %d\n", alu->dst_reg_id); + ice_info(hw, "\tinc0 = %d\n", alu->inc0); + ice_info(hw, "\tinc1 = %d\n", alu->inc1); + ice_info(hw, "\tproto_offset_opc = %d\n", alu->proto_offset_opc); + ice_info(hw, "\tproto_offset = %d\n", alu->proto_offset); + ice_info(hw, "\tbranch_addr = %d\n", alu->branch_addr); + ice_info(hw, "\timm = %d\n", alu->imm); + ice_info(hw, "\tdst_start = %d\n", alu->dst_start); + ice_info(hw, "\tdst_len = %d\n", alu->dst_len); + ice_info(hw, "\tflags_extr_imm = %d\n", alu->flags_extr_imm); + ice_info(hw, "\tflags_start_imm= %d\n", alu->flags_start_imm); +} + +/** + * ice_bst_tcam_dump - dump a boost tcam info + * @ice_hw: pointer to the hardware structure + * @item: boost tcam to dump + */ +void ice_bst_tcam_dump(struct ice_hw *hw, struct ice_bst_tcam_item *item) +{ + int i; + + ice_info(hw, "address = %d\n", item->address); + ice_info(hw, "key :"); + for (i = 0; i < 20; i++) + ice_info(hw, "%02x ", item->key[i]); + ice_info(hw, "\n"); + ice_info(hw, "key_inv:"); + for (i = 0; i < 20; i++) + ice_info(hw, "%02x ", item->key_inv[i]); + ice_info(hw, "\n"); + ice_info(hw, "hit_idx_grp = %d\n", item->hit_idx_grp); + ice_info(hw, "pg_pri = %d\n", item->pg_pri); + _bst_np_kb_dump(hw, &item->np_kb); + _bst_pg_kb_dump(hw, &item->pg_kb); + _bst_alu_dump(hw, &item->alu0, 0); + _bst_alu_dump(hw, &item->alu1, 1); + _bst_alu_dump(hw, &item->alu2, 2); +} + +/** The function parses a 96 bits ALU entry with below format: + * BIT 0-5: Opcode (alu->opc) + * BIT 6-13: Source Start (alu->src_start) + * BIT 14-18: Source Length (alu->src_len) + * BIT 19: Shift/Xlate Select (alu->shift_xlate_select) + * BIT 20-23: Shift/Xlate Key (alu->shift_xlate_key) + * BIT 24-30: Source Register ID (alu->src_reg_id) + * BIT 31-37: Dest. Register ID (alu->dst_reg_id) + * BIT 38: Inc0 (alu->inc0) + * BIT 39: Inc1:(alu->inc1) + * BIT 40:41 Protocol Offset Opcode (alu->proto_offset_opc) + * BIT 42:49 Protocol Offset (alu->proto_offset) + * BIT 50:57 Branch Address (alu->branch_addr) + * BIT 58:73 Immediate (alu->imm) + * BIT 74 Dedicated Flags Enable (alu->dedicate_flags_ena) + * BIT 75:80 Dest. Start (alu->dst_start) + * BIT 81:86 Dest. Length (alu->dst_len) + * BIT 87 Flags Extract Imm. (alu->flags_extr_imm) + * BIT 88:95 Flags Start/Immediate (alu->flags_start_imm) + * + * NOTE: the first 7 bits are skipped as the start bit is not + * byte aligned. + */ +static void _bst_alu_init(struct ice_alu *alu, u8 *data) +{ + u64 d64 = *(u64 *)data >> 7; + + alu->opc = (enum ice_alu_opcode)(d64 & 0x3f); + alu->src_start = (u8)((d64 >> 6) & 0xff); + alu->src_len = (u8)((d64 >> 14) & 0x1f); + alu->shift_xlate_select = ((d64 >> 19) & 0x1) != 0; + alu->shift_xlate_key = (u8)((d64 >> 20) & 0xf); + alu->src_reg_id = (u8)((d64 >> 24) & 0x7f); + alu->dst_reg_id = (u8)((d64 >> 31) & 0x7f); + alu->inc0 = ((d64 >> 38) & 0x1) != 0; + alu->inc1 = ((d64 >> 39) & 0x1) != 0; + alu->proto_offset_opc = (u8)((d64 >> 40) & 0x3); + alu->proto_offset = (u8)((d64 >> 42) & 0xff); + + d64 = *(u64 *)(&data[6]) >> 9; + + alu->branch_addr = (u8)(d64 & 0xff); + alu->imm = (u16)((d64 >> 8) & 0xffff); + alu->dedicate_flags_ena = ((d64 >> 24) & 0x1) != 0; + alu->dst_start = (u8)((d64 >> 25) & 0x3f); + alu->dst_len = (u8)((d64 >> 31) & 0x3f); + alu->flags_extr_imm = ((d64 >> 37) & 0x1) != 0; + alu->flags_start_imm = (u8)((d64 >> 38) & 0xff); +} + +/** The function parses a 35 bits Parse Graph Key Build with below format: + * BIT 0: Flag 0 Enable (kb->flag0_ena) + * BIT 1-6: Flag 0 Index (kb->flag0_idx) + * BIT 7: Flag 1 Enable (kb->flag1_ena) + * BIT 8-13: Flag 1 Index (kb->flag1_idx) + * BIT 14: Flag 2 Enable (kb->flag2_ena) + * BIT 15-20: Flag 2 Index (kb->flag2_idx) + * BIT 21: Flag 3 Enable (kb->flag3_ena) + * BIT 22-27: Flag 3 Index (kb->flag3_idx) + * BIT 28-34: ALU Register Index (kb->alu_reg_idx) + */ +static void _bst_pgkb_init(struct ice_pg_keybuilder *kb, u64 data) +{ + kb->flag0_ena = (data & 0x1) != 0; + kb->flag0_idx = (u8)((data >> 1) & 0x3f); + kb->flag1_ena = ((data >> 7) & 0x1) != 0; + kb->flag1_idx = (u8)((data >> 8) & 0x3f); + kb->flag2_ena = ((data >> 14) & 0x1) != 0; + kb->flag2_idx = (u8)((data >> 15) & 0x3f); + kb->flag3_ena = ((data >> 21) & 0x1) != 0; + kb->flag3_idx = (u8)((data >> 22) & 0x3f); + kb->alu_reg_idx = (u8)((data >> 28) & 0x7f); +} + +/** The function parses a 18 bits Next Protocol Key Build with below format: + * BIT 0-1: Opcode kb->ops + * BIT 2-9: Start / Reg 0 (kb->start_or_reg0) + * BIT 10-17: Length / Reg 1 (kb->len_or_reg1) + */ +static void _bst_npkb_init(struct ice_np_keybuilder *kb, u32 data) +{ + kb->ops = (u8)(data & 0x3); + kb->start_or_reg0 = (u8)((data >> 2) & 0xff); + kb->len_or_reg1 = (u8)((data >> 10) & 0xff); +} + +/** The function parses a 704 bits Boost TCAM entry with below format: + * BIT 0-15: Address (ti->address) + * BIT 16-31: reserved + * BIT 32-191: Key (ti->key) + * BIT 192-351:Key Invert (ti->key_inv) + * BIT 352-359:Boost Hit Index Group (ti->hit_idx_grp) + * BIT 360-361:PG Priority (ti->pg_pri) + * BIT 362-379:Next Proto Key Build (ti->np_kb) + * BIT 380-414:PG Key Build (ti->pg_kb) + * BIT 415-510:ALU 0 (ti->alu0) + * BIT 511-606:ALU 1 (ti->alu1) + * BIT 607-702:ALU 2 (ti->alu2) + * BIT 703: reserved + */ +static void _bst_parse_item(struct ice_hw *hw, u16 idx, void *item, + void *data, int size) +{ + struct ice_bst_tcam_item *ti = (struct ice_bst_tcam_item *)item; + u8 *buf = (u8 *)data; + int i; + + ti->address = *(u16 *)buf; + + for (i = 0; i < 20; i++) + ti->key[i] = buf[4 + i]; + for (i = 0; i < 20; i++) + ti->key_inv[i] = buf[24 + i]; + ti->hit_idx_grp = buf[44]; + ti->pg_pri = buf[45] & 0x3; + _bst_npkb_init(&ti->np_kb, *(u32 *)&buf[45] >> 2); + _bst_pgkb_init(&ti->pg_kb, *(u64 *)&buf[47] >> 4); + _bst_alu_init(&ti->alu0, &buf[51]); + _bst_alu_init(&ti->alu1, &buf[63]); + _bst_alu_init(&ti->alu2, &buf[75]); + + if (hw->debug_mask & ICE_DBG_PARSER) + ice_bst_tcam_dump(hw, ti); +} + +/** + * ice_bst_tcam_table_get - create a boost tcam table + * @ice_hw: pointer to the hardware structure + */ +struct ice_bst_tcam_item *ice_bst_tcam_table_get(struct ice_hw *hw) +{ + return (struct ice_bst_tcam_item *) + ice_parser_create_table(hw, ICE_SID_RXPARSER_BOOST_TCAM, + sizeof(struct ice_bst_tcam_item), + ICE_BST_TCAM_TABLE_SIZE, + ice_parser_sect_item_get, + _bst_parse_item, true); +} + +static void _parse_lbl_item(struct ice_hw *hw, u16 idx, void *item, + void *data, int size) +{ + ice_parse_item_dflt(hw, idx, item, data, size); + + if (hw->debug_mask & ICE_DBG_PARSER) + ice_lbl_dump(hw, (struct ice_lbl_item *)item); +} + +/** + * ice_bst_lbl_table_get - create a boost label table + * @ice_hw: pointer to the hardware structure + */ +struct ice_lbl_item *ice_bst_lbl_table_get(struct ice_hw *hw) +{ + return (struct ice_lbl_item *) + ice_parser_create_table(hw, ICE_SID_LBL_RXPARSER_TMEM, + sizeof(struct ice_lbl_item), + ICE_BST_TCAM_TABLE_SIZE, + ice_parser_sect_item_get, + _parse_lbl_item, true); +} diff --git a/drivers/net/ice/base/ice_bst_tcam.h b/drivers/net/ice/base/ice_bst_tcam.h new file mode 100644 index 0000000000..a4ab40721f --- /dev/null +++ b/drivers/net/ice/base/ice_bst_tcam.h @@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2001-2021 Intel Corporation + */ + +#ifndef _ICE_BST_TCAM_H_ +#define _ICE_BST_TCAM_H_ + +#include "ice_imem.h" + +struct ice_bst_tcam_item { + u16 address; + u8 key[20]; + u8 key_inv[20]; + u8 hit_idx_grp; + u8 pg_pri; + struct ice_np_keybuilder np_kb; + struct ice_pg_keybuilder pg_kb; + struct ice_alu alu0; + struct ice_alu alu1; + struct ice_alu alu2; +}; + +void ice_bst_tcam_dump(struct ice_hw *hw, struct ice_bst_tcam_item *item); + +struct ice_bst_tcam_item *ice_bst_tcam_table_get(struct ice_hw *hw); + +struct ice_lbl_item *ice_bst_lbl_table_get(struct ice_hw *hw); +#endif /*_ICE_BST_TCAM_H_ */ diff --git a/drivers/net/ice/base/ice_imem.c b/drivers/net/ice/base/ice_imem.c index aefc7132eb..2136e0393b 100644 --- a/drivers/net/ice/base/ice_imem.c +++ b/drivers/net/ice/base/ice_imem.c @@ -240,5 +240,5 @@ struct ice_imem_item *ice_imem_table_get(struct ice_hw *hw) sizeof(struct ice_imem_item), ICE_IMEM_TABLE_SIZE, ice_parser_sect_item_get, - _imem_parse_item); + _imem_parse_item, false); } diff --git a/drivers/net/ice/base/ice_metainit.c b/drivers/net/ice/base/ice_metainit.c index 5d49c6861d..3f9e5d6833 100644 --- a/drivers/net/ice/base/ice_metainit.c +++ b/drivers/net/ice/base/ice_metainit.c @@ -139,5 +139,5 @@ struct ice_metainit_item *ice_metainit_table_get(struct ice_hw *hw) sizeof(struct ice_metainit_item), ICE_METAINIT_TABLE_SIZE, ice_parser_sect_item_get, - _metainit_parse_item); + _metainit_parse_item, false); } diff --git a/drivers/net/ice/base/ice_parser.c b/drivers/net/ice/base/ice_parser.c index f6a1c821f1..594f802800 100644 --- a/drivers/net/ice/base/ice_parser.c +++ b/drivers/net/ice/base/ice_parser.c @@ -12,6 +12,22 @@ #define ICE_SID_RXPARSER_PG_SPILL_ENTRY_SIZE 17 #define ICE_SID_RXPARSER_NOMATCH_CAM_ENTRY_SIZE 12 #define ICE_SID_RXPARSER_NOMATCH_SPILL_ENTRY_SIZE 13 +#define ICE_SID_RXPARSER_BOOST_TCAM_ENTRY_SIZE 88 + +#define ICE_SEC_LBL_DATA_OFFSET 2 +#define ICE_SID_LBL_ENTRY_SIZE 66 + +void ice_lbl_dump(struct ice_hw *hw, struct ice_lbl_item *item) +{ + ice_info(hw, "index = %d\n", item->idx); + ice_info(hw, "label = %s\n", item->label); +} + +void ice_parse_item_dflt(struct ice_hw *hw, u16 idx, void *item, + void *data, int size) +{ + ice_memcpy(item, data, size, ICE_DMA_TO_NONDMA); +} /** * ice_parser_sect_item_get - parse a item from a section @@ -49,6 +65,13 @@ void *ice_parser_sect_item_get(u32 sect_type, void *section, case ICE_SID_RXPARSER_NOMATCH_SPILL: size = ICE_SID_RXPARSER_NOMATCH_SPILL_ENTRY_SIZE; break; + case ICE_SID_RXPARSER_BOOST_TCAM: + size = ICE_SID_RXPARSER_BOOST_TCAM_ENTRY_SIZE; + break; + case ICE_SID_LBL_RXPARSER_TMEM: + data_off = ICE_SEC_LBL_DATA_OFFSET; + size = ICE_SID_LBL_ENTRY_SIZE; + break; default: return NULL; } @@ -68,6 +91,7 @@ void *ice_parser_sect_item_get(u32 sect_type, void *section, * @length: number of items in the table to create * @item_get: the function will be parsed to ice_pkg_enum_entry * @parser_item: the function to parse the item + * @no_offset: ignore header offset, calculate index from 0 */ void *ice_parser_create_table(struct ice_hw *hw, u32 sect_type, u32 item_size, u32 length, @@ -75,11 +99,12 @@ void *ice_parser_create_table(struct ice_hw *hw, u32 sect_type, u32 index, u32 *offset), void (*parse_item)(struct ice_hw *hw, u16 idx, void *item, void *data, - int size)) + int size), + bool no_offset) { struct ice_seg *seg = hw->seg; struct ice_pkg_enum state; - u16 idx = 0; + u16 idx = 0xffff; void *table; void *data; @@ -102,7 +127,10 @@ void *ice_parser_create_table(struct ice_hw *hw, u32 sect_type, struct ice_pkg_sect_hdr *hdr = (struct ice_pkg_sect_hdr *)state.sect; - idx = hdr->offset + state.entry_idx; + if (no_offset) + idx++; + else + idx = hdr->offset + state.entry_idx; parse_item(hw, idx, (void *)((uintptr_t)table + idx * item_size), data, item_size); @@ -165,6 +193,18 @@ enum ice_status ice_parser_create(struct ice_hw *hw, struct ice_parser **psr) goto err; } + p->bst_tcam_table = ice_bst_tcam_table_get(hw); + if (!p->bst_tcam_table) { + status = ICE_ERR_PARAM; + goto err; + } + + p->bst_lbl_table = ice_bst_lbl_table_get(hw); + if (!p->bst_lbl_table) { + status = ICE_ERR_PARAM; + goto err; + } + *psr = p; return ICE_SUCCESS; err: @@ -184,6 +224,8 @@ void ice_parser_destroy(struct ice_parser *psr) ice_free(psr->hw, psr->pg_sp_cam_table); ice_free(psr->hw, psr->pg_nm_cam_table); ice_free(psr->hw, psr->pg_nm_sp_cam_table); + ice_free(psr->hw, psr->bst_tcam_table); + ice_free(psr->hw, psr->bst_lbl_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 b157e27510..319648970a 100644 --- a/drivers/net/ice/base/ice_parser.h +++ b/drivers/net/ice/base/ice_parser.h @@ -8,6 +8,7 @@ #include "ice_metainit.h" #include "ice_imem.h" #include "ice_pg_cam.h" +#include "ice_bst_tcam.h" struct ice_parser { struct ice_hw *hw; /* pointer to the hardware structure */ @@ -24,6 +25,10 @@ struct ice_parser { struct ice_pg_nm_cam_item *pg_nm_cam_table; /* load data from section ICE_SID_RXPARSER_NOMATCH_SPILL */ struct ice_pg_nm_cam_item *pg_nm_sp_cam_table; + /* load data from section ICE_SID_RXPARSER_BOOST_TCAM */ + struct ice_bst_tcam_item *bst_tcam_table; + /* load data from section ICE_SID_LBL_RXPARSER_TMEM */ + struct ice_lbl_item *bst_lbl_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 e2054cb7d4..cf0222bed8 100644 --- a/drivers/net/ice/base/ice_parser_util.h +++ b/drivers/net/ice/base/ice_parser_util.h @@ -8,11 +8,20 @@ #include "ice_imem.h" #include "ice_metainit.h" +struct ice_lbl_item { + u16 idx; + char label[64]; +}; + struct ice_pkg_sect_hdr { __le16 count; __le16 offset; }; +void ice_lbl_dump(struct ice_hw *hw, struct ice_lbl_item *item); +void ice_parse_item_dflt(struct ice_hw *hw, u16 idx, void *item, + void *data, int size); + void *ice_parser_sect_item_get(u32 sect_type, void *section, u32 index, u32 *offset); @@ -22,5 +31,6 @@ void *ice_parser_create_table(struct ice_hw *hw, u32 sect_type, u32 index, u32 *offset), void (*parse_item)(struct ice_hw *hw, u16 idx, void *item, void *data, - int size)); + int size), + bool no_offset); #endif /* _ICE_PARSER_UTIL_H_ */ diff --git a/drivers/net/ice/base/ice_pg_cam.c b/drivers/net/ice/base/ice_pg_cam.c index 171986bf3d..03484d6a91 100644 --- a/drivers/net/ice/base/ice_pg_cam.c +++ b/drivers/net/ice/base/ice_pg_cam.c @@ -252,7 +252,7 @@ struct ice_pg_cam_item *ice_pg_cam_table_get(struct ice_hw *hw) sizeof(struct ice_pg_cam_item), ICE_PG_CAM_TABLE_SIZE, ice_parser_sect_item_get, - _pg_cam_parse_item); + _pg_cam_parse_item, false); } /** @@ -266,7 +266,7 @@ struct ice_pg_cam_item *ice_pg_sp_cam_table_get(struct ice_hw *hw) sizeof(struct ice_pg_cam_item), ICE_PG_SP_CAM_TABLE_SIZE, ice_parser_sect_item_get, - _pg_sp_cam_parse_item); + _pg_sp_cam_parse_item, false); } /** @@ -280,7 +280,7 @@ struct ice_pg_nm_cam_item *ice_pg_nm_cam_table_get(struct ice_hw *hw) sizeof(struct ice_pg_nm_cam_item), ICE_PG_NM_CAM_TABLE_SIZE, ice_parser_sect_item_get, - _pg_nm_cam_parse_item); + _pg_nm_cam_parse_item, false); } /** @@ -294,5 +294,5 @@ struct ice_pg_nm_cam_item *ice_pg_nm_sp_cam_table_get(struct ice_hw *hw) sizeof(struct ice_pg_nm_cam_item), ICE_PG_NM_SP_CAM_TABLE_SIZE, ice_parser_sect_item_get, - _pg_nm_sp_cam_parse_item); + _pg_nm_sp_cam_parse_item, false); } diff --git a/drivers/net/ice/base/meson.build b/drivers/net/ice/base/meson.build index 56dfb390e8..105ae411d3 100644 --- a/drivers/net/ice/base/meson.build +++ b/drivers/net/ice/base/meson.build @@ -19,6 +19,7 @@ sources = [ 'ice_imem.c', 'ice_metainit.c', 'ice_pg_cam.c', + 'ice_bst_tcam.c', ] error_cflags = [