Init/cleanup sriov/eswitch in the core software context init/cleanup
flows.
Attach/detach sriov/eswitch in the core load/unload flows.
Signed-off-by: Mohamad Haj Yahia <mohamad@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
esw->enabled_vports = 0;
esw->mode = SRIOV_NONE;
esw->enabled_vports = 0;
esw->mode = SRIOV_NONE;
- mlx5_eswitch_attach(esw);
dev->priv.eswitch = esw;
return 0;
abort:
dev->priv.eswitch = esw;
return 0;
abort:
esw_info(esw->dev, "cleanup\n");
esw_info(esw->dev, "cleanup\n");
- mlx5_eswitch_detach(esw);
esw->dev->priv.eswitch = NULL;
destroy_workqueue(esw->work_queue);
kfree(esw->l2_table.bitmap);
esw->dev->priv.eswitch = NULL;
destroy_workqueue(esw->work_queue);
kfree(esw->l2_table.bitmap);
goto err_tables_cleanup;
}
goto err_tables_cleanup;
}
+#ifdef CONFIG_MLX5_CORE_EN
+ err = mlx5_eswitch_init(dev);
+ if (err) {
+ dev_err(&pdev->dev, "Failed to init eswitch %d\n", err);
+ goto err_rl_cleanup;
+ }
+#endif
+
+ err = mlx5_sriov_init(dev);
+ if (err) {
+ dev_err(&pdev->dev, "Failed to init sriov %d\n", err);
+ goto err_eswitch_cleanup;
+ }
+
+err_eswitch_cleanup:
+#ifdef CONFIG_MLX5_CORE_EN
+ mlx5_eswitch_cleanup(dev->priv.eswitch);
+
+err_rl_cleanup:
+#endif
+ mlx5_cleanup_rl_table(dev);
+
err_tables_cleanup:
mlx5_cleanup_mkey_table(dev);
mlx5_cleanup_srq_table(dev);
err_tables_cleanup:
mlx5_cleanup_mkey_table(dev);
mlx5_cleanup_srq_table(dev);
static void mlx5_cleanup_once(struct mlx5_core_dev *dev)
{
static void mlx5_cleanup_once(struct mlx5_core_dev *dev)
{
+ mlx5_sriov_cleanup(dev);
+#ifdef CONFIG_MLX5_CORE_EN
+ mlx5_eswitch_cleanup(dev->priv.eswitch);
+#endif
mlx5_cleanup_rl_table(dev);
mlx5_cleanup_mkey_table(dev);
mlx5_cleanup_srq_table(dev);
mlx5_cleanup_rl_table(dev);
mlx5_cleanup_mkey_table(dev);
mlx5_cleanup_srq_table(dev);
}
#ifdef CONFIG_MLX5_CORE_EN
}
#ifdef CONFIG_MLX5_CORE_EN
- err = mlx5_eswitch_init(dev);
- if (err) {
- dev_err(&pdev->dev, "eswitch init failed %d\n", err);
- goto err_reg_dev;
- }
+ mlx5_eswitch_attach(dev->priv.eswitch);
- err = mlx5_sriov_init(dev);
+ err = mlx5_sriov_attach(dev);
if (err) {
dev_err(&pdev->dev, "sriov init failed %d\n", err);
goto err_sriov;
if (err) {
dev_err(&pdev->dev, "sriov init failed %d\n", err);
goto err_sriov;
- mlx5_sriov_cleanup(dev);
+ mlx5_sriov_detach(dev);
err_sriov:
#ifdef CONFIG_MLX5_CORE_EN
err_sriov:
#ifdef CONFIG_MLX5_CORE_EN
- mlx5_eswitch_cleanup(dev->priv.eswitch);
+ mlx5_eswitch_detach(dev->priv.eswitch);
#endif
mlx5_cleanup_fs(dev);
#endif
mlx5_cleanup_fs(dev);
if (mlx5_device_registered(dev))
mlx5_detach_device(dev);
if (mlx5_device_registered(dev))
mlx5_detach_device(dev);
- mlx5_sriov_cleanup(dev);
+ mlx5_sriov_detach(dev);
#ifdef CONFIG_MLX5_CORE_EN
#ifdef CONFIG_MLX5_CORE_EN
- mlx5_eswitch_cleanup(dev->priv.eswitch);
+ mlx5_eswitch_detach(dev->priv.eswitch);
#endif
mlx5_cleanup_fs(dev);
mlx5_irq_clear_affinity_hints(dev);
#endif
mlx5_cleanup_fs(dev);
mlx5_irq_clear_affinity_hints(dev);
if (!sriov->vfs_ctx)
return -ENOMEM;
if (!sriov->vfs_ctx)
return -ENOMEM;
- return mlx5_sriov_attach(dev);
}
void mlx5_sriov_cleanup(struct mlx5_core_dev *dev)
}
void mlx5_sriov_cleanup(struct mlx5_core_dev *dev)
if (!mlx5_core_is_pf(dev))
return;
if (!mlx5_core_is_pf(dev))
return;
- mlx5_sriov_detach(dev);