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

Commit 9a6edb60 authored by Ralph Campbell's avatar Ralph Campbell Committed by Roland Dreier
Browse files

IB/core: Allow device-specific per-port sysfs files 



Add a new parameter to ib_register_device() so that low-level device
drivers can pass in a pointer to a callback function that will be
called for each port that is registered in sysfs.  This allows
low-level device drivers to create files in

    /sys/class/infiniband/<hca>/ports/<N>/

without having to poke through the internals of the RDMA sysfs handling.

There is no need for an unregister function since the kobject
reference will go to zero when ib_unregister_device() is called.

Signed-off-by: default avatarRalph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent a0fe3cc5

drivers/infiniband/core/core_priv.h

+3 −1
Original line number Diff line number Diff line
@@ -38,7 +38,9 @@ 


#include <rdma/ib_verbs.h>



int  ib_device_register_sysfs(struct ib_device *device);

int  ib_device_register_sysfs(struct ib_device *device,

			      int (*port_callback)(struct ib_device *,

						   u8, struct kobject *));

void ib_device_unregister_sysfs(struct ib_device *device);



int  ib_sysfs_setup(void);

drivers/infiniband/core/device.c

+4 −2
Original line number Diff line number Diff line
@@ -267,7 +267,9 @@ static int read_port_table_lengths(struct ib_device *device) 
 * callback for each device that is added. @device must be allocated

 * with ib_alloc_device().

 */

int ib_register_device(struct ib_device *device)

int ib_register_device(struct ib_device *device,

		       int (*port_callback)(struct ib_device *,

					    u8, struct kobject *))

{

	int ret;
@@ -296,7 +298,7 @@ int ib_register_device(struct ib_device *device) 
		goto out;

	}



	ret = ib_device_register_sysfs(device);

	ret = ib_device_register_sysfs(device, port_callback);

	if (ret) {

		printk(KERN_WARNING "Couldn't register device %s with driver model\n",

		       device->name);

drivers/infiniband/core/sysfs.c

+17 −4
Original line number Diff line number Diff line
@@ -475,7 +475,9 @@ alloc_group_attrs(ssize_t (*show)(struct ib_port *, 
	return NULL;

}



static int add_port(struct ib_device *device, int port_num)

static int add_port(struct ib_device *device, int port_num,

		    int (*port_callback)(struct ib_device *,

					 u8, struct kobject *))

{

	struct ib_port *p;

	struct ib_port_attr attr;
@@ -522,11 +524,20 @@ static int add_port(struct ib_device *device, int port_num) 
	if (ret)

		goto err_free_pkey;



	if (port_callback) {

		ret = port_callback(device, port_num, &p->kobj);

		if (ret)

			goto err_remove_pkey;

	}



	list_add_tail(&p->kobj.entry, &device->port_list);



	kobject_uevent(&p->kobj, KOBJ_ADD);

	return 0;



err_remove_pkey:

	sysfs_remove_group(&p->kobj, &p->pkey_group);



err_free_pkey:

	for (i = 0; i < attr.pkey_tbl_len; ++i)

		kfree(p->pkey_group.attrs[i]);
@@ -754,7 +765,9 @@ static struct attribute_group iw_stats_group = { 
	.attrs	= iw_proto_stats_attrs,

};



int ib_device_register_sysfs(struct ib_device *device)

int ib_device_register_sysfs(struct ib_device *device,

			     int (*port_callback)(struct ib_device *,

						  u8, struct kobject *))

{

	struct device *class_dev = &device->dev;

	int ret;
@@ -785,12 +798,12 @@ int ib_device_register_sysfs(struct ib_device *device) 
	}



	if (device->node_type == RDMA_NODE_IB_SWITCH) {

		ret = add_port(device, 0);

		ret = add_port(device, 0, port_callback);

		if (ret)

			goto err_put;

	} else {

		for (i = 1; i <= device->phys_port_cnt; ++i) {

			ret = add_port(device, i);

			ret = add_port(device, i, port_callback);

			if (ret)

				goto err_put;

		}

drivers/infiniband/hw/amso1100/c2_provider.c

+1 −1
Original line number Diff line number Diff line
@@ -865,7 +865,7 @@ int c2_register_device(struct c2_dev *dev) 
	dev->ibdev.iwcm->create_listen = c2_service_create;

	dev->ibdev.iwcm->destroy_listen = c2_service_destroy;



	ret = ib_register_device(&dev->ibdev);

	ret = ib_register_device(&dev->ibdev, NULL);

	if (ret)

		goto out_free_iwcm;

drivers/infiniband/hw/cxgb3/iwch_provider.c

+1 −1
Original line number Diff line number Diff line
@@ -1428,7 +1428,7 @@ int iwch_register_device(struct iwch_dev *dev) 
	dev->ibdev.iwcm->rem_ref = iwch_qp_rem_ref;

	dev->ibdev.iwcm->get_qp = iwch_get_qp;



	ret = ib_register_device(&dev->ibdev);

	ret = ib_register_device(&dev->ibdev, NULL);

	if (ret)

		goto bail1;