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

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

mlxsw: spectrum_acl: Pass hints priv all the way to ERP code 



The hints priv comes from ERP code and it is possible to obtain it from
TCAM code. Add arg to appropriate functions so the hints
priv could be passed back down to ERP code. Pass NULL now as the
follow-up patches would pass an actual hints priv pointer.

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 29a2102a

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

+2 −1
Original line number Diff line number Diff line
@@ -704,7 +704,8 @@ struct mlxsw_sp_acl_tcam_ops { 
	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);

			   struct mlxsw_sp_acl_tcam_region *region,

			   void *hints_priv);

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

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

+2 −1
Original line number Diff line number Diff line
@@ -112,7 +112,8 @@ 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_sp_acl_tcam_region *_region,

			       void *hints_priv)

{

	struct mlxsw_sp1_acl_tcam_region *region = region_priv;

	int err;

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

+4 −2
Original line number Diff line number Diff line
@@ -139,7 +139,8 @@ 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_sp_acl_tcam_region *_region,

			       void *hints_priv)

{

	struct mlxsw_sp2_acl_tcam_region *region = region_priv;

	struct mlxsw_sp2_acl_tcam *tcam = tcam_priv;
@@ -147,7 +148,8 @@ mlxsw_sp2_acl_tcam_region_init(struct mlxsw_sp *mlxsw_sp, void *region_priv, 
	region->region = _region;



	return mlxsw_sp_acl_atcam_region_init(mlxsw_sp, &tcam->atcam,

					      &region->aregion, _region,

					      &region->aregion,

					      _region, hints_priv,

					      &mlxsw_sp2_acl_ctcam_region_ops);

}

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

+2 −1
Original line number Diff line number Diff line
@@ -318,6 +318,7 @@ 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 *hints_priv,

			       const struct mlxsw_sp_acl_ctcam_region_ops *ops)

{

	int err;
@@ -334,7 +335,7 @@ mlxsw_sp_acl_atcam_region_init(struct mlxsw_sp *mlxsw_sp, 
	err = aregion->ops->init(aregion);

	if (err)

		goto err_ops_init;

	err = mlxsw_sp_acl_erp_region_init(aregion);

	err = mlxsw_sp_acl_erp_region_init(aregion, hints_priv);

	if (err)

		goto err_erp_region_init;

	err = mlxsw_sp_acl_ctcam_region_init(mlxsw_sp, &aregion->cregion,

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

+7 −4
Original line number Diff line number Diff line
@@ -1313,7 +1313,8 @@ static const struct objagg_ops mlxsw_sp_acl_erp_objagg_ops = { 
};



static struct mlxsw_sp_acl_erp_table *

mlxsw_sp_acl_erp_table_create(struct mlxsw_sp_acl_atcam_region *aregion)

mlxsw_sp_acl_erp_table_create(struct mlxsw_sp_acl_atcam_region *aregion,

			      struct objagg_hints *hints)

{

	struct mlxsw_sp_acl_erp_table *erp_table;

	int err;
@@ -1323,7 +1324,7 @@ mlxsw_sp_acl_erp_table_create(struct mlxsw_sp_acl_atcam_region *aregion) 
		return ERR_PTR(-ENOMEM);



	erp_table->objagg = objagg_create(&mlxsw_sp_acl_erp_objagg_ops,

					  NULL, aregion);

					  hints, aregion);

	if (IS_ERR(erp_table->objagg)) {

		err = PTR_ERR(erp_table->objagg);

		goto err_objagg_create;
@@ -1444,12 +1445,14 @@ void mlxsw_sp_acl_erp_rehash_hints_put(void *hints_priv) 
	objagg_hints_put(hints);

}



int mlxsw_sp_acl_erp_region_init(struct mlxsw_sp_acl_atcam_region *aregion)

int mlxsw_sp_acl_erp_region_init(struct mlxsw_sp_acl_atcam_region *aregion,

				 void *hints_priv)

{

	struct mlxsw_sp_acl_erp_table *erp_table;

	struct objagg_hints *hints = hints_priv;

	int err;



	erp_table = mlxsw_sp_acl_erp_table_create(aregion);

	erp_table = mlxsw_sp_acl_erp_table_create(aregion, hints);

	if (IS_ERR(erp_table))

		return PTR_ERR(erp_table);

	aregion->erp_table = erp_table;