Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9410733c authored by Ilan Tayari's avatar Ilan Tayari Committed by Saeed Mahameed
Browse files

net/mlx5: FPGA, Move FPGA init/cleanup to init_once 



The FPGA init and cleanup routines should be called just once per
device.
Move them to the init_once and cleanup_once routines.

Signed-off-by: default avatarIlan Tayari <ilant@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 3f2b7edd

drivers/net/ethernet/mellanox/mlx5/core/fpga/core.c

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ int mlx5_fpga_device_start(struct mlx5_core_dev *mdev) 
	return err;

}



int mlx5_fpga_device_init(struct mlx5_core_dev *mdev)

int mlx5_fpga_init(struct mlx5_core_dev *mdev)

{

	struct mlx5_fpga_device *fdev = NULL;
@@ -177,7 +177,7 @@ void mlx5_fpga_device_stop(struct mlx5_core_dev *mdev) 
	mlx5_core_unreserve_gids(mdev, max_num_qps);

}



void mlx5_fpga_device_cleanup(struct mlx5_core_dev *mdev)

void mlx5_fpga_cleanup(struct mlx5_core_dev *mdev)

{

	struct mlx5_fpga_device *fdev = mdev->fpga;

drivers/net/ethernet/mellanox/mlx5/core/fpga/core.h

+4 −4
Original line number Diff line number Diff line
@@ -68,20 +68,20 @@ struct mlx5_fpga_device { 
#define mlx5_fpga_info(__adev, format, ...) \

	dev_info(&(__adev)->mdev->pdev->dev, "FPGA: " format, ##__VA_ARGS__)



int mlx5_fpga_device_init(struct mlx5_core_dev *mdev);

void mlx5_fpga_device_cleanup(struct mlx5_core_dev *mdev);

int mlx5_fpga_init(struct mlx5_core_dev *mdev);

void mlx5_fpga_cleanup(struct mlx5_core_dev *mdev);

int mlx5_fpga_device_start(struct mlx5_core_dev *mdev);

void mlx5_fpga_device_stop(struct mlx5_core_dev *mdev);

void mlx5_fpga_event(struct mlx5_core_dev *mdev, u8 event, void *data);



#else



static inline int mlx5_fpga_device_init(struct mlx5_core_dev *mdev)

static inline int mlx5_fpga_init(struct mlx5_core_dev *mdev)

{

	return 0;

}



static inline void mlx5_fpga_device_cleanup(struct mlx5_core_dev *mdev)

static inline void mlx5_fpga_cleanup(struct mlx5_core_dev *mdev)

{

}

drivers/net/ethernet/mellanox/mlx5/core/main.c

+10 −11
Original line number Diff line number Diff line
@@ -959,8 +959,16 @@ static int mlx5_init_once(struct mlx5_core_dev *dev, struct mlx5_priv *priv) 
		goto err_eswitch_cleanup;

	}



	err = mlx5_fpga_init(dev);

	if (err) {

		dev_err(&pdev->dev, "Failed to init fpga device %d\n", err);

		goto err_sriov_cleanup;

	}



	return 0;



err_sriov_cleanup:

	mlx5_sriov_cleanup(dev);

err_eswitch_cleanup:

#ifdef CONFIG_MLX5_CORE_EN

	mlx5_eswitch_cleanup(dev->priv.eswitch);
@@ -984,6 +992,7 @@ static int mlx5_init_once(struct mlx5_core_dev *dev, struct mlx5_priv *priv) 


static void mlx5_cleanup_once(struct mlx5_core_dev *dev)

{

	mlx5_fpga_cleanup(dev);

	mlx5_sriov_cleanup(dev);

#ifdef CONFIG_MLX5_CORE_EN

	mlx5_eswitch_cleanup(dev->priv.eswitch);
@@ -1121,16 +1130,10 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv, 
		goto err_disable_msix;

	}



	err = mlx5_fpga_device_init(dev);

	if (err) {

		dev_err(&pdev->dev, "fpga device init failed %d\n", err);

		goto err_put_uars;

	}



	err = mlx5_start_eqs(dev);

	if (err) {

		dev_err(&pdev->dev, "Failed to start pages and async EQs\n");

		goto err_fpga_init;

		goto err_put_uars;

	}



	err = alloc_comp_eqs(dev);
@@ -1205,9 +1208,6 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv, 
err_stop_eqs:

	mlx5_stop_eqs(dev);



err_fpga_init:

	mlx5_fpga_device_cleanup(dev);



err_put_uars:

	mlx5_put_uars_page(dev, priv->uar);
@@ -1277,7 +1277,6 @@ static int mlx5_unload_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv, 
	mlx5_irq_clear_affinity_hints(dev);

	free_comp_eqs(dev);

	mlx5_stop_eqs(dev);

	mlx5_fpga_device_cleanup(dev);

	mlx5_put_uars_page(dev, priv->uar);

	mlx5_disable_msix(dev);

	if (cleanup)