diff options
| author | Jiri Pirko <jiri@mellanox.com> | 2019-11-10 16:31:23 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-11 21:36:37 -0800 |
| commit | 73a533ecf0af5f73ff72dd7c96d1c8598ca93649 (patch) | |
| tree | 73f6448c25e10b376c9fea64794509c5af37799a /drivers | |
| parent | d279505b723cba058b604ed8cf9cd4c854e2a041 (diff) | |
| download | linux-73a533ecf0af5f73ff72dd7c96d1c8598ca93649.tar.gz | |
mlxsw: core: Enable devlink reload only on probe
Call devlink enable only during probe time and avoid deadlock
during reload.
Reported-by: Shalom Toledo <shalomt@mellanox.com>
Fixes: 5a508a254bed ("devlink: disallow reload operation during device cleanup")
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Tested-by: Shalom Toledo <shalomt@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c index 20e9dc46cacd..0a0884d86d44 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core.c @@ -1186,10 +1186,11 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, if (err) goto err_thermal_init; - if (mlxsw_driver->params_register) { + if (mlxsw_driver->params_register) devlink_params_publish(devlink); + + if (!reload) devlink_reload_enable(devlink); - } return 0; |