Commit b2ab483f authored by Leon Romanovsky's avatar Leon Romanovsky Committed by David S. Miller
Browse files

mlxsw: core: Register devlink instance last 



Make sure that devlink is open to receive user input when all
parameters are initialized.

Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 64ea2d0e

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

+6 −13
Original line number Diff line number Diff line
@@ -1973,9 +1973,6 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, 
	if (err)

		goto err_emad_init;



	if (!reload)

		devlink_register(devlink);



	if (!reload) {

		err = mlxsw_core_params_register(mlxsw_core);

		if (err)
@@ -2010,10 +2007,10 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, 
			goto err_driver_init;

	}



	devlink_params_publish(devlink);



	if (!reload)

	if (!reload) {

		devlink_register(devlink);

		devlink_reload_enable(devlink);

	}



	return 0;
@@ -2030,8 +2027,6 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, 
	if (!reload)

		mlxsw_core_params_unregister(mlxsw_core);

err_register_params:

	if (!reload)

		devlink_unregister(devlink);

	mlxsw_emad_fini(mlxsw_core);

err_emad_init:

	kfree(mlxsw_core->lag.mapping);
@@ -2080,8 +2075,10 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core, 
{

	struct devlink *devlink = priv_to_devlink(mlxsw_core);



	if (!reload)

	if (!reload) {

		devlink_reload_disable(devlink);

		devlink_unregister(devlink);

	}

	if (devlink_is_reload_failed(devlink)) {

		if (!reload)

			/* Only the parts that were not de-initialized in the
@@ -2092,7 +2089,6 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core, 
			return;

	}



	devlink_params_unpublish(devlink);

	if (mlxsw_core->driver->fini)

		mlxsw_core->driver->fini(mlxsw_core);

	mlxsw_env_fini(mlxsw_core->env);
@@ -2101,8 +2097,6 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core, 
	mlxsw_core_health_fini(mlxsw_core);

	if (!reload)

		mlxsw_core_params_unregister(mlxsw_core);

	if (!reload)

		devlink_unregister(devlink);

	mlxsw_emad_fini(mlxsw_core);

	kfree(mlxsw_core->lag.mapping);

	mlxsw_ports_fini(mlxsw_core, reload);
@@ -2116,7 +2110,6 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core, 


reload_fail_deinit:

	mlxsw_core_params_unregister(mlxsw_core);

	devlink_unregister(devlink);

	devlink_resources_unregister(devlink, NULL);

	devlink_free(devlink);

}