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

Commit 04ed5ad5 authored by Saeed Mahameed's avatar Saeed Mahameed Committed by Leon Romanovsky
Browse files

net/mlx5: Init/Teardown hca commands via mlx5 ifc 



Remove old representation of manually created Init/Teardown hca
commands layout and use mlx5_ifc canonical structures and defines.

Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 29b4817d

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

+10 −26
Original line number Diff line number Diff line
@@ -162,38 +162,22 @@ int mlx5_query_hca_caps(struct mlx5_core_dev *dev) 


int mlx5_cmd_init_hca(struct mlx5_core_dev *dev)

{

	struct mlx5_cmd_init_hca_mbox_in in;

	struct mlx5_cmd_init_hca_mbox_out out;

	u32 out[MLX5_ST_SZ_DW(init_hca_out)] = {0};

	u32 in[MLX5_ST_SZ_DW(init_hca_in)]   = {0};

	int err;



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

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

	in.hdr.opcode = cpu_to_be16(MLX5_CMD_OP_INIT_HCA);

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

	if (err)

		return err;



	if (out.hdr.status)

		err = mlx5_cmd_status_to_err(&out.hdr);



	return err;

	MLX5_SET(init_hca_in, in, opcode, MLX5_CMD_OP_INIT_HCA);

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

	return err ? : mlx5_cmd_status_to_err_v2(out);

}



int mlx5_cmd_teardown_hca(struct mlx5_core_dev *dev)

{

	struct mlx5_cmd_teardown_hca_mbox_in in;

	struct mlx5_cmd_teardown_hca_mbox_out out;

	u32 out[MLX5_ST_SZ_DW(teardown_hca_out)] = {0};

	u32 in[MLX5_ST_SZ_DW(teardown_hca_in)]   = {0};

	int err;



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

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

	in.hdr.opcode = cpu_to_be16(MLX5_CMD_OP_TEARDOWN_HCA);

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

	if (err)

		return err;



	if (out.hdr.status)

		err = mlx5_cmd_status_to_err(&out.hdr);



	return err;

	MLX5_SET(teardown_hca_in, in, opcode, MLX5_CMD_OP_TEARDOWN_HCA);

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

	return err ? : mlx5_cmd_status_to_err_v2(out);

}

include/linux/mlx5/device.h

+0 −24
Original line number Diff line number Diff line
@@ -455,30 +455,6 @@ struct mlx5_odp_caps { 
	char reserved2[0xe4];

};



struct mlx5_cmd_init_hca_mbox_in {

	struct mlx5_inbox_hdr	hdr;

	u8			rsvd0[2];

	__be16			profile;

	u8			rsvd1[4];

};



struct mlx5_cmd_init_hca_mbox_out {

	struct mlx5_outbox_hdr	hdr;

	u8			rsvd[8];

};



struct mlx5_cmd_teardown_hca_mbox_in {

	struct mlx5_inbox_hdr	hdr;

	u8			rsvd0[2];

	__be16			profile;

	u8			rsvd1[4];

};



struct mlx5_cmd_teardown_hca_mbox_out {

	struct mlx5_outbox_hdr	hdr;

	u8			rsvd[8];

};



struct mlx5_cmd_layout {

	u8		type;

	u8		rsvd0[3];