X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fbnxt%2Ftf_ulp%2Fulp_template_struct.h;h=6e5e8d6d17cac44d271dcc9c504caeb86cfca591;hb=fcf681890a31a7396df2b85b2888074c5b939535;hp=1bef5ab0e400a40cd6b0d1610f3ef8c59b4372da;hpb=4bc32a80556eb85ca980dcc5e82455e3ae741007;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 1bef5ab0e4..6e5e8d6d17 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h +++ b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h @@ -23,13 +23,18 @@ #define BNXT_ULP_PROTO_HDR_S_VLAN_NUM 3 #define BNXT_ULP_PROTO_HDR_VLAN_NUM 6 #define BNXT_ULP_PROTO_HDR_IPV4_NUM 10 -#define BNXT_ULP_PROTO_HDR_IPV6_NUM 6 +#define BNXT_ULP_PROTO_HDR_IPV6_NUM 8 #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_MAX 128 #define BNXT_ULP_PROTO_HDR_FIELD_SVIF_IDX 0 +/* Direction attributes */ +#define BNXT_ULP_FLOW_ATTR_TRANSFER 0x1 +#define BNXT_ULP_FLOW_ATTR_INGRESS 0x2 +#define BNXT_ULP_FLOW_ATTR_EGRESS 0x4 + struct ulp_rte_hdr_bitmap { uint64_t bits; }; @@ -58,14 +63,24 @@ struct ulp_rte_act_prop { /* Structure to be used for passing all the parser functions */ 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_hdr_field hdr_field[BNXT_ULP_PROTO_HDR_MAX]; - uint32_t comp_fld[BNXT_ULP_CHF_IDX_LAST]; + uint32_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; + uint32_t dir_attr; + uint32_t priority; + uint32_t fid; + uint32_t parent_flow; + uint32_t parent_fid; + uint16_t func_id; + uint16_t port_id; + uint32_t class_id; + uint32_t act_tmpl; + struct bnxt_ulp_context *ulp_ctx; }; /* Flow Parser Header Information Structure */ @@ -133,35 +148,54 @@ struct bnxt_ulp_act_match_info { extern uint16_t ulp_act_sig_tbl[]; extern struct bnxt_ulp_act_match_info ulp_act_match_list[]; +/* Device Specific Tables for mapper */ +struct ulp_template_device_tbls { + struct bnxt_ulp_mapper_tbl_list_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; + struct bnxt_ulp_mapper_ident_info *ident_list; +}; + /* Device specific parameters */ struct bnxt_ulp_device_params { uint8_t description[16]; - uint32_t global_fid_enable; enum bnxt_ulp_byte_order byte_order; uint8_t encap_byte_swap; - uint32_t lfid_entries; - uint32_t lfid_entry_size; - uint64_t gfid_entries; - uint32_t gfid_entry_size; - uint64_t num_flows; + uint8_t num_phy_ports; + uint32_t mark_db_lfid_entries; + uint64_t mark_db_gfid_entries; + uint64_t int_flow_db_num_entries; + uint64_t ext_flow_db_num_entries; + uint32_t flow_count_db_entries; + uint32_t fdb_parent_flow_entries; uint32_t num_resources_per_flow; + uint32_t ext_cntr_table_type; + uint64_t byte_count_mask; + uint64_t packet_count_mask; + uint32_t byte_count_shift; + uint32_t packet_count_shift; + const struct ulp_template_device_tbls *dev_tbls; }; /* Flow Mapper */ struct bnxt_ulp_mapper_tbl_list_info { - uint32_t device_name; - uint32_t start_tbl_idx; - uint32_t num_tbls; + uint32_t device_name; + uint32_t start_tbl_idx; + uint32_t num_tbls; }; -struct bnxt_ulp_mapper_class_tbl_info { +struct bnxt_ulp_mapper_tbl_info { enum bnxt_ulp_resource_func resource_func; - uint32_t table_type; - uint8_t direction; - uint8_t mem; - uint32_t priority; - uint8_t srch_b4_alloc; - uint32_t critical_resource; + uint32_t resource_type; /* TF_ enum type */ + enum bnxt_ulp_resource_sub_type resource_sub_type; + enum bnxt_ulp_cond_opcode 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_critical_resource critical_resource; /* Information for accessing the ulp_key_field_list */ uint32_t key_start_idx; @@ -174,44 +208,33 @@ struct bnxt_ulp_mapper_class_tbl_info { uint32_t result_start_idx; uint16_t result_bit_size; uint16_t result_num_fields; + uint16_t encap_num_fields; /* Information for accessing the ulp_ident_list */ uint32_t ident_start_idx; uint16_t ident_nums; - uint8_t mark_enable; - enum bnxt_ulp_regfile_index regfile_wr_idx; - - enum bnxt_ulp_cache_tbl_id cache_tbl_id; + enum bnxt_ulp_mark_db_opcode mark_db_opcode; + enum bnxt_ulp_index_opcode index_opcode; + uint32_t index_operand; }; -struct bnxt_ulp_mapper_act_tbl_info { - enum bnxt_ulp_resource_func resource_func; - enum tf_tbl_type table_type; - uint8_t direction; - uint8_t srch_b4_alloc; - uint32_t result_start_idx; - uint16_t result_bit_size; - uint16_t encap_num_fields; - uint16_t result_num_fields; - - enum bnxt_ulp_regfile_index regfile_wr_idx; -}; - -struct bnxt_ulp_mapper_class_key_field_info { - uint8_t description[64]; - enum bnxt_ulp_mask_opc mask_opcode; - enum bnxt_ulp_spec_opc spec_opcode; - uint16_t field_bit_size; - uint8_t mask_operand[16]; - uint8_t spec_operand[16]; +struct bnxt_ulp_mapper_key_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]; }; struct bnxt_ulp_mapper_result_field_info { uint8_t description[64]; - enum bnxt_ulp_result_opc result_opcode; + 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_ident_info { @@ -221,13 +244,14 @@ 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_wr_idx; + enum bnxt_ulp_regfile_index regfile_idx; }; -struct bnxt_ulp_def_ident_info { - enum tf_dir direction; - enum tf_identifier_type ident_type; - enum bnxt_ulp_def_regfile_index def_regfile_index; +struct bnxt_ulp_glb_resource_info { + enum bnxt_ulp_resource_func resource_func; + uint32_t resource_type; /* TF_ enum type */ + enum bnxt_ulp_glb_regfile_index glb_regfile_index; + enum tf_dir direction; }; struct bnxt_ulp_cache_tbl_params { @@ -246,51 +270,6 @@ struct bnxt_ulp_cache_tbl_params { */ extern struct bnxt_ulp_device_params ulp_device_params[]; -/* - * The ulp_class_tmpl_list and ulp_act_tmpl_list are indexed by the dev_id - * and template id (either class or action) returned by the matcher. - * The result provides the start index and number of entries in the connected - * ulp_class_tbl_list/ulp_act_tbl_list. - */ -extern struct bnxt_ulp_mapper_tbl_list_info ulp_class_tmpl_list[]; -extern struct bnxt_ulp_mapper_tbl_list_info ulp_act_tmpl_list[]; - -/* - * The ulp_class_tbl_list and ulp_act_tbl_list are indexed based on the results - * of the template lists. Each entry describes the high level details of the - * table entry to include the start index and number of instructions in the - * field lists. - */ -extern struct bnxt_ulp_mapper_class_tbl_info ulp_class_tbl_list[]; -extern struct bnxt_ulp_mapper_act_tbl_info ulp_act_tbl_list[]; - -/* - * The ulp_class_result_field_list provides the instructions for creating result - * records such as tcam/em results. - */ -extern struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[]; - -/* - * The ulp_data_field_list provides the instructions for creating an action - * record. It uses the same structure as the result list, but is only used for - * actions. - */ -extern -struct bnxt_ulp_mapper_result_field_info ulp_act_result_field_list[]; - -/* - * The ulp_act_prop_map_table provides the mapping to index and size of action - * tcam and em tables. - */ -extern -struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[]; - -/* - * The ulp_ident_list provides the instructions for creating identifiers such - * as profile ids. - */ -extern struct bnxt_ulp_mapper_ident_info ulp_ident_list[]; - /* * The ulp_act_prop_map_table provides the mapping to index and size of action * properties. @@ -298,10 +277,10 @@ extern struct bnxt_ulp_mapper_ident_info ulp_ident_list[]; extern uint32_t ulp_act_prop_map_table[]; /* - * The ulp_def_ident_tbl provides the list of default identifiers that need to + * The ulp_glb_resource_tbl provides the list of global resources that need to * be initialized and where to store them. */ -extern struct bnxt_ulp_def_ident_info ulp_def_ident_tbl[]; +extern struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[]; /* * The ulp_cache_tbl_parms table provides the sizes of the cache tables the @@ -309,4 +288,10 @@ extern struct bnxt_ulp_def_ident_info ulp_def_ident_tbl[]; */ extern struct bnxt_ulp_cache_tbl_params ulp_cache_tbl_params[]; +/* + * The ulp_global template table is used to initialize default entries + * that could be reused by other templates. + */ +extern uint32_t ulp_glb_template_tbl[]; + #endif /* _ULP_TEMPLATE_STRUCT_H_ */