sparc64: add MDESC node name property to VIO device metadata

Add the MDESC node name of MDESC client to VIO device metadata. It is
later used to uniquely identify a node in the MDESC. VIO & MDESC APIs
are updated to handle this node name.

Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Reviewed-by: Liam Merwick <liam.merwick@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc/include/asm/mdesc.h b/arch/sparc/include/asm/mdesc.h
index 68d19909d1cde20c874df03cb2bc660b7270c038..e8a4c413a1c76d48aece57e8c79043c3a7e85f92 100644 (file)
--- a/arch/sparc/include/asm/mdesc.h
+++ b/arch/sparc/include/asm/mdesc.h
@@ -63,9 +63,10 @@ u64 mdesc_arc_target(struct mdesc_handle *hp, u64 arc);
 void mdesc_update(void);
 
 struct mdesc_notifier_client {
-       void (*add)(struct mdesc_handle *handle, u64 node);
-       void (*remove)(struct mdesc_handle *handle, u64 node);
-
+       void (*add)(struct mdesc_handle *handle, u64 node,
+                   const char *node_name);
+       void (*remove)(struct mdesc_handle *handle, u64 node,
+                      const char *node_name);
        const char                      *node_name;
        struct mdesc_notifier_client    *next;
 };

diff --git a/arch/sparc/include/asm/vio.h b/arch/sparc/include/asm/vio.h
index 9dca7a892978a49d234a2b9325228b2c900d1276..69cb3a5ff8cfabc1e9e3ced030d49d0bc36a2902 100644 (file)
--- a/arch/sparc/include/asm/vio.h
+++ b/arch/sparc/include/asm/vio.h
@@ -316,12 +316,14 @@ static inline u32 vio_dring_prev(struct vio_dring_state *dr, u32 index)
 }
 
 #define VIO_MAX_TYPE_LEN       32
+#define VIO_MAX_NAME_LEN       32
 #define VIO_MAX_COMPAT_LEN     64
 
 struct vio_dev {
        u64                     mp;
        struct device_node      *dp;
 
+       char                    node_name[VIO_MAX_NAME_LEN];
        char                    type[VIO_MAX_TYPE_LEN];
        char                    compat[VIO_MAX_COMPAT_LEN];
        int                     compat_len;

diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c
index f0249691d0009f3255f05dc7d2935ed269d9e18b..04b76267ddfaa03548e894ec96de6faf6d30a654 100644 (file)
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
@@ -291,7 +291,7 @@ void mdesc_register_notifier(struct mdesc_notifier_client *client)
        client_list = client;
 
        mdesc_for_each_node_by_name(cur_mdesc, node, client->node_name)
-               client->add(cur_mdesc, node);
+               client->add(cur_mdesc, node, client->node_name);
 
        mutex_unlock(&mdesc_mutex);
 }
@@ -399,55 +399,61 @@ static bool ds_port_node_match(union md_node_info *a_node_info,
 static void invoke_on_missing(const char *name,
                              struct mdesc_handle *a,
                              struct mdesc_handle *b,
-                             void (*func)(struct mdesc_handle *, u64))
+                             void (*func)(struct mdesc_handle *, u64,
+                                          const char *node_name))
 {
-       u64 node;
+       mdesc_node_info_get_f get_info_func;
+       mdesc_node_info_rel_f rel_info_func;
+       mdesc_node_match_f node_match_func;
+       union md_node_info a_node_info;
+       union md_node_info b_node_info;
+       bool found;
+       u64 a_node;
+       u64 b_node;
+       int rv;
 
-       mdesc_for_each_node_by_name(a, node, name) {
-               int found = 0, is_vdc_port = 0;
-               const char *name_prop;
-               const u64 *id;
-               u64 fnode;
-
-               name_prop = mdesc_get_property(a, node, "name", NULL);
-               if (name_prop && !strcmp(name_prop, "vdc-port")) {
-                       is_vdc_port = 1;
-                       id = parent_cfg_handle(a, node);
-               } else
-                       id = mdesc_get_property(a, node, "id", NULL);
-
-               if (!id) {
-                       printk(KERN_ERR "MD: Cannot find ID for %s node.\n",
-                              (name_prop ? name_prop : name));
+       /*
+        * Find the get_info, rel_info and node_match ops for the given
+        * node name
+        */
+       mdesc_get_node_ops(name, &get_info_func, &rel_info_func,
+                          &node_match_func);
+
+       /* If we didn't find a match, the node type is not supported */
+       if (!get_info_func || !rel_info_func || !node_match_func) {
+               pr_err("MD: %s node type is not supported\n", name);
+               return;
+       }
+
+       mdesc_for_each_node_by_name(a, a_node, name) {
+               found = false;
+
+               rv = get_info_func(a, a_node, &a_node_info);
+               if (rv != 0) {
+                       pr_err("MD: Cannot find 1 or more required match properties for %s node.\n",
+                              name);
                        continue;
                }
 
-               mdesc_for_each_node_by_name(b, fnode, name) {
-                       const u64 *fid;
-
-                       if (is_vdc_port) {
-                               name_prop = mdesc_get_property(b, fnode,
-                                                              "name", NULL);
-                               if (!name_prop ||
-                                   strcmp(name_prop, "vdc-port"))
-                                       continue;
-                               fid = parent_cfg_handle(b, fnode);
-                               if (!fid) {
-                                       printk(KERN_ERR "MD: Cannot find ID "
-                                              "for vdc-port node.\n");
-                                       continue;
-                               }
-                       } else
-                               fid = mdesc_get_property(b, fnode,
-                                                        "id", NULL);
-
-                       if (*id == *fid) {
-                               found = 1;
+               /* Check each node in B for node matching a_node */
+               mdesc_for_each_node_by_name(b, b_node, name) {
+                       rv = get_info_func(b, b_node, &b_node_info);
+                       if (rv != 0)
+                               continue;
+
+                       if (node_match_func(&a_node_info, &b_node_info)) {
+                               found = true;
+                               rel_info_func(&b_node_info);
                                break;
                        }
+
+                       rel_info_func(&b_node_info);
                }
+
+               rel_info_func(&a_node_info);
+
                if (!found)
-                       func(a, node);
+                       func(a, a_node, name);
        }
 }
 

diff --git a/arch/sparc/kernel/vio.c b/arch/sparc/kernel/vio.c
index 075d38980dee394fdb32f86e130d0b3ec37ebfeb..f37937b95dbf3a06a414a0badada485f11d23d80 100644 (file)
--- a/arch/sparc/kernel/vio.c
+++ b/arch/sparc/kernel/vio.c
@@ -219,6 +219,7 @@ int vio_set_intr(unsigned long dev_ino, int state)
 EXPORT_SYMBOL(vio_set_intr);
 
 static struct vio_dev *vio_create_one(struct mdesc_handle *hp, u64 mp,
+                                     const char *node_name,
                                      struct device *parent)
 {
        const char *type, *compat, *bus_id_name;
@@ -236,7 +237,7 @@ static struct vio_dev *vio_create_one(struct mdesc_handle *hp, u64 mp,
                        tlen = strlen(type) + 1;
                }
        }
-       if (tlen > VIO_MAX_TYPE_LEN) {
+       if (tlen > VIO_MAX_TYPE_LEN || strlen(type) >= VIO_MAX_TYPE_LEN) {
                printk(KERN_ERR "VIO: Type string [%s] is too long.\n",
                       type);
                return NULL;
@@ -335,6 +336,11 @@ static struct vio_dev *vio_create_one(struct mdesc_handle *hp, u64 mp,
 
        printk(KERN_INFO "VIO: Adding device %s\n", dev_name(&vdev->dev));
 
+       /* node_name is NULL for the parent/channel-devices node */
+       if (node_name != NULL)
+               (void) snprintf(vdev->node_name, VIO_MAX_NAME_LEN, "%s",
+                               node_name);
+
        err = device_register(&vdev->dev);
        if (err) {
                printk(KERN_ERR "VIO: Could not register device %s, err=%d\n",
@@ -349,9 +355,10 @@ static struct vio_dev *vio_create_one(struct mdesc_handle *hp, u64 mp,
        return vdev;
 }
 
-static void vio_add(struct mdesc_handle *hp, u64 node)
+static void vio_add(struct mdesc_handle *hp, u64 node,
+                   const char *node_name)
 {
-       (void) vio_create_one(hp, node, &root_vdev->dev);
+       (void) vio_create_one(hp, node, node_name, &root_vdev->dev);
 }
 
 struct vio_md_node_query {
@@ -375,7 +382,7 @@ static int vio_md_node_match(struct device *dev, void *arg)
        return 1;
 }
 
-static void vio_remove(struct mdesc_handle *hp, u64 node)
+static void vio_remove(struct mdesc_handle *hp, u64 node, const char *node_name)
 {
        const char *type;
        const u64 *id, *cfg_handle;
@@ -446,7 +453,8 @@ static struct mdesc_notifier_client vio_device_notifier = {
  * under "openboot" that we should not mess with as aparently that is
  * reserved exclusively for OBP use.
  */
-static void vio_add_ds(struct mdesc_handle *hp, u64 node)
+static void vio_add_ds(struct mdesc_handle *hp, u64 node,
+                      const char *node_name)
 {
        int found;
        u64 a;
@@ -463,7 +471,7 @@ static void vio_add_ds(struct mdesc_handle *hp, u64 node)
        }
 
        if (found)
-               (void) vio_create_one(hp, node, &root_vdev->dev);
+               (void) vio_create_one(hp, node, node_name, &root_vdev->dev);
 }
 
 static struct mdesc_notifier_client vio_ds_notifier = {
@@ -530,7 +538,7 @@ static int __init vio_init(void)
 
        cdev_cfg_handle = *cfg_handle;
 
-       root_vdev = vio_create_one(hp, root, NULL);
+       root_vdev = vio_create_one(hp, root, NULL, NULL);
        err = -ENODEV;
        if (!root_vdev) {
                printk(KERN_ERR "VIO: Could not create root device.\n");