Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 20:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Frank Rowand 2018-10-12 19:21:16 -07:00
parent 8c329655c1
commit f962788101
2 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/of/dynamic.c
View File

@ -205,15 +205,24 @@ static void __of_attach_node(struct device_node *np)
const __be32 *phandle; const __be32 *phandle;
int sz; int sz;
np->name = __of_get_property(np, "name", NULL) ? : "<NULL>"; if (!of_node_check_flag(np, OF_OVERLAY)) {
np->type = __of_get_property(np, "device_type", NULL) ? : "<NULL>"; 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); phandle = __of_get_property(np, "phandle", &sz);
if (!phandle) if (!phandle)
phandle = __of_get_property(np, "linux,phandle", &sz); phandle = __of_get_property(np, "linux,phandle", &sz);
if (IS_ENABLED(CONFIG_PPC_PSERIES) && !phandle) if (IS_ENABLED(CONFIG_PPC_PSERIES) && !phandle)
phandle = __of_get_property(np, "ibm,phandle", &sz); phandle = __of_get_property(np, "ibm,phandle", &sz);
np->phandle = (phandle && (sz >= 4)) ? be32_to_cpup(phandle) : 0; if (phandle && (sz >= 4))
np->phandle = be32_to_cpup(phandle);
else
np->phandle = 0;
}
np->child = NULL; np->child = NULL;
np->sibling = np->parent->child; np->sibling = np->parent->child;

29
drivers/of/overlay.c
View File

@ -307,10 +307,11 @@ static int add_changeset_property(struct overlay_changeset *ovcs,
int ret = 0; int ret = 0;
bool check_for_non_overlay_node = false; bool check_for_non_overlay_node = false;
if (!of_prop_cmp(overlay_prop->name, "name") || if (target->in_livetree)
!of_prop_cmp(overlay_prop->name, "phandle") || if (!of_prop_cmp(overlay_prop->name, "name") ||
!of_prop_cmp(overlay_prop->name, "linux,phandle")) !of_prop_cmp(overlay_prop->name, "phandle") ||
return 0; !of_prop_cmp(overlay_prop->name, "linux,phandle"))
return 0;
if (target->in_livetree) if (target->in_livetree)
prop = of_find_property(target->np, overlay_prop->name, NULL); 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) { if (!prop) {
check_for_non_overlay_node = true; 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, ret = of_changeset_add_property(&ovcs->cset, target->np,
new_prop); new_prop);
} else if (!of_prop_cmp(prop->name, "#address-cells")) { } 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) struct target *target, struct device_node *node)
{ {
const char *node_kbasename; const char *node_kbasename;
const __be32 *phandle;
struct device_node *tchild; struct device_node *tchild;
struct target target_child; struct target target_child;
int ret = 0; int ret = 0, size;
node_kbasename = kbasename(node->full_name); node_kbasename = kbasename(node->full_name);
@ -416,6 +422,19 @@ static int add_changeset_node(struct overlay_changeset *ovcs,
return -ENOMEM; return -ENOMEM;
tchild->parent = target->np; 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); of_node_set_flag(tchild, OF_OVERLAY);
ret = of_changeset_attach_node(&ovcs->cset, tchild); ret = of_changeset_attach_node(&ovcs->cset, tchild);