From 9cbfa4cfd5c0654cc238be436f29526e7093e669 Mon Sep 17 00:00:00 2001 From: Kishore Padmanabha Date: Sun, 30 May 2021 14:29:04 +0530 Subject: [PATCH] net/bnxt: add ULP priority opcode processing Added ULP priority opcode to enable flexibility to the usage of the flow priority. New opcodes help template specify the flow priority accordingly. Signed-off-by: Kishore Padmanabha Signed-off-by: Venkat Duvvuru Reviewed-by: Douglas Flint Reviewed-by: Mike Baucom Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/tf_ulp/bnxt_ulp.h | 7 + drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c | 25 +- drivers/net/bnxt/tf_ulp/ulp_flow_db.c | 23 +- drivers/net/bnxt/tf_ulp/ulp_flow_db.h | 3 +- drivers/net/bnxt/tf_ulp/ulp_mapper.c | 92 +- drivers/net/bnxt/tf_ulp/ulp_mapper.h | 1 + .../net/bnxt/tf_ulp/ulp_template_db_enum.h | 75 +- .../tf_ulp/ulp_template_db_stingray_act.c | 833 ++++++++++++++---- .../tf_ulp/ulp_template_db_stingray_class.c | 620 +++++++------ drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c | 12 +- drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.h | 12 +- .../bnxt/tf_ulp/ulp_template_db_wh_plus_act.c | 723 ++++++++++++--- .../tf_ulp/ulp_template_db_wh_plus_class.c | 506 ++++++----- drivers/net/bnxt/tf_ulp/ulp_template_struct.h | 18 +- 14 files changed, 1955 insertions(+), 995 deletions(-) diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h index 330965061a..96aef28b92 100644 --- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h +++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h @@ -30,6 +30,13 @@ #define BNXT_ULP_VF_REP_ENABLED 0x1 #define ULP_VF_REP_IS_ENABLED(flag) ((flag) & BNXT_ULP_VF_REP_ENABLED) +enum bnxt_ulp_flow_mem_type { + BNXT_ULP_FLOW_MEM_TYPE_INT = 0, + BNXT_ULP_FLOW_MEM_TYPE_EXT = 1, + BNXT_ULP_FLOW_MEM_TYPE_BOTH = 2, + BNXT_ULP_FLOW_MEM_TYPE_LAST = 3 +}; + struct bnxt_ulp_df_rule_info { uint32_t port_to_app_flow_id; uint32_t app_to_port_flow_id; diff --git a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c index 3eddbd6831..de21fc0e20 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c +++ b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c @@ -251,7 +251,8 @@ ulp_bulk_get_flow_stats(struct tf *tfp, */ parms.entry_sz_in_bytes = sizeof(uint64_t); stats = (uint64_t *)fc_info->shadow_hw_tbl[dir].mem_va; - parms.physical_mem_addr = (uintptr_t)fc_info->shadow_hw_tbl[dir].mem_pa; + parms.physical_mem_addr = (uint64_t) + ((uintptr_t)(fc_info->shadow_hw_tbl[dir].mem_pa)); if (!stats) { PMD_DRV_LOG(ERR, @@ -588,11 +589,11 @@ int ulp_fc_mgr_query_count_get(struct bnxt_ulp_context *ctxt, if (params.resource_func == BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE && (params.resource_sub_type == - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_COUNT || + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT || params.resource_sub_type == - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_EXT_COUNT || + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_EXT_COUNT || params.resource_sub_type == - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_COUNT_ACC)) { + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT_ACC)) { found_cntr_resource = true; break; } @@ -606,7 +607,10 @@ int ulp_fc_mgr_query_count_get(struct bnxt_ulp_context *ctxt, dir = params.direction; hw_cntr_id = params.resource_hndl; if (params.resource_sub_type == - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_COUNT) { + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT) { + /* TODO: + * Think about optimizing with try_lock later + */ pthread_mutex_lock(&ulp_fc_info->fc_lock); sw_cntr_idx = hw_cntr_id - ulp_fc_info->shadow_hw_tbl[dir].start_idx; @@ -623,11 +627,12 @@ int ulp_fc_mgr_query_count_get(struct bnxt_ulp_context *ctxt, } pthread_mutex_unlock(&ulp_fc_info->fc_lock); } else if (params.resource_sub_type == - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_COUNT_ACC) { - /* Get stats from the parent child table */ - ulp_flow_db_parent_flow_count_get(ctxt, flow_id, - &count->hits, &count->bytes, - count->reset); + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT_ACC) { + /* Get the stats from the parent child table */ + ulp_flow_db_parent_flow_count_get(ctxt, + flow_id, + &count->hits, + &count->bytes); count->hits_set = 1; count->bytes_set = 1; } else { diff --git a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c index 8669edfeba..c599e0c7e1 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c +++ b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c @@ -720,7 +720,7 @@ ulp_flow_db_resource_add(struct bnxt_ulp_context *ulp_ctxt, if (params->resource_type == TF_TBL_TYPE_ACT_STATS_64 && params->resource_sub_type == - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_COUNT) { + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT) { /* Store the first HW counter ID for this table */ if (!ulp_fc_mgr_start_idx_isset(ulp_ctxt, params->direction)) ulp_fc_mgr_start_idx_set(ulp_ctxt, params->direction, @@ -833,7 +833,7 @@ ulp_flow_db_resource_del(struct bnxt_ulp_context *ulp_ctxt, */ if (params->resource_type == TF_TBL_TYPE_ACT_STATS_64 && params->resource_sub_type == - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_COUNT) { + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT) { ulp_fc_mgr_cntr_reset(ulp_ctxt, params->direction, params->resource_hndl); } @@ -1259,7 +1259,7 @@ ulp_default_flow_db_cfa_action_get(struct bnxt_ulp_context *ulp_ctx, uint32_t flow_id, uint16_t *cfa_action) { - uint8_t sub_type = BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_VFR_CFA_ACTION; + uint8_t sub_typ = BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_VFR_CFA_ACTION; struct ulp_flow_db_res_params params; int32_t rc; @@ -1267,7 +1267,7 @@ ulp_default_flow_db_cfa_action_get(struct bnxt_ulp_context *ulp_ctx, BNXT_ULP_FDB_TYPE_DEFAULT, flow_id, BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, - sub_type, ¶ms); + sub_typ, ¶ms); if (rc) { BNXT_TF_DBG(ERR, "CFA Action ptr not found for flow id %u\n", flow_id); @@ -1647,7 +1647,7 @@ int32_t ulp_flow_db_parent_flow_create(struct bnxt_ulp_mapper_parms *parms) { struct ulp_flow_db_res_params fid_parms; - uint32_t sub_type = BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_COUNT_ACC; + uint32_t sub_typ = BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT_ACC; struct ulp_flow_db_res_params res_params; int32_t fid_idx, rc; @@ -1676,7 +1676,7 @@ ulp_flow_db_parent_flow_create(struct bnxt_ulp_mapper_parms *parms) BNXT_ULP_FDB_TYPE_REGULAR, parms->fid, BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, - sub_type, + sub_typ, &res_params)) { /* Enable the counter accumulation in parent entry */ if (ulp_flow_db_parent_flow_count_accum_set(parms->ulp_ctx, @@ -1708,7 +1708,7 @@ int32_t ulp_flow_db_child_flow_create(struct bnxt_ulp_mapper_parms *parms) { struct ulp_flow_db_res_params fid_parms; - uint32_t sub_type = BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_COUNT; + uint32_t sub_type = BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT; enum bnxt_ulp_resource_func res_fun; struct ulp_flow_db_res_params res_p; uint32_t parent_fid = parms->parent_fid; @@ -1819,8 +1819,9 @@ ulp_flow_db_parent_flow_count_update(struct bnxt_ulp_context *ulp_ctxt, */ int32_t ulp_flow_db_parent_flow_count_get(struct bnxt_ulp_context *ulp_ctxt, - uint32_t parent_fid, uint64_t *packet_count, - uint64_t *byte_count, uint8_t count_reset) + uint32_t parent_fid, + uint64_t *packet_count, + uint64_t *byte_count) { struct bnxt_ulp_flow_db *flow_db; struct ulp_fdb_parent_child_db *p_pdb; @@ -1841,10 +1842,6 @@ ulp_flow_db_parent_flow_count_get(struct bnxt_ulp_context *ulp_ctxt, p_pdb->parent_flow_tbl[idx].pkt_count; *byte_count = p_pdb->parent_flow_tbl[idx].byte_count; - if (count_reset) { - p_pdb->parent_flow_tbl[idx].pkt_count = 0; - p_pdb->parent_flow_tbl[idx].byte_count = 0; - } } return 0; } diff --git a/drivers/net/bnxt/tf_ulp/ulp_flow_db.h b/drivers/net/bnxt/tf_ulp/ulp_flow_db.h index 62c914833b..14369271ff 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_flow_db.h +++ b/drivers/net/bnxt/tf_ulp/ulp_flow_db.h @@ -390,8 +390,7 @@ int32_t ulp_flow_db_parent_flow_count_get(struct bnxt_ulp_context *ulp_ctxt, uint32_t parent_fid, uint64_t *packet_count, - uint64_t *byte_count, - uint8_t count_reset); + uint64_t *byte_count); /* * reset the parent accumulation counters diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c index b38c834fce..8dc2e18f9f 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c +++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c @@ -154,7 +154,7 @@ ulp_mapper_resource_index_tbl_alloc(struct bnxt_ulp_context *ulp_ctx, aparms.type = glb_res->resource_type; aparms.dir = glb_res->direction; - aparms.search_enable = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO; + aparms.search_enable = 0; aparms.tbl_scope_id = tbl_scope_id; /* Allocate the index tbl using tf api */ @@ -219,7 +219,7 @@ ulp_mapper_tmpl_reject_list_get(struct bnxt_ulp_mapper_parms *mparms, enum bnxt_ulp_cond_list_opc *opc) { uint32_t idx; - const struct ulp_template_device_tbls *dev_tbls; + const struct bnxt_ulp_template_device_tbls *dev_tbls; dev_tbls = &mparms->device_params->dev_tbls[mparms->tmpl_type]; *num_tbls = dev_tbls->tmpl_list[tid].reject_info.cond_nums; @@ -236,7 +236,7 @@ ulp_mapper_tbl_execute_list_get(struct bnxt_ulp_mapper_parms *mparms, enum bnxt_ulp_cond_list_opc *opc) { uint32_t idx; - const struct ulp_template_device_tbls *dev_tbls; + const struct bnxt_ulp_template_device_tbls *dev_tbls; dev_tbls = &mparms->device_params->dev_tbls[mparms->tmpl_type]; *num_tbls = tbl->execute_info.cond_nums; @@ -265,7 +265,7 @@ ulp_mapper_tbl_list_get(struct bnxt_ulp_mapper_parms *mparms, uint32_t *num_tbls) { uint32_t idx; - const struct ulp_template_device_tbls *dev_tbls; + const struct bnxt_ulp_template_device_tbls *dev_tbls; dev_tbls = &mparms->device_params->dev_tbls[mparms->tmpl_type]; @@ -292,7 +292,7 @@ ulp_mapper_key_fields_get(struct bnxt_ulp_mapper_parms *mparms, uint32_t *num_flds) { uint32_t idx; - const struct ulp_template_device_tbls *dev_tbls; + const struct bnxt_ulp_template_device_tbls *dev_tbls; dev_tbls = &mparms->device_params->dev_tbls[mparms->tmpl_type]; if (!dev_tbls->key_field_list) { @@ -326,7 +326,7 @@ ulp_mapper_result_fields_get(struct bnxt_ulp_mapper_parms *mparms, uint32_t *num_encap_flds) { uint32_t idx; - const struct ulp_template_device_tbls *dev_tbls; + const struct bnxt_ulp_template_device_tbls *dev_tbls; dev_tbls = &mparms->device_params->dev_tbls[mparms->tmpl_type]; if (!dev_tbls->result_field_list) { @@ -357,7 +357,7 @@ ulp_mapper_ident_fields_get(struct bnxt_ulp_mapper_parms *mparms, uint32_t *num_flds) { uint32_t idx; - const struct ulp_template_device_tbls *dev_tbls; + const struct bnxt_ulp_template_device_tbls *dev_tbls; dev_tbls = &mparms->device_params->dev_tbls[mparms->tmpl_type]; if (!dev_tbls->ident_list) { @@ -584,6 +584,36 @@ error: return rc; } +/* + * Process the flow database opcode action. + * returns 0 on success. + */ +static int32_t +ulp_mapper_priority_opc_process(struct bnxt_ulp_mapper_parms *parms, + struct bnxt_ulp_mapper_tbl_info *tbl, + uint32_t *priority) +{ + int32_t rc = 0; + + switch (tbl->pri_opcode) { + case BNXT_ULP_PRI_OPC_NOT_USED: + *priority = 0; + break; + case BNXT_ULP_PRI_OPC_CONST: + *priority = tbl->pri_operand; + break; + case BNXT_ULP_PRI_OPC_APP_PRI: + *priority = parms->app_priority; + break; + default: + BNXT_TF_DBG(ERR, "Priority opcode not supported %d\n", + tbl->pri_opcode); + rc = -EINVAL; + break; + } + return rc; +} + /* * Process the identifier list in the given table. * Extract the ident from the table entry and @@ -1294,11 +1324,11 @@ ulp_mapper_mark_gfid_process(struct bnxt_ulp_mapper_parms *parms, { struct ulp_flow_db_res_params fid_parms; uint32_t mark, gfid, mark_flag; - enum bnxt_ulp_mark_db_opcode mark_op = tbl->mark_db_opcode; + enum bnxt_ulp_mark_db_opc mark_op = tbl->mark_db_opcode; int32_t rc = 0; - if (mark_op == BNXT_ULP_MARK_DB_OPCODE_NOP || - !(mark_op == BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION && + if (mark_op == BNXT_ULP_MARK_DB_OPC_NOP || + !(mark_op == BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION && ULP_BITMAP_ISSET(parms->act_bitmap->bits, BNXT_ULP_ACTION_BIT_MARK))) return rc; /* no need to perform gfid process */ @@ -1335,11 +1365,11 @@ ulp_mapper_mark_act_ptr_process(struct bnxt_ulp_mapper_parms *parms, struct ulp_flow_db_res_params fid_parms; uint32_t act_idx, mark, mark_flag; uint64_t val64; - enum bnxt_ulp_mark_db_opcode mark_op = tbl->mark_db_opcode; + enum bnxt_ulp_mark_db_opc mark_op = tbl->mark_db_opcode; int32_t rc = 0; - if (mark_op == BNXT_ULP_MARK_DB_OPCODE_NOP || - !(mark_op == BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION && + if (mark_op == BNXT_ULP_MARK_DB_OPC_NOP || + !(mark_op == BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION && ULP_BITMAP_ISSET(parms->act_bitmap->bits, BNXT_ULP_ACTION_BIT_MARK))) return rc; /* no need to perform mark action process */ @@ -1381,11 +1411,11 @@ ulp_mapper_mark_vfr_idx_process(struct bnxt_ulp_mapper_parms *parms, struct ulp_flow_db_res_params fid_parms; uint32_t act_idx, mark, mark_flag; uint64_t val64; - enum bnxt_ulp_mark_db_opcode mark_op = tbl->mark_db_opcode; + enum bnxt_ulp_mark_db_opc mark_op = tbl->mark_db_opcode; int32_t rc = 0; - if (mark_op == BNXT_ULP_MARK_DB_OPCODE_NOP || - mark_op == BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION) + if (mark_op == BNXT_ULP_MARK_DB_OPC_NOP || + mark_op == BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION) return rc; /* no need to perform mark action process */ /* Get the mark id details from the computed field of dev port id */ @@ -1644,7 +1674,15 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms, tmplen, tbl->blob_key_bit_size); return -EINVAL; } - aparms.priority = tbl->priority; + + /* calculate the entry priority */ + rc = ulp_mapper_priority_opc_process(parms, tbl, + &aparms.priority); + if (rc) { + BNXT_TF_DBG(ERR, "entry priority process failed\n"); + return rc; + } + rc = tf_alloc_tcam_entry(tfp, &aparms); if (rc) { BNXT_TF_DBG(ERR, "tcam alloc failed rc=%d.\n", rc); @@ -1662,11 +1700,18 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms, searchparms.key = ulp_blob_data_get(&key, &tmplen); searchparms.key_sz_in_bits = tbl->key_bit_size; searchparms.mask = ulp_blob_data_get(&mask, &tmplen); - searchparms.priority = tbl->priority; searchparms.alloc = 1; searchparms.result = ulp_blob_data_get(&data, &tmplen); searchparms.result_sz_in_bits = tbl->result_bit_size; + /* calculate the entry priority */ + rc = ulp_mapper_priority_opc_process(parms, tbl, + &searchparms.priority); + if (rc) { + BNXT_TF_DBG(ERR, "entry priority process failed\n"); + return rc; + } + rc = tf_search_tcam_entry(tfp, &searchparms); if (rc) { BNXT_TF_DBG(ERR, "tcam search failed rc=%d\n", rc); @@ -1969,7 +2014,7 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms, BNXT_TF_DBG(ERR, "Failed to get tbl idx from Global " "regfile[%d].\n", - tbl->index_operand); + tbl->tbl_operand); return -EINVAL; } index = tfp_be_to_cpu_64(regval); @@ -2407,7 +2452,7 @@ ulp_mapper_gen_tbl_process(struct bnxt_ulp_mapper_parms *parms, tfp_cpu_to_be_64(gen_tbl_hit)); if (!rc) { BNXT_TF_DBG(ERR, "Write regfile[%d] failed\n", - tbl->index_operand); + BNXT_ULP_REGFILE_INDEX_GENERIC_TBL_HIT); return -EIO; } @@ -2482,15 +2527,15 @@ ulp_mapper_tbl_memtype_opcode_process(struct bnxt_ulp_mapper_parms *parms, bnxt_ulp_cntxt_mem_type_get(parms->ulp_ctx, &mtype); switch (tbl->mem_type_opcode) { - case BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT: + case BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT: if (mtype == BNXT_ULP_FLOW_MEM_TYPE_INT) rc = 0; break; - case BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT: + case BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT: if (mtype == BNXT_ULP_FLOW_MEM_TYPE_EXT) rc = 0; break; - case BNXT_ULP_MEM_TYPE_OPCODE_NOP: + case BNXT_ULP_MEM_TYPE_OPC_NOP: rc = 0; break; default: @@ -3031,6 +3076,7 @@ ulp_mapper_flow_create(struct bnxt_ulp_context *ulp_ctx, parms.parent_fid = cparms->parent_fid; parms.fid = cparms->flow_id; parms.tun_idx = cparms->tun_idx; + parms.app_priority = cparms->app_priority; /* Get the device id from the ulp context */ if (bnxt_ulp_cntxt_dev_id_get(ulp_ctx, &parms.dev_id)) { diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.h b/drivers/net/bnxt/tf_ulp/ulp_mapper.h index 4c423d2374..bef72696d3 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_mapper.h +++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.h @@ -56,6 +56,7 @@ struct bnxt_ulp_mapper_parms { uint32_t parent_fid; uint32_t parent_flow; uint8_t tun_idx; + uint32_t app_priority; }; struct bnxt_ulp_mapper_create_parms { diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h b/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h index b9a81d881b..6bb26f0ad5 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h +++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h @@ -26,7 +26,6 @@ #define BNXT_ULP_ACT_HID_SHFTR 23 #define BNXT_ULP_ACT_HID_SHFTL 23 #define BNXT_ULP_ACT_HID_MASK 4095 -#define BNXT_ULP_CACHE_TBL_IDENT_MAX_NUM 2 #define BNXT_ULP_GLB_RESOURCE_TBL_MAX_SZ 8 #define BNXT_ULP_GLB_TEMPLATE_TBL_MAX_SZ 1 #define BNXT_ULP_GLB_FIELD_TBL_SHIFT 7 @@ -201,13 +200,6 @@ enum bnxt_ulp_fdb_opc { BNXT_ULP_FDB_OPC_LAST = 4 }; -enum bnxt_ulp_flow_mem_type { - BNXT_ULP_FLOW_MEM_TYPE_INT = 0, - BNXT_ULP_FLOW_MEM_TYPE_EXT = 1, - BNXT_ULP_FLOW_MEM_TYPE_BOTH = 2, - BNXT_ULP_FLOW_MEM_TYPE_LAST = 3 -}; - enum bnxt_ulp_generic_tbl_opc { BNXT_ULP_GENERIC_TBL_OPC_NOT_USED = 0, BNXT_ULP_GENERIC_TBL_OPC_READ = 1, @@ -252,15 +244,6 @@ enum bnxt_ulp_index_tbl_opc { BNXT_ULP_INDEX_TBL_OPC_LAST = 7 }; -enum bnxt_ulp_index_opcode { - BNXT_ULP_INDEX_OPCODE_NOT_USED = 0, - BNXT_ULP_INDEX_OPCODE_ALLOCATE = 1, - BNXT_ULP_INDEX_OPCODE_GLOBAL = 2, - BNXT_ULP_INDEX_OPCODE_COMP_FIELD = 3, - BNXT_ULP_INDEX_OPCODE_CONSTANT = 4, - BNXT_ULP_INDEX_OPCODE_LAST = 5 -}; - enum bnxt_ulp_mapper_opc { BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT = 0, BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD = 1, @@ -278,11 +261,11 @@ enum bnxt_ulp_mapper_opc { BNXT_ULP_MAPPER_OPC_LAST = 13 }; -enum bnxt_ulp_mark_db_opcode { - BNXT_ULP_MARK_DB_OPCODE_NOP = 0, - BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION = 1, - BNXT_ULP_MARK_DB_OPCODE_SET_VFR_FLAG = 2, - BNXT_ULP_MARK_DB_OPCODE_LAST = 3 +enum bnxt_ulp_mark_db_opc { + BNXT_ULP_MARK_DB_OPC_NOP = 0, + BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION = 1, + BNXT_ULP_MARK_DB_OPC_PUSH_AND_SET_VFR_FLAG = 2, + BNXT_ULP_MARK_DB_OPC_LAST = 3 }; enum bnxt_ulp_match_type { @@ -291,24 +274,18 @@ enum bnxt_ulp_match_type { BNXT_ULP_MATCH_TYPE_LAST = 2 }; -enum bnxt_ulp_mem_type_opcode { - BNXT_ULP_MEM_TYPE_OPCODE_NOP = 0, - BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT = 1, - BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT = 2, - BNXT_ULP_MEM_TYPE_OPCODE_LAST = 3 +enum bnxt_ulp_mem_type_opc { + BNXT_ULP_MEM_TYPE_OPC_NOP = 0, + BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT = 1, + BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT = 2, + BNXT_ULP_MEM_TYPE_OPC_LAST = 3 }; -enum bnxt_ulp_priority { - BNXT_ULP_PRIORITY_LEVEL_0 = 0, - BNXT_ULP_PRIORITY_LEVEL_1 = 1, - BNXT_ULP_PRIORITY_LEVEL_2 = 2, - BNXT_ULP_PRIORITY_LEVEL_3 = 3, - BNXT_ULP_PRIORITY_LEVEL_4 = 4, - BNXT_ULP_PRIORITY_LEVEL_5 = 5, - BNXT_ULP_PRIORITY_LEVEL_6 = 6, - BNXT_ULP_PRIORITY_LEVEL_7 = 7, - BNXT_ULP_PRIORITY_NOT_USED = 8, - BNXT_ULP_PRIORITY_LAST = 9 +enum bnxt_ulp_pri_opc { + BNXT_ULP_PRI_OPC_NOT_USED = 0, + BNXT_ULP_PRI_OPC_CONST = 1, + BNXT_ULP_PRI_OPC_APP_PRI = 2, + BNXT_ULP_PRI_OPC_LAST = 3 }; enum bnxt_ulp_regfile_index { @@ -352,13 +329,6 @@ enum bnxt_ulp_tcam_tbl_opc { BNXT_ULP_TCAM_TBL_OPC_LAST = 3 }; -enum bnxt_ulp_search_before_alloc { - BNXT_ULP_SEARCH_BEFORE_ALLOC_NO = 0, - BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP = 1, - BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_UPDATE = 2, - BNXT_ULP_SEARCH_BEFORE_ALLOC_LAST = 3 -}; - enum bnxt_ulp_template_type { BNXT_ULP_TEMPLATE_TYPE_CLASS = 0, BNXT_ULP_TEMPLATE_TYPE_ACTION = 1, @@ -403,13 +373,14 @@ enum bnxt_ulp_resource_func { enum bnxt_ulp_resource_sub_type { BNXT_ULP_RESOURCE_SUB_TYPE_NOT_USED = 0, - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL = 0, - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_VFR_CFA_ACTION = 1, - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_COUNT = 2, - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_COUNT_ACC = 3, - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_EXT_COUNT = 4, - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM = 0, - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM = 1 + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL = 0, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_VFR_CFA_ACTION = 1, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT = 2, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT_ACC = 3, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_EXT_COUNT = 4, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM = 0, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM = 1, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MIRROR_TBL = 2 }; enum bnxt_ulp_sym { diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_act.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_act.c index 6ad6263183..eb71b5053c 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_act.c +++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_act.c @@ -3,37 +3,52 @@ * All rights reserved. */ +/* date: Thu Oct 15 17:28:37 2020 */ + #include "ulp_template_db_enum.h" #include "ulp_template_db_field.h" #include "ulp_template_struct.h" #include "ulp_rte_parser.h" -struct bnxt_ulp_mapper_tbl_list_info ulp_stingray_act_tmpl_list[] = { +/* Mapper templates for header act list */ +struct bnxt_ulp_mapper_tmpl_info ulp_stingray_act_tmpl_list[] = { + /* act-ing-[dec_ttl, count, nat]:1 */ + /* act_tid: 1, stingray, ingress */ [1] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 6, .start_tbl_idx = 0 }, + /* act-ing-[drop, pop_vlan, push_vlan, dec_ttl, count, vxlan_decap]:2 */ + /* act_tid: 2, stingray, ingress */ [2] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 3, .start_tbl_idx = 6 }, + /* act-ing-[mark, rss, count, pop_vlan, vxlan_decap]:3 */ + /* act_tid: 3, stingray, ingress */ [3] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 3, .start_tbl_idx = 9 }, + /* act_egr-[vxlan_encap, count]:4 */ + /* act_tid: 4, stingray, egress */ [4] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 6, .start_tbl_idx = 12 }, + /* act-egr-[dec_ttl, count, nat]:5 */ + /* act_tid: 5, stingray, egress */ [5] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 6, .start_tbl_idx = 18 }, + /* act-egr-[drop, push_vlan, dec_ttl, count]:6 */ + /* act_tid: 6, stingray, egress */ [6] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 5, @@ -42,495 +57,470 @@ struct bnxt_ulp_mapper_tbl_list_info ulp_stingray_act_tmpl_list[] = { }; struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = { - { + { /* act_tid: 1, stingray, table: int_flow_counter_tbl_0 */ .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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT, .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, .result_start_idx = 0, .result_bit_size = 64, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0 }, - { + { /* act_tid: 1, stingray, table: int_act_modify_ipv4_src_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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .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, .result_start_idx = 1, .result_bit_size = 32, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_SRC_PTR_0 }, - { + { /* act_tid: 1, stingray, table: int_act_modify_ipv4_dst_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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .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, .result_start_idx = 2, .result_bit_size = 32, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_DST_PTR_0 }, - { + { /* act_tid: 1, stingray, table: int_encap_mac_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_ACT_ENCAP_16B, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 3, .result_bit_size = 0, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE, + .tbl_operand = BNXT_ULP_GLB_REGFILE_INDEX_ENCAP_MAC_PTR }, - { + { /* act_tid: 1, stingray, table: ext_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_EXT, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 15, .result_bit_size = 128, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 1, stingray, table: int_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 41, .result_bit_size = 128, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 2, stingray, table: int_flow_counter_tbl_0 */ .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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT, .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, .result_start_idx = 67, .result_bit_size = 64, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0 }, - { + { /* act_tid: 2, stingray, table: ext_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_EXT, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 68, .result_bit_size = 128, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 2, stingray, table: int_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 94, .result_bit_size = 128, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 3, stingray, table: int_flow_counter_tbl_0 */ .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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT, .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, .result_start_idx = 120, .result_bit_size = 64, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0 }, - { + { /* act_tid: 3, stingray, table: ext_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_EXT, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 121, .result_bit_size = 128, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 3, stingray, table: int_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 147, .result_bit_size = 128, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 4, stingray, table: int_flow_counter_tbl_0 */ .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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT, .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, .result_start_idx = 173, .result_bit_size = 64, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0 }, - { + { /* act_tid: 4, stingray, table: int_sp_smac_ipv4_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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .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, .result_start_idx = 174, .result_bit_size = 0, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_SP_PTR }, - { + { /* act_tid: 4, stingray, table: int_sp_smac_ipv6_0 */ .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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .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, .result_start_idx = 177, .result_bit_size = 0, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_SP_PTR }, - { + { /* act_tid: 4, stingray, table: int_tun_encap_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_ACT_ENCAP_64B, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP, .result_start_idx = 180, .result_bit_size = 0, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0 }, - { + { /* act_tid: 4, stingray, table: ext_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_EXT, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 192, .result_bit_size = 128, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 4, stingray, table: int_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 230, .result_bit_size = 128, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 5, stingray, table: int_flow_counter_tbl_0 */ .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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT, .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, .result_start_idx = 256, .result_bit_size = 64, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0 }, - { + { /* act_tid: 5, stingray, table: int_act_modify_ipv4_src_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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .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, .result_start_idx = 257, .result_bit_size = 32, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_SRC_PTR_0 }, - { + { /* act_tid: 5, stingray, table: int_act_modify_ipv4_dst_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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .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, .result_start_idx = 258, .result_bit_size = 32, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_DST_PTR_0 }, - { + { /* act_tid: 5, stingray, table: int_encap_mac_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_ACT_ENCAP_16B, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 259, .result_bit_size = 0, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE, + .tbl_operand = BNXT_ULP_GLB_REGFILE_INDEX_ENCAP_MAC_PTR }, - { + { /* act_tid: 5, stingray, table: int_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 271, .result_bit_size = 128, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 5, stingray, table: ext_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_EXT, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 297, .result_bit_size = 128, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 6, stingray, table: int_flow_counter_tbl_0 */ .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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT, .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, .result_start_idx = 334, .result_bit_size = 64, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0 }, - { + { /* act_tid: 6, stingray, table: int_vtag_encap_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_ACT_ENCAP_16B, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .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, .result_start_idx = 335, .result_bit_size = 0, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0 }, - { + { /* act_tid: 6, stingray, table: int_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 347, .result_bit_size = 128, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 6, stingray, table: ext_full_act_record_no_tag_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_EXT, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .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, .result_start_idx = 373, .result_bit_size = 128, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 6, stingray, table: ext_full_act_record_one_tag_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_EXT, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .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, .result_start_idx = 399, .result_bit_size = 128, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR } }; struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = { + /* act_tid: 1, stingray, table: int_flow_counter_tbl_0 */ { + .description = "count", .field_bit_size = 64, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 1, stingray, table: int_act_modify_ipv4_src_0 */ { + .description = "ipv4_addr", .field_bit_size = 32, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -539,7 +529,9 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, + /* act_tid: 1, stingray, table: int_act_modify_ipv4_dst_0 */ { + .description = "ipv4_addr", .field_bit_size = 32, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -548,19 +540,24 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, + /* act_tid: 1, stingray, table: int_encap_mac_record_0 */ { + .description = "ecv_tun_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l4_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l3_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l2_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = { @@ -569,40 +566,50 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_vtag_type", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_custom_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_valid", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vtag_tpid", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_vid", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_de", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_pcp", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "spare", .field_bit_size = 80, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 1, stingray, table: ext_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -612,18 +619,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -638,22 +649,27 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "flow_cntr_ext", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE, .result_operand = { @@ -663,12 +679,14 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_rec_int", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -678,6 +696,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -697,6 +716,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -706,6 +726,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -725,18 +746,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -746,6 +771,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -755,6 +781,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_HDR_BIT_THEN_CONST_ELSE_CONST, .result_operand = { @@ -773,6 +800,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -782,22 +810,28 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 1, stingray, table: int_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -807,18 +841,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -833,18 +871,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE, .result_operand = { @@ -854,6 +896,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -863,6 +906,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -882,6 +926,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -891,6 +936,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -910,18 +956,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -931,6 +981,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -940,6 +991,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_HDR_BIT_THEN_CONST_ELSE_CONST, .result_operand = { @@ -958,6 +1010,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -967,34 +1020,44 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "hit", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "type", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 2, stingray, table: int_flow_counter_tbl_0 */ { + .description = "count", .field_bit_size = 64, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 2, stingray, table: ext_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -1004,18 +1067,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1030,30 +1097,37 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "flow_cntr_ext", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_rec_int", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -1063,6 +1137,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -1082,6 +1157,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -1091,6 +1167,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -1110,18 +1187,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -1131,6 +1212,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -1140,6 +1222,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_CONST_ELSE_CONST, .result_operand = { @@ -1156,6 +1239,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1165,6 +1249,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1179,14 +1264,17 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1200,7 +1288,9 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = (uint64_t)BNXT_ULP_ACTION_BIT_DROP & 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, + /* act_tid: 2, stingray, table: int_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -1210,18 +1300,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1236,18 +1330,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -1257,6 +1355,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -1266,6 +1365,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -1285,6 +1385,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -1294,6 +1395,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -1313,18 +1415,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -1334,6 +1440,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -1343,6 +1450,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_CONST_ELSE_CONST, .result_operand = { @@ -1359,6 +1467,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1368,6 +1477,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1382,14 +1492,17 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1404,18 +1517,24 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "hit", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "type", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 3, stingray, table: int_flow_counter_tbl_0 */ { + .description = "count", .field_bit_size = 64, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 3, stingray, table: ext_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -1425,18 +1544,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1451,66 +1574,82 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "flow_cntr_ext", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_rec_int", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_CONST_ELSE_CONST, .result_operand = { @@ -1527,6 +1666,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1536,6 +1676,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1550,18 +1691,23 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 3, stingray, table: int_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -1571,18 +1717,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1597,58 +1747,72 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_CONST_ELSE_CONST, .result_operand = { @@ -1665,6 +1829,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1674,6 +1839,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1688,30 +1854,39 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "hit", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "type", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 4, stingray, table: int_flow_counter_tbl_0 */ { + .description = "count", .field_bit_size = 64, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 4, stingray, table: int_sp_smac_ipv4_0 */ { + .description = "smac", .field_bit_size = 48, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1721,6 +1896,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ipv4_src_addr", .field_bit_size = 32, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1730,10 +1906,13 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "reserved", .field_bit_size = 48, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 4, stingray, table: int_sp_smac_ipv6_0 */ { + .description = "smac", .field_bit_size = 48, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1743,6 +1922,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ipv6_src_addr", .field_bit_size = 128, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1752,10 +1932,13 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "reserved", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 4, stingray, table: int_tun_encap_record_0 */ { + .description = "ecv_tun_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = { @@ -1764,6 +1947,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_l4_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = { @@ -1772,6 +1956,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_l3_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1781,12 +1966,14 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_l2_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_vtag_type", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1796,16 +1983,19 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_custom_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_valid", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_l2_dmac", .field_bit_size = 48, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1815,6 +2005,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_vtag", .field_bit_size = 0, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ENCAP_ACT_PROP_SZ, .result_operand = { @@ -1826,6 +2017,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_ip", .field_bit_size = 0, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ENCAP_ACT_PROP_SZ, .result_operand = { @@ -1837,6 +2029,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_udp", .field_bit_size = 32, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1846,6 +2039,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_tun", .field_bit_size = 0, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ENCAP_ACT_PROP_SZ, .result_operand = { @@ -1856,7 +2050,9 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, + /* act_tid: 4, stingray, table: ext_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -1866,18 +2062,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1892,70 +2092,87 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "flow_cntr_ext", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_rec_int", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1965,22 +2182,27 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_tun_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = { @@ -1989,6 +2211,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_l4_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = { @@ -1997,6 +2220,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_l3_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2006,12 +2230,14 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_l2_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_vtag_type", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2021,16 +2247,19 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_custom_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_valid", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_l2_dmac", .field_bit_size = 48, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2040,6 +2269,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_vtag", .field_bit_size = 0, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ENCAP_ACT_PROP_SZ, .result_operand = { @@ -2051,6 +2281,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_ip", .field_bit_size = 0, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ENCAP_ACT_PROP_SZ, .result_operand = { @@ -2062,6 +2293,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_udp", .field_bit_size = 32, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2071,6 +2303,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_tun", .field_bit_size = 0, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ENCAP_ACT_PROP_SZ, .result_operand = { @@ -2081,7 +2314,9 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, + /* act_tid: 4, stingray, table: int_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2091,18 +2326,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -2117,18 +2356,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2138,46 +2381,57 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2187,34 +2441,44 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "hit", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "type", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 5, stingray, table: int_flow_counter_tbl_0 */ { + .description = "count", .field_bit_size = 64, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 5, stingray, table: int_act_modify_ipv4_src_0 */ { + .description = "ipv4_addr", .field_bit_size = 32, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2223,7 +2487,9 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, + /* act_tid: 5, stingray, table: int_act_modify_ipv4_dst_0 */ { + .description = "ipv4_addr", .field_bit_size = 32, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2232,19 +2498,24 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, + /* act_tid: 5, stingray, table: int_encap_mac_record_0 */ { + .description = "ecv_tun_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l4_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l3_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l2_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = { @@ -2253,40 +2524,50 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_vtag_type", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_custom_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_valid", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vtag_tpid", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_vid", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_de", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_pcp", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "spare", .field_bit_size = 80, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 5, stingray, table: int_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2296,18 +2577,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -2322,18 +2607,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE, .result_operand = { @@ -2343,6 +2632,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2352,6 +2642,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -2371,6 +2662,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2380,6 +2672,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -2399,18 +2692,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -2420,6 +2717,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -2429,6 +2727,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_HDR_BIT_THEN_CONST_ELSE_CONST, .result_operand = { @@ -2447,6 +2746,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2456,30 +2756,38 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "hit", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "type", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 5, stingray, table: ext_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2489,18 +2797,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -2515,30 +2827,37 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "flow_cntr_ext", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_rec_int", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2548,6 +2867,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -2567,6 +2887,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2576,6 +2897,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -2595,18 +2917,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -2616,6 +2942,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -2625,6 +2952,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_HDR_BIT_THEN_CONST_ELSE_CONST, .result_operand = { @@ -2643,6 +2971,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2652,34 +2981,42 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_tun_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l4_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l3_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l2_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = { @@ -2688,56 +3025,71 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_vtag_type", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_custom_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_valid", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vtag_tpid", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_vid", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_de", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_pcp", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 6, stingray, table: int_flow_counter_tbl_0 */ { + .description = "count", .field_bit_size = 64, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 6, stingray, table: int_vtag_encap_record_0 */ { + .description = "ecv_tun_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l4_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l3_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l2_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_vtag_type", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = { @@ -2746,16 +3098,19 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_custom_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_valid", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vtag_tpid", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2765,6 +3120,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vtag_vid", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2774,10 +3130,12 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vtag_de", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_pcp", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2787,10 +3145,13 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "spare", .field_bit_size = 80, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 6, stingray, table: int_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2800,18 +3161,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -2826,18 +3191,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2847,34 +3216,42 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -2884,6 +3261,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -2893,10 +3271,12 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2906,18 +3286,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -2932,14 +3316,18 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "hit", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "type", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 6, stingray, table: ext_full_act_record_no_tag_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2949,18 +3337,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -2975,58 +3367,72 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "flow_cntr_ext", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_rec_int", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -3036,6 +3442,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -3045,10 +3452,12 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -3058,18 +3467,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -3083,7 +3496,9 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = (uint64_t)BNXT_ULP_ACTION_BIT_DROP & 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, + /* act_tid: 6, stingray, table: ext_full_act_record_one_tag_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -3093,18 +3508,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -3119,58 +3538,72 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "flow_cntr_ext", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_rec_int", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -3180,6 +3613,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -3189,10 +3623,12 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -3202,6 +3638,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -3216,14 +3653,17 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -3238,22 +3678,27 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_tun_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l4_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l3_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l2_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_vtag_type", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = { @@ -3262,16 +3707,19 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_custom_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_valid", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vtag_tpid", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -3281,6 +3729,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vtag_vid", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -3290,10 +3739,12 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vtag_de", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_pcp", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_class.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_class.c index c11d1ad96d..53ba637d4e 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_class.c +++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_class.c @@ -11,7 +11,7 @@ #include "ulp_rte_parser.h" /* Mapper templates for header class list */ -struct bnxt_ulp_mapper_tbl_list_info ulp_stingray_class_tmpl_list[] = { +struct bnxt_ulp_mapper_tmpl_info ulp_stingray_class_tmpl_list[] = { /* default-vfr-[port_to_vs]:1 */ /* class_tid: 1, stingray, ingress */ [1] = { @@ -194,22 +194,21 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 0, .result_bit_size = 128, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, { /* class_tid: 1, stingray, table: l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM, .direction = TF_DIR_RX, .key_start_idx = 0, .blob_key_bit_size = 12, @@ -226,8 +225,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -238,7 +237,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 1, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 1, stingray, table: parif_def_lkup_arec_ptr_0 */ @@ -249,8 +248,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .result_bit_size = 32, .result_num_fields = 1, .encap_num_fields = 0, - .index_opcode = BNXT_ULP_INDEX_OPCODE_COMP_FIELD, - .index_operand = BNXT_ULP_CF_IDX_PHY_PORT_PARIF + .tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD, + .tbl_operand = BNXT_ULP_CF_IDX_PHY_PORT_PARIF }, { /* class_tid: 1, stingray, table: parif_def_arec_ptr_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE, @@ -260,8 +259,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .result_bit_size = 32, .result_num_fields = 1, .encap_num_fields = 0, - .index_opcode = BNXT_ULP_INDEX_OPCODE_COMP_FIELD, - .index_operand = BNXT_ULP_CF_IDX_PHY_PORT_PARIF + .tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD, + .tbl_operand = BNXT_ULP_CF_IDX_PHY_PORT_PARIF }, { /* class_tid: 1, stingray, table: parif_def_err_arec_ptr_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE, @@ -271,23 +270,22 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .result_bit_size = 32, .result_num_fields = 1, .encap_num_fields = 0, - .index_opcode = BNXT_ULP_INDEX_OPCODE_COMP_FIELD, - .index_operand = BNXT_ULP_CF_IDX_PHY_PORT_PARIF + .tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD, + .tbl_operand = BNXT_ULP_CF_IDX_PHY_PORT_PARIF }, { /* class_tid: 2, stingray, table: int_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_VFR_CFA_ACTION, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_VFR_CFA_ACTION, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 43, .result_bit_size = 128, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, { /* class_tid: 2, stingray, table: l2_cntxt_tcam_vfr_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, @@ -295,8 +293,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .cond_opcode = BNXT_ULP_COND_OPC_COMP_FIELD_IS_SET, .cond_operand = BNXT_ULP_CF_IDX_VFR_MODE, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 14, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -307,14 +305,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 1, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 2, stingray, table: l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM, .cond_opcode = BNXT_ULP_COND_OPC_COMP_FIELD_NOT_SET, .cond_operand = BNXT_ULP_CF_IDX_VFR_MODE, .direction = TF_DIR_TX, @@ -335,8 +333,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .cond_opcode = BNXT_ULP_COND_OPC_COMP_FIELD_NOT_SET, .cond_operand = BNXT_ULP_CF_IDX_VFR_MODE, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 28, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -347,7 +345,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 2, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 2, stingray, table: parif_def_lkup_arec_ptr_0 */ @@ -358,8 +356,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .result_bit_size = 32, .result_num_fields = 1, .encap_num_fields = 0, - .index_opcode = BNXT_ULP_INDEX_OPCODE_COMP_FIELD, - .index_operand = BNXT_ULP_CF_IDX_DRV_FUNC_PARIF + .tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD, + .tbl_operand = BNXT_ULP_CF_IDX_DRV_FUNC_PARIF }, { /* class_tid: 2, stingray, table: parif_def_arec_ptr_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE, @@ -369,8 +367,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .result_bit_size = 32, .result_num_fields = 1, .encap_num_fields = 0, - .index_opcode = BNXT_ULP_INDEX_OPCODE_COMP_FIELD, - .index_operand = BNXT_ULP_CF_IDX_DRV_FUNC_PARIF + .tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD, + .tbl_operand = BNXT_ULP_CF_IDX_DRV_FUNC_PARIF }, { /* class_tid: 2, stingray, table: parif_def_err_arec_ptr_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE, @@ -380,44 +378,42 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .result_bit_size = 32, .result_num_fields = 1, .encap_num_fields = 0, - .index_opcode = BNXT_ULP_INDEX_OPCODE_COMP_FIELD, - .index_operand = BNXT_ULP_CF_IDX_DRV_FUNC_PARIF + .tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD, + .tbl_operand = BNXT_ULP_CF_IDX_DRV_FUNC_PARIF }, { /* class_tid: 3, stingray, table: egr_int_vtag_encap_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_ACT_ENCAP_8B, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 99, .result_bit_size = 0, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0 }, { /* class_tid: 3, stingray, table: egr_int_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_VFR_CFA_ACTION, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_VFR_CFA_ACTION, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 111, .result_bit_size = 128, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, { /* class_tid: 3, stingray, table: egr_l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM, .direction = TF_DIR_TX, .key_start_idx = 41, .blob_key_bit_size = 12, @@ -434,8 +430,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 42, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -446,30 +442,29 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 2, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 3, stingray, table: ing_int_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 150, .result_bit_size = 128, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, { /* class_tid: 3, stingray, table: ing_l2_cntxt_dtagged_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 55, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -480,15 +475,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 2, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 3, stingray, table: ing_l2_cntxt_stagged_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 68, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -499,14 +494,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 2, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 4, stingray, table: egr_l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM, .direction = TF_DIR_TX, .key_start_idx = 81, .blob_key_bit_size = 12, @@ -523,8 +518,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 82, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -535,7 +530,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 3, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 4, stingray, table: egr_parif_def_lkup_arec_ptr_0 */ @@ -546,8 +541,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .result_bit_size = 32, .result_num_fields = 1, .encap_num_fields = 0, - .index_opcode = BNXT_ULP_INDEX_OPCODE_CONSTANT, - .index_operand = BNXT_ULP_SYM_VF_FUNC_PARIF + .tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_CONST, + .tbl_operand = BNXT_ULP_SYM_VF_FUNC_PARIF }, { /* class_tid: 4, stingray, table: egr_parif_def_arec_ptr_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE, @@ -557,8 +552,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .result_bit_size = 32, .result_num_fields = 1, .encap_num_fields = 0, - .index_opcode = BNXT_ULP_INDEX_OPCODE_CONSTANT, - .index_operand = BNXT_ULP_SYM_VF_FUNC_PARIF + .tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_CONST, + .tbl_operand = BNXT_ULP_SYM_VF_FUNC_PARIF }, { /* class_tid: 4, stingray, table: egr_parif_def_err_arec_ptr_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE, @@ -568,30 +563,29 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .result_bit_size = 32, .result_num_fields = 1, .encap_num_fields = 0, - .index_opcode = BNXT_ULP_INDEX_OPCODE_CONSTANT, - .index_operand = BNXT_ULP_SYM_VF_FUNC_PARIF + .tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_CONST, + .tbl_operand = BNXT_ULP_SYM_VF_FUNC_PARIF }, { /* class_tid: 4, stingray, table: ing_int_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 219, .result_bit_size = 128, .result_num_fields = 26, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_VFR_FLAG, - .index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE, - .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_AND_SET_VFR_FLAG, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, { /* class_tid: 4, stingray, table: ing_l2_cntxt_tcam_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 95, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -602,30 +596,29 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 3, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 5, stingray, table: int_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_VFR_CFA_ACTION, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_VFR_CFA_ACTION, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 258, .result_bit_size = 128, .result_num_fields = 26, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, - .index_opcode = BNXT_ULP_INDEX_OPCODE_GLOBAL, - .index_operand = BNXT_ULP_GLB_REGFILE_INDEX_GLB_LB_AREC_PTR + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE, + .tbl_operand = BNXT_ULP_GLB_REGFILE_INDEX_GLB_LB_AREC_PTR }, { /* class_tid: 6, stingray, table: l2_cntxt_tcam_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 108, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -636,14 +629,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 3, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 6, stingray, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 121, .blob_key_bit_size = 16, @@ -660,8 +653,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_1, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 1, .key_start_idx = 124, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -672,13 +665,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 5, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 6, stingray, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 167, .blob_key_bit_size = 448, @@ -690,13 +683,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 5, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 6, stingray, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 178, .blob_key_bit_size = 200, @@ -708,15 +701,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 5, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 7, stingray, table: l2_cntxt_tcam_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 189, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -727,14 +720,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 5, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 7, stingray, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 202, .blob_key_bit_size = 16, @@ -751,8 +744,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_1, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 1, .key_start_idx = 205, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -763,13 +756,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 7, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 7, stingray, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 248, .blob_key_bit_size = 448, @@ -781,13 +774,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 7, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 7, stingray, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 259, .blob_key_bit_size = 200, @@ -799,14 +792,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 7, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 8, stingray, table: l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM, .direction = TF_DIR_RX, .key_start_idx = 270, .blob_key_bit_size = 12, @@ -823,8 +816,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 271, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -835,14 +828,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 8, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 8, stingray, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 284, .blob_key_bit_size = 16, @@ -859,8 +852,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 287, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -871,13 +864,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 9, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 8, stingray, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 330, .blob_key_bit_size = 448, @@ -889,13 +882,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 9, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 8, stingray, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 341, .blob_key_bit_size = 200, @@ -907,14 +900,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 9, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 9, stingray, table: l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM, .direction = TF_DIR_RX, .key_start_idx = 352, .blob_key_bit_size = 12, @@ -931,8 +924,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 353, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -943,14 +936,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 10, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 9, stingray, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 366, .blob_key_bit_size = 16, @@ -967,8 +960,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 369, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -979,13 +972,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 11, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 9, stingray, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 412, .blob_key_bit_size = 448, @@ -997,13 +990,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 11, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 9, stingray, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 423, .blob_key_bit_size = 200, @@ -1015,14 +1008,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 11, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 10, stingray, table: l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM, .direction = TF_DIR_RX, .key_start_idx = 434, .blob_key_bit_size = 12, @@ -1039,8 +1032,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 435, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -1051,14 +1044,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 12, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 10, stingray, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 448, .blob_key_bit_size = 16, @@ -1075,8 +1068,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 451, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -1087,13 +1080,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 13, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 10, stingray, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 494, .blob_key_bit_size = 448, @@ -1105,13 +1098,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 13, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 10, stingray, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 505, .blob_key_bit_size = 392, @@ -1123,14 +1116,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 13, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 11, stingray, table: l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM, .direction = TF_DIR_RX, .key_start_idx = 516, .blob_key_bit_size = 12, @@ -1147,8 +1140,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 517, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -1159,14 +1152,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 14, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 11, stingray, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 530, .blob_key_bit_size = 16, @@ -1183,8 +1176,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 533, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -1195,13 +1188,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 15, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 11, stingray, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 576, .blob_key_bit_size = 448, @@ -1213,13 +1206,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 15, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 11, stingray, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 587, .blob_key_bit_size = 392, @@ -1231,15 +1224,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 15, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 12, stingray, table: l2_cntxt_tcam_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 598, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -1250,14 +1243,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 15, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 12, stingray, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 611, .blob_key_bit_size = 16, @@ -1274,8 +1267,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 614, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -1286,13 +1279,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 17, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 12, stingray, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 657, .blob_key_bit_size = 448, @@ -1304,13 +1297,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 17, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 12, stingray, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 668, .blob_key_bit_size = 200, @@ -1322,15 +1315,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 17, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 13, stingray, table: l2_cntxt_tcam_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 679, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -1341,14 +1334,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 17, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 13, stingray, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 692, .blob_key_bit_size = 16, @@ -1365,8 +1358,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 695, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -1377,13 +1370,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 19, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 13, stingray, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 738, .blob_key_bit_size = 448, @@ -1395,13 +1388,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 19, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 13, stingray, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 749, .blob_key_bit_size = 200, @@ -1413,15 +1406,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 19, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 14, stingray, table: l2_cntxt_tcam_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 760, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -1432,14 +1425,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 19, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 14, stingray, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 773, .blob_key_bit_size = 16, @@ -1456,8 +1449,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 776, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -1468,13 +1461,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 21, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 14, stingray, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 819, .blob_key_bit_size = 448, @@ -1486,13 +1479,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 21, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 14, stingray, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 830, .blob_key_bit_size = 392, @@ -1504,15 +1497,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 21, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 15, stingray, table: l2_cntxt_tcam_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 841, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -1523,14 +1516,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 21, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 15, stingray, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 854, .blob_key_bit_size = 16, @@ -1547,8 +1540,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 857, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -1559,13 +1552,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 23, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 15, stingray, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 900, .blob_key_bit_size = 448, @@ -1577,13 +1570,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 23, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 15, stingray, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 911, .blob_key_bit_size = 392, @@ -1595,15 +1588,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 23, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 16, stingray, table: l2_cntxt_tcam_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 922, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -1614,14 +1607,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 23, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 16, stingray, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 935, .blob_key_bit_size = 16, @@ -1638,8 +1631,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 938, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -1650,13 +1643,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 25, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 16, stingray, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 981, .blob_key_bit_size = 448, @@ -1668,13 +1661,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 25, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 16, stingray, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 992, .blob_key_bit_size = 200, @@ -1686,15 +1679,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 25, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 17, stingray, table: l2_cntxt_tcam_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1003, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -1705,14 +1698,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 25, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 17, stingray, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 1016, .blob_key_bit_size = 16, @@ -1729,8 +1722,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1019, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -1741,13 +1734,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 27, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 17, stingray, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 1062, .blob_key_bit_size = 448, @@ -1759,13 +1752,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 27, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 17, stingray, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 1073, .blob_key_bit_size = 392, @@ -1777,32 +1770,31 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 27, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 18, stingray, table: int_flow_counter_tbl_0 */ .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_ACC, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT_ACC, .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, .result_start_idx = 768, .result_bit_size = 64, .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 + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, + .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, + .tbl_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0 }, { /* class_tid: 18, stingray, table: l2_cntxt_tcam_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1084, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -1813,14 +1805,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 27, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 18, stingray, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 1097, .blob_key_bit_size = 16, @@ -1837,8 +1829,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1100, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -1849,15 +1841,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 30, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 18, stingray, table: wm_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_WC_TCAM, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1143, .blob_key_bit_size = 192, .key_bit_size = 160, @@ -1868,15 +1860,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 30, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 19, stingray, table: l2_cntxt_tcam_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1148, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -1887,14 +1879,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 30, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 19, stingray, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 1161, .blob_key_bit_size = 16, @@ -1911,8 +1903,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1164, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -1923,13 +1915,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 33, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 19, stingray, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 1207, .blob_key_bit_size = 112, @@ -1941,13 +1933,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 33, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 19, stingray, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 1215, .blob_key_bit_size = 448, @@ -1959,14 +1951,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 33, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 20, stingray, table: l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM, .direction = TF_DIR_TX, .key_start_idx = 1223, .blob_key_bit_size = 12, @@ -1983,8 +1975,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1224, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -1995,14 +1987,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 34, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 20, stingray, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_TX, .key_start_idx = 1237, .blob_key_bit_size = 16, @@ -2019,8 +2011,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1240, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -2031,13 +2023,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 35, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 20, stingray, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_TX, .key_start_idx = 1283, .blob_key_bit_size = 448, @@ -2049,13 +2041,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 35, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 20, stingray, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_TX, .key_start_idx = 1294, .blob_key_bit_size = 200, @@ -2067,14 +2059,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 35, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 21, stingray, table: l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM, .direction = TF_DIR_TX, .key_start_idx = 1305, .blob_key_bit_size = 12, @@ -2091,8 +2083,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1306, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -2103,14 +2095,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 36, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 21, stingray, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_TX, .key_start_idx = 1319, .blob_key_bit_size = 16, @@ -2127,8 +2119,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1322, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -2139,13 +2131,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 37, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 21, stingray, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_TX, .key_start_idx = 1365, .blob_key_bit_size = 448, @@ -2157,13 +2149,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 37, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 21, stingray, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_TX, .key_start_idx = 1376, .blob_key_bit_size = 200, @@ -2175,14 +2167,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 37, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 22, stingray, table: l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM, .direction = TF_DIR_TX, .key_start_idx = 1387, .blob_key_bit_size = 12, @@ -2199,8 +2191,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1388, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -2211,14 +2203,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 38, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 22, stingray, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_TX, .key_start_idx = 1401, .blob_key_bit_size = 16, @@ -2235,8 +2227,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1404, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -2247,13 +2239,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 39, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 22, stingray, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_TX, .key_start_idx = 1447, .blob_key_bit_size = 448, @@ -2265,13 +2257,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 39, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 22, stingray, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_TX, .key_start_idx = 1458, .blob_key_bit_size = 392, @@ -2283,14 +2275,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 39, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 23, stingray, table: l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM, .direction = TF_DIR_TX, .key_start_idx = 1469, .blob_key_bit_size = 12, @@ -2307,8 +2299,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1470, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -2319,14 +2311,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 40, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 23, stingray, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_TX, .key_start_idx = 1483, .blob_key_bit_size = 16, @@ -2343,8 +2335,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1486, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -2355,13 +2347,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 41, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 23, stingray, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_TX, .key_start_idx = 1529, .blob_key_bit_size = 448, @@ -2373,13 +2365,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 41, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 23, stingray, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_TX, .key_start_idx = 1540, .blob_key_bit_size = 392, @@ -2391,15 +2383,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 41, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 24, stingray, table: l2_cntxt_tcam_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_UPDATE, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1551, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -2410,14 +2402,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 41, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 24, stingray, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_TX, .key_start_idx = 1564, .blob_key_bit_size = 16, @@ -2434,8 +2426,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1567, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -2446,13 +2438,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 43, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 24, stingray, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_TX, .key_start_idx = 1610, .blob_key_bit_size = 448, @@ -2464,13 +2456,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 43, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 24, stingray, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_TX, .key_start_idx = 1617, .blob_key_bit_size = 104, @@ -2482,15 +2474,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 43, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 25, stingray, table: l2_cntxt_tcam_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_UPDATE, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1624, .blob_key_bit_size = 171, .key_bit_size = 171, @@ -2501,14 +2493,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 43, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 25, stingray, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_TX, .key_start_idx = 1637, .blob_key_bit_size = 16, @@ -2525,8 +2517,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1640, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -2537,13 +2529,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 45, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 25, stingray, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_TX, .key_start_idx = 1683, .blob_key_bit_size = 448, @@ -2555,13 +2547,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 45, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 25, stingray, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_TX, .key_start_idx = 1690, .blob_key_bit_size = 104, @@ -2573,7 +2565,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 45, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES } }; diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c index 4fe90d8bb9..bb48ad284a 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c +++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c @@ -547,26 +547,26 @@ struct bnxt_ulp_rte_act_info ulp_act_info[] = { /* Specifies parameters for the generic tables */ struct bnxt_ulp_generic_tbl_params ulp_generic_tbl_params[] = { - [BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM << 1 | + [BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM << 1 | TF_DIR_RX] = { .result_num_entries = 16384, .result_byte_size = 6, .result_byte_order = BNXT_ULP_BYTE_ORDER_LE }, - [BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM << 1 | + [BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM << 1 | TF_DIR_TX] = { .result_num_entries = 16384, .result_byte_size = 6, .result_byte_order = BNXT_ULP_BYTE_ORDER_LE }, - [BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM << 1 | + [BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM << 1 | TF_DIR_RX] = { .result_num_entries = 16384, .result_byte_size = 6, .result_byte_order = BNXT_ULP_BYTE_ORDER_LE }, - [BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM << 1 | + [BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM << 1 | TF_DIR_TX] = { .result_num_entries = 16384, .result_byte_size = 6, @@ -575,7 +575,7 @@ struct bnxt_ulp_generic_tbl_params ulp_generic_tbl_params[] = { }; /* device tables */ -const struct ulp_template_device_tbls ulp_template_stingray_tbls[] = { +const struct bnxt_ulp_template_device_tbls ulp_template_stingray_tbls[] = { [BNXT_ULP_TEMPLATE_TYPE_CLASS] = { .tmpl_list = ulp_stingray_class_tmpl_list, .tbl_list = ulp_stingray_class_tbl_list, @@ -591,7 +591,7 @@ const struct ulp_template_device_tbls ulp_template_stingray_tbls[] = { }; /* device tables */ -const struct ulp_template_device_tbls ulp_template_wh_plus_tbls[] = { +const struct bnxt_ulp_template_device_tbls ulp_template_wh_plus_tbls[] = { [BNXT_ULP_TEMPLATE_TYPE_CLASS] = { .tmpl_list = ulp_wh_plus_class_tmpl_list, .tbl_list = ulp_wh_plus_class_tbl_list, diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.h b/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.h index a656f3da52..727818bede 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.h +++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.h @@ -3,12 +3,15 @@ * All rights reserved. */ +/* date: Mon Sep 21 14:21:33 2020 */ + #ifndef ULP_TEMPLATE_DB_TBL_H_ #define ULP_TEMPLATE_DB_TBL_H_ #include "ulp_template_struct.h" -extern struct bnxt_ulp_mapper_tbl_list_info ulp_wh_plus_class_tmpl_list[]; +/* WH_PLUS template table declarations */ +extern struct bnxt_ulp_mapper_tmpl_info ulp_wh_plus_class_tmpl_list[]; extern struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[]; @@ -20,14 +23,15 @@ bnxt_ulp_mapper_result_field_info ulp_wh_plus_class_result_field_list[]; extern struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[]; -extern struct bnxt_ulp_mapper_tbl_list_info ulp_wh_plus_act_tmpl_list[]; +extern struct bnxt_ulp_mapper_tmpl_info ulp_wh_plus_act_tmpl_list[]; extern struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[]; extern struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[]; -extern struct bnxt_ulp_mapper_tbl_list_info ulp_stingray_class_tmpl_list[]; +/* STINGRAY template table declarations */ +extern struct bnxt_ulp_mapper_tmpl_info ulp_stingray_class_tmpl_list[]; extern struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[]; @@ -39,7 +43,7 @@ bnxt_ulp_mapper_result_field_info ulp_stingray_class_result_field_list[]; extern struct bnxt_ulp_mapper_ident_info ulp_stingray_class_ident_list[]; -extern struct bnxt_ulp_mapper_tbl_list_info ulp_stingray_act_tmpl_list[]; +extern struct bnxt_ulp_mapper_tmpl_info ulp_stingray_act_tmpl_list[]; extern struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[]; 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 73f57409a9..40b1088325 100644 --- 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 @@ -3,37 +3,52 @@ * All rights reserved. */ +/* date: Thu Oct 15 17:28:37 2020 */ + #include "ulp_template_db_enum.h" #include "ulp_template_db_field.h" #include "ulp_template_struct.h" #include "ulp_rte_parser.h" -struct bnxt_ulp_mapper_tbl_list_info ulp_wh_plus_act_tmpl_list[] = { +/* Mapper templates for header act list */ +struct bnxt_ulp_mapper_tmpl_info ulp_wh_plus_act_tmpl_list[] = { + /* act-ing-[dec_ttl, count, nat]:1 */ + /* act_tid: 1, wh_plus, ingress */ [1] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 6, .start_tbl_idx = 0 }, + /* act-ing-[drop, pop_vlan, push_vlan, dec_ttl, count, vxlan_decap]:2 */ + /* act_tid: 2, wh_plus, ingress */ [2] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 3, .start_tbl_idx = 6 }, + /* act-ing-[mark, rss, count, pop_vlan, vxlan_decap]:3 */ + /* act_tid: 3, wh_plus, ingress */ [3] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 3, .start_tbl_idx = 9 }, + /* act_egr-[vxlan_encap, count]:4 */ + /* act_tid: 4, wh_plus, egress */ [4] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 6, .start_tbl_idx = 12 }, + /* act-egr-[dec_ttl, count, nat]:5 */ + /* act_tid: 5, wh_plus, egress */ [5] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 6, .start_tbl_idx = 18 }, + /* act-egr-[drop, push_vlan, dec_ttl, count]:6 */ + /* act_tid: 6, wh_plus, egress */ [6] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 5, @@ -42,494 +57,469 @@ struct bnxt_ulp_mapper_tbl_list_info ulp_wh_plus_act_tmpl_list[] = { }; struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = { - { + { /* act_tid: 1, wh_plus, table: int_flow_counter_tbl_0 */ .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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT, .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, .result_start_idx = 0, .result_bit_size = 64, .result_num_fields = 1, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0 }, - { + { /* act_tid: 1, wh_plus, table: int_act_modify_ipv4_src_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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .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, .result_start_idx = 1, .result_bit_size = 32, .result_num_fields = 1, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, - .index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_SRC_PTR_0 + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_SRC_PTR_0 }, - { + { /* act_tid: 1, wh_plus, table: int_act_modify_ipv4_dst_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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .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, .result_start_idx = 2, .result_bit_size = 32, .result_num_fields = 1, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_DST_PTR_0 }, - { + { /* act_tid: 1, wh_plus, table: int_encap_mac_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_ACT_ENCAP_16B, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 3, .result_bit_size = 0, .result_num_fields = 0, .encap_num_fields = 12, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE, .tbl_operand = BNXT_ULP_GLB_REGFILE_INDEX_ENCAP_MAC_PTR }, - { + { /* act_tid: 1, wh_plus, table: ext_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_EXT, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 15, .result_bit_size = 128, .result_num_fields = 26, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 1, wh_plus, table: int_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 41, .result_bit_size = 128, .result_num_fields = 26, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 2, wh_plus, table: int_flow_counter_tbl_0 */ .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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT, .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, .result_start_idx = 67, .result_bit_size = 64, .result_num_fields = 1, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0 }, - { + { /* act_tid: 2, wh_plus, table: ext_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_EXT, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 68, .result_bit_size = 128, .result_num_fields = 26, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 2, wh_plus, table: int_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 94, .result_bit_size = 128, .result_num_fields = 26, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 3, wh_plus, table: int_flow_counter_tbl_0 */ .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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT, .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, .result_start_idx = 120, .result_bit_size = 64, .result_num_fields = 1, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0 }, - { + { /* act_tid: 3, wh_plus, table: ext_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_EXT, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 121, .result_bit_size = 128, .result_num_fields = 26, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 3, wh_plus, table: int_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 147, .result_bit_size = 128, .result_num_fields = 26, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 4, wh_plus, table: int_flow_counter_tbl_0 */ .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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT, .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, .result_start_idx = 173, .result_bit_size = 64, .result_num_fields = 1, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0 }, - { + { /* act_tid: 4, wh_plus, table: int_sp_smac_ipv4_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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .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, .result_start_idx = 174, .result_bit_size = 0, .result_num_fields = 0, .encap_num_fields = 3, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, - .index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_SP_PTR + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_SP_PTR }, - { + { /* act_tid: 4, wh_plus, table: int_sp_smac_ipv6_0 */ .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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .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, .result_start_idx = 177, .result_bit_size = 0, .result_num_fields = 0, .encap_num_fields = 3, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_SP_PTR }, - { + { /* act_tid: 4, wh_plus, table: int_tun_encap_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_ACT_ENCAP_64B, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP, .result_start_idx = 180, .result_bit_size = 0, .result_num_fields = 0, .encap_num_fields = 12, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0 }, - { + { /* act_tid: 4, wh_plus, table: ext_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_EXT, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 192, .result_bit_size = 128, .result_num_fields = 26, .encap_num_fields = 12, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 4, wh_plus, table: int_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 230, .result_bit_size = 128, .result_num_fields = 26, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 5, wh_plus, table: int_flow_counter_tbl_0 */ .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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT, .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, .result_start_idx = 256, .result_bit_size = 64, .result_num_fields = 1, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0 }, - { + { /* act_tid: 5, wh_plus, table: int_act_modify_ipv4_src_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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .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, .result_start_idx = 257, .result_bit_size = 32, .result_num_fields = 1, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_SRC_PTR_0 }, - { + { /* act_tid: 5, wh_plus, table: int_act_modify_ipv4_dst_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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .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, .result_start_idx = 258, .result_bit_size = 32, .result_num_fields = 1, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, - .index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_DST_PTR_0 + .tbl_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_DST_PTR_0 }, - { + { /* act_tid: 5, wh_plus, table: int_encap_mac_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_ACT_ENCAP_16B, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 259, .result_bit_size = 0, .result_num_fields = 0, .encap_num_fields = 12, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE, .tbl_operand = BNXT_ULP_GLB_REGFILE_INDEX_ENCAP_MAC_PTR }, - { + { /* act_tid: 5, wh_plus, table: int_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 271, .result_bit_size = 128, .result_num_fields = 26, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 5, wh_plus, table: ext_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_EXT, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 297, .result_bit_size = 128, .result_num_fields = 26, .encap_num_fields = 11, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 6, wh_plus, table: int_flow_counter_tbl_0 */ .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, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT, .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, .result_start_idx = 334, .result_bit_size = 64, .result_num_fields = 1, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0 }, - { + { /* act_tid: 6, wh_plus, table: int_vtag_encap_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_ACT_ENCAP_16B, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .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, .result_start_idx = 335, .result_bit_size = 0, .result_num_fields = 0, .encap_num_fields = 12, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, - .index_operand = BNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0 + .tbl_operand = BNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0 }, - { + { /* act_tid: 6, wh_plus, table: int_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 347, .result_bit_size = 128, .result_num_fields = 26, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 6, wh_plus, table: ext_full_act_record_no_tag_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_EXT, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .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, .result_start_idx = 373, .result_bit_size = 128, .result_num_fields = 26, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, - { + { /* act_tid: 6, wh_plus, table: ext_full_act_record_one_tag_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_EXT, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .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, .result_start_idx = 399, .result_bit_size = 128, .result_num_fields = 26, .encap_num_fields = 11, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR } }; struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { + /* act_tid: 1, wh_plus, table: int_flow_counter_tbl_0 */ { + .description = "count", .field_bit_size = 64, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 1, wh_plus, table: int_act_modify_ipv4_src_0 */ { + .description = "ipv4_addr", .field_bit_size = 32, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -538,7 +528,9 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, + /* act_tid: 1, wh_plus, table: int_act_modify_ipv4_dst_0 */ { + .description = "ipv4_addr", .field_bit_size = 32, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -547,19 +539,24 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, + /* act_tid: 1, wh_plus, table: int_encap_mac_record_0 */ { + .description = "ecv_tun_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l4_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l3_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l2_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = { @@ -568,40 +565,50 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_vtag_type", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_custom_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_valid", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vtag_tpid", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_vid", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_de", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_pcp", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "spare", .field_bit_size = 80, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 1, wh_plus, table: ext_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -611,18 +618,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -637,22 +648,27 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "flow_cntr_ext", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE, .result_operand = { @@ -662,12 +678,14 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_rec_int", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -677,6 +695,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -696,6 +715,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -705,6 +725,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -724,18 +745,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -745,6 +770,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -754,6 +780,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_HDR_BIT_THEN_CONST_ELSE_CONST, .result_operand = { @@ -772,6 +799,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -781,22 +809,28 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 1, wh_plus, table: int_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -806,18 +840,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -832,18 +870,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE, .result_operand = { @@ -853,6 +895,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -862,6 +905,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -881,6 +925,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -890,6 +935,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -909,18 +955,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -930,6 +980,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -939,6 +990,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_HDR_BIT_THEN_CONST_ELSE_CONST, .result_operand = { @@ -957,6 +1009,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -966,34 +1019,44 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "hit", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "type", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 2, wh_plus, table: int_flow_counter_tbl_0 */ { + .description = "count", .field_bit_size = 64, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 2, wh_plus, table: ext_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -1003,18 +1066,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1029,30 +1096,37 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "flow_cntr_ext", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_rec_int", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -1062,6 +1136,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -1081,6 +1156,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -1090,6 +1166,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -1109,18 +1186,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -1130,6 +1211,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -1139,6 +1221,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_CONST_ELSE_CONST, .result_operand = { @@ -1155,6 +1238,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1164,6 +1248,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1178,14 +1263,17 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1199,7 +1287,9 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { (uint64_t)BNXT_ULP_ACTION_BIT_DROP & 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, + /* act_tid: 2, wh_plus, table: int_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -1209,18 +1299,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1235,18 +1329,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -1256,6 +1354,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -1265,6 +1364,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -1284,6 +1384,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -1293,6 +1394,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -1312,18 +1414,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -1333,6 +1439,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -1342,6 +1449,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_CONST_ELSE_CONST, .result_operand = { @@ -1358,6 +1466,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1367,6 +1476,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1381,14 +1491,17 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1403,18 +1516,24 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "hit", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "type", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 3, wh_plus, table: int_flow_counter_tbl_0 */ { + .description = "count", .field_bit_size = 64, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 3, wh_plus, table: ext_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -1424,18 +1543,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1450,66 +1573,82 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "flow_cntr_ext", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_rec_int", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_CONST_ELSE_CONST, .result_operand = { @@ -1526,6 +1665,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1535,6 +1675,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1549,18 +1690,23 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 3, wh_plus, table: int_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -1570,18 +1716,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1596,58 +1746,72 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_CONST_ELSE_CONST, .result_operand = { @@ -1664,6 +1828,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1673,6 +1838,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1687,30 +1853,39 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "hit", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "type", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 4, wh_plus, table: int_flow_counter_tbl_0 */ { + .description = "count", .field_bit_size = 64, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 4, wh_plus, table: int_sp_smac_ipv4_0 */ { + .description = "smac", .field_bit_size = 48, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1720,6 +1895,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ipv4_src_addr", .field_bit_size = 32, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1729,10 +1905,13 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "reserved", .field_bit_size = 48, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 4, wh_plus, table: int_sp_smac_ipv6_0 */ { + .description = "smac", .field_bit_size = 48, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1742,6 +1921,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ipv6_src_addr", .field_bit_size = 128, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1751,10 +1931,13 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "reserved", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 4, wh_plus, table: int_tun_encap_record_0 */ { + .description = "ecv_tun_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = { @@ -1763,6 +1946,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_l4_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = { @@ -1771,6 +1955,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_l3_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1780,12 +1965,14 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_l2_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_vtag_type", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1795,16 +1982,19 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_custom_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_valid", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_l2_dmac", .field_bit_size = 48, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1814,6 +2004,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_vtag", .field_bit_size = 0, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ENCAP_ACT_PROP_SZ, .result_operand = { @@ -1825,6 +2016,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_ip", .field_bit_size = 0, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ENCAP_ACT_PROP_SZ, .result_operand = { @@ -1836,6 +2028,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_udp", .field_bit_size = 32, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1845,6 +2038,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_tun", .field_bit_size = 0, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ENCAP_ACT_PROP_SZ, .result_operand = { @@ -1855,7 +2049,9 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, + /* act_tid: 4, wh_plus, table: ext_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -1865,18 +2061,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -1891,70 +2091,87 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "flow_cntr_ext", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_rec_int", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -1964,22 +2181,27 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_tun_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = { @@ -1988,6 +2210,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_l4_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = { @@ -1996,6 +2219,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_l3_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2005,12 +2229,14 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_l2_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_vtag_type", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2020,16 +2246,19 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_custom_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_valid", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_l2_dmac", .field_bit_size = 48, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2039,6 +2268,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_vtag", .field_bit_size = 0, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ENCAP_ACT_PROP_SZ, .result_operand = { @@ -2050,6 +2280,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_ip", .field_bit_size = 0, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ENCAP_ACT_PROP_SZ, .result_operand = { @@ -2061,6 +2292,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_udp", .field_bit_size = 32, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2070,6 +2302,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "encap_tun", .field_bit_size = 0, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ENCAP_ACT_PROP_SZ, .result_operand = { @@ -2080,7 +2313,9 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, + /* act_tid: 4, wh_plus, table: int_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2090,18 +2325,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -2116,18 +2355,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2137,46 +2380,57 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2186,34 +2440,44 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "hit", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "type", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 5, wh_plus, table: int_flow_counter_tbl_0 */ { + .description = "count", .field_bit_size = 64, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 5, wh_plus, table: int_act_modify_ipv4_src_0 */ { + .description = "ipv4_addr", .field_bit_size = 32, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2222,7 +2486,9 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, + /* act_tid: 5, wh_plus, table: int_act_modify_ipv4_dst_0 */ { + .description = "ipv4_addr", .field_bit_size = 32, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2231,19 +2497,24 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, + /* act_tid: 5, wh_plus, table: int_encap_mac_record_0 */ { + .description = "ecv_tun_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l4_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l3_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l2_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = { @@ -2252,40 +2523,50 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_vtag_type", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_custom_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_valid", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vtag_tpid", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_vid", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_de", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_pcp", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "spare", .field_bit_size = 80, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 5, wh_plus, table: int_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2295,18 +2576,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -2321,18 +2606,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE, .result_operand = { @@ -2342,6 +2631,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2351,6 +2641,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -2370,6 +2661,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2379,6 +2671,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -2398,18 +2691,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -2419,6 +2716,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -2428,6 +2726,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_HDR_BIT_THEN_CONST_ELSE_CONST, .result_operand = { @@ -2446,6 +2745,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2455,30 +2755,38 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "hit", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "type", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 5, wh_plus, table: ext_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2488,18 +2796,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -2514,30 +2826,37 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "flow_cntr_ext", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_rec_int", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2547,6 +2866,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -2566,6 +2886,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2575,6 +2896,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST, .result_operand = { @@ -2594,18 +2916,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -2615,6 +2941,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -2624,6 +2951,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_IF_HDR_BIT_THEN_CONST_ELSE_CONST, .result_operand = { @@ -2642,6 +2970,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2651,34 +2980,42 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_tun_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l4_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l3_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l2_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = { @@ -2687,56 +3024,71 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_vtag_type", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_custom_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_valid", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vtag_tpid", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_vid", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_de", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_pcp", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 6, wh_plus, table: int_flow_counter_tbl_0 */ { + .description = "count", .field_bit_size = 64, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 6, wh_plus, table: int_vtag_encap_record_0 */ { + .description = "ecv_tun_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l4_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l3_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l2_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_vtag_type", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = { @@ -2745,16 +3097,19 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_custom_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_valid", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vtag_tpid", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2764,6 +3119,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vtag_vid", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2773,10 +3129,12 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vtag_de", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_pcp", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2786,10 +3144,13 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "spare", .field_bit_size = 80, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 6, wh_plus, table: int_full_act_record_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2799,18 +3160,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -2825,18 +3190,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2846,34 +3215,42 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -2883,6 +3260,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -2892,10 +3270,12 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -2905,18 +3285,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -2931,14 +3315,18 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "hit", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "type", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, + /* act_tid: 6, wh_plus, table: ext_full_act_record_no_tag_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -2948,18 +3336,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -2974,58 +3366,72 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "flow_cntr_ext", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_rec_int", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -3035,6 +3441,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -3044,10 +3451,12 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -3057,18 +3466,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -3082,7 +3495,9 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { (uint64_t)BNXT_ULP_ACTION_BIT_DROP & 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, + /* act_tid: 6, wh_plus, table: ext_full_act_record_one_tag_0 */ { + .description = "flow_cntr_ptr", .field_bit_size = 14, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE, .result_operand = { @@ -3092,18 +3507,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "age_enable", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "agg_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "rate_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "flow_cntr_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -3118,58 +3537,72 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "flow_cntr_ext", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_key", .field_bit_size = 8, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_mir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcpflags_match", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_ptr", .field_bit_size = 11, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "encap_rec_int", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "dst_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_dst_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "src_ip_ptr", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tcp_src_port", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "meter_id", .field_bit_size = 10, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "tl3_rdir", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "l3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -3179,6 +3612,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "tl3_ttl_dec", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD, .result_operand = { @@ -3188,10 +3622,12 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "decap_func", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vnic_or_vport", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -3201,6 +3637,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "pop_vlan", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -3215,14 +3652,17 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "meter", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "mirror", .field_bit_size = 2, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "drop", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT, .result_operand = { @@ -3237,22 +3677,27 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_tun_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l4_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l3_type", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_l2_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_vtag_type", .field_bit_size = 4, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = { @@ -3261,16 +3706,19 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "ecv_custom_en", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "ecv_valid", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT, .result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vtag_tpid", .field_bit_size = 16, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -3280,6 +3728,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vtag_vid", .field_bit_size = 12, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { @@ -3289,10 +3738,12 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }, { + .description = "vtag_de", .field_bit_size = 1, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO }, { + .description = "vtag_pcp", .field_bit_size = 3, .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP, .result_operand = { diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_class.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_class.c index fcc5c9e20c..a4a435cc6f 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_class.c +++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_class.c @@ -11,7 +11,7 @@ #include "ulp_rte_parser.h" /* Mapper templates for header class list */ -struct bnxt_ulp_mapper_tbl_list_info ulp_wh_plus_class_tmpl_list[] = { +struct bnxt_ulp_mapper_tmpl_info ulp_wh_plus_class_tmpl_list[] = { /* default-vfr-[port_to_vs]:1 */ /* class_tid: 1, wh_plus, ingress */ [1] = { @@ -194,14 +194,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 0, .result_bit_size = 128, .result_num_fields = 26, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, @@ -209,7 +208,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 0, .blob_key_bit_size = 8, @@ -228,7 +227,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -239,7 +239,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 1, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 1, wh_plus, table: parif_def_lkup_arec_ptr_0 */ @@ -279,14 +279,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_VFR_CFA_ACTION, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_VFR_CFA_ACTION, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 43, .result_bit_size = 128, .result_num_fields = 26, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, @@ -298,7 +297,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_TX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 14, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -309,14 +309,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 1, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 2, wh_plus, table: l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .cond_opcode = BNXT_ULP_COND_OPC_COMP_FIELD_NOT_SET, .cond_operand = BNXT_ULP_CF_IDX_VFR_MODE, .direction = TF_DIR_TX, @@ -339,7 +339,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_TX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 28, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -350,7 +351,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 2, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 2, wh_plus, table: parif_def_lkup_arec_ptr_0 */ @@ -390,14 +391,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_ACT_ENCAP_8B, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 99, .result_bit_size = 0, .result_num_fields = 0, .encap_num_fields = 12, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0 }, @@ -405,14 +405,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_VFR_CFA_ACTION, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_VFR_CFA_ACTION, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 111, .result_bit_size = 128, .result_num_fields = 26, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, @@ -420,7 +419,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_TX, .key_start_idx = 41, .blob_key_bit_size = 8, @@ -439,7 +438,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_TX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 42, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -450,21 +450,20 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 2, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 3, wh_plus, table: ing_int_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 150, .result_bit_size = 128, .result_num_fields = 26, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, @@ -472,8 +471,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 55, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -484,15 +483,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 2, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 3, wh_plus, table: ing_l2_cntxt_stagged_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 68, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -503,14 +502,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 2, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 4, wh_plus, table: egr_l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_TX, .key_start_idx = 81, .blob_key_bit_size = 8, @@ -529,7 +528,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_TX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 82, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -540,7 +540,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 3, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 4, wh_plus, table: egr_parif_def_lkup_arec_ptr_0 */ @@ -580,14 +580,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 219, .result_bit_size = 128, .result_num_fields = 26, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_VFR_FLAG, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_AND_SET_VFR_FLAG, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR }, @@ -597,7 +596,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 95, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -608,21 +608,20 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 3, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 5, wh_plus, table: int_full_act_record_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_VFR_CFA_ACTION, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_VFR_CFA_ACTION, .direction = TF_DIR_TX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, .result_start_idx = 258, .result_bit_size = 128, .result_num_fields = 26, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE, .tbl_operand = BNXT_ULP_GLB_REGFILE_INDEX_GLB_LB_AREC_PTR, .fdb_opcode = BNXT_ULP_FDB_OPC_NOP @@ -633,7 +632,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_SRCH_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 108, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -644,14 +644,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 3, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 6, wh_plus, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 121, .blob_key_bit_size = 16, @@ -670,7 +670,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_PROFILE_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_1, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 1, .key_start_idx = 124, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -681,13 +682,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 5, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 6, wh_plus, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 167, .blob_key_bit_size = 448, @@ -699,13 +700,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 5, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 6, wh_plus, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 178, .blob_key_bit_size = 200, @@ -717,7 +718,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 5, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 7, wh_plus, table: l2_cntxt_tcam_0 */ @@ -726,7 +727,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_SRCH_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 189, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -737,14 +739,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 5, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 7, wh_plus, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 202, .blob_key_bit_size = 16, @@ -763,7 +765,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_PROFILE_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_1, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 1, .key_start_idx = 205, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -774,13 +777,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 7, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 7, wh_plus, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 248, .blob_key_bit_size = 448, @@ -792,13 +795,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 7, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 7, wh_plus, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 259, .blob_key_bit_size = 200, @@ -810,14 +813,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 7, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 8, wh_plus, table: l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 270, .blob_key_bit_size = 8, @@ -836,7 +839,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 271, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -847,14 +851,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 8, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 8, wh_plus, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 284, .blob_key_bit_size = 16, @@ -873,7 +877,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_PROFILE_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 287, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -884,13 +889,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 9, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 8, wh_plus, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 330, .blob_key_bit_size = 448, @@ -902,13 +907,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 9, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 8, wh_plus, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 341, .blob_key_bit_size = 200, @@ -920,14 +925,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 9, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 9, wh_plus, table: l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 352, .blob_key_bit_size = 8, @@ -946,7 +951,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 353, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -957,14 +963,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 10, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 9, wh_plus, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 366, .blob_key_bit_size = 16, @@ -983,7 +989,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_PROFILE_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 369, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -994,13 +1001,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 11, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 9, wh_plus, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 412, .blob_key_bit_size = 448, @@ -1012,13 +1019,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 11, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 9, wh_plus, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 423, .blob_key_bit_size = 200, @@ -1030,14 +1037,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 11, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 10, wh_plus, table: l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 434, .blob_key_bit_size = 8, @@ -1056,7 +1063,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 435, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -1067,14 +1075,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 12, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 10, wh_plus, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 448, .blob_key_bit_size = 16, @@ -1093,7 +1101,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_PROFILE_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 451, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -1104,13 +1113,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 13, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 10, wh_plus, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 494, .blob_key_bit_size = 448, @@ -1122,13 +1131,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 13, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 10, wh_plus, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 505, .blob_key_bit_size = 392, @@ -1140,14 +1149,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 13, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 11, wh_plus, table: l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 516, .blob_key_bit_size = 8, @@ -1166,7 +1175,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 517, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -1177,14 +1187,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 14, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 11, wh_plus, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 530, .blob_key_bit_size = 16, @@ -1203,7 +1213,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_PROFILE_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 533, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -1214,13 +1225,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 15, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 11, wh_plus, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 576, .blob_key_bit_size = 448, @@ -1232,13 +1243,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 15, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 11, wh_plus, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 587, .blob_key_bit_size = 392, @@ -1250,7 +1261,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 15, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 12, wh_plus, table: l2_cntxt_tcam_0 */ @@ -1259,7 +1270,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_SRCH_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 598, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -1270,14 +1282,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 15, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 12, wh_plus, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 611, .blob_key_bit_size = 16, @@ -1296,7 +1308,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_PROFILE_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 614, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -1307,13 +1320,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 17, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 12, wh_plus, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 657, .blob_key_bit_size = 448, @@ -1325,13 +1338,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 17, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 12, wh_plus, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 668, .blob_key_bit_size = 200, @@ -1343,7 +1356,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 17, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 13, wh_plus, table: l2_cntxt_tcam_0 */ @@ -1352,7 +1365,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_SRCH_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 679, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -1363,14 +1377,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 17, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 13, wh_plus, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 692, .blob_key_bit_size = 16, @@ -1389,7 +1403,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_PROFILE_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 695, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -1400,13 +1415,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 19, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 13, wh_plus, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 738, .blob_key_bit_size = 448, @@ -1418,13 +1433,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 19, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 13, wh_plus, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 749, .blob_key_bit_size = 200, @@ -1436,7 +1451,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 19, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 14, wh_plus, table: l2_cntxt_tcam_0 */ @@ -1445,7 +1460,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_SRCH_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 760, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -1456,14 +1472,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 19, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 14, wh_plus, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 773, .blob_key_bit_size = 16, @@ -1482,7 +1498,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_PROFILE_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 776, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -1493,13 +1510,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 21, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 14, wh_plus, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 819, .blob_key_bit_size = 448, @@ -1511,13 +1528,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 21, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 14, wh_plus, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 830, .blob_key_bit_size = 392, @@ -1529,7 +1546,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 21, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 15, wh_plus, table: l2_cntxt_tcam_0 */ @@ -1538,7 +1555,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_SRCH_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 841, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -1549,14 +1567,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 21, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 15, wh_plus, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 854, .blob_key_bit_size = 16, @@ -1575,7 +1593,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_PROFILE_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 857, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -1586,13 +1605,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 23, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 15, wh_plus, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 900, .blob_key_bit_size = 448, @@ -1604,13 +1623,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 23, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 15, wh_plus, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 911, .blob_key_bit_size = 392, @@ -1622,7 +1641,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 23, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 16, wh_plus, table: l2_cntxt_tcam_0 */ @@ -1631,7 +1650,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_SRCH_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 922, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -1642,14 +1662,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 23, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 16, wh_plus, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 935, .blob_key_bit_size = 16, @@ -1668,7 +1688,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_PROFILE_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 938, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -1679,13 +1700,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 25, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 16, wh_plus, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 981, .blob_key_bit_size = 448, @@ -1697,13 +1718,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 25, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 16, wh_plus, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 992, .blob_key_bit_size = 200, @@ -1715,7 +1736,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 25, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 17, wh_plus, table: l2_cntxt_tcam_0 */ @@ -1724,7 +1745,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_SRCH_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1003, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -1735,14 +1757,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 25, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 17, wh_plus, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 1016, .blob_key_bit_size = 16, @@ -1761,7 +1783,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_PROFILE_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1019, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -1772,13 +1795,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 27, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 17, wh_plus, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 1062, .blob_key_bit_size = 448, @@ -1790,13 +1813,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 27, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 17, wh_plus, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 1073, .blob_key_bit_size = 392, @@ -1808,23 +1831,22 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 27, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 18, wh_plus, table: int_flow_counter_tbl_0 */ .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_ACC, + BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT_ACC, .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, .result_start_idx = 768, .result_bit_size = 64, .result_num_fields = 1, .encap_num_fields = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0 }, @@ -1834,7 +1856,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_SRCH_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1084, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -1845,14 +1868,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 27, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 18, wh_plus, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 1097, .blob_key_bit_size = 16, @@ -1871,7 +1894,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_PROFILE_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1100, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -1882,15 +1906,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 30, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 18, wh_plus, table: wm_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE, .resource_type = TF_TCAM_TBL_TYPE_WC_TCAM, .direction = TF_DIR_RX, - .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1143, .blob_key_bit_size = 192, .key_bit_size = 160, @@ -1901,7 +1925,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 30, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 19, wh_plus, table: l2_cntxt_tcam_0 */ @@ -1910,7 +1934,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_SRCH_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1148, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -1921,14 +1946,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 30, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 19, wh_plus, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_RX, .key_start_idx = 1161, .blob_key_bit_size = 16, @@ -1947,7 +1972,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_RX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_PROFILE_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1164, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -1958,13 +1984,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 33, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 19, wh_plus, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_RX, .key_start_idx = 1207, .blob_key_bit_size = 112, @@ -1976,13 +2002,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 33, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 19, wh_plus, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_RX, .key_start_idx = 1215, .blob_key_bit_size = 448, @@ -1994,14 +2020,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 33, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 20, wh_plus, table: l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_TX, .key_start_idx = 1223, .blob_key_bit_size = 8, @@ -2020,7 +2046,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_TX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1224, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -2031,14 +2058,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 34, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 20, wh_plus, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_TX, .key_start_idx = 1237, .blob_key_bit_size = 16, @@ -2057,7 +2084,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_TX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_PROFILE_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1240, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -2068,13 +2096,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 35, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 20, wh_plus, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_TX, .key_start_idx = 1283, .blob_key_bit_size = 448, @@ -2086,13 +2114,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 35, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 20, wh_plus, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_TX, .key_start_idx = 1294, .blob_key_bit_size = 200, @@ -2104,14 +2132,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 35, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 21, wh_plus, table: l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_TX, .key_start_idx = 1305, .blob_key_bit_size = 8, @@ -2130,7 +2158,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_TX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1306, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -2141,14 +2170,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 36, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 21, wh_plus, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_TX, .key_start_idx = 1319, .blob_key_bit_size = 16, @@ -2167,7 +2196,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_TX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_PROFILE_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1322, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -2178,13 +2208,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 37, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 21, wh_plus, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_TX, .key_start_idx = 1365, .blob_key_bit_size = 448, @@ -2196,13 +2226,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 37, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 21, wh_plus, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_TX, .key_start_idx = 1376, .blob_key_bit_size = 200, @@ -2214,14 +2244,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 37, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 22, wh_plus, table: l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_TX, .key_start_idx = 1387, .blob_key_bit_size = 8, @@ -2240,7 +2270,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_TX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1388, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -2251,14 +2282,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 38, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 22, wh_plus, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_TX, .key_start_idx = 1401, .blob_key_bit_size = 16, @@ -2277,7 +2308,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_TX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_PROFILE_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1404, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -2288,13 +2320,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 39, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 22, wh_plus, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_TX, .key_start_idx = 1447, .blob_key_bit_size = 448, @@ -2306,13 +2338,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 39, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 22, wh_plus, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_TX, .key_start_idx = 1458, .blob_key_bit_size = 392, @@ -2324,14 +2356,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 39, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 23, wh_plus, table: l2_cntxt_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_TX, .key_start_idx = 1469, .blob_key_bit_size = 8, @@ -2350,7 +2382,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_TX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1470, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -2361,14 +2394,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 40, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 23, wh_plus, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_TX, .key_start_idx = 1483, .blob_key_bit_size = 16, @@ -2387,7 +2420,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_TX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_PROFILE_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1486, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -2398,13 +2432,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 41, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 23, wh_plus, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_TX, .key_start_idx = 1529, .blob_key_bit_size = 448, @@ -2416,13 +2450,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 41, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 23, wh_plus, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_TX, .key_start_idx = 1540, .blob_key_bit_size = 392, @@ -2434,7 +2468,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 41, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 24, wh_plus, table: l2_cntxt_tcam_0 */ @@ -2443,7 +2477,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_TX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_SRCH_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1551, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -2454,14 +2489,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 41, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 24, wh_plus, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_TX, .key_start_idx = 1564, .blob_key_bit_size = 16, @@ -2480,7 +2515,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_TX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_PROFILE_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1567, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -2491,13 +2527,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 43, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 24, wh_plus, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_TX, .key_start_idx = 1610, .blob_key_bit_size = 448, @@ -2509,13 +2545,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 43, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 24, wh_plus, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_TX, .key_start_idx = 1617, .blob_key_bit_size = 104, @@ -2527,7 +2563,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 43, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 25, wh_plus, table: l2_cntxt_tcam_0 */ @@ -2536,7 +2572,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_TX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_SRCH_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1624, .blob_key_bit_size = 167, .key_bit_size = 167, @@ -2547,14 +2584,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 43, .ident_nums = 1, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 25, wh_plus, table: profile_tcam_cache_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INVALID, .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM, .resource_sub_type = - BNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM, + BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM, .direction = TF_DIR_TX, .key_start_idx = 1637, .blob_key_bit_size = 16, @@ -2573,7 +2610,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .direction = TF_DIR_TX, .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE, .tbl_operand = BNXT_ULP_REGFILE_INDEX_PROFILE_TCAM_INDEX_0, - .priority = BNXT_ULP_PRIORITY_LEVEL_0, + .pri_opcode = BNXT_ULP_PRI_OPC_CONST, + .pri_operand = 0, .key_start_idx = 1640, .blob_key_bit_size = 81, .key_bit_size = 81, @@ -2584,13 +2622,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 45, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO }, { /* class_tid: 25, wh_plus, table: ext_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE, .resource_type = TF_MEM_EXTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT, .direction = TF_DIR_TX, .key_start_idx = 1683, .blob_key_bit_size = 448, @@ -2602,13 +2640,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 45, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES }, { /* class_tid: 25, wh_plus, table: int_em_0 */ .resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE, .resource_type = TF_MEM_INTERNAL, - .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT, + .mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT, .direction = TF_DIR_TX, .key_start_idx = 1690, .blob_key_bit_size = 104, @@ -2620,7 +2658,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = { .encap_num_fields = 0, .ident_start_idx = 45, .ident_nums = 0, - .mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP, + .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP, .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES } }; diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h index b253aefe8d..23b4c89896 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h +++ b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h @@ -161,8 +161,8 @@ struct bnxt_ulp_mapper_cond_list_info { uint32_t cond_nums; }; -struct ulp_template_device_tbls { - struct bnxt_ulp_mapper_tbl_list_info *tmpl_list; +struct bnxt_ulp_template_device_tbls { + struct bnxt_ulp_mapper_tmpl_info *tmpl_list; struct bnxt_ulp_mapper_tbl_info *tbl_list; struct bnxt_ulp_mapper_key_field_info *key_field_list; struct bnxt_ulp_mapper_result_field_info *result_field_list; @@ -188,11 +188,11 @@ struct bnxt_ulp_device_params { uint64_t packet_count_mask; uint32_t byte_count_shift; uint32_t packet_count_shift; - const struct ulp_template_device_tbls *dev_tbls; + const struct bnxt_ulp_template_device_tbls *dev_tbls; }; /* Flow Mapper */ -struct bnxt_ulp_mapper_tbl_list_info { +struct bnxt_ulp_mapper_tmpl_info { uint32_t device_name; uint32_t start_tbl_idx; uint32_t num_tbls; @@ -206,10 +206,10 @@ struct bnxt_ulp_mapper_tbl_info { struct bnxt_ulp_mapper_cond_list_info execute_info; enum bnxt_ulp_cond_opc cond_opcode; uint32_t cond_operand; - enum bnxt_ulp_mem_type_opcode mem_type_opcode; + enum bnxt_ulp_mem_type_opc mem_type_opcode; uint8_t direction; - uint32_t priority; - enum bnxt_ulp_search_before_alloc srch_b4_alloc; + enum bnxt_ulp_pri_opc pri_opcode; + uint32_t pri_operand; enum bnxt_ulp_critical_resource critical_resource; /* Information for accessing the ulp_key_field_list */ @@ -229,9 +229,7 @@ struct bnxt_ulp_mapper_tbl_info { uint32_t ident_start_idx; uint16_t ident_nums; - enum bnxt_ulp_mark_db_opcode mark_db_opcode; - enum bnxt_ulp_index_opcode index_opcode; - uint32_t index_operand; + enum bnxt_ulp_mark_db_opc mark_db_opcode; /* Table opcode for table operations */ uint32_t tbl_opcode; -- 2.20.1