git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
net/bnxt: modify table processing
[dpdk.git] / drivers / net / bnxt / tf_ulp / ulp_template_db_wh_plus_act.c
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_act.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_act.c
index 33e7585..73f5740 100644 (file)
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_act.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_act.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2020 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
@@ -47,7 +47,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .resource_type = TF_TBL_TYPE_ACT_STATS_64,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_COUNT,
-       .cond_opcode = BNXT_ULP_COND_OPCODE_ACTION_BIT_IS_SET,
+       .cond_opcode = BNXT_ULP_COND_OPC_ACTION_BIT_IS_SET,
        .cond_operand = BNXT_ULP_ACTION_BIT_COUNT,
        .direction = TF_DIR_RX,
        .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
@@ -56,15 +56,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 1,
        .encap_num_fields = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_MODIFY_IPV4,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL,
-       .cond_opcode = BNXT_ULP_COND_OPCODE_ACTION_BIT_IS_SET,
+       .cond_opcode = BNXT_ULP_COND_OPC_ACTION_BIT_IS_SET,
        .cond_operand = BNXT_ULP_ACTION_BIT_SET_IPV4_SRC,
        .direction = TF_DIR_RX,
        .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
@@ -73,7 +73,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 1,
        .encap_num_fields = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
        .index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_SRC_PTR_0
        },
        {
@@ -81,7 +81,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .resource_type = TF_TBL_TYPE_ACT_MODIFY_IPV4,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL,
-       .cond_opcode = BNXT_ULP_COND_OPCODE_ACTION_BIT_IS_SET,
+       .cond_opcode = BNXT_ULP_COND_OPC_ACTION_BIT_IS_SET,
        .cond_operand = BNXT_ULP_ACTION_BIT_SET_IPV4_DST,
        .direction = TF_DIR_RX,
        .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
@@ -90,8 +90,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 1,
        .encap_num_fields = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_DST_PTR_0
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_DST_PTR_0
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
@@ -105,8 +105,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 0,
        .encap_num_fields = 12,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_GLOBAL,
-       .index_operand = BNXT_ULP_GLB_REGFILE_INDEX_ENCAP_MAC_PTR
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE,
+       .tbl_operand = BNXT_ULP_GLB_REGFILE_INDEX_ENCAP_MAC_PTR
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
@@ -121,8 +121,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
@@ -137,15 +137,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_STATS_64,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_COUNT,
-       .cond_opcode = BNXT_ULP_COND_OPCODE_ACTION_BIT_IS_SET,
+       .cond_opcode = BNXT_ULP_COND_OPC_ACTION_BIT_IS_SET,
        .cond_operand = BNXT_ULP_ACTION_BIT_COUNT,
        .direction = TF_DIR_RX,
        .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
@@ -154,8 +154,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 1,
        .encap_num_fields = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
@@ -170,8 +170,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
@@ -186,15 +186,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_STATS_64,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_COUNT,
-       .cond_opcode = BNXT_ULP_COND_OPCODE_ACTION_BIT_IS_SET,
+       .cond_opcode = BNXT_ULP_COND_OPC_ACTION_BIT_IS_SET,
        .cond_operand = BNXT_ULP_ACTION_BIT_COUNT,
        .direction = TF_DIR_RX,
        .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
@@ -203,8 +203,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 1,
        .encap_num_fields = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
@@ -219,8 +219,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
@@ -235,15 +235,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_STATS_64,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_COUNT,
-       .cond_opcode = BNXT_ULP_COND_OPCODE_ACTION_BIT_IS_SET,
+       .cond_opcode = BNXT_ULP_COND_OPC_ACTION_BIT_IS_SET,
        .cond_operand = BNXT_ULP_ACTION_BIT_COUNT,
        .direction = TF_DIR_TX,
        .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
@@ -252,15 +252,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 1,
        .encap_num_fields = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL,
-       .cond_opcode = BNXT_ULP_COND_OPCODE_COMP_FIELD_IS_SET,
+       .cond_opcode = BNXT_ULP_COND_OPC_COMP_FIELD_IS_SET,
        .cond_operand = BNXT_ULP_CF_IDX_ACT_ENCAP_IPV4_FLAG,
        .direction = TF_DIR_TX,
        .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,
@@ -269,7 +269,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 0,
        .encap_num_fields = 3,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
        .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_SP_PTR
        },
        {
@@ -277,7 +277,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL,
-       .cond_opcode = BNXT_ULP_COND_OPCODE_COMP_FIELD_IS_SET,
+       .cond_opcode = BNXT_ULP_COND_OPC_COMP_FIELD_IS_SET,
        .cond_operand = BNXT_ULP_CF_IDX_ACT_ENCAP_IPV6_FLAG,
        .direction = TF_DIR_TX,
        .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,
@@ -286,8 +286,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 0,
        .encap_num_fields = 3,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_SP_PTR
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_SP_PTR
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
@@ -301,8 +301,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 0,
        .encap_num_fields = 12,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
@@ -317,8 +317,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 12,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
@@ -333,15 +333,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_STATS_64,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_COUNT,
-       .cond_opcode = BNXT_ULP_COND_OPCODE_ACTION_BIT_IS_SET,
+       .cond_opcode = BNXT_ULP_COND_OPC_ACTION_BIT_IS_SET,
        .cond_operand = BNXT_ULP_ACTION_BIT_COUNT,
        .direction = TF_DIR_TX,
        .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
@@ -350,15 +350,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 1,
        .encap_num_fields = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_MODIFY_IPV4,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL,
-       .cond_opcode = BNXT_ULP_COND_OPCODE_ACTION_BIT_IS_SET,
+       .cond_opcode = BNXT_ULP_COND_OPC_ACTION_BIT_IS_SET,
        .cond_operand = BNXT_ULP_ACTION_BIT_SET_IPV4_SRC,
        .direction = TF_DIR_TX,
        .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
@@ -367,15 +367,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 1,
        .encap_num_fields = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_SRC_PTR_0
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_SRC_PTR_0
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_MODIFY_IPV4,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL,
-       .cond_opcode = BNXT_ULP_COND_OPCODE_ACTION_BIT_IS_SET,
+       .cond_opcode = BNXT_ULP_COND_OPC_ACTION_BIT_IS_SET,
        .cond_operand = BNXT_ULP_ACTION_BIT_SET_IPV4_DST,
        .direction = TF_DIR_TX,
        .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
@@ -384,7 +384,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 1,
        .encap_num_fields = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
        .index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_DST_PTR_0
        },
        {
@@ -400,8 +400,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 0,
        .encap_num_fields = 12,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_GLOBAL,
-       .index_operand = BNXT_ULP_GLB_REGFILE_INDEX_ENCAP_MAC_PTR
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE,
+       .tbl_operand = BNXT_ULP_GLB_REGFILE_INDEX_ENCAP_MAC_PTR
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
@@ -416,8 +416,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
@@ -432,15 +432,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 11,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_STATS_64,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_COUNT,
-       .cond_opcode = BNXT_ULP_COND_OPCODE_ACTION_BIT_IS_SET,
+       .cond_opcode = BNXT_ULP_COND_OPC_ACTION_BIT_IS_SET,
        .cond_operand = BNXT_ULP_ACTION_BIT_COUNT,
        .direction = TF_DIR_TX,
        .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
@@ -449,8 +449,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 1,
        .encap_num_fields = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
@@ -458,7 +458,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL,
        .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT,
-       .cond_opcode = BNXT_ULP_COND_OPCODE_ACTION_BIT_IS_SET,
+       .cond_opcode = BNXT_ULP_COND_OPC_ACTION_BIT_IS_SET,
        .cond_operand = BNXT_ULP_ACTION_BIT_PUSH_VLAN,
        .direction = TF_DIR_TX,
        .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
@@ -467,7 +467,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 0,
        .encap_num_fields = 12,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
        .index_operand = BNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0
        },
        {
@@ -483,8 +483,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
@@ -492,7 +492,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL,
        .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT,
-       .cond_opcode = BNXT_ULP_COND_OPCODE_ACTION_BIT_NOT_SET,
+       .cond_opcode = BNXT_ULP_COND_OPC_ACTION_BIT_NOT_SET,
        .cond_operand = BNXT_ULP_ACTION_BIT_PUSH_VLAN,
        .direction = TF_DIR_TX,
        .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
@@ -501,8 +501,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
@@ -510,7 +510,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL,
        .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT,
-       .cond_opcode = BNXT_ULP_COND_OPCODE_ACTION_BIT_IS_SET,
+       .cond_opcode = BNXT_ULP_COND_OPC_ACTION_BIT_IS_SET,
        .cond_operand = BNXT_ULP_ACTION_BIT_PUSH_VLAN,
        .direction = TF_DIR_TX,
        .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
@@ -519,8 +519,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 11,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
        }
 };
 
DPDK repo used for reviews