X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fbnxt%2Ftf_ulp%2Fulp_template_db_tbl.c;h=c5f340d7bb94e93ba24749cc930f58d96c755ad0;hb=0bf5a0b5ebb8e020e441c8e01c8a10900f859692;hp=86fd489b9a0295e3124ebbed9af7da558083f7a3;hpb=0c9fe336d5a84acbdb911a04289c429f59b3f8e9;p=dpdk.git

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 86fd489b9a..c5f340d7bb 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c
@@ -90,6 +90,8 @@ uint32_t ulp_act_prop_map_table[] = {
 		BNXT_ULP_ACT_PROP_SZ_ENCAP_UDP,
 	[BNXT_ULP_ACT_PROP_IDX_ENCAP_TUN] =
 		BNXT_ULP_ACT_PROP_SZ_ENCAP_TUN,
+	[BNXT_ULP_ACT_PROP_IDX_JUMP] =
+		BNXT_ULP_ACT_PROP_SZ_JUMP,
 	[BNXT_ULP_ACT_PROP_IDX_LAST] =
 		BNXT_ULP_ACT_PROP_SZ_LAST
 };
@@ -108,8 +110,8 @@ struct bnxt_ulp_rte_act_info ulp_act_info[] = {
 	.proto_act_func          = NULL
 	},
 	[RTE_FLOW_ACTION_TYPE_JUMP] = {
-	.act_type                = BNXT_ULP_ACT_TYPE_NOT_SUPPORTED,
-	.proto_act_func          = NULL
+	.act_type                = BNXT_ULP_ACT_TYPE_SUPPORTED,
+	.proto_act_func          = ulp_rte_jump_act_handler
 	},
 	[RTE_FLOW_ACTION_TYPE_MARK] = {
 	.act_type                = BNXT_ULP_ACT_TYPE_SUPPORTED,
@@ -314,43 +316,44 @@ struct bnxt_ulp_cache_tbl_params ulp_cache_tbl_params[] = {
 
 const struct ulp_template_device_tbls ulp_template_stingray_tbls[] = {
 	[BNXT_ULP_TEMPLATE_TYPE_CLASS] = {
-		.tmpl_list = ulp_class_stingray_tmpl_list,
-		.tbl_list = ulp_class_stingray_tbl_list,
-		.key_field_list = ulp_class_stingray_key_field_list,
-		.result_field_list = ulp_class_stingray_result_field_list,
-		.ident_list = ulp_class_stingray_ident_list
+	.tmpl_list               = ulp_stingray_class_tmpl_list,
+	.tbl_list                = ulp_stingray_class_tbl_list,
+	.key_field_list          = ulp_stingray_class_key_field_list,
+	.result_field_list       = ulp_stingray_class_result_field_list,
+	.ident_list              = ulp_stingray_class_ident_list
 	},
 	[BNXT_ULP_TEMPLATE_TYPE_ACTION] = {
-		.tmpl_list = ulp_act_stingray_tmpl_list,
-		.tbl_list = ulp_act_stingray_tbl_list,
-		.result_field_list = ulp_act_stingray_result_field_list,
+	.tmpl_list               = ulp_stingray_act_tmpl_list,
+	.tbl_list                = ulp_stingray_act_tbl_list,
+	.result_field_list       = ulp_stingray_act_result_field_list
 	}
 };
 
 const struct ulp_template_device_tbls ulp_template_wh_plus_tbls[] = {
 	[BNXT_ULP_TEMPLATE_TYPE_CLASS] = {
-		.tmpl_list = ulp_class_wh_plus_tmpl_list,
-		.tbl_list = ulp_class_wh_plus_tbl_list,
-		.key_field_list = ulp_class_wh_plus_key_field_list,
-		.result_field_list = ulp_class_wh_plus_result_field_list,
-		.ident_list = ulp_class_wh_plus_ident_list,
+	.tmpl_list               = ulp_wh_plus_class_tmpl_list,
+	.tbl_list                = ulp_wh_plus_class_tbl_list,
+	.key_field_list          = ulp_wh_plus_class_key_field_list,
+	.result_field_list       = ulp_wh_plus_class_result_field_list,
+	.ident_list              = ulp_wh_plus_class_ident_list
 	},
 	[BNXT_ULP_TEMPLATE_TYPE_ACTION] = {
-		.tmpl_list = ulp_act_wh_plus_tmpl_list,
-		.tbl_list = ulp_act_wh_plus_tbl_list,
-		.result_field_list = ulp_act_wh_plus_result_field_list
+	.tmpl_list               = ulp_wh_plus_act_tmpl_list,
+	.tbl_list                = ulp_wh_plus_act_tbl_list,
+	.result_field_list       = ulp_wh_plus_act_result_field_list
 	}
 };
 
 struct bnxt_ulp_device_params ulp_device_params[BNXT_ULP_DEVICE_ID_LAST] = {
 	[BNXT_ULP_DEVICE_ID_WH_PLUS] = {
-	.flow_mem_type           = BNXT_ULP_FLOW_MEM_TYPE_INT,
 	.byte_order              = BNXT_ULP_BYTE_ORDER_LE,
 	.encap_byte_swap         = 1,
-	.flow_db_num_entries     = 16384,
+	.int_flow_db_num_entries = 16384,
+	.ext_flow_db_num_entries = 32768,
 	.mark_db_lfid_entries    = 65536,
-	.mark_db_gfid_entries    = 0,
+	.mark_db_gfid_entries    = 65536,
 	.flow_count_db_entries   = 16384,
+	.fdb_parent_flow_entries = 2,
 	.num_resources_per_flow  = 8,
 	.num_phy_ports           = 2,
 	.ext_cntr_table_type     = 0,
@@ -358,16 +361,17 @@ struct bnxt_ulp_device_params ulp_device_params[BNXT_ULP_DEVICE_ID_LAST] = {
 	.packet_count_mask       = 0xffffffff00000000,
 	.byte_count_shift        = 0,
 	.packet_count_shift      = 36,
-	.dev_tbls		 = ulp_template_wh_plus_tbls
+	.dev_tbls                = ulp_template_wh_plus_tbls
 	},
 	[BNXT_ULP_DEVICE_ID_STINGRAY] = {
-	.flow_mem_type           = BNXT_ULP_FLOW_MEM_TYPE_INT,
 	.byte_order              = BNXT_ULP_BYTE_ORDER_LE,
 	.encap_byte_swap         = 1,
-	.flow_db_num_entries     = 16384,
+	.int_flow_db_num_entries = 16384,
+	.ext_flow_db_num_entries = 32768,
 	.mark_db_lfid_entries    = 65536,
-	.mark_db_gfid_entries    = 0,
+	.mark_db_gfid_entries    = 65536,
 	.flow_count_db_entries   = 16384,
+	.fdb_parent_flow_entries = 2,
 	.num_resources_per_flow  = 8,
 	.num_phy_ports           = 2,
 	.ext_cntr_table_type     = 0,
@@ -375,7 +379,7 @@ struct bnxt_ulp_device_params ulp_device_params[BNXT_ULP_DEVICE_ID_LAST] = {
 	.packet_count_mask       = 0xffffffff00000000,
 	.byte_count_shift        = 0,
 	.packet_count_shift      = 36,
-	.dev_tbls		 = ulp_template_stingray_tbls
+	.dev_tbls                = ulp_template_stingray_tbls
 	}
 };
 
@@ -413,7 +417,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {
 	[5] = {
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
 	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index = BNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID,
+	.glb_regfile_index       = BNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID,
 	.direction               = TF_DIR_RX
 	},
 	[6] = {