net/mlx5: DR, Allow native protocol support for HW STEv1

Some flex parser protocols are native as part of STEv1.
The check for supported protocols was modified to allow this.

Signed-off-by: Alex Vesker <valex@mellanox.com>
Signed-off-by: Yevgeny Kliteynik <kliteyn@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c
index e3a002983c26294a7cbf7ea8fb47a4bd8c99b3a1..15673cd10039b04a1091af3ef0378075c6c6e948 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c
@@ -113,7 +113,8 @@ dr_mask_is_vxlan_gpe_set(struct mlx5dr_match_misc3 *misc3)
 static bool
 dr_matcher_supp_vxlan_gpe(struct mlx5dr_cmd_caps *caps)
 {
-       return caps->flex_protocols & MLX5_FLEX_PARSER_VXLAN_GPE_ENABLED;
+       return (caps->sw_format_ver == MLX5_STEERING_FORMAT_CONNECTX_6DX) ||
+              (caps->flex_protocols & MLX5_FLEX_PARSER_VXLAN_GPE_ENABLED);
 }
 
 static bool
@@ -135,7 +136,8 @@ static bool dr_mask_is_tnl_geneve_set(struct mlx5dr_match_misc *misc)
 static bool
 dr_matcher_supp_tnl_geneve(struct mlx5dr_cmd_caps *caps)
 {
-       return caps->flex_protocols & MLX5_FLEX_PARSER_GENEVE_ENABLED;
+       return (caps->sw_format_ver == MLX5_STEERING_FORMAT_CONNECTX_6DX) ||
+              (caps->flex_protocols & MLX5_FLEX_PARSER_GENEVE_ENABLED);
 }
 
 static bool
@@ -148,12 +150,14 @@ dr_mask_is_tnl_geneve(struct mlx5dr_match_param *mask,
 
 static int dr_matcher_supp_icmp_v4(struct mlx5dr_cmd_caps *caps)
 {
-       return caps->flex_protocols & MLX5_FLEX_PARSER_ICMP_V4_ENABLED;
+       return (caps->sw_format_ver == MLX5_STEERING_FORMAT_CONNECTX_6DX) ||
+              (caps->flex_protocols & MLX5_FLEX_PARSER_ICMP_V4_ENABLED);
 }
 
 static int dr_matcher_supp_icmp_v6(struct mlx5dr_cmd_caps *caps)
 {
-       return caps->flex_protocols & MLX5_FLEX_PARSER_ICMP_V6_ENABLED;
+       return (caps->sw_format_ver == MLX5_STEERING_FORMAT_CONNECTX_6DX) ||
+              (caps->flex_protocols & MLX5_FLEX_PARSER_ICMP_V6_ENABLED);
 }
 
 static bool dr_mask_is_icmpv6_set(struct mlx5dr_match_misc3 *misc3)