3 files changed, 99 insertions, 29 deletions

diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index a50391b6ba2a..3a59d5f018d3 100644
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -517,7 +517,7 @@ static struct rio_dev __devinit *rio_setup_device(struct rio_net *net,
         return rdev;
 
 cleanup:
-        if (rswitch->route_table)
+        if (rio_is_switch(rdev))
                 kfree(rswitch->route_table);
 
         kfree(rdev);
diff --git a/drivers/rapidio/rio-sysfs.c b/drivers/rapidio/rio-sysfs.c
index 1269fbd2deca..4dbe360989be 100644
--- a/drivers/rapidio/rio-sysfs.c
+++ b/drivers/rapidio/rio-sysfs.c
@@ -14,6 +14,7 @@
 #include <linux/rio.h>
 #include <linux/rio_drv.h>
 #include <linux/stat.h>
+#include <linux/capability.h>
 
 #include "rio.h"
 
@@ -33,6 +34,8 @@ rio_config_attr(device_rev, "0x%08x\n");
 rio_config_attr(asm_did, "0x%04x\n");
 rio_config_attr(asm_vid, "0x%04x\n");
 rio_config_attr(asm_rev, "0x%04x\n");
+rio_config_attr(destid, "0x%04x\n");
+rio_config_attr(hopcount, "0x%02x\n");
 
 static ssize_t routes_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
@@ -52,6 +55,35 @@ static ssize_t routes_show(struct device *dev, struct device_attribute *attr, ch
         return (str - buf);
 }
 
+static ssize_t lprev_show(struct device *dev,
+                          struct device_attribute *attr, char *buf)
+{
+        struct rio_dev *rdev = to_rio_dev(dev);
+
+        return sprintf(buf, "%s\n",
+                        (rdev->prev) ? rio_name(rdev->prev) : "root");
+}
+
+static ssize_t lnext_show(struct device *dev,
+                          struct device_attribute *attr, char *buf)
+{
+        struct rio_dev *rdev = to_rio_dev(dev);
+        char *str = buf;
+        int i;
+
+        if (rdev->pef & RIO_PEF_SWITCH) {
+                for (i = 0; i < RIO_GET_TOTAL_PORTS(rdev->swpinfo); i++) {
+                        if (rdev->rswitch->nextdev[i])
+                                str += sprintf(str, "%s\n",
+                                        rio_name(rdev->rswitch->nextdev[i]));
+                        else
+                                str += sprintf(str, "null\n");
+                }
+        }
+
+        return str - buf;
+}
+
 struct device_attribute rio_dev_attrs[] = {
         __ATTR_RO(did),
         __ATTR_RO(vid),
@@ -59,10 +91,14 @@ struct device_attribute rio_dev_attrs[] = {
         __ATTR_RO(asm_did),
         __ATTR_RO(asm_vid),
         __ATTR_RO(asm_rev),
+        __ATTR_RO(lprev),
+        __ATTR_RO(destid),
         __ATTR_NULL,
 };
 
 static DEVICE_ATTR(routes, S_IRUGO, routes_show, NULL);
+static DEVICE_ATTR(lnext, S_IRUGO, lnext_show, NULL);
+static DEVICE_ATTR(hopcount, S_IRUGO, hopcount_show, NULL);
 
 static ssize_t
 rio_read_config(struct file *filp, struct kobject *kobj,
@@ -218,7 +254,9 @@ int rio_create_sysfs_dev_files(struct rio_dev *rdev)
         err = device_create_bin_file(&rdev->dev, &rio_config_attr);
 
         if (!err && (rdev->pef & RIO_PEF_SWITCH)) {
-                err = device_create_file(&rdev->dev, &dev_attr_routes);
+                err |= device_create_file(&rdev->dev, &dev_attr_routes);
+                err |= device_create_file(&rdev->dev, &dev_attr_lnext);
+                err |= device_create_file(&rdev->dev, &dev_attr_hopcount);
                 if (!err && rdev->rswitch->sw_sysfs)
                         err = rdev->rswitch->sw_sysfs(rdev, RIO_SW_SYSFS_CREATE);
         }
@@ -241,6 +279,8 @@ void rio_remove_sysfs_dev_files(struct rio_dev *rdev)
         device_remove_bin_file(&rdev->dev, &rio_config_attr);
         if (rdev->pef & RIO_PEF_SWITCH) {
                 device_remove_file(&rdev->dev, &dev_attr_routes);
+                device_remove_file(&rdev->dev, &dev_attr_lnext);
+                device_remove_file(&rdev->dev, &dev_attr_hopcount);
                 if (rdev->rswitch->sw_sysfs)
                         rdev->rswitch->sw_sysfs(rdev, RIO_SW_SYSFS_REMOVE);
         }
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index cc2a3b74d0f0..c29719cacbca 100644
--- a/drivers/rapidio/rio.c
+++ b/drivers/rapidio/rio.c
@@ -32,6 +32,7 @@
 #include "rio.h"
 
 static LIST_HEAD(rio_mports);
+static unsigned char next_portid;
 
 /**
  * rio_local_get_device_id - Get the base/extended device id for a port
@@ -68,9 +69,13 @@ int rio_request_inb_mbox(struct rio_mport *mport,
                          void (*minb) (struct rio_mport * mport, void *dev_id, int mbox,
                                        int slot))
 {
-        int rc = 0;
+        int rc = -ENOSYS;
+        struct resource *res;
 
-        struct resource *res = kmalloc(sizeof(struct resource), GFP_KERNEL);
+        if (mport->ops->open_inb_mbox == NULL)
+                goto out;
+
+        res = kmalloc(sizeof(struct resource), GFP_KERNEL);
 
         if (res) {
                 rio_init_mbox_res(res, mbox, mbox);
@@ -88,7 +93,7 @@ int rio_request_inb_mbox(struct rio_mport *mport,
                 /* Hook the inbound message callback */
                 mport->inb_msg[mbox].mcback = minb;
 
-                rc = rio_open_inb_mbox(mport, dev_id, mbox, entries);
+                rc = mport->ops->open_inb_mbox(mport, dev_id, mbox, entries);
         } else
                 rc = -ENOMEM;
 
@@ -106,10 +111,13 @@ int rio_request_inb_mbox(struct rio_mport *mport,
  */
 int rio_release_inb_mbox(struct rio_mport *mport, int mbox)
 {
-        rio_close_inb_mbox(mport, mbox);
+        if (mport->ops->close_inb_mbox) {
+                mport->ops->close_inb_mbox(mport, mbox);
 
-        /* Release the mailbox resource */
-        return release_resource(mport->inb_msg[mbox].res);
+                /* Release the mailbox resource */
+                return release_resource(mport->inb_msg[mbox].res);
+        } else
+                return -ENOSYS;
 }
 
 /**
@@ -129,9 +137,13 @@ int rio_request_outb_mbox(struct rio_mport *mport,
                           int entries,
                           void (*moutb) (struct rio_mport * mport, void *dev_id, int mbox, int slot))
 {
-        int rc = 0;
+        int rc = -ENOSYS;
+        struct resource *res;
 
-        struct resource *res = kmalloc(sizeof(struct resource), GFP_KERNEL);
+        if (mport->ops->open_outb_mbox == NULL)
+                goto out;
+
+        res = kmalloc(sizeof(struct resource), GFP_KERNEL);
 
         if (res) {
                 rio_init_mbox_res(res, mbox, mbox);
@@ -149,7 +161,7 @@ int rio_request_outb_mbox(struct rio_mport *mport,
                 /* Hook the inbound message callback */
                 mport->outb_msg[mbox].mcback = moutb;
 
-                rc = rio_open_outb_mbox(mport, dev_id, mbox, entries);
+                rc = mport->ops->open_outb_mbox(mport, dev_id, mbox, entries);
         } else
                 rc = -ENOMEM;
 
@@ -167,10 +179,13 @@ int rio_request_outb_mbox(struct rio_mport *mport,
  */
 int rio_release_outb_mbox(struct rio_mport *mport, int mbox)
 {
-        rio_close_outb_mbox(mport, mbox);
+        if (mport->ops->close_outb_mbox) {
+                mport->ops->close_outb_mbox(mport, mbox);
 
-        /* Release the mailbox resource */
-        return release_resource(mport->outb_msg[mbox].res);
+                /* Release the mailbox resource */
+                return release_resource(mport->outb_msg[mbox].res);
+        } else
+                return -ENOSYS;
 }
 
 /**
@@ -1120,36 +1135,51 @@ static int __devinit rio_init(void)
         return 0;
 }
 
-device_initcall(rio_init);
-
 int __devinit rio_init_mports(void)
 {
-        int rc = 0;
         struct rio_mport *port;
 
         list_for_each_entry(port, &rio_mports, node) {
-                if (!request_mem_region(port->iores.start,
-                                        resource_size(&port->iores),
-                                        port->name)) {
-                        printk(KERN_ERR
-                               "RIO: Error requesting master port region 0x%016llx-0x%016llx\n",
-                               (u64)port->iores.start, (u64)port->iores.end);
-                        rc = -ENOMEM;
-                        goto out;
-                }
-
                 if (port->host_deviceid >= 0)
                         rio_enum_mport(port);
                 else
                         rio_disc_mport(port);
         }
 
-      out:
-        return rc;
+        rio_init();
+
+        return 0;
 }
 
+device_initcall_sync(rio_init_mports);
+
+static int hdids[RIO_MAX_MPORTS + 1];
+
+static int rio_get_hdid(int index)
+{
+        if (!hdids[0] || hdids[0] <= index || index >= RIO_MAX_MPORTS)
+                return -1;
+
+        return hdids[index + 1];
+}
+
+static int rio_hdid_setup(char *str)
+{
+        (void)get_options(str, ARRAY_SIZE(hdids), hdids);
+        return 1;
+}
+
+__setup("riohdid=", rio_hdid_setup);
+
 void rio_register_mport(struct rio_mport *port)
 {
+        if (next_portid >= RIO_MAX_MPORTS) {
+                pr_err("RIO: reached specified max number of mports\n");
+                return;
+        }
+
+        port->id = next_portid++;
+        port->host_deviceid = rio_get_hdid(port->id);
         list_add_tail(&port->node, &rio_mports);
 }