Commit 97285b78 authored by Marcel Apfelbaum's avatar Marcel Apfelbaum Committed by Roland Dreier
Browse files

mlx4_core: Add extended port capabilities support 



An Extended Port Info packet is sent to each hw port during HCA init.
If it returns without error, we assume the port supports extended port
capabilities.

Signed-off-by: default avatarMarcel Apfelbaum <marcela@dev.mellanox.co.il>
Reviewed-by: default avatarJack Morgenstein <jackm@dev.mellanox.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent e36fb88a

drivers/net/mlx4/main.c

+7 −0
Original line number Diff line number Diff line
@@ -998,6 +998,13 @@ static int mlx4_setup_hca(struct mlx4_dev *dev) 
				  "ib capabilities (%d). Continuing with "

				  "caps = 0\n", port, err);

		dev->caps.ib_port_def_cap[port] = ib_port_default_caps;



		err = mlx4_check_ext_port_caps(dev, port);

		if (err)

			mlx4_warn(dev, "failed to get port %d extended "

				  "port capabilities support info (%d)."

				  " Assuming not supported\n", port, err);



		err = mlx4_SET_PORT(dev, port);

		if (err) {

			mlx4_err(dev, "Failed to set port %d, aborting\n",

drivers/net/mlx4/mlx4.h

+1 −0
Original line number Diff line number Diff line
@@ -450,6 +450,7 @@ void mlx4_init_vlan_table(struct mlx4_dev *dev, struct mlx4_vlan_table *table); 


int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port);

int mlx4_get_port_ib_caps(struct mlx4_dev *dev, u8 port, __be32 *caps);

int mlx4_check_ext_port_caps(struct mlx4_dev *dev, u8 port);



int mlx4_qp_detach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],

			  enum mlx4_protocol prot, enum mlx4_steer_type steer);

drivers/net/mlx4/port.c

+42 −0
Original line number Diff line number Diff line
@@ -464,6 +464,48 @@ int mlx4_get_port_ib_caps(struct mlx4_dev *dev, u8 port, __be32 *caps) 
	return err;

}



int mlx4_check_ext_port_caps(struct mlx4_dev *dev, u8 port)

{

	struct mlx4_cmd_mailbox *inmailbox, *outmailbox;

	u8 *inbuf, *outbuf;

	int err, packet_error;



	inmailbox = mlx4_alloc_cmd_mailbox(dev);

	if (IS_ERR(inmailbox))

		return PTR_ERR(inmailbox);



	outmailbox = mlx4_alloc_cmd_mailbox(dev);

	if (IS_ERR(outmailbox)) {

		mlx4_free_cmd_mailbox(dev, inmailbox);

		return PTR_ERR(outmailbox);

	}



	inbuf = inmailbox->buf;

	outbuf = outmailbox->buf;

	memset(inbuf, 0, 256);

	memset(outbuf, 0, 256);

	inbuf[0] = 1;

	inbuf[1] = 1;

	inbuf[2] = 1;

	inbuf[3] = 1;



	*(__be16 *) (&inbuf[16]) = MLX4_ATTR_EXTENDED_PORT_INFO;

	*(__be32 *) (&inbuf[20]) = cpu_to_be32(port);



	err = mlx4_cmd_box(dev, inmailbox->dma, outmailbox->dma, port, 3,

			   MLX4_CMD_MAD_IFC, MLX4_CMD_TIME_CLASS_C);



	packet_error = be16_to_cpu(*(__be16 *) (outbuf + 4));



	dev->caps.ext_port_cap[port] = (!err && !packet_error) ?

				       MLX_EXT_PORT_CAP_FLAG_EXTENDED_PORT_INFO

				       : 0;



	mlx4_free_cmd_mailbox(dev, inmailbox);

	mlx4_free_cmd_mailbox(dev, outmailbox);

	return err;

}



int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port)

{

	struct mlx4_cmd_mailbox *mailbox;

include/linux/mlx4/device.h

+7 −0
Original line number Diff line number Diff line
@@ -82,6 +82,12 @@ enum { 
	MLX4_DEV_CAP_FLAG_COUNTERS	= 1LL << 48

};



#define MLX4_ATTR_EXTENDED_PORT_INFO	cpu_to_be16(0xff90)



enum {

	MLX_EXT_PORT_CAP_FLAG_EXTENDED_PORT_INFO	= 1 <<  0

};



enum {

	MLX4_BMME_FLAG_LOCAL_INV	= 1 <<  6,

	MLX4_BMME_FLAG_REMOTE_INV	= 1 <<  7,
@@ -276,6 +282,7 @@ struct mlx4_caps { 
	u32			port_mask;

	enum mlx4_port_type	possible_type[MLX4_MAX_PORTS + 1];

	u32			max_counters;

	u8			ext_port_cap[MLX4_MAX_PORTS + 1];

};



struct mlx4_buf_list {