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

Commit cd9281d8 authored by Jack Morgenstein's avatar Jack Morgenstein Committed by Roland Dreier
Browse files

IB/mlx4: Display misc device information under /sys/class/infiniband/ 



display the following device information under /sys/class/infiniband/mlx4_X:
board_id, fw_ver, hw_rev, hca_type.

This patch makes this information available to userspace utilities
such as ibstat and ibv_devinfo.

Signed-off-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 57cb61d5

drivers/infiniband/hw/mlx4/main.c

+45 −0
Original line number Diff line number Diff line
@@ -476,9 +476,48 @@ static int init_node_data(struct mlx4_ib_dev *dev) 
	return err;

}



static ssize_t show_hca(struct class_device *cdev, char *buf)

{

	struct mlx4_ib_dev *dev = container_of(cdev, struct mlx4_ib_dev, ib_dev.class_dev);

	return sprintf(buf, "MT%d\n", dev->dev->pdev->device);

}



static ssize_t show_fw_ver(struct class_device *cdev, char *buf)

{

	struct mlx4_ib_dev *dev = container_of(cdev, struct mlx4_ib_dev, ib_dev.class_dev);

	return sprintf(buf, "%d.%d.%d\n", (int) (dev->dev->caps.fw_ver >> 32),

		       (int) (dev->dev->caps.fw_ver >> 16) & 0xffff,

		       (int) dev->dev->caps.fw_ver & 0xffff);

}



static ssize_t show_rev(struct class_device *cdev, char *buf)

{

	struct mlx4_ib_dev *dev = container_of(cdev, struct mlx4_ib_dev, ib_dev.class_dev);

	return sprintf(buf, "%x\n", dev->dev->rev_id);

}



static ssize_t show_board(struct class_device *cdev, char *buf)

{

	struct mlx4_ib_dev *dev = container_of(cdev, struct mlx4_ib_dev, ib_dev.class_dev);

	return sprintf(buf, "%.*s\n", MLX4_BOARD_ID_LEN, dev->dev->board_id);

}



static CLASS_DEVICE_ATTR(hw_rev,   S_IRUGO, show_rev,    NULL);

static CLASS_DEVICE_ATTR(fw_ver,   S_IRUGO, show_fw_ver, NULL);

static CLASS_DEVICE_ATTR(hca_type, S_IRUGO, show_hca,    NULL);

static CLASS_DEVICE_ATTR(board_id, S_IRUGO, show_board,  NULL);



static struct class_device_attribute *mlx4_class_attributes[] = {

	&class_device_attr_hw_rev,

	&class_device_attr_fw_ver,

	&class_device_attr_hca_type,

	&class_device_attr_board_id

};



static void *mlx4_ib_add(struct mlx4_dev *dev)

{

	struct mlx4_ib_dev *ibdev;

	int i;



	ibdev = (struct mlx4_ib_dev *) ib_alloc_device(sizeof *ibdev);

	if (!ibdev) {
@@ -580,6 +619,12 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) 
	if (mlx4_ib_mad_init(ibdev))

		goto err_reg;



	for (i = 0; i < ARRAY_SIZE(mlx4_class_attributes); ++i) {

		if (class_device_create_file(&ibdev->ib_dev.class_dev,

					       mlx4_class_attributes[i]))

			goto err_reg;

	}



	return ibdev;



err_reg:

drivers/net/mlx4/main.c

+2 −2
Original line number Diff line number Diff line
@@ -524,8 +524,8 @@ static int __devinit mlx4_init_hca(struct mlx4_dev *dev) 
	}



	priv->eq_table.inta_pin = adapter.inta_pin;

	priv->rev_id		= adapter.revision_id;

	memcpy(priv->board_id, adapter.board_id, sizeof priv->board_id);

	dev->rev_id		= adapter.revision_id;

	memcpy(dev->board_id, adapter.board_id, sizeof dev->board_id);



	return 0;

drivers/net/mlx4/mlx4.h

+0 −7
Original line number Diff line number Diff line
@@ -55,10 +55,6 @@ enum { 
	MLX4_CLR_INT_SIZE	= 0x00008

};



enum {

	MLX4_BOARD_ID_LEN	= 64

};



enum {

	MLX4_MGM_ENTRY_SIZE	=  0x40,

	MLX4_QP_PER_MGM		= 4 * (MLX4_MGM_ENTRY_SIZE / 16 - 2),
@@ -277,9 +273,6 @@ struct mlx4_priv { 


	struct mlx4_uar		driver_uar;

	void __iomem	       *kar;



	u32			rev_id;

	char			board_id[MLX4_BOARD_ID_LEN];

};



static inline struct mlx4_priv *mlx4_priv(struct mlx4_dev *dev)

include/linux/mlx4/device.h

+6 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ enum { 
	MLX4_MAX_PORTS		= 2

};



enum {

	MLX4_BOARD_ID_LEN = 64

};



enum {

	MLX4_DEV_CAP_FLAG_RC		= 1 <<  0,

	MLX4_DEV_CAP_FLAG_UC		= 1 <<  1,
@@ -272,6 +276,8 @@ struct mlx4_dev { 
	unsigned long		flags;

	struct mlx4_caps	caps;

	struct radix_tree_root	qp_table_tree;

	u32			rev_id;

	char			board_id[MLX4_BOARD_ID_LEN];

};



struct mlx4_init_port_param {