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: Ralph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

12 files changed, 35 insertions, 16 deletions

diff --git a/drivers/infiniband/core/core_priv.h b/drivers/infiniband/core/core_priv.h
index 05ac36e6acdb..a565af5c2d2e 100644
--- a/drivers/infiniband/core/core_priv.h
+++ b/drivers/infiniband/core/core_priv.h
@@ -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);
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index d1fba4153332..a19effad0811 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -267,7 +267,9 @@ out:
  * 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);
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index f901957abc8b..3627300e2a10 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -475,7 +475,9 @@ err:
         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;
                 }
diff --git a/drivers/infiniband/hw/amso1100/c2_provider.c b/drivers/infiniband/hw/amso1100/c2_provider.c
index c47f618d12e8..aeebc4d37e33 100644
--- a/drivers/infiniband/hw/amso1100/c2_provider.c
+++ b/drivers/infiniband/hw/amso1100/c2_provider.c
@@ -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;
 
diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c
index 19b1c4a62a23..fca0b4b747e4 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
@@ -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;
 
diff --git a/drivers/infiniband/hw/cxgb4/provider.c b/drivers/infiniband/hw/cxgb4/provider.c
index dfc49020bb9c..cd3d6e2c7edf 100644
--- a/drivers/infiniband/hw/cxgb4/provider.c
+++ b/drivers/infiniband/hw/cxgb4/provider.c
@@ -486,7 +486,7 @@ int c4iw_register_device(struct c4iw_dev *dev)
         dev->ibdev.iwcm->rem_ref = c4iw_qp_rem_ref;
         dev->ibdev.iwcm->get_qp = c4iw_get_qp;
 
-        ret = ib_register_device(&dev->ibdev);
+        ret = ib_register_device(&dev->ibdev, NULL);
         if (ret)
                 goto bail1;
 
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index 129a6bebd6e3..d1a92785c9ee 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -798,7 +798,7 @@ static int __devinit ehca_probe(struct of_device *dev,
                 goto probe5;
         }
 
-        ret = ib_register_device(&shca->ib_device);
+        ret = ib_register_device(&shca->ib_device, NULL);
         if (ret) {
                 ehca_err(&shca->ib_device,
                          "ib_register_device() failed ret=%i", ret);
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
index 559f39be0dcc..dd7f26d04d46 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -2182,7 +2182,7 @@ int ipath_register_ib_device(struct ipath_devdata *dd)
         snprintf(dev->node_desc, sizeof(dev->node_desc),
                  IPATH_IDSTR " %s", init_utsname()->nodename);
 
-        ret = ib_register_device(dev);
+        ret = ib_register_device(dev, NULL);
         if (ret)
                 goto err_reg;
 
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 39051417054c..4e94e360e43b 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -662,7 +662,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
         spin_lock_init(&ibdev->sm_lock);
         mutex_init(&ibdev->cap_mask_mutex);
 
-        if (ib_register_device(&ibdev->ib_dev))
+        if (ib_register_device(&ibdev->ib_dev, NULL))
                 goto err_map;
 
         if (mlx4_ib_mad_init(ibdev))
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
index f080a784bc79..1e0b4b6074ad 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -1403,7 +1403,7 @@ int mthca_register_device(struct mthca_dev *dev)
 
         mutex_init(&dev->cap_mask_mutex);
 
-        ret = ib_register_device(&dev->ib_dev);
+        ret = ib_register_device(&dev->ib_dev, NULL);
         if (ret)
                 return ret;
 
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index 925e1f2d1d55..9bc2d744b2ea 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -3962,7 +3962,7 @@ int nes_register_ofa_device(struct nes_ib_device *nesibdev)
         struct nes_adapter *nesadapter = nesdev->nesadapter;
         int i, ret;
 
-        ret = ib_register_device(&nesvnic->nesibdev->ibdev);
+        ret = ib_register_device(&nesvnic->nesibdev->ibdev, NULL);
         if (ret) {
                 return ret;
         }
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 310d31474034..f3e8f3c07725 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -1172,7 +1172,9 @@ struct ib_client {
 struct ib_device *ib_alloc_device(size_t size);
 void ib_dealloc_device(struct ib_device *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 *));
 void ib_unregister_device(struct ib_device *device);
 
 int ib_register_client   (struct ib_client *client);