Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox...

[linux-2.6-microblaze.git] / drivers / net / ethernet / mellanox / mlx5 / core / main.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index 998eec9..072b56f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -172,18 +172,28 @@ static struct mlx5_profile profile[] = {
 
 #define FW_INIT_TIMEOUT_MILI           2000
 #define FW_INIT_WAIT_MS                        2
-#define FW_PRE_INIT_TIMEOUT_MILI       10000
+#define FW_PRE_INIT_TIMEOUT_MILI       120000
+#define FW_INIT_WARN_MESSAGE_INTERVAL  20000
 
-static int wait_fw_init(struct mlx5_core_dev *dev, u32 max_wait_mili)
+static int wait_fw_init(struct mlx5_core_dev *dev, u32 max_wait_mili,
+                       u32 warn_time_mili)
 {
+       unsigned long warn = jiffies + msecs_to_jiffies(warn_time_mili);
        unsigned long end = jiffies + msecs_to_jiffies(max_wait_mili);
        int err = 0;
 
+       BUILD_BUG_ON(FW_PRE_INIT_TIMEOUT_MILI < FW_INIT_WARN_MESSAGE_INTERVAL);
+
        while (fw_initializing(dev)) {
                if (time_after(jiffies, end)) {
                        err = -EBUSY;
                        break;
                }
+               if (warn_time_mili && time_after(jiffies, warn)) {
+                       mlx5_core_warn(dev, "Waiting for FW initialization, timeout abort in %ds\n",
+                                      jiffies_to_msecs(end - warn) / 1000);
+                       warn = jiffies + msecs_to_jiffies(warn_time_mili);
+               }
                msleep(FW_INIT_WAIT_MS);
        }
 
@@ -799,10 +809,16 @@ static int mlx5_init_once(struct mlx5_core_dev *dev)
                goto err_devcom;
        }
 
+       err = mlx5_irq_table_init(dev);
+       if (err) {
+               mlx5_core_err(dev, "failed to initialize irq table\n");
+               goto err_devcom;
+       }
+
        err = mlx5_eq_table_init(dev);
        if (err) {
                mlx5_core_err(dev, "failed to initialize eq\n");
-               goto err_devcom;
+               goto err_irq_cleanup;
        }
 
        err = mlx5_events_init(dev);
@@ -840,32 +856,32 @@ static int mlx5_init_once(struct mlx5_core_dev *dev)
                goto err_rl_cleanup;
        }
 
-       err = mlx5_eswitch_init(dev);
+       err = mlx5_sriov_init(dev);
        if (err) {
-               mlx5_core_err(dev, "Failed to init eswitch %d\n", err);
+               mlx5_core_err(dev, "Failed to init sriov %d\n", err);
                goto err_mpfs_cleanup;
        }
 
-       err = mlx5_sriov_init(dev);
+       err = mlx5_eswitch_init(dev);
        if (err) {
-               mlx5_core_err(dev, "Failed to init sriov %d\n", err);
-               goto err_eswitch_cleanup;
+               mlx5_core_err(dev, "Failed to init eswitch %d\n", err);
+               goto err_sriov_cleanup;
        }
 
        err = mlx5_fpga_init(dev);
        if (err) {
                mlx5_core_err(dev, "Failed to init fpga device %d\n", err);
-               goto err_sriov_cleanup;
+               goto err_eswitch_cleanup;
        }
 
        dev->tracer = mlx5_fw_tracer_create(dev);
 
        return 0;
 
-err_sriov_cleanup:
-       mlx5_sriov_cleanup(dev);
 err_eswitch_cleanup:
        mlx5_eswitch_cleanup(dev->priv.eswitch);
+err_sriov_cleanup:
+       mlx5_sriov_cleanup(dev);
 err_mpfs_cleanup:
        mlx5_mpfs_cleanup(dev);
 err_rl_cleanup:
@@ -880,6 +896,8 @@ err_events_cleanup:
        mlx5_events_cleanup(dev);
 err_eq_cleanup:
        mlx5_eq_table_cleanup(dev);
+err_irq_cleanup:
+       mlx5_irq_table_cleanup(dev);
 err_devcom:
        mlx5_devcom_unregister_device(dev->priv.devcom);
 
@@ -890,8 +908,8 @@ static void mlx5_cleanup_once(struct mlx5_core_dev *dev)
 {
        mlx5_fw_tracer_destroy(dev->tracer);
        mlx5_fpga_cleanup(dev);
-       mlx5_sriov_cleanup(dev);
        mlx5_eswitch_cleanup(dev->priv.eswitch);
+       mlx5_sriov_cleanup(dev);
        mlx5_mpfs_cleanup(dev);
        mlx5_cleanup_rl_table(dev);
        mlx5_geneve_destroy(dev->geneve);
@@ -903,6 +921,7 @@ static void mlx5_cleanup_once(struct mlx5_core_dev *dev)
        mlx5_cq_debugfs_cleanup(dev);
        mlx5_events_cleanup(dev);
        mlx5_eq_table_cleanup(dev);
+       mlx5_irq_table_cleanup(dev);
        mlx5_devcom_unregister_device(dev->priv.devcom);
 }
 
@@ -919,7 +938,7 @@ static int mlx5_function_setup(struct mlx5_core_dev *dev, bool boot)
 
        /* wait for firmware to accept initialization segments configurations
         */
-       err = wait_fw_init(dev, FW_PRE_INIT_TIMEOUT_MILI);
+       err = wait_fw_init(dev, FW_PRE_INIT_TIMEOUT_MILI, FW_INIT_WARN_MESSAGE_INTERVAL);
        if (err) {
                mlx5_core_err(dev, "Firmware over %d MS in pre-initializing state, aborting\n",
                              FW_PRE_INIT_TIMEOUT_MILI);
@@ -932,7 +951,7 @@ static int mlx5_function_setup(struct mlx5_core_dev *dev, bool boot)
                return err;
        }
 
-       err = wait_fw_init(dev, FW_INIT_TIMEOUT_MILI);
+       err = wait_fw_init(dev, FW_INIT_TIMEOUT_MILI, 0);
        if (err) {
                mlx5_core_err(dev, "Firmware over %d MS in initializing state, aborting\n",
                              FW_INIT_TIMEOUT_MILI);
@@ -1036,6 +1055,12 @@ static int mlx5_load(struct mlx5_core_dev *dev)
        mlx5_events_start(dev);
        mlx5_pagealloc_start(dev);
 
+       err = mlx5_irq_table_create(dev);
+       if (err) {
+               mlx5_core_err(dev, "Failed to alloc IRQs\n");
+               goto err_irq_table;
+       }
+
        err = mlx5_eq_table_create(dev);
        if (err) {
                mlx5_core_err(dev, "Failed to create EQs\n");
@@ -1107,6 +1132,8 @@ err_fpga_start:
 err_fw_tracer:
        mlx5_eq_table_destroy(dev);
 err_eq_table:
+       mlx5_irq_table_destroy(dev);
+err_irq_table:
        mlx5_pagealloc_stop(dev);
        mlx5_events_stop(dev);
        mlx5_put_uars_page(dev, dev->priv.uar);
@@ -1123,6 +1150,7 @@ static void mlx5_unload(struct mlx5_core_dev *dev)
        mlx5_fpga_device_stop(dev);
        mlx5_fw_tracer_cleanup(dev->tracer);
        mlx5_eq_table_destroy(dev);
+       mlx5_irq_table_destroy(dev);
        mlx5_pagealloc_stop(dev);
        mlx5_events_stop(dev);
        mlx5_put_uars_page(dev, dev->priv.uar);