Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c17d2083 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: spectrum_acl: Convert mlxsw_afk_create args to ops 



Since the flex keys for Spectrum-2 differ not only in blocks definitions
but also in encoding layout, prepare for the implementation and pass
Spectrum/Spectrum-2 specific ops down to mlxsw_afk_create.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bab5c1cf

drivers/net/ethernet/mellanox/mlxsw/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ mlxsw_spectrum-objs := spectrum.o spectrum_buffers.o \ 
				   spectrum_flower.o spectrum_cnt.o \

				   spectrum_fid.o spectrum_ipip.o \

				   spectrum_acl_flex_actions.o \

				   spectrum_acl_flex_keys.o \

				   spectrum1_mr_tcam.o \

				   spectrum_mr_tcam.o spectrum_mr.o \

				   spectrum_qdisc.o spectrum_span.o

drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c

+5 −4
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
struct mlxsw_afk {

	struct list_head key_info_list;

	unsigned int max_blocks;

	const struct mlxsw_afk_ops *ops;

	const struct mlxsw_afk_block *blocks;

	unsigned int blocks_count;

};
@@ -69,8 +70,7 @@ static bool mlxsw_afk_blocks_check(struct mlxsw_afk *mlxsw_afk) 
}



struct mlxsw_afk *mlxsw_afk_create(unsigned int max_blocks,

				   const struct mlxsw_afk_block *blocks,

				   unsigned int blocks_count)

				   const struct mlxsw_afk_ops *ops)

{

	struct mlxsw_afk *mlxsw_afk;
@@ -79,8 +79,9 @@ struct mlxsw_afk *mlxsw_afk_create(unsigned int max_blocks, 
		return NULL;

	INIT_LIST_HEAD(&mlxsw_afk->key_info_list);

	mlxsw_afk->max_blocks = max_blocks;

	mlxsw_afk->blocks = blocks;

	mlxsw_afk->blocks_count = blocks_count;

	mlxsw_afk->ops = ops;

	mlxsw_afk->blocks = ops->blocks;

	mlxsw_afk->blocks_count = ops->blocks_count;

	WARN_ON(!mlxsw_afk_blocks_check(mlxsw_afk));

	return mlxsw_afk;

}

drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.h

+6 −2
Original line number Diff line number Diff line
@@ -216,9 +216,13 @@ mlxsw_afk_element_usage_subset(struct mlxsw_afk_element_usage *elusage_small, 


struct mlxsw_afk;



struct mlxsw_afk_ops {

	const struct mlxsw_afk_block *blocks;

	unsigned int blocks_count;

};



struct mlxsw_afk *mlxsw_afk_create(unsigned int max_blocks,

				   const struct mlxsw_afk_block *blocks,

				   unsigned int blocks_count);

				   const struct mlxsw_afk_ops *ops);

void mlxsw_afk_destroy(struct mlxsw_afk *mlxsw_afk);



struct mlxsw_afk_key_info;

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+1 −0
Original line number Diff line number Diff line
@@ -3623,6 +3623,7 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 


	mlxsw_sp->kvdl_ops = &mlxsw_sp1_kvdl_ops;

	mlxsw_sp->afa_ops = &mlxsw_sp1_act_afa_ops;

	mlxsw_sp->afk_ops = &mlxsw_sp1_afk_ops;

	mlxsw_sp->mr_tcam_ops = &mlxsw_sp1_mr_tcam_ops;

	mlxsw_sp->acl_tcam_ops = &mlxsw_sp1_acl_tcam_ops;

drivers/net/ethernet/mellanox/mlxsw/spectrum.h

+4 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ struct mlxsw_sp { 
	} span;

	const struct mlxsw_sp_kvdl_ops *kvdl_ops;

	const struct mlxsw_afa_ops *afa_ops;

	const struct mlxsw_afk_ops *afk_ops;

	const struct mlxsw_sp_mr_tcam_ops *mr_tcam_ops;

	const struct mlxsw_sp_acl_tcam_ops *acl_tcam_ops;

};
@@ -639,6 +640,9 @@ extern const struct mlxsw_sp_acl_tcam_ops mlxsw_sp1_acl_tcam_ops; 
/* spectrum_acl_flex_actions.c */

extern const struct mlxsw_afa_ops mlxsw_sp1_act_afa_ops;



/* spectrum_acl_flex_keys.c */

extern const struct mlxsw_afk_ops mlxsw_sp1_afk_ops;



/* spectrum_flower.c */

int mlxsw_sp_flower_replace(struct mlxsw_sp *mlxsw_sp,

			    struct mlxsw_sp_acl_block *block,