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

Commit 508a523f authored by Parav Pandit's avatar Parav Pandit Committed by Jason Gunthorpe
Browse files

RDMA/drivers: Use core provided API for registering device attributes 



Use rdma_set_device_sysfs_group() to register device attributes and
simplify the driver.

Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent d4122f5a

drivers/infiniband/hw/bnxt_re/main.c

+31 −43
Original line number Diff line number Diff line
@@ -535,6 +535,34 @@ static struct bnxt_en_dev *bnxt_re_dev_probe(struct net_device *netdev) 
	return en_dev;

}



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

			   char *buf)

{

	struct bnxt_re_dev *rdev = to_bnxt_re_dev(device, ibdev.dev);



	return scnprintf(buf, PAGE_SIZE, "0x%x\n", rdev->en_dev->pdev->vendor);

}

static DEVICE_ATTR_RO(hw_rev);



static ssize_t hca_type_show(struct device *device,

			     struct device_attribute *attr, char *buf)

{

	struct bnxt_re_dev *rdev = to_bnxt_re_dev(device, ibdev.dev);



	return scnprintf(buf, PAGE_SIZE, "%s\n", rdev->ibdev.node_desc);

}

static DEVICE_ATTR_RO(hca_type);



static struct attribute *bnxt_re_attributes[] = {

	&dev_attr_hw_rev.attr,

	&dev_attr_hca_type.attr,

	NULL

};



static const struct attribute_group bnxt_re_dev_attr_group = {

	.attrs = bnxt_re_attributes,

};



static void bnxt_re_unregister_ib(struct bnxt_re_dev *rdev)

{

	ib_unregister_device(&rdev->ibdev);
@@ -638,34 +666,11 @@ static int bnxt_re_register_ib(struct bnxt_re_dev *rdev) 
	ibdev->get_hw_stats             = bnxt_re_ib_get_hw_stats;

	ibdev->alloc_hw_stats           = bnxt_re_ib_alloc_hw_stats;



	rdma_set_device_sysfs_group(ibdev, &bnxt_re_dev_attr_group);

	ibdev->driver_id = RDMA_DRIVER_BNXT_RE;

	return ib_register_device(ibdev, "bnxt_re%d", NULL);

}



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

			char *buf)

{

	struct bnxt_re_dev *rdev = to_bnxt_re_dev(device, ibdev.dev);



	return scnprintf(buf, PAGE_SIZE, "0x%x\n", rdev->en_dev->pdev->vendor);

}



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

			char *buf)

{

	struct bnxt_re_dev *rdev = to_bnxt_re_dev(device, ibdev.dev);



	return scnprintf(buf, PAGE_SIZE, "%s\n", rdev->ibdev.node_desc);

}



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

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



static struct device_attribute *bnxt_re_attributes[] = {

	&dev_attr_hw_rev,

	&dev_attr_hca_type

};



static void bnxt_re_dev_remove(struct bnxt_re_dev *rdev)

{

	dev_put(rdev->netdev);
@@ -1200,12 +1205,9 @@ static int bnxt_re_setup_qos(struct bnxt_re_dev *rdev) 


static void bnxt_re_ib_unreg(struct bnxt_re_dev *rdev)

{

	int i, rc;

	int rc;



	if (test_and_clear_bit(BNXT_RE_FLAG_IBDEV_REGISTERED, &rdev->flags)) {

		for (i = 0; i < ARRAY_SIZE(bnxt_re_attributes); i++)

			device_remove_file(&rdev->ibdev.dev,

					   bnxt_re_attributes[i]);

		/* Cleanup ib dev */

		bnxt_re_unregister_ib(rdev);

	}
@@ -1255,7 +1257,7 @@ static void bnxt_re_worker(struct work_struct *work) 


static int bnxt_re_ib_reg(struct bnxt_re_dev *rdev)

{

	int i, j, rc;

	int rc;



	bool locked;
@@ -1375,20 +1377,6 @@ static int bnxt_re_ib_reg(struct bnxt_re_dev *rdev) 
	}

	set_bit(BNXT_RE_FLAG_IBDEV_REGISTERED, &rdev->flags);

	dev_info(rdev_to_dev(rdev), "Device registered successfully");

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

		rc = device_create_file(&rdev->ibdev.dev,

					bnxt_re_attributes[i]);

		if (rc) {

			dev_err(rdev_to_dev(rdev),

				"Failed to create IB sysfs: %#x", rc);

			/* Must clean up all created device files */

			for (j = 0; j < i; j++)

				device_remove_file(&rdev->ibdev.dev,

						   bnxt_re_attributes[j]);

			bnxt_re_unregister_ib(rdev);

			goto fail;

		}

	}

	ib_get_eth_speed(&rdev->ibdev, 1, &rdev->active_speed,

			 &rdev->active_width);

	set_bit(BNXT_RE_FLAG_ISSUE_ROCE_STATS, &rdev->flags);

drivers/infiniband/hw/cxgb3/iwch_provider.c

+19 −33
Original line number Diff line number Diff line
@@ -1127,17 +1127,18 @@ static int iwch_query_port(struct ib_device *ibdev, 
	return 0;

}



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

			char *buf)

static ssize_t hw_rev_show(struct device *dev,

			   struct device_attribute *attr, char *buf)

{

	struct iwch_dev *iwch_dev = container_of(dev, struct iwch_dev,

						 ibdev.dev);

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

	return sprintf(buf, "%d\n", iwch_dev->rdev.t3cdev_p->type);

}

static DEVICE_ATTR_RO(hw_rev);



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

			char *buf)

static ssize_t hca_type_show(struct device *dev,

			     struct device_attribute *attr, char *buf)

{

	struct iwch_dev *iwch_dev = container_of(dev, struct iwch_dev,

						 ibdev.dev);
@@ -1148,9 +1149,10 @@ static ssize_t show_hca(struct device *dev, struct device_attribute *attr, 
	lldev->ethtool_ops->get_drvinfo(lldev, &info);

	return sprintf(buf, "%s\n", info.driver);

}

static DEVICE_ATTR_RO(hca_type);



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

			  char *buf)

static ssize_t board_id_show(struct device *dev,

			     struct device_attribute *attr, char *buf)

{

	struct iwch_dev *iwch_dev = container_of(dev, struct iwch_dev,

						 ibdev.dev);
@@ -1158,6 +1160,7 @@ static ssize_t show_board(struct device *dev, struct device_attribute *attr, 
	return sprintf(buf, "%x.%x\n", iwch_dev->rdev.rnic_info.pdev->vendor,

		       iwch_dev->rdev.rnic_info.pdev->device);

}

static DEVICE_ATTR_RO(board_id);



enum counters {

	IPINRECEIVES,
@@ -1274,14 +1277,15 @@ static int iwch_get_mib(struct ib_device *ibdev, struct rdma_hw_stats *stats, 
	return stats->num_counters;

}



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

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

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

static struct attribute *iwch_class_attributes[] = {

	&dev_attr_hw_rev.attr,

	&dev_attr_hca_type.attr,

	&dev_attr_board_id.attr,

	NULL

};



static struct device_attribute *iwch_class_attributes[] = {

	&dev_attr_hw_rev,

	&dev_attr_hca_type,

	&dev_attr_board_id,

static const struct attribute_group iwch_attr_group = {

	.attrs = iwch_class_attributes,

};



static int iwch_port_immutable(struct ib_device *ibdev, u8 port_num,
@@ -1316,7 +1320,6 @@ static void get_dev_fw_ver_str(struct ib_device *ibdev, char *str) 
int iwch_register_device(struct iwch_dev *dev)

{

	int ret;

	int i;



	pr_debug("%s iwch_dev %p\n", __func__, dev);

	memset(&dev->ibdev.node_guid, 0, sizeof(dev->ibdev.node_guid));
@@ -1401,33 +1404,16 @@ int iwch_register_device(struct iwch_dev *dev) 
	       sizeof(dev->ibdev.iwcm->ifname));



	dev->ibdev.driver_id = RDMA_DRIVER_CXGB3;

	rdma_set_device_sysfs_group(&dev->ibdev, &iwch_attr_group);

	ret = ib_register_device(&dev->ibdev, "cxgb3_%d", NULL);

	if (ret)

		goto bail1;



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

		ret = device_create_file(&dev->ibdev.dev,

					 iwch_class_attributes[i]);

		if (ret) {

			goto bail2;

		}

	}

	return 0;

bail2:

	ib_unregister_device(&dev->ibdev);

bail1:

		kfree(dev->ibdev.iwcm);

	return ret;

}



void iwch_unregister_device(struct iwch_dev *dev)

{

	int i;



	pr_debug("%s iwch_dev %p\n", __func__, dev);

	for (i = 0; i < ARRAY_SIZE(iwch_class_attributes); ++i)

		device_remove_file(&dev->ibdev.dev,

				   iwch_class_attributes[i]);

	ib_unregister_device(&dev->ibdev);

	kfree(dev->ibdev.iwcm);

	return;

drivers/infiniband/hw/cxgb4/provider.c

+19 −28
Original line number Diff line number Diff line
@@ -373,8 +373,8 @@ static int c4iw_query_port(struct ib_device *ibdev, u8 port, 
	return 0;

}



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

			char *buf)

static ssize_t hw_rev_show(struct device *dev,

			   struct device_attribute *attr, char *buf)

{

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

						 ibdev.dev);
@@ -382,9 +382,10 @@ static ssize_t show_rev(struct device *dev, struct device_attribute *attr, 
	return sprintf(buf, "%d\n",

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

}

static DEVICE_ATTR_RO(hw_rev);



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

			char *buf)

static ssize_t hca_type_show(struct device *dev,

			     struct device_attribute *attr, char *buf)

{

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

						 ibdev.dev);
@@ -395,8 +396,9 @@ static ssize_t show_hca(struct device *dev, struct device_attribute *attr, 
	lldev->ethtool_ops->get_drvinfo(lldev, &info);

	return sprintf(buf, "%s\n", info.driver);

}

static DEVICE_ATTR_RO(hca_type);



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

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

			     char *buf)

{

	struct c4iw_dev *c4iw_dev = container_of(dev, struct c4iw_dev,
@@ -405,6 +407,7 @@ static ssize_t show_board(struct device *dev, struct device_attribute *attr, 
	return sprintf(buf, "%x.%x\n", c4iw_dev->rdev.lldi.pdev->vendor,

		       c4iw_dev->rdev.lldi.pdev->device);

}

static DEVICE_ATTR_RO(board_id);



enum counters {

	IP4INSEGS,
@@ -461,14 +464,15 @@ static int c4iw_get_mib(struct ib_device *ibdev, 
	return stats->num_counters;

}



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

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

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

static struct attribute *c4iw_class_attributes[] = {

	&dev_attr_hw_rev.attr,

	&dev_attr_hca_type.attr,

	&dev_attr_board_id.attr,

	NULL

};



static struct device_attribute *c4iw_class_attributes[] = {

	&dev_attr_hw_rev,

	&dev_attr_hca_type,

	&dev_attr_board_id,

static const struct attribute_group c4iw_attr_group = {

	.attrs = c4iw_class_attributes,

};



static int c4iw_port_immutable(struct ib_device *ibdev, u8 port_num,
@@ -530,7 +534,6 @@ static int fill_res_entry(struct sk_buff *msg, struct rdma_restrack_entry *res) 
void c4iw_register_device(struct work_struct *work)

{

	int ret;

	int i;

	struct uld_ctx *ctx = container_of(work, struct uld_ctx, reg_work);

	struct c4iw_dev *dev = ctx->dev;
@@ -625,20 +628,13 @@ void c4iw_register_device(struct work_struct *work) 
	memcpy(dev->ibdev.iwcm->ifname, dev->rdev.lldi.ports[0]->name,

	       sizeof(dev->ibdev.iwcm->ifname));



	rdma_set_device_sysfs_group(&dev->ibdev, &c4iw_attr_group);

	dev->ibdev.driver_id = RDMA_DRIVER_CXGB4;

	ret = ib_register_device(&dev->ibdev, "cxgb4_%d", NULL);

	if (ret)

		goto err_kfree_iwcm;



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

		ret = device_create_file(&dev->ibdev.dev,

					 c4iw_class_attributes[i]);

		if (ret)

			goto err_unregister_device;

	}

	return;

err_unregister_device:

	ib_unregister_device(&dev->ibdev);



err_kfree_iwcm:

	kfree(dev->ibdev.iwcm);

err_dealloc_ctx:
@@ -650,12 +646,7 @@ void c4iw_register_device(struct work_struct *work) 


void c4iw_unregister_device(struct c4iw_dev *dev)

{

	int i;



	pr_debug("c4iw_dev %p\n", dev);

	for (i = 0; i < ARRAY_SIZE(c4iw_class_attributes); ++i)

		device_remove_file(&dev->ibdev.dev,

				   c4iw_class_attributes[i]);

	ib_unregister_device(&dev->ibdev);

	kfree(dev->ibdev.iwcm);

	return;

drivers/infiniband/hw/hfi1/hfi.h

+1 −0
Original line number Diff line number Diff line
@@ -1968,6 +1968,7 @@ static inline u32 get_rcvhdrtail(const struct hfi1_ctxtdata *rcd) 
 */



extern const char ib_hfi1_version[];

extern const struct attribute_group ib_hfi1_attr_group;



int hfi1_device_create(struct hfi1_devdata *dd);

void hfi1_device_remove(struct hfi1_devdata *dd);

drivers/infiniband/hw/hfi1/sysfs.c

+32 −37
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ static struct kobj_type hfi1_vl2mtu_ktype = { 
 * Start of per-unit (or driver, in some cases, but replicated

 * per unit) functions (these get a device *)

 */

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

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

			   char *buf)

{

	struct hfi1_ibdev *dev =
@@ -502,9 +502,10 @@ static ssize_t show_rev(struct device *device, struct device_attribute *attr, 


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

}

static DEVICE_ATTR_RO(hw_rev);



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

			char *buf)

static ssize_t board_id_show(struct device *device,

			     struct device_attribute *attr, char *buf)

{

	struct hfi1_ibdev *dev =

		container_of(device, struct hfi1_ibdev, rdi.ibdev.dev);
@@ -517,8 +518,9 @@ static ssize_t show_hfi(struct device *device, struct device_attribute *attr, 
		ret = scnprintf(buf, PAGE_SIZE, "%s\n", dd->boardname);

	return ret;

}

static DEVICE_ATTR_RO(board_id);



static ssize_t show_boardversion(struct device *device,

static ssize_t boardversion_show(struct device *device,

				 struct device_attribute *attr, char *buf)

{

	struct hfi1_ibdev *dev =
@@ -528,8 +530,9 @@ static ssize_t show_boardversion(struct device *device, 
	/* The string printed here is already newline-terminated. */

	return scnprintf(buf, PAGE_SIZE, "%s", dd->boardversion);

}

static DEVICE_ATTR_RO(boardversion);



static ssize_t show_nctxts(struct device *device,

static ssize_t nctxts_show(struct device *device,

			   struct device_attribute *attr, char *buf)

{

	struct hfi1_ibdev *dev =
@@ -546,8 +549,9 @@ static ssize_t show_nctxts(struct device *device, 
			 min(dd->num_user_contexts,

			     (u32)dd->sc_sizes[SC_USER].count));

}

static DEVICE_ATTR_RO(nctxts);



static ssize_t show_nfreectxts(struct device *device,

static ssize_t nfreectxts_show(struct device *device,

			       struct device_attribute *attr, char *buf)

{

	struct hfi1_ibdev *dev =
@@ -557,8 +561,9 @@ static ssize_t show_nfreectxts(struct device *device, 
	/* Return the number of free user ports (contexts) available. */

	return scnprintf(buf, PAGE_SIZE, "%u\n", dd->freectxts);

}

static DEVICE_ATTR_RO(nfreectxts);



static ssize_t show_serial(struct device *device,

static ssize_t serial_show(struct device *device,

			   struct device_attribute *attr, char *buf)

{

	struct hfi1_ibdev *dev =
@@ -567,8 +572,9 @@ static ssize_t show_serial(struct device *device, 


	return scnprintf(buf, PAGE_SIZE, "%s", dd->serial);

}

static DEVICE_ATTR_RO(serial);



static ssize_t store_chip_reset(struct device *device,

static ssize_t chip_reset_store(struct device *device,

				struct device_attribute *attr, const char *buf,

				size_t count)

{
@@ -586,6 +592,7 @@ static ssize_t store_chip_reset(struct device *device, 
bail:

	return ret < 0 ? ret : count;

}

static DEVICE_ATTR_WO(chip_reset);



/*

 * Convert the reported temperature from an integer (reported in
@@ -598,7 +605,7 @@ static ssize_t store_chip_reset(struct device *device, 
/*

 * Dump tempsense values, in decimal, to ease shell-scripts.

 */

static ssize_t show_tempsense(struct device *device,

static ssize_t tempsense_show(struct device *device,

			      struct device_attribute *attr, char *buf)

{

	struct hfi1_ibdev *dev =
@@ -622,6 +629,7 @@ static ssize_t show_tempsense(struct device *device, 
	}

	return ret;

}

static DEVICE_ATTR_RO(tempsense);



/*

 * end of per-unit (or driver, in some cases, but replicated
@@ -629,24 +637,20 @@ static ssize_t show_tempsense(struct device *device, 
 */



/* start of per-unit file structures and support code */

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

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

static DEVICE_ATTR(nctxts, S_IRUGO, show_nctxts, NULL);

static DEVICE_ATTR(nfreectxts, S_IRUGO, show_nfreectxts, NULL);

static DEVICE_ATTR(serial, S_IRUGO, show_serial, NULL);

static DEVICE_ATTR(boardversion, S_IRUGO, show_boardversion, NULL);

static DEVICE_ATTR(tempsense, S_IRUGO, show_tempsense, NULL);

static DEVICE_ATTR(chip_reset, S_IWUSR, NULL, store_chip_reset);



static struct device_attribute *hfi1_attributes[] = {

	&dev_attr_hw_rev,

	&dev_attr_board_id,

	&dev_attr_nctxts,

	&dev_attr_nfreectxts,

	&dev_attr_serial,

	&dev_attr_boardversion,

	&dev_attr_tempsense,

	&dev_attr_chip_reset,

static struct attribute *hfi1_attributes[] = {

	&dev_attr_hw_rev.attr,

	&dev_attr_board_id.attr,

	&dev_attr_nctxts.attr,

	&dev_attr_nfreectxts.attr,

	&dev_attr_serial.attr,

	&dev_attr_boardversion.attr,

	&dev_attr_tempsense.attr,

	&dev_attr_chip_reset.attr,

	NULL,

};



const struct attribute_group ib_hfi1_attr_group = {

	.attrs = hfi1_attributes,

};



int hfi1_create_port_files(struct ib_device *ibdev, u8 port_num,
@@ -832,12 +836,6 @@ int hfi1_verbs_register_sysfs(struct hfi1_devdata *dd) 
	struct device *class_dev = &dev->dev;

	int i, j, ret;



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

		ret = device_create_file(&dev->dev, hfi1_attributes[i]);

		if (ret)

			goto bail;

	}



	for (i = 0; i < dd->num_sdma; i++) {

		ret = kobject_init_and_add(&dd->per_sdma[i].kobj,

					   &sde_ktype, &class_dev->kobj,
@@ -855,9 +853,6 @@ int hfi1_verbs_register_sysfs(struct hfi1_devdata *dd) 


	return 0;

bail:

	for (i = 0; i < ARRAY_SIZE(hfi1_attributes); ++i)

		device_remove_file(&dev->dev, hfi1_attributes[i]);



	for (i = 0; i < dd->num_sdma; i++)

		kobject_del(&dd->per_sdma[i].kobj);