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

Commit 20bb566b authored by Saeed Mahameed's avatar Saeed Mahameed Committed by Leon Romanovsky
Browse files

net/mlx5: MCG commands via mlx5 ifc 



Remove old representation of manually created MCG 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 732ef5ad

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

+2 −2
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 
	case MLX5_CMD_OP_DEALLOC_Q_COUNTER:

	case MLX5_CMD_OP_DEALLOC_PD:

	case MLX5_CMD_OP_DEALLOC_UAR:

	case MLX5_CMD_OP_DETTACH_FROM_MCG:

	case MLX5_CMD_OP_DETACH_FROM_MCG:

	case MLX5_CMD_OP_DEALLOC_XRCD:

	case MLX5_CMD_OP_DEALLOC_TRANSPORT_DOMAIN:

	case MLX5_CMD_OP_DELETE_VXLAN_UDP_DPORT:
@@ -490,7 +490,7 @@ const char *mlx5_command_str(int command) 
	MLX5_COMMAND_STR_CASE(CONFIG_INT_MODERATION);

	MLX5_COMMAND_STR_CASE(ACCESS_REG);

	MLX5_COMMAND_STR_CASE(ATTACH_TO_MCG);

	MLX5_COMMAND_STR_CASE(DETTACH_FROM_MCG);

	MLX5_COMMAND_STR_CASE(DETACH_FROM_MCG);

	MLX5_COMMAND_STR_CASE(GET_DROPPED_PACKET_LOG);

	MLX5_COMMAND_STR_CASE(MAD_IFC);

	MLX5_COMMAND_STR_CASE(QUERY_MAD_DEMUX);

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

+18 −52
Original line number Diff line number Diff line
@@ -37,70 +37,36 @@ 
#include <rdma/ib_verbs.h>

#include "mlx5_core.h"



struct mlx5_attach_mcg_mbox_in {

	struct mlx5_inbox_hdr	hdr;

	__be32			qpn;

	__be32			rsvd;

	u8			gid[16];

};



struct mlx5_attach_mcg_mbox_out {

	struct mlx5_outbox_hdr	hdr;

	u8			rsvf[8];

};



struct mlx5_detach_mcg_mbox_in {

	struct mlx5_inbox_hdr	hdr;

	__be32			qpn;

	__be32			rsvd;

	u8			gid[16];

};



struct mlx5_detach_mcg_mbox_out {

	struct mlx5_outbox_hdr	hdr;

	u8			rsvf[8];

};



int mlx5_core_attach_mcg(struct mlx5_core_dev *dev, union ib_gid *mgid, u32 qpn)

{

	struct mlx5_attach_mcg_mbox_in in;

	struct mlx5_attach_mcg_mbox_out out;

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

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

	void *gid;

	int err;



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

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

	in.hdr.opcode = cpu_to_be16(MLX5_CMD_OP_ATTACH_TO_MCG);

	memcpy(in.gid, mgid, sizeof(*mgid));

	in.qpn = cpu_to_be32(qpn);

	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);

	MLX5_SET(attach_to_mcg_in, in, opcode, MLX5_CMD_OP_ATTACH_TO_MCG);

	MLX5_SET(attach_to_mcg_in, in, qpn, qpn);

	gid = MLX5_ADDR_OF(attach_to_mcg_in, in, multicast_gid);

	memcpy(gid, mgid, sizeof(*mgid));



	return err;

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

	return err ? : mlx5_cmd_status_to_err_v2(out);

}

EXPORT_SYMBOL(mlx5_core_attach_mcg);



int mlx5_core_detach_mcg(struct mlx5_core_dev *dev, union ib_gid *mgid, u32 qpn)

{

	struct mlx5_detach_mcg_mbox_in in;

	struct mlx5_detach_mcg_mbox_out out;

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

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

	void *gid;

	int err;



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

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

	in.hdr.opcode = cpu_to_be16(MLX5_CMD_OP_DETTACH_FROM_MCG);

	memcpy(in.gid, mgid, sizeof(*mgid));

	in.qpn = cpu_to_be32(qpn);

	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);

	MLX5_SET(detach_from_mcg_in, in, opcode, MLX5_CMD_OP_DETACH_FROM_MCG);

	MLX5_SET(detach_from_mcg_in, in, qpn, qpn);

	gid = MLX5_ADDR_OF(detach_from_mcg_in, in, multicast_gid);

	memcpy(gid, mgid, sizeof(*mgid));



	return err;

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

	return err ? : mlx5_cmd_status_to_err_v2(out);

}

EXPORT_SYMBOL(mlx5_core_detach_mcg);

include/linux/mlx5/mlx5_ifc.h

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ enum { 
	MLX5_CMD_OP_CONFIG_INT_MODERATION         = 0x804,

	MLX5_CMD_OP_ACCESS_REG                    = 0x805,

	MLX5_CMD_OP_ATTACH_TO_MCG                 = 0x806,

	MLX5_CMD_OP_DETTACH_FROM_MCG              = 0x807,

	MLX5_CMD_OP_DETACH_FROM_MCG               = 0x807,

	MLX5_CMD_OP_GET_DROPPED_PACKET_LOG        = 0x80a,

	MLX5_CMD_OP_MAD_IFC                       = 0x50d,

	MLX5_CMD_OP_QUERY_MAD_DEMUX               = 0x80b,