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

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

IB/mthca: Supprot device FW version string 



And remove the sysfs entry in favor of the core support.

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 c7342823

drivers/infiniband/hw/mthca/mthca_provider.c

+12 −12
Original line number Diff line number Diff line
@@ -1081,16 +1081,6 @@ static ssize_t show_rev(struct device *device, struct device_attribute *attr, 
	return sprintf(buf, "%x\n", dev->rev_id);

}



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

			   char *buf)

{

	struct mthca_dev *dev =

		container_of(device, struct mthca_dev, ib_dev.dev);

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

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

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

}



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

			char *buf)

{
@@ -1120,13 +1110,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 *mthca_dev_attributes[] = {

	&dev_attr_hw_rev,

	&dev_attr_fw_ver,

	&dev_attr_hca_type,

	&dev_attr_board_id

};
@@ -1187,6 +1175,17 @@ static int mthca_port_immutable(struct ib_device *ibdev, u8 port_num, 
	return 0;

}



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

			   size_t str_len)

{

	struct mthca_dev *dev =

		container_of(device, struct mthca_dev, ib_dev);

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

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

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

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

}



int mthca_register_device(struct mthca_dev *dev)

{

	int ret;
@@ -1266,6 +1265,7 @@ int mthca_register_device(struct mthca_dev *dev) 
	dev->ib_dev.reg_user_mr          = mthca_reg_user_mr;

	dev->ib_dev.dereg_mr             = mthca_dereg_mr;

	dev->ib_dev.get_port_immutable   = mthca_port_immutable;

	dev->ib_dev.get_dev_fw_str       = get_dev_fw_str;



	if (dev->mthca_flags & MTHCA_FLAG_FMR) {

		dev->ib_dev.alloc_fmr            = mthca_alloc_fmr;