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

Commit e9db59fc authored by Ira Weiny's avatar Ira Weiny Committed by Doug Ledford
Browse files

IB/mlx4: Support device FW version string 



And remove the sysfs in favor of common core version.

Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent f65c52ca

drivers/infiniband/hw/mlx4/main.c

+12 −12
Original line number Diff line number Diff line
@@ -2022,16 +2022,6 @@ static ssize_t show_hca(struct device *device, struct device_attribute *attr, 
	return sprintf(buf, "MT%d\n", dev->dev->persist->pdev->device);

}



static ssize_t show_fw_ver(struct device *device, struct device_attribute *attr,

			   char *buf)

{

	struct mlx4_ib_dev *dev =

		container_of(device, struct mlx4_ib_dev, ib_dev.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 device *device, struct device_attribute *attr,

			char *buf)

{
@@ -2050,13 +2040,11 @@ static ssize_t show_board(struct device *device, struct device_attribute *attr, 
}



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

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

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

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



static struct device_attribute *mlx4_class_attributes[] = {

	&dev_attr_hw_rev,

	&dev_attr_fw_ver,

	&dev_attr_hca_type,

	&dev_attr_board_id

};
@@ -2277,6 +2265,17 @@ static int mlx4_port_immutable(struct ib_device *ibdev, u8 port_num, 
	return 0;

}



static void get_fw_ver_str(struct ib_device *device, char *str,

			   size_t str_len)

{

	struct mlx4_ib_dev *dev =

		container_of(device, struct mlx4_ib_dev, ib_dev);

	snprintf(str, str_len, "%d.%d.%d",

		 (int) (dev->dev->caps.fw_ver >> 32),

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

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

}



static void *mlx4_ib_add(struct mlx4_dev *dev)

{

	struct mlx4_ib_dev *ibdev;
@@ -2410,6 +2409,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) 
	ibdev->ib_dev.detach_mcast	= mlx4_ib_mcg_detach;

	ibdev->ib_dev.process_mad	= mlx4_ib_process_mad;

	ibdev->ib_dev.get_port_immutable = mlx4_port_immutable;

	ibdev->ib_dev.get_dev_fw_str    = get_fw_ver_str;

	ibdev->ib_dev.disassociate_ucontext = mlx4_ib_disassociate_ucontext;



	if (!mlx4_is_slave(ibdev->dev)) {