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

Commit 707c4602 authored by Majd Dibbiny's avatar Majd Dibbiny Committed by David S. Miller
Browse files

net/mlx5_core: Add new query HCA vport commands 



Added the implementation for the following commands:

1. QUERY_HCA_VPORT_GID
2. QUERY_HCA_VPORT_PKEY
3. QUERY_HCA_VPORT_CONTEXT

They will be needed when we move to work with ISSI > 0 in the IB driver too.

Signed-off-by: default avatarMajd Dibbiny <majd@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d18a9470

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ obj-$(CONFIG_MLX5_CORE) += mlx5_core.o 


mlx5_core-y :=	main.o cmd.o debugfs.o fw.o eq.o uar.o pagealloc.o \

		health.o mcg.o cq.o srq.o alloc.o qp.o port.o mr.o pd.o   \

		mad.o transobj.o

mlx5_core-$(CONFIG_MLX5_CORE_EN) += wq.o flow_table.o vport.o \

		mad.o transobj.o vport.o

mlx5_core-$(CONFIG_MLX5_CORE_EN) += wq.o flow_table.o \

		en_main.o en_flow_table.o en_ethtool.o en_tx.o en_rx.o \

		en_txrx.o

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

+1 −9
Original line number Diff line number Diff line
@@ -284,14 +284,6 @@ static u16 to_fw_pkey_sz(u32 size) 
	}

}



static u16 to_sw_pkey_sz(int pkey_sz)

{

	if (pkey_sz > MLX5_MAX_LOG_PKEY_TABLE)

		return 0;



	return MLX5_MIN_PKEY_TABLE_SIZE << pkey_sz;

}



int mlx5_core_get_caps(struct mlx5_core_dev *dev, enum mlx5_cap_type cap_type,

		       enum mlx5_cap_mode cap_mode)

{
@@ -386,7 +378,7 @@ static int handle_hca_cap(struct mlx5_core_dev *dev) 
	       MLX5_ST_SZ_BYTES(cmd_hca_cap));



	mlx5_core_dbg(dev, "Current Pkey table size %d Setting new size %d\n",

		      to_sw_pkey_sz(MLX5_CAP_GEN(dev, pkey_table_size)),

		      mlx5_to_sw_pkey_sz(MLX5_CAP_GEN(dev, pkey_table_size)),

		      128);

	/* we limit the size of the pkey table to 128 entries for now */

	MLX5_SET(cmd_hca_cap, set_hca_cap, pkey_table_size,

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

+259 −0
Original line number Diff line number Diff line
@@ -84,3 +84,262 @@ void mlx5_query_nic_vport_mac_address(struct mlx5_core_dev *mdev, u8 *addr) 
	kvfree(out);

}

EXPORT_SYMBOL(mlx5_query_nic_vport_mac_address);



int mlx5_query_hca_vport_gid(struct mlx5_core_dev *dev, u8 other_vport,

			     u8 port_num, u16  vf_num, u16 gid_index,

			     union ib_gid *gid)

{

	int in_sz = MLX5_ST_SZ_BYTES(query_hca_vport_gid_in);

	int out_sz = MLX5_ST_SZ_BYTES(query_hca_vport_gid_out);

	int is_group_manager;

	void *out = NULL;

	void *in = NULL;

	union ib_gid *tmp;

	int tbsz;

	int nout;

	int err;



	is_group_manager = MLX5_CAP_GEN(dev, vport_group_manager);

	tbsz = mlx5_get_gid_table_len(MLX5_CAP_GEN(dev, gid_table_size));

	mlx5_core_dbg(dev, "vf_num %d, index %d, gid_table_size %d\n",

		      vf_num, gid_index, tbsz);



	if (gid_index > tbsz && gid_index != 0xffff)

		return -EINVAL;



	if (gid_index == 0xffff)

		nout = tbsz;

	else

		nout = 1;



	out_sz += nout * sizeof(*gid);



	in = kzalloc(in_sz, GFP_KERNEL);

	out = kzalloc(out_sz, GFP_KERNEL);

	if (!in || !out) {

		err = -ENOMEM;

		goto out;

	}



	MLX5_SET(query_hca_vport_gid_in, in, opcode, MLX5_CMD_OP_QUERY_HCA_VPORT_GID);

	if (other_vport) {

		if (is_group_manager) {

			MLX5_SET(query_hca_vport_gid_in, in, vport_number, vf_num);

			MLX5_SET(query_hca_vport_gid_in, in, other_vport, 1);

		} else {

			err = -EPERM;

			goto out;

		}

	}

	MLX5_SET(query_hca_vport_gid_in, in, gid_index, gid_index);



	if (MLX5_CAP_GEN(dev, num_ports) == 2)

		MLX5_SET(query_hca_vport_gid_in, in, port_num, port_num);



	err = mlx5_cmd_exec(dev, in, in_sz, out, out_sz);

	if (err)

		goto out;



	err = mlx5_cmd_status_to_err_v2(out);

	if (err)

		goto out;



	tmp = out + MLX5_ST_SZ_BYTES(query_hca_vport_gid_out);

	gid->global.subnet_prefix = tmp->global.subnet_prefix;

	gid->global.interface_id = tmp->global.interface_id;



out:

	kfree(in);

	kfree(out);

	return err;

}

EXPORT_SYMBOL_GPL(mlx5_query_hca_vport_gid);



int mlx5_query_hca_vport_pkey(struct mlx5_core_dev *dev, u8 other_vport,

			      u8 port_num, u16 vf_num, u16 pkey_index,

			      u16 *pkey)

{

	int in_sz = MLX5_ST_SZ_BYTES(query_hca_vport_pkey_in);

	int out_sz = MLX5_ST_SZ_BYTES(query_hca_vport_pkey_out);

	int is_group_manager;

	void *out = NULL;

	void *in = NULL;

	void *pkarr;

	int nout;

	int tbsz;

	int err;

	int i;



	is_group_manager = MLX5_CAP_GEN(dev, vport_group_manager);



	tbsz = mlx5_to_sw_pkey_sz(MLX5_CAP_GEN(dev, pkey_table_size));

	if (pkey_index > tbsz && pkey_index != 0xffff)

		return -EINVAL;



	if (pkey_index == 0xffff)

		nout = tbsz;

	else

		nout = 1;



	out_sz += nout * MLX5_ST_SZ_BYTES(pkey);



	in = kzalloc(in_sz, GFP_KERNEL);

	out = kzalloc(out_sz, GFP_KERNEL);

	if (!in || !out) {

		err = -ENOMEM;

		goto out;

	}



	MLX5_SET(query_hca_vport_pkey_in, in, opcode, MLX5_CMD_OP_QUERY_HCA_VPORT_PKEY);

	if (other_vport) {

		if (is_group_manager) {

			MLX5_SET(query_hca_vport_pkey_in, in, vport_number, vf_num);

			MLX5_SET(query_hca_vport_pkey_in, in, other_vport, 1);

		} else {

			err = -EPERM;

			goto out;

		}

	}

	MLX5_SET(query_hca_vport_pkey_in, in, pkey_index, pkey_index);



	if (MLX5_CAP_GEN(dev, num_ports) == 2)

		MLX5_SET(query_hca_vport_pkey_in, in, port_num, port_num);



	err = mlx5_cmd_exec(dev, in, in_sz, out, out_sz);

	if (err)

		goto out;



	err = mlx5_cmd_status_to_err_v2(out);

	if (err)

		goto out;



	pkarr = MLX5_ADDR_OF(query_hca_vport_pkey_out, out, pkey);

	for (i = 0; i < nout; i++, pkey++, pkarr += MLX5_ST_SZ_BYTES(pkey))

		*pkey = MLX5_GET_PR(pkey, pkarr, pkey);



out:

	kfree(in);

	kfree(out);

	return err;

}

EXPORT_SYMBOL_GPL(mlx5_query_hca_vport_pkey);



int mlx5_query_hca_vport_context(struct mlx5_core_dev *dev,

				 u8 other_vport, u8 port_num,

				 u16 vf_num,

				 struct mlx5_hca_vport_context *rep)

{

	int out_sz = MLX5_ST_SZ_BYTES(query_hca_vport_context_out);

	int in[MLX5_ST_SZ_DW(query_hca_vport_context_in)];

	int is_group_manager;

	void *out;

	void *ctx;

	int err;



	is_group_manager = MLX5_CAP_GEN(dev, vport_group_manager);



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

	out = kzalloc(out_sz, GFP_KERNEL);

	if (!out)

		return -ENOMEM;



	MLX5_SET(query_hca_vport_context_in, in, opcode, MLX5_CMD_OP_QUERY_HCA_VPORT_CONTEXT);



	if (other_vport) {

		if (is_group_manager) {

			MLX5_SET(query_hca_vport_context_in, in, other_vport, 1);

			MLX5_SET(query_hca_vport_context_in, in, vport_number, vf_num);

		} else {

			err = -EPERM;

			goto ex;

		}

	}



	if (MLX5_CAP_GEN(dev, num_ports) == 2)

		MLX5_SET(query_hca_vport_context_in, in, port_num, port_num);



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

	if (err)

		goto ex;

	err = mlx5_cmd_status_to_err_v2(out);

	if (err)

		goto ex;



	ctx = MLX5_ADDR_OF(query_hca_vport_context_out, out, hca_vport_context);

	rep->field_select = MLX5_GET_PR(hca_vport_context, ctx, field_select);

	rep->sm_virt_aware = MLX5_GET_PR(hca_vport_context, ctx, sm_virt_aware);

	rep->has_smi = MLX5_GET_PR(hca_vport_context, ctx, has_smi);

	rep->has_raw = MLX5_GET_PR(hca_vport_context, ctx, has_raw);

	rep->policy = MLX5_GET_PR(hca_vport_context, ctx, vport_state_policy);

	rep->phys_state = MLX5_GET_PR(hca_vport_context, ctx,

				      port_physical_state);

	rep->vport_state = MLX5_GET_PR(hca_vport_context, ctx, vport_state);

	rep->port_physical_state = MLX5_GET_PR(hca_vport_context, ctx,

					       port_physical_state);

	rep->port_guid = MLX5_GET64_PR(hca_vport_context, ctx, port_guid);

	rep->node_guid = MLX5_GET64_PR(hca_vport_context, ctx, node_guid);

	rep->cap_mask1 = MLX5_GET_PR(hca_vport_context, ctx, cap_mask1);

	rep->cap_mask1_perm = MLX5_GET_PR(hca_vport_context, ctx,

					  cap_mask1_field_select);

	rep->cap_mask2 = MLX5_GET_PR(hca_vport_context, ctx, cap_mask2);

	rep->cap_mask2_perm = MLX5_GET_PR(hca_vport_context, ctx,

					  cap_mask2_field_select);

	rep->lid = MLX5_GET_PR(hca_vport_context, ctx, lid);

	rep->init_type_reply = MLX5_GET_PR(hca_vport_context, ctx,

					   init_type_reply);

	rep->lmc = MLX5_GET_PR(hca_vport_context, ctx, lmc);

	rep->subnet_timeout = MLX5_GET_PR(hca_vport_context, ctx,

					  subnet_timeout);

	rep->sm_lid = MLX5_GET_PR(hca_vport_context, ctx, sm_lid);

	rep->sm_sl = MLX5_GET_PR(hca_vport_context, ctx, sm_sl);

	rep->qkey_violation_counter = MLX5_GET_PR(hca_vport_context, ctx,

						  qkey_violation_counter);

	rep->pkey_violation_counter = MLX5_GET_PR(hca_vport_context, ctx,

						  pkey_violation_counter);

	rep->grh_required = MLX5_GET_PR(hca_vport_context, ctx, grh_required);

	rep->sys_image_guid = MLX5_GET64_PR(hca_vport_context, ctx,

					    system_image_guid);



ex:

	kfree(out);

	return err;

}

EXPORT_SYMBOL_GPL(mlx5_query_hca_vport_context);



int mlx5_query_hca_vport_system_image_guid(struct mlx5_core_dev *dev,

					   __be64 *sys_image_guid)

{

	struct mlx5_hca_vport_context *rep;

	int err;



	rep = kzalloc(sizeof(*rep), GFP_KERNEL);

	if (!rep)

		return -ENOMEM;



	err = mlx5_query_hca_vport_context(dev, 0, 1, 0, rep);

	if (!err)

		*sys_image_guid = rep->sys_image_guid;



	kfree(rep);

	return err;

}

EXPORT_SYMBOL_GPL(mlx5_query_hca_vport_system_image_guid);



int mlx5_query_hca_vport_node_guid(struct mlx5_core_dev *dev,

				   u64 *node_guid)

{

	struct mlx5_hca_vport_context *rep;

	int err;



	rep = kzalloc(sizeof(*rep), GFP_KERNEL);

	if (!rep)

		return -ENOMEM;



	err = mlx5_query_hca_vport_context(dev, 0, 1, 0, rep);

	if (!err)

		*node_guid = rep->node_guid;



	kfree(rep);

	return err;

}

EXPORT_SYMBOL_GPL(mlx5_query_hca_vport_node_guid);

include/linux/mlx5/device.h

+13 −0
Original line number Diff line number Diff line
@@ -99,6 +99,12 @@ __mlx5_mask(typ, fld)) 


#define MLX5_GET64(typ, p, fld) be64_to_cpu(*((__be64 *)(p) + __mlx5_64_off(typ, fld)))



#define MLX5_GET64_PR(typ, p, fld) ({ \

	u64 ___t = MLX5_GET64(typ, p, fld); \

	pr_debug(#fld " = 0x%llx\n", ___t); \

	___t; \

})



enum {

	MLX5_MAX_COMMANDS		= 32,

	MLX5_CMD_DATA_BLOCK_SIZE	= 512,
@@ -1172,4 +1178,11 @@ enum { 
	MLX5_CMD_STAT_BAD_SIZE_OUTS_CQES_ERR	= 0x40,

};



static inline u16 mlx5_to_sw_pkey_sz(int pkey_sz)

{

	if (pkey_sz > MLX5_MAX_LOG_PKEY_TABLE)

		return 0;

	return MLX5_MIN_PKEY_TABLE_SIZE << pkey_sz;

}



#endif /* MLX5_DEVICE_H */

include/linux/mlx5/driver.h

+45 −0
Original line number Diff line number Diff line
@@ -553,6 +553,41 @@ struct mlx5_pas { 
	u8	log_sz;

};



enum port_state_policy {

	MLX5_AAA_000

};



enum phy_port_state {

	MLX5_AAA_111

};



struct mlx5_hca_vport_context {

	u32			field_select;

	bool			sm_virt_aware;

	bool			has_smi;

	bool			has_raw;

	enum port_state_policy	policy;

	enum phy_port_state	phys_state;

	enum ib_port_state	vport_state;

	u8			port_physical_state;

	u64			sys_image_guid;

	u64			port_guid;

	u64			node_guid;

	u32			cap_mask1;

	u32			cap_mask1_perm;

	u32			cap_mask2;

	u32			cap_mask2_perm;

	u16			lid;

	u8			init_type_reply; /* bitmask: see ib spec 14.2.5.6 InitTypeReply */

	u8			lmc;

	u8			subnet_timeout;

	u16			sm_lid;

	u8			sm_sl;

	u16			qkey_violation_counter;

	u16			pkey_violation_counter;

	bool			grh_required;

};



static inline void *mlx5_buf_offset(struct mlx5_buf *buf, int offset)

{

		return buf->direct.buf + offset;
@@ -792,4 +827,14 @@ struct mlx5_profile { 
	} mr_cache[MAX_MR_CACHE_ENTRIES];

};



static inline int mlx5_get_gid_table_len(u16 param)

{

	if (param > 4) {

		pr_warn("gid table length is zero\n");

		return 0;

	}



	return 8 * (1 << param);

}



#endif /* MLX5_DRIVER_H */