diff options
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/main.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/main.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index 0d32a82458bf..2f4a26039e80 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c | |||
| @@ -1290,7 +1290,6 @@ static int mlx4_init_slave(struct mlx4_dev *dev) | |||
| 1290 | { | 1290 | { |
| 1291 | struct mlx4_priv *priv = mlx4_priv(dev); | 1291 | struct mlx4_priv *priv = mlx4_priv(dev); |
| 1292 | u64 dma = (u64) priv->mfunc.vhcr_dma; | 1292 | u64 dma = (u64) priv->mfunc.vhcr_dma; |
| 1293 | int num_of_reset_retries = NUM_OF_RESET_RETRIES; | ||
| 1294 | int ret_from_reset = 0; | 1293 | int ret_from_reset = 0; |
| 1295 | u32 slave_read; | 1294 | u32 slave_read; |
| 1296 | u32 cmd_channel_ver; | 1295 | u32 cmd_channel_ver; |
| @@ -1304,18 +1303,10 @@ static int mlx4_init_slave(struct mlx4_dev *dev) | |||
| 1304 | * NUM_OF_RESET_RETRIES times before leaving.*/ | 1303 | * NUM_OF_RESET_RETRIES times before leaving.*/ |
| 1305 | if (ret_from_reset) { | 1304 | if (ret_from_reset) { |
| 1306 | if (MLX4_DELAY_RESET_SLAVE == ret_from_reset) { | 1305 | if (MLX4_DELAY_RESET_SLAVE == ret_from_reset) { |
| 1307 | msleep(SLEEP_TIME_IN_RESET); | 1306 | mlx4_warn(dev, "slave is currently in the " |
| 1308 | while (ret_from_reset && num_of_reset_retries) { | 1307 | "middle of FLR. Deferring probe.\n"); |
| 1309 | mlx4_warn(dev, "slave is currently in the" | 1308 | mutex_unlock(&priv->cmd.slave_cmd_mutex); |
| 1310 | "middle of FLR. retrying..." | 1309 | return -EPROBE_DEFER; |
| 1311 | "(try num:%d)\n", | ||
| 1312 | (NUM_OF_RESET_RETRIES - | ||
| 1313 | num_of_reset_retries + 1)); | ||
| 1314 | ret_from_reset = | ||
| 1315 | mlx4_comm_cmd(dev, MLX4_COMM_CMD_RESET, | ||
| 1316 | 0, MLX4_COMM_TIME); | ||
| 1317 | num_of_reset_retries = num_of_reset_retries - 1; | ||
| 1318 | } | ||
| 1319 | } else | 1310 | } else |
| 1320 | goto err; | 1311 | goto err; |
| 1321 | } | 1312 | } |
| @@ -1526,7 +1517,8 @@ static int mlx4_init_hca(struct mlx4_dev *dev) | |||
| 1526 | } else { | 1517 | } else { |
| 1527 | err = mlx4_init_slave(dev); | 1518 | err = mlx4_init_slave(dev); |
| 1528 | if (err) { | 1519 | if (err) { |
| 1529 | mlx4_err(dev, "Failed to initialize slave\n"); | 1520 | if (err != -EPROBE_DEFER) |
| 1521 | mlx4_err(dev, "Failed to initialize slave\n"); | ||
| 1530 | return err; | 1522 | return err; |
| 1531 | } | 1523 | } |
| 1532 | 1524 | ||