net/mlx5: Return specific error code for timeout on wait_fw_init

The function wait_fw_init() returns same error code either if it breaks
waiting due to timeout or other reason. Thus, the function callers print
error message on timeout without checking error type.

Return different error code for different failure reason and print error
message accordingly on wait_fw_init().

Signed-off-by: Moshe Shemesh <moshe@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index bccf6e53556c6d72c09e19fb64a4e8d22194920d..c2593625c09ad6a9150e03baeda0ae41a1a010be 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -187,31 +187,36 @@ static struct mlx5_profile profile[] = {
 };
 
 static int wait_fw_init(struct mlx5_core_dev *dev, u32 max_wait_mili,
-                       u32 warn_time_mili)
+                       u32 warn_time_mili, const char *init_state)
 {
        unsigned long warn = jiffies + msecs_to_jiffies(warn_time_mili);
        unsigned long end = jiffies + msecs_to_jiffies(max_wait_mili);
        u32 fw_initializing;
-       int err = 0;
 
        do {
                fw_initializing = ioread32be(&dev->iseg->initializing);
                if (!(fw_initializing >> 31))
                        break;
-               if (time_after(jiffies, end) ||
-                   test_bit(MLX5_BREAK_FW_WAIT, &dev->intf_state)) {
-                       err = -EBUSY;
-                       break;
+               if (time_after(jiffies, end)) {
+                       mlx5_core_err(dev, "Firmware over %u MS in %s state, aborting\n",
+                                     max_wait_mili, init_state);
+                       return -ETIMEDOUT;
+               }
+               if (test_bit(MLX5_BREAK_FW_WAIT, &dev->intf_state)) {
+                       mlx5_core_warn(dev, "device is being removed, stop waiting for FW %s\n",
+                                      init_state);
+                       return -ENODEV;
                }
                if (warn_time_mili && time_after(jiffies, warn)) {
-                       mlx5_core_warn(dev, "Waiting for FW initialization, timeout abort in %ds (0x%x)\n",
-                                      jiffies_to_msecs(end - warn) / 1000, fw_initializing);
+                       mlx5_core_warn(dev, "Waiting for FW %s, timeout abort in %ds (0x%x)\n",
+                                      init_state, jiffies_to_msecs(end - warn) / 1000,
+                                      fw_initializing);
                        warn = jiffies + msecs_to_jiffies(warn_time_mili);
                }
                msleep(mlx5_tout_ms(dev, FW_PRE_INIT_WAIT));
        } while (true);
 
-       return err;
+       return 0;
 }
 
 static void mlx5_set_driver_version(struct mlx5_core_dev *dev)
@@ -1151,12 +1156,10 @@ static int mlx5_function_enable(struct mlx5_core_dev *dev, bool boot, u64 timeou
        /* wait for firmware to accept initialization segments configurations
         */
        err = wait_fw_init(dev, timeout,
-                          mlx5_tout_ms(dev, FW_PRE_INIT_WARN_MESSAGE_INTERVAL));
-       if (err) {
-               mlx5_core_err(dev, "Firmware over %llu MS in pre-initializing state, aborting\n",
-                             timeout);
+                          mlx5_tout_ms(dev, FW_PRE_INIT_WARN_MESSAGE_INTERVAL),
+                          "pre-initializing");
+       if (err)
                return err;
-       }
 
        err = mlx5_cmd_enable(dev);
        if (err) {
@@ -1166,12 +1169,9 @@ static int mlx5_function_enable(struct mlx5_core_dev *dev, bool boot, u64 timeou
 
        mlx5_tout_query_iseg(dev);
 
-       err = wait_fw_init(dev, mlx5_tout_ms(dev, FW_INIT), 0);
-       if (err) {
-               mlx5_core_err(dev, "Firmware over %llu MS in initializing state, aborting\n",
-                             mlx5_tout_ms(dev, FW_INIT));
+       err = wait_fw_init(dev, mlx5_tout_ms(dev, FW_INIT), 0, "initializing");
+       if (err)
                goto err_cmd_cleanup;
-       }
 
        dev->caps.embedded_cpu = mlx5_read_embedded_cpu(dev);
        mlx5_cmd_set_state(dev, MLX5_CMDIF_STATE_UP);