X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fbnxt%2Ftf_ulp%2Fulp_template_struct.h;h=6617ab9d49ae6ef02d552de8e65c700427f64c60;hb=25ae7f1a5d9d127a46f8d62d1d689f77a78138fd;hp=eebe0351c9981d815746ba91b8ada004aaa232d9;hpb=494f03ff01ade3f52b362df558083fa5f805039a;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 eebe0351c9..6617ab9d49 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,6 +63,7 @@ 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_CF_IDX_LAST]; @@ -65,7 +71,7 @@ struct ulp_rte_parser_params { 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; struct bnxt_ulp_context *ulp_ctx; }; @@ -137,32 +143,40 @@ extern struct bnxt_ulp_act_match_info ulp_act_match_list[]; /* Device specific parameters */ struct bnxt_ulp_device_params { uint8_t description[16]; - uint32_t global_fid_enable; + enum bnxt_ulp_flow_mem_type flow_mem_type; 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 flow_db_num_entries; + uint32_t flow_count_db_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; }; /* 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; + enum bnxt_ulp_fdb_type flow_db_table_type; }; -struct bnxt_ulp_mapper_class_tbl_info { +struct bnxt_ulp_mapper_tbl_info { enum bnxt_ulp_resource_func resource_func; uint32_t resource_type; /* TF_ enum type */ enum bnxt_ulp_resource_sub_type resource_sub_type; - uint8_t direction; - uint32_t priority; - uint8_t srch_b4_alloc; - uint32_t critical_resource; + enum bnxt_ulp_cond_opcode cond_opcode; + uint32_t cond_operand; + 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; @@ -175,43 +189,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; -}; - -struct bnxt_ulp_mapper_act_tbl_info { - enum bnxt_ulp_resource_func resource_func; - uint32_t resource_type; /* TF_ enum type */ - enum bnxt_ulp_resource_sub_type resource_sub_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; + enum bnxt_ulp_mark_db_opcode mark_db_opcode; + enum bnxt_ulp_index_opcode index_opcode; + uint32_t index_operand; }; 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]; + 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,7 +225,7 @@ 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_glb_resource_info { @@ -262,8 +266,8 @@ extern struct bnxt_ulp_mapper_tbl_list_info ulp_act_tmpl_list[]; * 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[]; +extern struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[]; +extern struct bnxt_ulp_mapper_tbl_info ulp_act_tbl_list[]; /* * The ulp_class_result_field_list provides the instructions for creating result @@ -310,4 +314,10 @@ extern struct bnxt_ulp_glb_resource_info ulp_glb_resource_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_ */