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

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

mlxsw: spectrum_router: Initialize RIFs in a separate function 



The router interfaces (RIFs) array is currently initialized together
with the general router configuration. However, in a follow-up patchset
we're going to introduce a common RIF core that will require us to
initialize more RIF constructs, so move the RIF initialization to its
own function.

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

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

+30 −18
Original line number Diff line number Diff line
@@ -3550,6 +3550,28 @@ int mlxsw_sp_netdevice_vrf_event(struct net_device *l3_dev, unsigned long event, 
	return err;

}



static int mlxsw_sp_rifs_init(struct mlxsw_sp *mlxsw_sp)

{

	u64 max_rifs = MLXSW_CORE_RES_GET(mlxsw_sp->core, MAX_RIFS);



	mlxsw_sp->router->rifs = kcalloc(max_rifs,

					 sizeof(struct mlxsw_sp_rif *),

					 GFP_KERNEL);

	if (!mlxsw_sp->router->rifs)

		return -ENOMEM;

	return 0;

}



static void mlxsw_sp_rifs_fini(struct mlxsw_sp *mlxsw_sp)

{

	int i;



	for (i = 0; i < MLXSW_CORE_RES_GET(mlxsw_sp->core, MAX_RIFS); i++)

		WARN_ON_ONCE(mlxsw_sp->router->rifs[i]);



	kfree(mlxsw_sp->router->rifs);

}



static void mlxsw_sp_router_fib_dump_flush(struct notifier_block *nb)

{

	struct mlxsw_sp_router *router;
@@ -3571,39 +3593,22 @@ static int __mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp) 


	if (!MLXSW_CORE_RES_VALID(mlxsw_sp->core, MAX_RIFS))

		return -EIO;



	max_rifs = MLXSW_CORE_RES_GET(mlxsw_sp->core, MAX_RIFS);

	mlxsw_sp->router->rifs = kcalloc(max_rifs,

					 sizeof(struct mlxsw_sp_rif *),

					 GFP_KERNEL);

	if (!mlxsw_sp->router->rifs)

		return -ENOMEM;



	mlxsw_reg_rgcr_pack(rgcr_pl, true);

	mlxsw_reg_rgcr_max_router_interfaces_set(rgcr_pl, max_rifs);

	err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(rgcr), rgcr_pl);

	if (err)

		goto err_rgcr_fail;



	return 0;



err_rgcr_fail:

	kfree(mlxsw_sp->router->rifs);

		return err;

	return 0;

}



static void __mlxsw_sp_router_fini(struct mlxsw_sp *mlxsw_sp)

{

	char rgcr_pl[MLXSW_REG_RGCR_LEN];

	int i;



	mlxsw_reg_rgcr_pack(rgcr_pl, false);

	mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(rgcr), rgcr_pl);



	for (i = 0; i < MLXSW_CORE_RES_GET(mlxsw_sp->core, MAX_RIFS); i++)

		WARN_ON_ONCE(mlxsw_sp->router->rifs[i]);



	kfree(mlxsw_sp->router->rifs);

}



int mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp)
@@ -3622,6 +3627,10 @@ int mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp) 
	if (err)

		goto err_router_init;



	err = mlxsw_sp_rifs_init(mlxsw_sp);

	if (err)

		goto err_rifs_init;



	err = rhashtable_init(&mlxsw_sp->router->nexthop_ht,

			      &mlxsw_sp_nexthop_ht_params);

	if (err)
@@ -3663,6 +3672,8 @@ int mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp) 
err_nexthop_group_ht_init:

	rhashtable_destroy(&mlxsw_sp->router->nexthop_ht);

err_nexthop_ht_init:

	mlxsw_sp_rifs_fini(mlxsw_sp);

err_rifs_init:

	__mlxsw_sp_router_fini(mlxsw_sp);

err_router_init:

	kfree(mlxsw_sp->router);
@@ -3677,6 +3688,7 @@ void mlxsw_sp_router_fini(struct mlxsw_sp *mlxsw_sp) 
	mlxsw_sp_lpm_fini(mlxsw_sp);

	rhashtable_destroy(&mlxsw_sp->router->nexthop_group_ht);

	rhashtable_destroy(&mlxsw_sp->router->nexthop_ht);

	mlxsw_sp_rifs_fini(mlxsw_sp);

	__mlxsw_sp_router_fini(mlxsw_sp);

	kfree(mlxsw_sp->router);

}