Commit 46779098 authored by Yevgeny Kliteynik's avatar Yevgeny Kliteynik Committed by Saeed Mahameed
Browse files

net/mlx5: DR, Merge similar DR STE SET macros 



Merge DR_STE_STE macros for better code reuse, the macro
DR_STE_SET_MASK_V and DR_STE_SET_TAG are merged to avoid
tag and bit_mask function creation which are usually the
same.

Signed-off-by: default avatarAlex Vesker <valex@nvidia.com>
Signed-off-by: default avatarYevgeny Kliteynik <kliteyn@nvidia.com>
Reviewed-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 7863c912

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.h

+11 −24
Original line number Diff line number Diff line
@@ -24,17 +24,13 @@ 
	} \

} while (0)



/* Set to STE spec->s_fname to tag->t_fname */

/* Set to STE spec->s_fname to tag->t_fname set spec->s_fname as used */

#define DR_STE_SET_TAG(lookup_type, tag, t_fname, spec, s_fname) \

	DR_STE_SET_VAL(lookup_type, tag, t_fname, spec, s_fname, spec->s_fname)



/* Set to STE -1 to bit_mask->bm_fname and set spec->s_fname as used */

#define DR_STE_SET_MASK(lookup_type, bit_mask, bm_fname, spec, s_fname) \

	DR_STE_SET_VAL(lookup_type, bit_mask, bm_fname, spec, s_fname, -1)



/* Set to STE spec->s_fname to bit_mask->bm_fname and set spec->s_fname as used */

#define DR_STE_SET_MASK_V(lookup_type, bit_mask, bm_fname, spec, s_fname) \

	DR_STE_SET_VAL(lookup_type, bit_mask, bm_fname, spec, s_fname, (spec)->s_fname)

/* Set to STE -1 to tag->t_fname and set spec->s_fname as used */

#define DR_STE_SET_ONES(lookup_type, tag, t_fname, spec, s_fname) \

	DR_STE_SET_VAL(lookup_type, tag, t_fname, spec, s_fname, -1)



#define DR_STE_SET_TCP_FLAGS(lookup_type, tag, spec) do { \

	MLX5_SET(ste_##lookup_type, tag, tcp_ns, !!((spec)->tcp_flags & (1 << 8))); \
@@ -48,25 +44,16 @@ 
	MLX5_SET(ste_##lookup_type, tag, tcp_fin, !!((spec)->tcp_flags & (1 << 0))); \

} while (0)



#define DR_STE_SET_MPLS_MASK(lookup_type, mask, in_out, bit_mask) do { \

	DR_STE_SET_MASK_V(lookup_type, bit_mask, mpls0_label, mask, \

			  in_out##_first_mpls_label);\

	DR_STE_SET_MASK_V(lookup_type, bit_mask, mpls0_s_bos, mask, \

			  in_out##_first_mpls_s_bos); \

	DR_STE_SET_MASK_V(lookup_type, bit_mask, mpls0_exp, mask, \

			  in_out##_first_mpls_exp); \

	DR_STE_SET_MASK_V(lookup_type, bit_mask, mpls0_ttl, mask, \

			  in_out##_first_mpls_ttl); \

} while (0)



#define DR_STE_SET_MPLS_TAG(lookup_type, mask, in_out, tag) do { \

	DR_STE_SET_TAG(lookup_type, tag, mpls0_label, mask, \

#define DR_STE_SET_MPLS(lookup_type, mask, in_out, tag) do { \

	struct mlx5dr_match_misc2 *_mask = mask; \

	u8 *_tag = tag; \

	DR_STE_SET_TAG(lookup_type, _tag, mpls0_label, _mask, \

		       in_out##_first_mpls_label);\

	DR_STE_SET_TAG(lookup_type, tag, mpls0_s_bos, mask, \

	DR_STE_SET_TAG(lookup_type, _tag, mpls0_s_bos, _mask, \

		       in_out##_first_mpls_s_bos); \

	DR_STE_SET_TAG(lookup_type, tag, mpls0_exp, mask, \

	DR_STE_SET_TAG(lookup_type, _tag, mpls0_exp, _mask, \

		       in_out##_first_mpls_exp); \

	DR_STE_SET_TAG(lookup_type, tag, mpls0_ttl, mask, \

	DR_STE_SET_TAG(lookup_type, _tag, mpls0_ttl, _mask, \

		       in_out##_first_mpls_ttl); \

} while (0)

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v0.c

+73 −391

File changed.

Preview size limit exceeded, changes collapsed.