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

Commit a6b9c87d authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum_acl: Add region association callback 



In Spectrum-2, ACL regions that use 8 or 12 key blocks require several
consecutive hardware regions.

In order to allow defragmentation, the device stores a mapping from a
logical region ID to an hardware region ID, which is similar to the page
table that is used to translate virtual addresses to physical addresses.

Add the region association callback to the region create sequence and
implement it as a NOP in Spectrum which does not require it.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7a921a1e

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

+2 −0
Original line number Diff line number Diff line
@@ -624,6 +624,8 @@ struct mlxsw_sp_acl_tcam_ops { 
	int (*region_init)(struct mlxsw_sp *mlxsw_sp, void *region_priv,

			   struct mlxsw_sp_acl_tcam_region *region);

	void (*region_fini)(struct mlxsw_sp *mlxsw_sp, void *region_priv);

	int (*region_associate)(struct mlxsw_sp *mlxsw_sp,

				struct mlxsw_sp_acl_tcam_region *region);

	size_t chunk_priv_size;

	void (*chunk_init)(void *region_priv, void *chunk_priv,

			   unsigned int priority);

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

+8 −0
Original line number Diff line number Diff line
@@ -151,6 +151,13 @@ mlxsw_sp1_acl_tcam_region_fini(struct mlxsw_sp *mlxsw_sp, void *region_priv) 
	mlxsw_sp_acl_ctcam_region_fini(&region->cregion);

}



static int

mlxsw_sp1_acl_tcam_region_associate(struct mlxsw_sp *mlxsw_sp,

				    struct mlxsw_sp_acl_tcam_region *region)

{

	return 0;

}



static void mlxsw_sp1_acl_tcam_chunk_init(void *region_priv, void *chunk_priv,

					  unsigned int priority)

{
@@ -235,6 +242,7 @@ const struct mlxsw_sp_acl_tcam_ops mlxsw_sp1_acl_tcam_ops = { 
	.region_priv_size	= sizeof(struct mlxsw_sp1_acl_tcam_region),

	.region_init		= mlxsw_sp1_acl_tcam_region_init,

	.region_fini		= mlxsw_sp1_acl_tcam_region_fini,

	.region_associate	= mlxsw_sp1_acl_tcam_region_associate,

	.chunk_priv_size	= sizeof(struct mlxsw_sp1_acl_tcam_chunk),

	.chunk_init		= mlxsw_sp1_acl_tcam_chunk_init,

	.chunk_fini		= mlxsw_sp1_acl_tcam_chunk_fini,

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

+5 −0
Original line number Diff line number Diff line
@@ -547,6 +547,10 @@ mlxsw_sp_acl_tcam_region_create(struct mlxsw_sp *mlxsw_sp, 
	if (err)

		goto err_region_id_get;



	err = ops->region_associate(mlxsw_sp, region);

	if (err)

		goto err_tcam_region_associate;



	region->key_type = ops->key_type;

	err = mlxsw_sp_acl_tcam_region_alloc(mlxsw_sp, region);

	if (err)
@@ -567,6 +571,7 @@ mlxsw_sp_acl_tcam_region_create(struct mlxsw_sp *mlxsw_sp, 
err_tcam_region_enable:

	mlxsw_sp_acl_tcam_region_free(mlxsw_sp, region);

err_tcam_region_alloc:

err_tcam_region_associate:

	mlxsw_sp_acl_tcam_region_id_put(tcam, region->id);

err_region_id_get:

	mlxsw_afk_key_info_put(region->key_info);