X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fbnxt%2Ftf_ulp%2Fulp_template_struct.h;h=0cbac662371e96e5ddf7e1b7d4dfa1219c339ffd;hb=b37ed6def36798342172f298516c5fc6d0d8e070;hp=b253aefe8d603c12c69420c544a995f868d0deb8;hpb=835731f63b0a89deedc6878a7028844b643fb54e;p=dpdk.git diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h index b253aefe8d..0cbac66237 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h +++ b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h @@ -18,7 +18,7 @@ #include "tf_core.h" /* Number of fields for each protocol */ -#define BNXT_ULP_PROTO_HDR_SVIF_NUM 1 +#define BNXT_ULP_PROTO_HDR_SVIF_NUM 2 #define BNXT_ULP_PROTO_HDR_ETH_NUM 3 #define BNXT_ULP_PROTO_HDR_S_VLAN_NUM 3 #define BNXT_ULP_PROTO_HDR_VLAN_NUM 6 @@ -27,8 +27,10 @@ #define BNXT_ULP_PROTO_HDR_UDP_NUM 4 #define BNXT_ULP_PROTO_HDR_TCP_NUM 9 #define BNXT_ULP_PROTO_HDR_VXLAN_NUM 4 +#define BNXT_ULP_PROTO_HDR_GRE_NUM 6 +#define BNXT_ULP_PROTO_HDR_ICMP_NUM 5 #define BNXT_ULP_PROTO_HDR_MAX 128 -#define BNXT_ULP_PROTO_HDR_FIELD_SVIF_IDX 0 +#define BNXT_ULP_PROTO_HDR_FIELD_SVIF_IDX 1 /* Direction attributes */ #define BNXT_ULP_FLOW_ATTR_TRANSFER 0x1 @@ -66,10 +68,10 @@ struct ulp_rte_parser_params { struct ulp_rte_hdr_bitmap hdr_bitmap; struct ulp_rte_hdr_bitmap hdr_fp_bit; struct ulp_rte_field_bitmap fld_bitmap; + struct ulp_rte_field_bitmap fld_s_bitmap; struct ulp_rte_hdr_field hdr_field[BNXT_ULP_PROTO_HDR_MAX]; - uint32_t comp_fld[BNXT_ULP_CF_IDX_LAST]; + uint64_t comp_fld[BNXT_ULP_CF_IDX_LAST]; uint32_t field_idx; - uint32_t vlan_idx; struct ulp_rte_act_bitmap act_bitmap; struct ulp_rte_act_prop act_prop; uint32_t dir_attr; @@ -82,6 +84,11 @@ struct ulp_rte_parser_params { uint32_t class_id; uint32_t act_tmpl; struct bnxt_ulp_context *ulp_ctx; + uint32_t hdr_sig_id; + uint32_t flow_sig_id; + uint32_t flow_pattern_id; + uint32_t act_pattern_id; + uint8_t app_id; }; /* Flow Parser Header Information Structure */ @@ -127,6 +134,10 @@ struct bnxt_ulp_class_match_info { uint32_t class_tid; uint8_t act_vnic; uint8_t wc_pri; + uint8_t app_sig; + uint32_t hdr_sig_id; + uint32_t flow_sig_id; + uint32_t flow_pattern_id; }; /* Flow Matcher templates Structure for class entries */ @@ -143,6 +154,8 @@ struct bnxt_ulp_act_match_info { struct ulp_rte_bitmap act_sig; uint32_t act_hid; uint32_t act_tid; + uint32_t act_pattern_id; + uint8_t app_sig; }; /* Flow Matcher templates Structure for action entries */ @@ -159,15 +172,32 @@ struct bnxt_ulp_mapper_cond_list_info { enum bnxt_ulp_cond_list_opc cond_list_opcode; uint32_t cond_start_idx; uint32_t cond_nums; + int32_t cond_true_goto; + int32_t cond_false_goto; }; -struct ulp_template_device_tbls { - struct bnxt_ulp_mapper_tbl_list_info *tmpl_list; +struct bnxt_ulp_mapper_func_info { + enum bnxt_ulp_func_opc func_opc; + enum bnxt_ulp_func_src func_src1; + enum bnxt_ulp_func_src func_src2; + uint16_t func_opr1; + uint16_t func_opr2; + uint16_t func_dst_opr; +}; + +struct bnxt_ulp_template_device_tbls { + struct bnxt_ulp_mapper_tmpl_info *tmpl_list; + uint32_t tmpl_list_size; 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; + uint32_t tbl_list_size; + struct bnxt_ulp_mapper_key_info *key_info_list; + uint32_t key_info_list_size; + struct bnxt_ulp_mapper_field_info *result_field_list; + uint32_t result_field_list_size; struct bnxt_ulp_mapper_ident_info *ident_list; + uint32_t ident_list_size; struct bnxt_ulp_mapper_cond_info *cond_list; + uint32_t cond_list_size; }; /* Device specific parameters */ @@ -188,11 +218,21 @@ 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; + uint32_t dynamic_pad_en; + uint16_t em_blk_size_bits; + uint16_t em_blk_align_bits; + uint16_t em_key_align_bytes; + uint16_t em_result_size_bits; + uint16_t wc_slice_width; + uint16_t wc_max_slices; + uint32_t wc_mode_list[4]; + uint32_t wc_mod_list_max_size; + uint32_t wc_ctl_size_bits; + 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; @@ -204,12 +244,17 @@ struct bnxt_ulp_mapper_tbl_info { uint32_t resource_type; /* TF_ enum type */ enum bnxt_ulp_resource_sub_type resource_sub_type; struct bnxt_ulp_mapper_cond_list_info execute_info; + struct bnxt_ulp_mapper_func_info func_info; enum bnxt_ulp_cond_opc cond_opcode; uint32_t cond_operand; - enum bnxt_ulp_mem_type_opcode 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_byte_order byte_order; + + /* conflict resolution opcode */ + enum bnxt_ulp_accept_opc accept_opcode; + enum bnxt_ulp_critical_resource critical_resource; /* Information for accessing the ulp_key_field_list */ @@ -229,35 +274,36 @@ 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; uint32_t tbl_operand; + enum bnxt_ulp_generic_tbl_lkup_type gen_tbl_lkup_type; /* FDB table opcode */ enum bnxt_ulp_fdb_opc fdb_opcode; - uint32_t flow_db_operand; + uint32_t fdb_operand; + + /* Shared session */ + enum bnxt_ulp_shared_session shared_session; }; -struct bnxt_ulp_mapper_key_field_info { +struct bnxt_ulp_mapper_field_info { uint8_t description[64]; - enum bnxt_ulp_mapper_opc mask_opcode; - enum bnxt_ulp_mapper_opc spec_opcode; uint16_t field_bit_size; - uint8_t mask_operand[16]; - uint8_t spec_operand[16]; + enum bnxt_ulp_field_opc field_opc; + enum bnxt_ulp_field_src field_src1; + uint8_t field_opr1[16]; + enum bnxt_ulp_field_src field_src2; + uint8_t field_opr2[16]; + enum bnxt_ulp_field_src field_src3; + uint8_t field_opr3[16]; }; -struct bnxt_ulp_mapper_result_field_info { - uint8_t description[64]; - enum bnxt_ulp_mapper_opc result_opcode; - uint16_t field_bit_size; - uint8_t result_operand[16]; - uint8_t result_operand_true[16]; - uint8_t result_operand_false[16]; +struct bnxt_ulp_mapper_key_info { + struct bnxt_ulp_mapper_field_info field_info_spec; + struct bnxt_ulp_mapper_field_info field_info_mask; }; struct bnxt_ulp_mapper_ident_info { @@ -267,14 +313,31 @@ struct bnxt_ulp_mapper_ident_info { uint16_t ident_type; uint16_t ident_bit_size; uint16_t ident_bit_pos; - enum bnxt_ulp_regfile_index regfile_idx; + enum bnxt_ulp_rf_idx regfile_idx; }; struct bnxt_ulp_glb_resource_info { + uint8_t app_id; + enum bnxt_ulp_device_id device_id; + enum tf_dir direction; enum bnxt_ulp_resource_func resource_func; uint32_t resource_type; /* TF_ enum type */ - enum bnxt_ulp_glb_regfile_index glb_regfile_index; + enum bnxt_ulp_glb_rf_idx glb_regfile_index; +}; + +struct bnxt_ulp_resource_resv_info { + uint8_t app_id; + enum bnxt_ulp_device_id device_id; enum tf_dir direction; + enum bnxt_ulp_resource_func resource_func; + uint32_t resource_type; /* TF_ enum type */ + uint32_t count; +}; + +struct bnxt_ulp_app_capabilities_info { + uint8_t app_id; + enum bnxt_ulp_device_id device_id; + uint32_t flags; }; struct bnxt_ulp_cache_tbl_params { @@ -282,9 +345,17 @@ struct bnxt_ulp_cache_tbl_params { }; struct bnxt_ulp_generic_tbl_params { + const char *name; uint16_t result_num_entries; - uint16_t result_byte_size; + uint16_t result_num_bytes; enum bnxt_ulp_byte_order result_byte_order; + uint32_t hash_tbl_entries; + uint16_t num_buckets; + uint16_t key_num_bytes; +}; + +struct bnxt_ulp_shared_act_info { + uint64_t act_bitmask; }; /* @@ -311,6 +382,29 @@ extern uint32_t ulp_act_prop_map_table[]; */ extern struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[]; +/* + * The ulp_app_glb_resource_tbl provides the list of shared resources required + * in the event that shared session is enabled. + */ +extern struct bnxt_ulp_glb_resource_info ulp_app_glb_resource_tbl[]; + +/* + * The ulp_resource_resv_list provides the list of tf resources required when + * calling tf_open. + */ +extern struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[]; + +/* + * The ulp_app_resource_resv_list provides the list of tf resources required + * when calling tf_open. + */ +extern struct bnxt_ulp_resource_resv_info ulp_app_resource_resv_list[]; + +/* + * The_app_cap_info_list provides the list of ULP capabilities per app/device. + */ +extern struct bnxt_ulp_app_capabilities_info ulp_app_cap_info_list[]; + /* * The ulp_cache_tbl_parms table provides the sizes of the cache tables the * mapper must dynamically allocate during initialization.