mlxsw: spectrum_acl: Make global TCAM resources available to regions
Each TCAM region currently uses its own resources and there is no sharing between the different regions. This is going to change with A-TCAM as each region will need to allocate an eRP table from the global eRP tables array. Make the global TCAM resources available to each region by passing the TCAM private data to the region initialization routine. Signed-off-by: Ido Schimmel <idosch@mellanox.com> Reviewed-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
57e56d3699
commit
f58df510f8
@ -628,6 +628,7 @@ struct mlxsw_sp_acl_tcam_ops {
|
||||
void (*fini)(struct mlxsw_sp *mlxsw_sp, void *priv);
|
||||
size_t region_priv_size;
|
||||
int (*region_init)(struct mlxsw_sp *mlxsw_sp, void *region_priv,
|
||||
void *tcam_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,
|
||||
|
@ -122,6 +122,7 @@ mlxsw_sp1_acl_ctcam_region_catchall_del(struct mlxsw_sp *mlxsw_sp,
|
||||
|
||||
static int
|
||||
mlxsw_sp1_acl_tcam_region_init(struct mlxsw_sp *mlxsw_sp, void *region_priv,
|
||||
void *tcam_priv,
|
||||
struct mlxsw_sp_acl_tcam_region *_region)
|
||||
{
|
||||
struct mlxsw_sp1_acl_tcam_region *region = region_priv;
|
||||
|
@ -130,14 +130,16 @@ static void mlxsw_sp2_acl_tcam_fini(struct mlxsw_sp *mlxsw_sp, void *priv)
|
||||
|
||||
static int
|
||||
mlxsw_sp2_acl_tcam_region_init(struct mlxsw_sp *mlxsw_sp, void *region_priv,
|
||||
void *tcam_priv,
|
||||
struct mlxsw_sp_acl_tcam_region *_region)
|
||||
{
|
||||
struct mlxsw_sp2_acl_tcam_region *region = region_priv;
|
||||
struct mlxsw_sp2_acl_tcam *tcam = tcam_priv;
|
||||
|
||||
region->region = _region;
|
||||
|
||||
return mlxsw_sp_acl_atcam_region_init(mlxsw_sp, ®ion->aregion,
|
||||
_region);
|
||||
return mlxsw_sp_acl_atcam_region_init(mlxsw_sp, &tcam->atcam,
|
||||
®ion->aregion, _region);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -77,6 +77,7 @@ mlxsw_sp_acl_atcam_region_erp_init(struct mlxsw_sp *mlxsw_sp,
|
||||
}
|
||||
|
||||
int mlxsw_sp_acl_atcam_region_init(struct mlxsw_sp *mlxsw_sp,
|
||||
struct mlxsw_sp_acl_atcam *atcam,
|
||||
struct mlxsw_sp_acl_atcam_region *aregion,
|
||||
struct mlxsw_sp_acl_tcam_region *region)
|
||||
{
|
||||
|
@ -577,7 +577,7 @@ mlxsw_sp_acl_tcam_region_create(struct mlxsw_sp *mlxsw_sp,
|
||||
if (err)
|
||||
goto err_tcam_region_enable;
|
||||
|
||||
err = ops->region_init(mlxsw_sp, region->priv, region);
|
||||
err = ops->region_init(mlxsw_sp, region->priv, tcam->priv, region);
|
||||
if (err)
|
||||
goto err_tcam_region_init;
|
||||
|
||||
|
@ -173,6 +173,7 @@ struct mlxsw_sp_acl_atcam_region {
|
||||
int mlxsw_sp_acl_atcam_region_associate(struct mlxsw_sp *mlxsw_sp,
|
||||
u16 region_id);
|
||||
int mlxsw_sp_acl_atcam_region_init(struct mlxsw_sp *mlxsw_sp,
|
||||
struct mlxsw_sp_acl_atcam *atcam,
|
||||
struct mlxsw_sp_acl_atcam_region *aregion,
|
||||
struct mlxsw_sp_acl_tcam_region *region);
|
||||
void mlxsw_sp_acl_atcam_region_fini(struct mlxsw_sp_acl_atcam_region *aregion);
|
||||
|
Loading…
Reference in New Issue
Block a user