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 381278e..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.
  */
 
@@ -12,38 +12,32 @@ struct bnxt_ulp_mapper_tbl_list_info ulp_wh_plus_act_tmpl_list[] = {
        [1] = {
        .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .num_tbls = 6,
-       .start_tbl_idx = 0,
-       .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR
+       .start_tbl_idx = 0
        },
        [2] = {
        .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .num_tbls = 3,
-       .start_tbl_idx = 6,
-       .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR
+       .start_tbl_idx = 6
        },
        [3] = {
        .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .num_tbls = 3,
-       .start_tbl_idx = 9,
-       .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR
+       .start_tbl_idx = 9
        },
        [4] = {
        .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .num_tbls = 6,
-       .start_tbl_idx = 12,
-       .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR
+       .start_tbl_idx = 12
        },
        [5] = {
        .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .num_tbls = 6,
-       .start_tbl_idx = 18,
-       .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR
+       .start_tbl_idx = 18
        },
        [6] = {
        .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .num_tbls = 5,
-       .start_tbl_idx = 24,
-       .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR
+       .start_tbl_idx = 24
        }
 };
 
@@ -53,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,
@@ -61,16 +55,16 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 1,
        .encap_num_fields = 0,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -78,16 +72,16 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 32,
        .result_num_fields = 1,
        .encap_num_fields = 0,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_SRC_PTR_0,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .index_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_RX,
        .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
@@ -95,9 +89,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 32,
        .result_num_fields = 1,
        .encap_num_fields = 0,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_DST_PTR_0,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -110,9 +104,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 0,
        .result_num_fields = 0,
        .encap_num_fields = 12,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_GLOBAL,
-       .index_operand = BNXT_ULP_GLB_REGFILE_INDEX_ENCAP_MAC_PTR,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -126,9 +120,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 128,
        .result_num_fields = 26,
        .encap_num_fields = 0,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -142,16 +136,16 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 128,
        .result_num_fields = 26,
        .encap_num_fields = 0,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -159,9 +153,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 1,
        .encap_num_fields = 0,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -175,9 +169,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 128,
        .result_num_fields = 26,
        .encap_num_fields = 0,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -191,16 +185,16 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 128,
        .result_num_fields = 26,
        .encap_num_fields = 0,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -208,9 +202,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 1,
        .encap_num_fields = 0,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -224,9 +218,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 128,
        .result_num_fields = 26,
        .encap_num_fields = 0,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -240,16 +234,16 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 128,
        .result_num_fields = 26,
        .encap_num_fields = 0,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -257,16 +251,16 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 1,
        .encap_num_fields = 0,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -274,16 +268,16 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 0,
        .result_num_fields = 0,
        .encap_num_fields = 3,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_SP_PTR,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_SP_PTR
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .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,
@@ -291,9 +285,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 0,
        .result_num_fields = 0,
        .encap_num_fields = 3,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_SP_PTR,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -306,9 +300,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 0,
        .result_num_fields = 0,
        .encap_num_fields = 12,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -322,9 +316,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 128,
        .result_num_fields = 26,
        .encap_num_fields = 12,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -338,16 +332,16 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 128,
        .result_num_fields = 26,
        .encap_num_fields = 0,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -355,16 +349,16 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 1,
        .encap_num_fields = 0,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -372,16 +366,16 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 32,
        .result_num_fields = 1,
        .encap_num_fields = 0,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_SRC_PTR_0,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -389,9 +383,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 32,
        .result_num_fields = 1,
        .encap_num_fields = 0,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_DST_PTR_0,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_DST_PTR_0
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
@@ -405,9 +399,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 0,
        .result_num_fields = 0,
        .encap_num_fields = 12,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_GLOBAL,
-       .index_operand = BNXT_ULP_GLB_REGFILE_INDEX_ENCAP_MAC_PTR,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -421,9 +415,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 128,
        .result_num_fields = 26,
        .encap_num_fields = 0,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -437,16 +431,16 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 128,
        .result_num_fields = 26,
        .encap_num_fields = 11,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -454,9 +448,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 1,
        .encap_num_fields = 0,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -464,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,
@@ -472,9 +466,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 0,
        .result_num_fields = 0,
        .encap_num_fields = 12,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .index_operand = BNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0
        },
        {
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
@@ -488,9 +482,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 128,
        .result_num_fields = 26,
        .encap_num_fields = 0,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -498,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,
@@ -506,9 +500,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 128,
        .result_num_fields = 26,
        .encap_num_fields = 0,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .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,
@@ -516,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,
@@ -524,9 +518,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 128,
        .result_num_fields = 26,
        .encap_num_fields = 11,
-       .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,
-       .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR
        }
 };