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

Commit 0b107106 authored by Eli Cohen's avatar Eli Cohen Committed by David S. Miller
Browse files

net/mlx5_core: Modify enable/disable hca functions 



Modify these functions to have func_id argument to state which device we
are referring to. This is done as a preparation for SRIOV support where
a PF driver needs to control its virtual functions.

Signed-off-by: default avatarEli Cohen <eli@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 24e2416e

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

+21 −24
Original line number Diff line number Diff line
@@ -462,42 +462,39 @@ static int set_hca_ctrl(struct mlx5_core_dev *dev) 
	return err;

}



static int mlx5_core_enable_hca(struct mlx5_core_dev *dev)

int mlx5_core_enable_hca(struct mlx5_core_dev *dev, u16 func_id)

{

	u32 out[MLX5_ST_SZ_DW(enable_hca_out)];

	u32 in[MLX5_ST_SZ_DW(enable_hca_in)];

	int err;

	struct mlx5_enable_hca_mbox_in in;

	struct mlx5_enable_hca_mbox_out out;



	memset(&in, 0, sizeof(in));

	memset(&out, 0, sizeof(out));

	in.hdr.opcode = cpu_to_be16(MLX5_CMD_OP_ENABLE_HCA);

	memset(in, 0, sizeof(in));

	MLX5_SET(enable_hca_in, in, opcode, MLX5_CMD_OP_ENABLE_HCA);

	MLX5_SET(enable_hca_in, in, function_id, func_id);

	memset(out, 0, sizeof(out));



	err = mlx5_cmd_exec(dev, &in, sizeof(in), &out, sizeof(out));

	if (err)

		return err;



	if (out.hdr.status)

		return mlx5_cmd_status_to_err(&out.hdr);



	return 0;

	return mlx5_cmd_status_to_err_v2(out);

}



static int mlx5_core_disable_hca(struct mlx5_core_dev *dev)

int mlx5_core_disable_hca(struct mlx5_core_dev *dev, u16 func_id)

{

	u32 out[MLX5_ST_SZ_DW(disable_hca_out)];

	u32 in[MLX5_ST_SZ_DW(disable_hca_in)];

	int err;

	struct mlx5_disable_hca_mbox_in in;

	struct mlx5_disable_hca_mbox_out out;



	memset(&in, 0, sizeof(in));

	memset(&out, 0, sizeof(out));

	in.hdr.opcode = cpu_to_be16(MLX5_CMD_OP_DISABLE_HCA);

	err = mlx5_cmd_exec(dev, &in, sizeof(in), &out, sizeof(out));

	memset(in, 0, sizeof(in));

	MLX5_SET(disable_hca_in, in, opcode, MLX5_CMD_OP_DISABLE_HCA);

	MLX5_SET(disable_hca_in, in, function_id, func_id);

	memset(out, 0, sizeof(out));

	err = mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

	if (err)

		return err;



	if (out.hdr.status)

		return mlx5_cmd_status_to_err(&out.hdr);



	return 0;

	return mlx5_cmd_status_to_err_v2(out);

}



static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i)
@@ -942,7 +939,7 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv) 


	mlx5_pagealloc_init(dev);



	err = mlx5_core_enable_hca(dev);

	err = mlx5_core_enable_hca(dev, 0);

	if (err) {

		dev_err(&pdev->dev, "enable hca failed\n");

		goto err_pagealloc_cleanup;
@@ -1106,7 +1103,7 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv) 
	mlx5_reclaim_startup_pages(dev);



err_disable_hca:

	mlx5_core_disable_hca(dev);

	mlx5_core_disable_hca(dev, 0);



err_pagealloc_cleanup:

	mlx5_pagealloc_cleanup(dev);
@@ -1149,7 +1146,7 @@ static int mlx5_unload_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv) 
	}

	mlx5_pagealloc_stop(dev);

	mlx5_reclaim_startup_pages(dev);

	mlx5_core_disable_hca(dev);

	mlx5_core_disable_hca(dev, 0);

	mlx5_pagealloc_cleanup(dev);

	mlx5_cmd_cleanup(dev);

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

+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,8 @@ void mlx5_core_event(struct mlx5_core_dev *dev, enum mlx5_dev_event event, 
		     unsigned long param);

void mlx5_enter_error_state(struct mlx5_core_dev *dev);

void mlx5_disable_device(struct mlx5_core_dev *dev);

int mlx5_core_enable_hca(struct mlx5_core_dev *dev, u16 func_id);

int mlx5_core_disable_hca(struct mlx5_core_dev *dev, u16 func_id);



void mlx5e_init(void);

void mlx5e_cleanup(void);