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

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

IB/cxgb4: Support device FW version string 



And remove sysfs fw_ver in favor of the core.

Reviewed-by: default avatarSteve Wise <swise@opengridcomputing.com>
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 e1803694

drivers/infiniband/hw/cxgb4/provider.c

+15 −16
Original line number Original line Diff line number Diff line
@@ -409,20 +409,6 @@ static ssize_t show_rev(struct device *dev, struct device_attribute *attr, 
		       CHELSIO_CHIP_RELEASE(c4iw_dev->rdev.lldi.adapter_type));

		       CHELSIO_CHIP_RELEASE(c4iw_dev->rdev.lldi.adapter_type));

}

}





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

			   char *buf)

{

	struct c4iw_dev *c4iw_dev = container_of(dev, struct c4iw_dev,

						 ibdev.dev);

	PDBG("%s dev 0x%p\n", __func__, dev);



	return sprintf(buf, "%u.%u.%u.%u\n",

			FW_HDR_FW_VER_MAJOR_G(c4iw_dev->rdev.lldi.fw_vers),

			FW_HDR_FW_VER_MINOR_G(c4iw_dev->rdev.lldi.fw_vers),

			FW_HDR_FW_VER_MICRO_G(c4iw_dev->rdev.lldi.fw_vers),

			FW_HDR_FW_VER_BUILD_G(c4iw_dev->rdev.lldi.fw_vers));

}



static ssize_t show_hca(struct device *dev, struct device_attribute *attr,

static ssize_t show_hca(struct device *dev, struct device_attribute *attr,

			char *buf)

			char *buf)

{

{
@@ -502,13 +488,11 @@ static int c4iw_get_mib(struct ib_device *ibdev, 
}

}





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

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(hca_type, S_IRUGO, show_hca, NULL);

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

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





static struct device_attribute *c4iw_class_attributes[] = {

static struct device_attribute *c4iw_class_attributes[] = {

	&dev_attr_hw_rev,

	&dev_attr_hw_rev,

	&dev_attr_fw_ver,

	&dev_attr_hca_type,

	&dev_attr_hca_type,

	&dev_attr_board_id,

	&dev_attr_board_id,

};

};
@@ -530,6 +514,20 @@ static int c4iw_port_immutable(struct ib_device *ibdev, u8 port_num, 
	return 0;

	return 0;

}

}





static void get_dev_fw_str(struct ib_device *dev, char *str,

			   size_t str_len)

{

	struct c4iw_dev *c4iw_dev = container_of(dev, struct c4iw_dev,

						 ibdev);

	PDBG("%s dev 0x%p\n", __func__, dev);



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

		 FW_HDR_FW_VER_MAJOR_G(c4iw_dev->rdev.lldi.fw_vers),

		 FW_HDR_FW_VER_MINOR_G(c4iw_dev->rdev.lldi.fw_vers),

		 FW_HDR_FW_VER_MICRO_G(c4iw_dev->rdev.lldi.fw_vers),

		 FW_HDR_FW_VER_BUILD_G(c4iw_dev->rdev.lldi.fw_vers));

}



int c4iw_register_device(struct c4iw_dev *dev)

int c4iw_register_device(struct c4iw_dev *dev)

{

{

	int ret;

	int ret;
@@ -605,6 +603,7 @@ int c4iw_register_device(struct c4iw_dev *dev) 
	dev->ibdev.get_hw_stats = c4iw_get_mib;

	dev->ibdev.get_hw_stats = c4iw_get_mib;

	dev->ibdev.uverbs_abi_ver = C4IW_UVERBS_ABI_VERSION;

	dev->ibdev.uverbs_abi_ver = C4IW_UVERBS_ABI_VERSION;

	dev->ibdev.get_port_immutable = c4iw_port_immutable;

	dev->ibdev.get_port_immutable = c4iw_port_immutable;

	dev->ibdev.get_dev_fw_str = get_dev_fw_str;

	dev->ibdev.drain_sq = c4iw_drain_sq;

	dev->ibdev.drain_sq = c4iw_drain_sq;

	dev->ibdev.drain_rq = c4iw_drain_rq;

	dev->ibdev.drain_rq = c4iw_drain_rq;