net/ice/base: init marker group table for parser

Parse DDP section ICE_SID_RXPARSER_MARKER_GRP into an array of
ice_mk_grp_item.

Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Junfeng Guo <junfeng.guo@intel.com>

diff --git a/drivers/net/ice/base/ice_mk_grp.c b/drivers/net/ice/base/ice_mk_grp.c
new file mode 100644 (file)
index 0000000..4e9ab5c
--- /dev/null
+++ b/drivers/net/ice/base/ice_mk_grp.c
@@ -0,0 +1,55 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2001-2021 Intel Corporation
+ */
+
+#include "ice_common.h"
+#include "ice_parser_util.h"
+
+#define ICE_MK_GRP_TABLE_SIZE 128
+#define ICE_MK_COUNT_PER_GRP 8
+
+/**
+ * ice_mk_grp_dump - dump an marker group item info
+ * @ice_hw: pointer to the hardware structure
+ * @item: marker group item to dump
+ */
+void ice_mk_grp_dump(struct ice_hw *hw, struct ice_mk_grp_item *item)
+{
+       int i;
+
+       ice_info(hw, "index = %d\n", item->idx);
+       ice_info(hw, "markers: ");
+       for (i = 0; i < ICE_MK_COUNT_PER_GRP; i++)
+               ice_info(hw, "%d ", item->markers[i]);
+       ice_info(hw, "\n");
+}
+
+static void _mk_grp_parse_item(struct ice_hw *hw, u16 idx, void *item,
+                              void *data, int size)
+{
+       struct ice_mk_grp_item *grp = (struct ice_mk_grp_item *)item;
+       u8 *buf = (u8 *)data;
+       int i;
+
+       grp->idx = idx;
+
+       for (i = 0; i < ICE_MK_COUNT_PER_GRP; i++)
+               grp->markers[i] = buf[i];
+
+       if (hw->debug_mask & ICE_DBG_PARSER)
+               ice_mk_grp_dump(hw, grp);
+}
+
+/**
+ * ice_mk_grp_table_get - create a marker group table
+ * @ice_hw: pointer to the hardware structure
+ */
+struct ice_mk_grp_item *ice_mk_grp_table_get(struct ice_hw *hw)
+{
+       return (struct ice_mk_grp_item *)
+               ice_parser_create_table(hw, ICE_SID_RXPARSER_MARKER_GRP,
+                                       sizeof(struct ice_mk_grp_item),
+                                       ICE_MK_GRP_TABLE_SIZE,
+                                       ice_parser_sect_item_get,
+                                       _mk_grp_parse_item, false);
+}

diff --git a/drivers/net/ice/base/ice_mk_grp.h b/drivers/net/ice/base/ice_mk_grp.h
new file mode 100644 (file)
index 0000000..04d11b4
--- /dev/null
+++ b/drivers/net/ice/base/ice_mk_grp.h
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2001-2021 Intel Corporation
+ */
+
+#ifndef _ICE_MK_GRP_H_
+#define _ICE_MK_GRP_H_
+
+struct ice_mk_grp_item {
+       int idx;
+       u8 markers[8];
+};
+
+void ice_mk_grp_dump(struct ice_hw *hw, struct ice_mk_grp_item *item);
+struct ice_mk_grp_item *ice_mk_grp_table_get(struct ice_hw *hw);
+#endif /* _ICE_MK_GRP_H_ */

diff --git a/drivers/net/ice/base/ice_parser.c b/drivers/net/ice/base/ice_parser.c
index e7b7945..142da46 100644 (file)
--- a/drivers/net/ice/base/ice_parser.c
+++ b/drivers/net/ice/base/ice_parser.c
@@ -14,6 +14,7 @@
 #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_SID_RXPARSER_MARKER_GRP_ENTRY_SIZE         8
 
 #define ICE_SEC_LBL_DATA_OFFSET                                2
 #define ICE_SID_LBL_ENTRY_SIZE                         66
@@ -76,6 +77,9 @@ void *ice_parser_sect_item_get(u32 sect_type, void *section,
        case ICE_SID_RXPARSER_MARKER_PTYPE:
                size = ICE_SID_RXPARSER_MARKER_TYPE_ENTRY_SIZE;
                break;
+       case ICE_SID_RXPARSER_MARKER_GRP:
+               size = ICE_SID_RXPARSER_MARKER_GRP_ENTRY_SIZE;
+               break;
        default:
                return NULL;
        }
@@ -215,6 +219,12 @@ enum ice_status ice_parser_create(struct ice_hw *hw, struct ice_parser **psr)
                goto err;
        }
 
+       p->mk_grp_table = ice_mk_grp_table_get(hw);
+       if (!p->mk_grp_table) {
+               status = ICE_ERR_PARAM;
+               goto err;
+       }
+
        *psr = p;
        return ICE_SUCCESS;
 err:
@@ -237,6 +247,7 @@ void ice_parser_destroy(struct ice_parser *psr)
        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->mk_grp_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 40b7b82..b390eec 100644 (file)
--- a/drivers/net/ice/base/ice_parser.h
+++ b/drivers/net/ice/base/ice_parser.h
@@ -10,6 +10,7 @@
 #include "ice_pg_cam.h"
 #include "ice_bst_tcam.h"
 #include "ice_ptype_mk.h"
+#include "ice_mk_grp.h"
 
 struct ice_parser {
        struct ice_hw *hw; /* pointer to the hardware structure */
@@ -32,6 +33,8 @@ struct ice_parser {
        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;
+       /* load data from section ICE_SID_RXPARSER_MARKER_GRP */
+       struct ice_mk_grp_item *mk_grp_table;
 };
 
 enum ice_status ice_parser_create(struct ice_hw *hw, struct ice_parser **psr);

diff --git a/drivers/net/ice/base/meson.build b/drivers/net/ice/base/meson.build
index 97f4aab..e96503c 100644 (file)
--- a/drivers/net/ice/base/meson.build
+++ b/drivers/net/ice/base/meson.build
@@ -21,6 +21,7 @@ sources = [
         'ice_pg_cam.c',
         'ice_bst_tcam.c',
         'ice_ptype_mk.c',
+        'ice_mk_grp.c',
 ]
 
 error_cflags = [