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

net/mlx5: DR, Move macros from dr_ste.c to header 



Move some macros from dr_ste.c to header - these macros
will be used by all the format-specific functions.

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 4bdba39b

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

+0 −74
Original line number Diff line number Diff line
@@ -6,83 +6,9 @@ 
#include "dr_ste.h"



#define DR_STE_CRC_POLY 0xEDB88320L

#define STE_IPV4 0x1

#define STE_IPV6 0x2

#define STE_TCP 0x1

#define STE_UDP 0x2

#define STE_SPI 0x3

#define IP_VERSION_IPV4 0x4

#define IP_VERSION_IPV6 0x6

#define STE_SVLAN 0x1

#define STE_CVLAN 0x2



#define DR_STE_ENABLE_FLOW_TAG BIT(31)



/* Set to STE a specific value using DR_STE_SET */

#define DR_STE_SET_VAL(lookup_type, tag, t_fname, spec, s_fname, value) do { \

	if ((spec)->s_fname) { \

		MLX5_SET(ste_##lookup_type, tag, t_fname, value); \

		(spec)->s_fname = 0; \

	} \

} while (0)



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

#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)



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

	MLX5_SET(ste_##lookup_type, tag, tcp_ns, !!((spec)->tcp_flags & (1 << 8))); \

	MLX5_SET(ste_##lookup_type, tag, tcp_cwr, !!((spec)->tcp_flags & (1 << 7))); \

	MLX5_SET(ste_##lookup_type, tag, tcp_ece, !!((spec)->tcp_flags & (1 << 6))); \

	MLX5_SET(ste_##lookup_type, tag, tcp_urg, !!((spec)->tcp_flags & (1 << 5))); \

	MLX5_SET(ste_##lookup_type, tag, tcp_ack, !!((spec)->tcp_flags & (1 << 4))); \

	MLX5_SET(ste_##lookup_type, tag, tcp_psh, !!((spec)->tcp_flags & (1 << 3))); \

	MLX5_SET(ste_##lookup_type, tag, tcp_rst, !!((spec)->tcp_flags & (1 << 2))); \

	MLX5_SET(ste_##lookup_type, tag, tcp_syn, !!((spec)->tcp_flags & (1 << 1))); \

	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, mask, mpls0_label, mask, \

			  in_out##_first_mpls_label);\

	DR_STE_SET_MASK_V(lookup_type, mask, mpls0_s_bos, mask, \

			  in_out##_first_mpls_s_bos); \

	DR_STE_SET_MASK_V(lookup_type, mask, mpls0_exp, mask, \

			  in_out##_first_mpls_exp); \

	DR_STE_SET_MASK_V(lookup_type, 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, \

		       in_out##_first_mpls_label);\

	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, \

		       in_out##_first_mpls_exp); \

	DR_STE_SET_TAG(lookup_type, tag, mpls0_ttl, mask, \

		       in_out##_first_mpls_ttl); \

} while (0)



#define DR_STE_IS_OUTER_MPLS_OVER_GRE_SET(_misc) (\

	(_misc)->outer_first_mpls_over_gre_label || \

	(_misc)->outer_first_mpls_over_gre_exp || \

	(_misc)->outer_first_mpls_over_gre_s_bos || \

	(_misc)->outer_first_mpls_over_gre_ttl)

#define DR_STE_IS_OUTER_MPLS_OVER_UDP_SET(_misc) (\

	(_misc)->outer_first_mpls_over_udp_label || \

	(_misc)->outer_first_mpls_over_udp_exp || \

	(_misc)->outer_first_mpls_over_udp_s_bos || \

	(_misc)->outer_first_mpls_over_udp_ttl)



#define DR_STE_CALC_LU_TYPE(lookup_type, rx, inner) \

	((inner) ? MLX5DR_STE_LU_TYPE_##lookup_type##_I : \

		   (rx) ? MLX5DR_STE_LU_TYPE_##lookup_type##_D : \

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

+76 −0
Original line number Diff line number Diff line
@@ -6,6 +6,82 @@ 


#include "dr_types.h"



#define STE_IPV4 0x1

#define STE_IPV6 0x2

#define STE_TCP 0x1

#define STE_UDP 0x2

#define STE_SPI 0x3

#define IP_VERSION_IPV4 0x4

#define IP_VERSION_IPV6 0x6

#define STE_SVLAN 0x1

#define STE_CVLAN 0x2



/* Set to STE a specific value using DR_STE_SET */

#define DR_STE_SET_VAL(lookup_type, tag, t_fname, spec, s_fname, value) do { \

	if ((spec)->s_fname) { \

		MLX5_SET(ste_##lookup_type, tag, t_fname, value); \

		(spec)->s_fname = 0; \

	} \

} while (0)



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

#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)



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

	MLX5_SET(ste_##lookup_type, tag, tcp_ns, !!((spec)->tcp_flags & (1 << 8))); \

	MLX5_SET(ste_##lookup_type, tag, tcp_cwr, !!((spec)->tcp_flags & (1 << 7))); \

	MLX5_SET(ste_##lookup_type, tag, tcp_ece, !!((spec)->tcp_flags & (1 << 6))); \

	MLX5_SET(ste_##lookup_type, tag, tcp_urg, !!((spec)->tcp_flags & (1 << 5))); \

	MLX5_SET(ste_##lookup_type, tag, tcp_ack, !!((spec)->tcp_flags & (1 << 4))); \

	MLX5_SET(ste_##lookup_type, tag, tcp_psh, !!((spec)->tcp_flags & (1 << 3))); \

	MLX5_SET(ste_##lookup_type, tag, tcp_rst, !!((spec)->tcp_flags & (1 << 2))); \

	MLX5_SET(ste_##lookup_type, tag, tcp_syn, !!((spec)->tcp_flags & (1 << 1))); \

	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, \

		       in_out##_first_mpls_label);\

	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, \

		       in_out##_first_mpls_exp); \

	DR_STE_SET_TAG(lookup_type, tag, mpls0_ttl, mask, \

		       in_out##_first_mpls_ttl); \

} while (0)



#define DR_STE_IS_OUTER_MPLS_OVER_GRE_SET(_misc) (\

	(_misc)->outer_first_mpls_over_gre_label || \

	(_misc)->outer_first_mpls_over_gre_exp || \

	(_misc)->outer_first_mpls_over_gre_s_bos || \

	(_misc)->outer_first_mpls_over_gre_ttl)



#define DR_STE_IS_OUTER_MPLS_OVER_UDP_SET(_misc) (\

	(_misc)->outer_first_mpls_over_udp_label || \

	(_misc)->outer_first_mpls_over_udp_exp || \

	(_misc)->outer_first_mpls_over_udp_s_bos || \

	(_misc)->outer_first_mpls_over_udp_ttl)



#define DR_STE_CTX_BUILDER(fname) \

	((*build_##fname##_init)(struct mlx5dr_ste_build *sb, \

				 struct mlx5dr_match_param *mask))