Commit a74ea43d authored by Andres Salomon's avatar Andres Salomon Committed by Grant Likely

of/promtree: allow DT device matching by fixing 'name' brokenness (v5)

Commit e2f2a93b, "of/promtree: add package-to-path support to pdt"
changed dp->name from using the 'name' property to using
package-to-path.  This fixed /proc/device-tree creation by eliminating
conflicts between names (the 'name' property provides names like
'battery', whereas package-to-path provides names like
'/foo/bar/battery@0', which we stripped to 'battery@0').  However, it
also breaks of_device_id table matching.

The fix that we _really_ wanted was to keep dp->name based upon
the name property ('battery'), but based dp->full_name upon
package-to-path ('battery@0').  This patch does just that.

This changes all users (except SPARC) of promtree to use the full
result from package-to-path for full_name, rather than stripping the
directory out.  In practice, the strings end up being exactly the
same; this change saves time, code, and memory.

SPARC continues to use the existing build_path_component() code.

v2: combine two patches and revert of_pdt_node_name to original version
v3: use dp->phandle instead of passing around node
v4: warn/bail out for non-sparc archs if pkg2path is not set
v5: split of_pdt_build_full_name into sparc & non-sparc versions
v6: Pass NULL to pkg2path before buf gets assigned.
    Drop check for pkg2path hook on each and every node.
v7: Don't BUG() when unable to get the full_path; create a
    known-unique name instead.
Signed-off-by: default avatarAndres Salomon <dilinger@queued.net>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 60cba5a5
...@@ -36,19 +36,55 @@ unsigned int of_pdt_unique_id __initdata; ...@@ -36,19 +36,55 @@ unsigned int of_pdt_unique_id __initdata;
(p)->unique_id = of_pdt_unique_id++; \ (p)->unique_id = of_pdt_unique_id++; \
} while (0) } while (0)
static inline const char *of_pdt_node_name(struct device_node *dp) static char * __init of_pdt_build_full_name(struct device_node *dp)
{ {
return dp->path_component_name; int len, ourlen, plen;
char *n;
dp->path_component_name = build_path_component(dp);
plen = strlen(dp->parent->full_name);
ourlen = strlen(dp->path_component_name);
len = ourlen + plen + 2;
n = prom_early_alloc(len);
strcpy(n, dp->parent->full_name);
if (!of_node_is_root(dp->parent)) {
strcpy(n + plen, "/");
plen++;
}
strcpy(n + plen, dp->path_component_name);
return n;
} }
#else #else /* CONFIG_SPARC */
static inline void of_pdt_incr_unique_id(void *p) { } static inline void of_pdt_incr_unique_id(void *p) { }
static inline void irq_trans_init(struct device_node *dp) { } static inline void irq_trans_init(struct device_node *dp) { }
static inline const char *of_pdt_node_name(struct device_node *dp) static char * __init of_pdt_build_full_name(struct device_node *dp)
{ {
return dp->name; static int failsafe_id = 0; /* for generating unique names on failure */
char *buf;
int len;
if (of_pdt_prom_ops->pkg2path(dp->phandle, NULL, 0, &len))
goto failsafe;
buf = prom_early_alloc(len + 1);
if (of_pdt_prom_ops->pkg2path(dp->phandle, buf, len, &len))
goto failsafe;
return buf;
failsafe:
buf = prom_early_alloc(strlen(dp->parent->full_name) +
strlen(dp->name) + 16);
sprintf(buf, "%s/%s@unknown%i",
of_node_is_root(dp->parent) ? "" : dp->parent->full_name,
dp->name, failsafe_id++);
pr_err("%s: pkg2path failed; assigning %s\n", __func__, buf);
return buf;
} }
#endif /* !CONFIG_SPARC */ #endif /* !CONFIG_SPARC */
...@@ -132,47 +168,6 @@ static char * __init of_pdt_get_one_property(phandle node, const char *name) ...@@ -132,47 +168,6 @@ static char * __init of_pdt_get_one_property(phandle node, const char *name)
return buf; return buf;
} }
static char * __init of_pdt_try_pkg2path(phandle node)
{
char *res, *buf = NULL;
int len;
if (!of_pdt_prom_ops->pkg2path)
return NULL;
if (of_pdt_prom_ops->pkg2path(node, buf, 0, &len))
return NULL;
buf = prom_early_alloc(len + 1);
if (of_pdt_prom_ops->pkg2path(node, buf, len, &len)) {
pr_err("%s: package-to-path failed\n", __func__);
return NULL;
}
res = strrchr(buf, '/');
if (!res) {
pr_err("%s: couldn't find / in %s\n", __func__, buf);
return NULL;
}
return res+1;
}
/*
* When fetching the node's name, first try using package-to-path; if
* that fails (either because the arch hasn't supplied a PROM callback,
* or some other random failure), fall back to just looking at the node's
* 'name' property.
*/
static char * __init of_pdt_build_name(phandle node)
{
char *buf;
buf = of_pdt_try_pkg2path(node);
if (!buf)
buf = of_pdt_get_one_property(node, "name");
return buf;
}
static struct device_node * __init of_pdt_create_node(phandle node, static struct device_node * __init of_pdt_create_node(phandle node,
struct device_node *parent) struct device_node *parent)
{ {
...@@ -187,7 +182,7 @@ static struct device_node * __init of_pdt_create_node(phandle node, ...@@ -187,7 +182,7 @@ static struct device_node * __init of_pdt_create_node(phandle node,
kref_init(&dp->kref); kref_init(&dp->kref);
dp->name = of_pdt_build_name(node); dp->name = of_pdt_get_one_property(node, "name");
dp->type = of_pdt_get_one_property(node, "device_type"); dp->type = of_pdt_get_one_property(node, "device_type");
dp->phandle = node; dp->phandle = node;
...@@ -198,26 +193,6 @@ static struct device_node * __init of_pdt_create_node(phandle node, ...@@ -198,26 +193,6 @@ static struct device_node * __init of_pdt_create_node(phandle node,
return dp; return dp;
} }
static char * __init of_pdt_build_full_name(struct device_node *dp)
{
int len, ourlen, plen;
char *n;
plen = strlen(dp->parent->full_name);
ourlen = strlen(of_pdt_node_name(dp));
len = ourlen + plen + 2;
n = prom_early_alloc(len);
strcpy(n, dp->parent->full_name);
if (!of_node_is_root(dp->parent)) {
strcpy(n + plen, "/");
plen++;
}
strcpy(n + plen, of_pdt_node_name(dp));
return n;
}
static struct device_node * __init of_pdt_build_tree(struct device_node *parent, static struct device_node * __init of_pdt_build_tree(struct device_node *parent,
phandle node, phandle node,
struct device_node ***nextp) struct device_node ***nextp)
...@@ -240,9 +215,6 @@ static struct device_node * __init of_pdt_build_tree(struct device_node *parent, ...@@ -240,9 +215,6 @@ static struct device_node * __init of_pdt_build_tree(struct device_node *parent,
*(*nextp) = dp; *(*nextp) = dp;
*nextp = &dp->allnext; *nextp = &dp->allnext;
#if defined(CONFIG_SPARC)
dp->path_component_name = build_path_component(dp);
#endif
dp->full_name = of_pdt_build_full_name(dp); dp->full_name = of_pdt_build_full_name(dp);
dp->child = of_pdt_build_tree(dp, dp->child = of_pdt_build_tree(dp,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment