From 111871087cdf93a05a40754f9fa621b9715156f1 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Fri, 17 Sep 2021 22:43:08 +0800 Subject: [PATCH] net/ice/base: init ptype marker TCAM table for parser Parse DDP section ICE_SID_RXPARSER_MARKER_PTYPE into an array of ice_ptype_mk_tcam_item. Signed-off-by: Qi Zhang Acked-by: Junfeng Guo --- drivers/net/ice/base/ice_parser.c | 11 ++++++ drivers/net/ice/base/ice_parser.h | 3 ++ drivers/net/ice/base/ice_ptype_mk.c | 54 +++++++++++++++++++++++++++++ drivers/net/ice/base/ice_ptype_mk.h | 18 ++++++++++ drivers/net/ice/base/meson.build | 1 + 5 files changed, 87 insertions(+) create mode 100644 drivers/net/ice/base/ice_ptype_mk.c create mode 100644 drivers/net/ice/base/ice_ptype_mk.h diff --git a/drivers/net/ice/base/ice_parser.c b/drivers/net/ice/base/ice_parser.c index 594f802800..e7b79453a8 100644 --- a/drivers/net/ice/base/ice_parser.c +++ b/drivers/net/ice/base/ice_parser.c @@ -13,6 +13,7 @@ #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_SID_RXPARSER_MARKER_TYPE_ENTRY_SIZE 24 #define ICE_SEC_LBL_DATA_OFFSET 2 #define ICE_SID_LBL_ENTRY_SIZE 66 @@ -72,6 +73,9 @@ void *ice_parser_sect_item_get(u32 sect_type, void *section, data_off = ICE_SEC_LBL_DATA_OFFSET; size = ICE_SID_LBL_ENTRY_SIZE; break; + case ICE_SID_RXPARSER_MARKER_PTYPE: + size = ICE_SID_RXPARSER_MARKER_TYPE_ENTRY_SIZE; + break; default: return NULL; } @@ -205,6 +209,12 @@ enum ice_status ice_parser_create(struct ice_hw *hw, struct ice_parser **psr) goto err; } + p->ptype_mk_tcam_table = ice_ptype_mk_tcam_table_get(hw); + if (!p->ptype_mk_tcam_table) { + status = ICE_ERR_PARAM; + goto err; + } + *psr = p; return ICE_SUCCESS; err: @@ -226,6 +236,7 @@ void ice_parser_destroy(struct ice_parser *psr) 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->ptype_mk_tcam_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 319648970a..40b7b823c3 100644 --- a/drivers/net/ice/base/ice_parser.h +++ b/drivers/net/ice/base/ice_parser.h @@ -9,6 +9,7 @@ #include "ice_imem.h" #include "ice_pg_cam.h" #include "ice_bst_tcam.h" +#include "ice_ptype_mk.h" struct ice_parser { struct ice_hw *hw; /* pointer to the hardware structure */ @@ -29,6 +30,8 @@ struct ice_parser { struct ice_bst_tcam_item *bst_tcam_table; /* load data from section ICE_SID_LBL_RXPARSER_TMEM */ struct ice_lbl_item *bst_lbl_table; + /* load data from section ICE_SID_RXPARSER_MARKER_PTYPE */ + struct ice_ptype_mk_tcam_item *ptype_mk_tcam_table; }; enum ice_status ice_parser_create(struct ice_hw *hw, struct ice_parser **psr); diff --git a/drivers/net/ice/base/ice_ptype_mk.c b/drivers/net/ice/base/ice_ptype_mk.c new file mode 100644 index 0000000000..33623dcfbc --- /dev/null +++ b/drivers/net/ice/base/ice_ptype_mk.c @@ -0,0 +1,54 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2001-2021 Intel Corporation + */ + +#include "ice_common.h" +#include "ice_parser_util.h" + +#define ICE_PTYPE_MK_TCAM_TABLE_SIZE 1024 + +/** + * ice_ptype_mk_tcam_dump - dump an ptype marker tcam info_ + * @ice_hw: pointer to the hardware structure + * @item: ptype marker tcam to dump + */ +void ice_ptype_mk_tcam_dump(struct ice_hw *hw, + struct ice_ptype_mk_tcam_item *item) +{ + int i; + + ice_info(hw, "address = %d\n", item->address); + ice_info(hw, "ptype = %d\n", item->ptype); + ice_info(hw, "key :"); + for (i = 0; i < 10; i++) + ice_info(hw, "%02x ", item->key[i]); + ice_info(hw, "\n"); + ice_info(hw, "key_inv:"); + for (i = 0; i < 10; i++) + ice_info(hw, "%02x ", item->key_inv[i]); + ice_info(hw, "\n"); +} + +static void _parse_ptype_mk_tcam_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_ptype_mk_tcam_dump(hw, + (struct ice_ptype_mk_tcam_item *)item); +} + +/** + * ice_ptype_mk_tcam_table_get - create a ptype marker tcam table + * @ice_hw: pointer to the hardware structure + */ +struct ice_ptype_mk_tcam_item *ice_ptype_mk_tcam_table_get(struct ice_hw *hw) +{ + return (struct ice_ptype_mk_tcam_item *) + ice_parser_create_table(hw, ICE_SID_RXPARSER_MARKER_PTYPE, + sizeof(struct ice_ptype_mk_tcam_item), + ICE_PTYPE_MK_TCAM_TABLE_SIZE, + ice_parser_sect_item_get, + _parse_ptype_mk_tcam_item, true); +} diff --git a/drivers/net/ice/base/ice_ptype_mk.h b/drivers/net/ice/base/ice_ptype_mk.h new file mode 100644 index 0000000000..c93cd8f0ad --- /dev/null +++ b/drivers/net/ice/base/ice_ptype_mk.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2001-2021 Intel Corporation + */ + +#ifndef _ICE_PTYPE_MK_H_ +#define _ICE_PTYPE_MK_H_ + +struct ice_ptype_mk_tcam_item { + u16 address; + u16 ptype; + u8 key[10]; + u8 key_inv[10]; +}; + +void ice_ptype_mk_tcam_dump(struct ice_hw *hw, + struct ice_ptype_mk_tcam_item *item); +struct ice_ptype_mk_tcam_item *ice_ptype_mk_tcam_table_get(struct ice_hw *hw); +#endif /* _ICE_PTYPE_MK_H_ */ diff --git a/drivers/net/ice/base/meson.build b/drivers/net/ice/base/meson.build index a4ff05c085..97f4aab011 100644 --- a/drivers/net/ice/base/meson.build +++ b/drivers/net/ice/base/meson.build @@ -20,6 +20,7 @@ sources = [ 'ice_metainit.c', 'ice_pg_cam.c', 'ice_bst_tcam.c', + 'ice_ptype_mk.c', ] error_cflags = [ -- 2.20.1