of: overlay: set node fields from properties when add new overlay node

Overlay nodes added by add_changeset_node() do not have the node
fields name, phandle, and type set.

The node passed to __of_attach_node() when the add node changeset
entry is processed does not contain any properties.  The node's
properties are located in add property changeset entries that will
be processed after the add node changeset is applied.

Set the node's fields in the node contained in the add node
changeset entry and do not set them to incorrect values in
add_changeset_node().

A visible symptom that is fixed by this patch is the names of nodes
added by overlays that have an entry in /sys/bus/platform/drivers/*/
will contain the unit-address but the node-name will be <NULL>,  for
example, "fc4ab000.<NULL>".  After applying the patch the name, in
this example, for node restart@fc4ab000 is "fc4ab000.restart".

Tested-by: Alan Tull <atull@kernel.org>
Signed-off-by: Frank Rowand <frank.rowand@sony.com>

diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c
index 146681540487aadc3161f658e3bf89bccbe1cb20..b4e5b90cb3149a65dce70e0eb3831cf993af2b9e 100644 (file)
--- a/drivers/of/dynamic.c
+++ b/drivers/of/dynamic.c
@@ -205,15 +205,24 @@ static void __of_attach_node(struct device_node *np)
        const __be32 *phandle;
        int sz;
 
-       np->name = __of_get_property(np, "name", NULL) ? : "<NULL>";
-       np->type = __of_get_property(np, "device_type", NULL) ? : "<NULL>";
-
-       phandle = __of_get_property(np, "phandle", &sz);
-       if (!phandle)
-               phandle = __of_get_property(np, "linux,phandle", &sz);
-       if (IS_ENABLED(CONFIG_PPC_PSERIES) && !phandle)
-               phandle = __of_get_property(np, "ibm,phandle", &sz);
-       np->phandle = (phandle && (sz >= 4)) ? be32_to_cpup(phandle) : 0;
+       if (!of_node_check_flag(np, OF_OVERLAY)) {
+               np->name = __of_get_property(np, "name", NULL);
+               np->type = __of_get_property(np, "device_type", NULL);
+               if (!np->name)
+                       np->name = "<NULL>";
+               if (!np->type)
+                       np->type = "<NULL>";
+
+               phandle = __of_get_property(np, "phandle", &sz);
+               if (!phandle)
+                       phandle = __of_get_property(np, "linux,phandle", &sz);
+               if (IS_ENABLED(CONFIG_PPC_PSERIES) && !phandle)
+                       phandle = __of_get_property(np, "ibm,phandle", &sz);
+               if (phandle && (sz >= 4))
+                       np->phandle = be32_to_cpup(phandle);
+               else
+                       np->phandle = 0;
+       }
 
        np->child = NULL;
        np->sibling = np->parent->child;

diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 184cc2c4a9317415435c5dda0574d15f0b9caf0c..2b5ac43a5690019b3d0ce30a918083ce5acb7040 100644 (file)
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -307,10 +307,11 @@ static int add_changeset_property(struct overlay_changeset *ovcs,
        int ret = 0;
        bool check_for_non_overlay_node = false;
 
-       if (!of_prop_cmp(overlay_prop->name, "name") ||
-           !of_prop_cmp(overlay_prop->name, "phandle") ||
-           !of_prop_cmp(overlay_prop->name, "linux,phandle"))
-               return 0;
+       if (target->in_livetree)
+               if (!of_prop_cmp(overlay_prop->name, "name") ||
+                   !of_prop_cmp(overlay_prop->name, "phandle") ||
+                   !of_prop_cmp(overlay_prop->name, "linux,phandle"))
+                       return 0;
 
        if (target->in_livetree)
                prop = of_find_property(target->np, overlay_prop->name, NULL);
@@ -330,6 +331,10 @@ static int add_changeset_property(struct overlay_changeset *ovcs,
 
        if (!prop) {
                check_for_non_overlay_node = true;
+               if (!target->in_livetree) {
+                       new_prop->next = target->np->deadprops;
+                       target->np->deadprops = new_prop;
+               }
                ret = of_changeset_add_property(&ovcs->cset, target->np,
                                                new_prop);
        } else if (!of_prop_cmp(prop->name, "#address-cells")) {
@@ -400,9 +405,10 @@ static int add_changeset_node(struct overlay_changeset *ovcs,
                struct target *target, struct device_node *node)
 {
        const char *node_kbasename;
+       const __be32 *phandle;
        struct device_node *tchild;
        struct target target_child;
-       int ret = 0;
+       int ret = 0, size;
 
        node_kbasename = kbasename(node->full_name);
 
@@ -416,6 +422,19 @@ static int add_changeset_node(struct overlay_changeset *ovcs,
                        return -ENOMEM;
 
                tchild->parent = target->np;
+               tchild->name = __of_get_property(node, "name", NULL);
+               tchild->type = __of_get_property(node, "device_type", NULL);
+
+               if (!tchild->name)
+                       tchild->name = "<NULL>";
+               if (!tchild->type)
+                       tchild->type = "<NULL>";
+
+               /* ignore obsolete "linux,phandle" */
+               phandle = __of_get_property(node, "phandle", &size);
+               if (phandle && (size == 4))
+                       tchild->phandle = be32_to_cpup(phandle);
+
                of_node_set_flag(tchild, OF_OVERLAY);
 
                ret = of_changeset_attach_node(&ovcs->cset, tchild);