Commit 254cec14 authored by Nir Dotan's avatar Nir Dotan Committed by David S. Miller
Browse files

mlxsw: spectrum: Change stage of ACL initialization 



In Spectrum-2, MC routing is implemented using ACL block explicitly, so
router initialization should take place after ACL initialization.
Set the initialization of the ACL block before IP router initizalization
takes place, so multicast router will be able to allocate ACL data
structures and create its required chains.

Signed-off-by: default avatarNir Dotan <nird@mellanox.com>
Reviewed-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 a75e41d3

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

+9 −9
Original line number Diff line number Diff line
@@ -4002,6 +4002,12 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 
		goto err_nve_init;

	}



	err = mlxsw_sp_acl_init(mlxsw_sp);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to initialize ACL\n");

		goto err_acl_init;

	}



	err = mlxsw_sp_router_init(mlxsw_sp);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to initialize router\n");
@@ -4019,12 +4025,6 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 
		goto err_netdev_notifier;

	}



	err = mlxsw_sp_acl_init(mlxsw_sp);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to initialize ACL\n");

		goto err_acl_init;

	}



	err = mlxsw_sp_dpipe_init(mlxsw_sp);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to init pipeline debug\n");
@@ -4042,12 +4042,12 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 
err_ports_create:

	mlxsw_sp_dpipe_fini(mlxsw_sp);

err_dpipe_init:

	mlxsw_sp_acl_fini(mlxsw_sp);

err_acl_init:

	unregister_netdevice_notifier(&mlxsw_sp->netdevice_nb);

err_netdev_notifier:

	mlxsw_sp_router_fini(mlxsw_sp);

err_router_init:

	mlxsw_sp_acl_fini(mlxsw_sp);

err_acl_init:

	mlxsw_sp_nve_fini(mlxsw_sp);

err_nve_init:

	mlxsw_sp_afa_fini(mlxsw_sp);
@@ -4108,9 +4108,9 @@ static void mlxsw_sp_fini(struct mlxsw_core *mlxsw_core) 


	mlxsw_sp_ports_remove(mlxsw_sp);

	mlxsw_sp_dpipe_fini(mlxsw_sp);

	mlxsw_sp_acl_fini(mlxsw_sp);

	unregister_netdevice_notifier(&mlxsw_sp->netdevice_nb);

	mlxsw_sp_router_fini(mlxsw_sp);

	mlxsw_sp_acl_fini(mlxsw_sp);

	mlxsw_sp_nve_fini(mlxsw_sp);

	mlxsw_sp_afa_fini(mlxsw_sp);

	mlxsw_sp_counter_pool_fini(mlxsw_sp);

CRA Git | Maintained and supported by SUSTech CRA and CCSE