X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fbnxt%2Ftf_ulp%2Fulp_rte_parser.h;h=cbc8a43dedd28b11c1412386a89b72303a74dca6;hb=dd8384a4f5dd7e04cd3bc7ded0f0a6d9c79d25b4;hp=0d571bbba3d5579bca5db8696cfd73971d7ecd3d;hpb=a7420bd934633ad4eeab961b3ad2e26aa244005a;p=dpdk.git

diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h
index 0d571bbba3..cbc8a43ded 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h
@@ -22,8 +22,11 @@
 
 /* Function to handle the parsing of the RTE port id. */
 int32_t
-ulp_rte_parser_svif_process(struct ulp_rte_hdr_bitmap	*hdr_bitmap,
-			    struct ulp_rte_hdr_field	*hdr_field);
+ulp_rte_parser_svif_process(struct ulp_rte_parser_params *params);
+
+/* Function to handle the implicit VNIC RTE port id */
+int32_t
+ulp_rte_parser_vnic_process(struct ulp_rte_parser_params *params);
 
 /*
  * Function to handle the parsing of RTE Flows and placing
@@ -31,178 +34,129 @@ ulp_rte_parser_svif_process(struct ulp_rte_hdr_bitmap	*hdr_bitmap,
  */
 int32_t
 bnxt_ulp_rte_parser_hdr_parse(const struct rte_flow_item pattern[],
-			      struct ulp_rte_hdr_bitmap *hdr_bitmap,
-			      struct ulp_rte_hdr_field  *hdr_field);
+			      struct ulp_rte_parser_params *params);
 
 /*
  * Function to handle the parsing of RTE Flows and placing
  * the RTE flow actions into the ulp structures.
  */
 int32_t
-bnxt_ulp_rte_parser_act_parse(const struct rte_flow_action	actions[],
-			      struct ulp_rte_act_bitmap		*act_bitmap,
-			      struct ulp_rte_act_prop		*act_prop);
+bnxt_ulp_rte_parser_act_parse(const struct rte_flow_action actions[],
+			      struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow item PF Header. */
 int32_t
-ulp_rte_pf_hdr_handler(const struct rte_flow_item	*item,
-		       struct ulp_rte_hdr_bitmap	*hdr_bitmap,
-		       struct ulp_rte_hdr_field		*hdr_field,
-		       uint32_t				*field_idx,
-		       uint32_t				*vlan_idx);
+ulp_rte_pf_hdr_handler(const struct rte_flow_item *item,
+		       struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow item VF Header. */
 int32_t
-ulp_rte_vf_hdr_handler(const struct rte_flow_item	*item,
-		       struct ulp_rte_hdr_bitmap	*hdr_bitmap,
-		       struct ulp_rte_hdr_field		*hdr_field,
-		       uint32_t				*field_idx,
-		       uint32_t				*vlan_idx);
+ulp_rte_vf_hdr_handler(const struct rte_flow_item *item,
+		       struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow item port id Header. */
 int32_t
-ulp_rte_port_id_hdr_handler(const struct rte_flow_item	*item,
-			    struct ulp_rte_hdr_bitmap	*hdr_bitmap,
-			    struct ulp_rte_hdr_field	*hdr_field,
-			    uint32_t			*field_idx,
-			    uint32_t			*vlan_idx);
+ulp_rte_port_id_hdr_handler(const struct rte_flow_item *item,
+			    struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow item port Header. */
 int32_t
-ulp_rte_phy_port_hdr_handler(const struct rte_flow_item	*item,
-			     struct ulp_rte_hdr_bitmap	*hdr_bitmap,
-			     struct ulp_rte_hdr_field	*hdr_field,
-			     uint32_t			*field_idx,
-			     uint32_t			*vlan_idx);
+ulp_rte_phy_port_hdr_handler(const struct rte_flow_item *item,
+			     struct ulp_rte_parser_params *params);
 
 /* Function to handle the RTE item Ethernet Header. */
 int32_t
-ulp_rte_eth_hdr_handler(const struct rte_flow_item	*item,
-			struct ulp_rte_hdr_bitmap	*hdr_bitmap,
-			struct ulp_rte_hdr_field	*hdr_field,
-			uint32_t			*field_idx,
-			uint32_t			*vlan_idx);
+ulp_rte_eth_hdr_handler(const struct rte_flow_item *item,
+			struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow item Vlan Header. */
 int32_t
-ulp_rte_vlan_hdr_handler(const struct rte_flow_item	*item,
-			 struct ulp_rte_hdr_bitmap	*hdr_bitmap,
-			 struct ulp_rte_hdr_field	*hdr_field,
-			 uint32_t			*field_idx,
-			 uint32_t			*vlan_idx);
+ulp_rte_vlan_hdr_handler(const struct rte_flow_item *item,
+			 struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow item IPV4 Header. */
 int32_t
-ulp_rte_ipv4_hdr_handler(const struct rte_flow_item	*item,
-			 struct ulp_rte_hdr_bitmap	*hdr_bitmap,
-			 struct ulp_rte_hdr_field	*hdr_field,
-			 uint32_t			*field_idx,
-			 uint32_t			*vlan_idx);
+ulp_rte_ipv4_hdr_handler(const struct rte_flow_item *item,
+			 struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow item IPV6 Header. */
 int32_t
-ulp_rte_ipv6_hdr_handler(const struct rte_flow_item	*item,
-			 struct ulp_rte_hdr_bitmap	*hdr_bitmap,
-			 struct ulp_rte_hdr_field	*hdr_field,
-			 uint32_t			*field_idx,
-			 uint32_t			*vlan_idx);
+ulp_rte_ipv6_hdr_handler(const struct rte_flow_item *item,
+			 struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow item UDP Header. */
 int32_t
-ulp_rte_udp_hdr_handler(const struct rte_flow_item	*item,
-			struct ulp_rte_hdr_bitmap	*hdr_bitmap,
-			struct ulp_rte_hdr_field	*hdr_field,
-			uint32_t			*field_idx,
-			uint32_t			*vlan_idx);
+ulp_rte_udp_hdr_handler(const struct rte_flow_item *item,
+			struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow item TCP Header. */
 int32_t
-ulp_rte_tcp_hdr_handler(const struct rte_flow_item	*item,
-			struct ulp_rte_hdr_bitmap	*hdr_bitmap,
-			struct ulp_rte_hdr_field	*hdr_field,
-			uint32_t			*field_idx,
-			uint32_t			*vlan_idx);
+ulp_rte_tcp_hdr_handler(const struct rte_flow_item *item,
+			struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow item Vxlan Header. */
 int32_t
-ulp_rte_vxlan_hdr_handler(const struct rte_flow_item	*item,
-			  struct ulp_rte_hdr_bitmap	*hdrbitmap,
-			  struct ulp_rte_hdr_field	*hdr_field,
-			  uint32_t			*field_idx,
-			  uint32_t			*vlan_idx);
+ulp_rte_vxlan_hdr_handler(const struct rte_flow_item *item,
+			  struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow item void Header. */
 int32_t
-ulp_rte_void_hdr_handler(const struct rte_flow_item	*item,
-			 struct ulp_rte_hdr_bitmap	*hdr_bitmap,
-			 struct ulp_rte_hdr_field	*hdr_field,
-			 uint32_t			*field_idx,
-			 uint32_t			*vlan_idx);
+ulp_rte_void_hdr_handler(const struct rte_flow_item *item,
+			 struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow action void Header. */
 int32_t
-ulp_rte_void_act_handler(const struct rte_flow_action	*action_item,
-			 struct ulp_rte_act_bitmap	*act,
-			 struct ulp_rte_act_prop	*act_prop);
+ulp_rte_void_act_handler(const struct rte_flow_action *action_item,
+			 struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow action RSS Header. */
 int32_t
-ulp_rte_rss_act_handler(const struct rte_flow_action	*action_item,
-			struct ulp_rte_act_bitmap	*act,
-			struct ulp_rte_act_prop	*act_prop);
+ulp_rte_rss_act_handler(const struct rte_flow_action *action_item,
+			struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow action Mark Header. */
 int32_t
-ulp_rte_mark_act_handler(const struct rte_flow_action	*action_item,
-			 struct ulp_rte_act_bitmap	*act,
-			 struct ulp_rte_act_prop	*act_prop);
+ulp_rte_mark_act_handler(const struct rte_flow_action *action_item,
+			 struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow action vxlan_encap Header. */
 int32_t
-ulp_rte_vxlan_encap_act_handler(const struct rte_flow_action	*action_item,
-				struct ulp_rte_act_bitmap	*act,
-				struct ulp_rte_act_prop		*act_prop);
+ulp_rte_vxlan_encap_act_handler(const struct rte_flow_action *action_item,
+				struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow action vxlan_encap Header. */
 int32_t
-ulp_rte_vxlan_decap_act_handler(const struct rte_flow_action	*action_item,
-				struct ulp_rte_act_bitmap	*act,
-				struct ulp_rte_act_prop		*act_prop);
+ulp_rte_vxlan_decap_act_handler(const struct rte_flow_action *action_item,
+				struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow action drop Header. */
 int32_t
-ulp_rte_drop_act_handler(const struct rte_flow_action	*action_item,
-			 struct ulp_rte_act_bitmap	*act,
-			 struct ulp_rte_act_prop	*act_prop);
+ulp_rte_drop_act_handler(const struct rte_flow_action *action_item,
+			 struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow action count. */
 int32_t
-ulp_rte_count_act_handler(const struct rte_flow_action	*action_item,
-			  struct ulp_rte_act_bitmap	*act,
-			  struct ulp_rte_act_prop	*act_prop);
+ulp_rte_count_act_handler(const struct rte_flow_action *action_item,
+			  struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow action PF. */
 int32_t
-ulp_rte_pf_act_handler(const struct rte_flow_action	*action_item,
-		       struct ulp_rte_act_bitmap	*act,
-		       struct ulp_rte_act_prop		*act_prop);
+ulp_rte_pf_act_handler(const struct rte_flow_action *action_item,
+		       struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow action VF. */
 int32_t
-ulp_rte_vf_act_handler(const struct rte_flow_action	*action_item,
-		       struct ulp_rte_act_bitmap	*act,
-		       struct ulp_rte_act_prop		*act_prop);
+ulp_rte_vf_act_handler(const struct rte_flow_action *action_item,
+		       struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow action port_id. */
 int32_t
-ulp_rte_port_id_act_handler(const struct rte_flow_action	*act_item,
-			    struct ulp_rte_act_bitmap		*act,
-			    struct ulp_rte_act_prop		*act_p);
+ulp_rte_port_id_act_handler(const struct rte_flow_action *act_item,
+			    struct ulp_rte_parser_params *params);
 
 /* Function to handle the parsing of RTE Flow action phy_port. */
 int32_t
-ulp_rte_phy_port_act_handler(const struct rte_flow_action	*action_item,
-			     struct ulp_rte_act_bitmap		*act,
-			     struct ulp_rte_act_prop		*act_prop);
+ulp_rte_phy_port_act_handler(const struct rte_flow_action *action_item,
+			     struct ulp_rte_parser_params *params);
 
 #endif /* _ULP_RTE_PARSER_H_ */