lkml.org 
[lkml]   [2011]   [Feb]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] of/pdt: allow DT device matching by fixing 'name' brokenness (v3)

    Commit e2f2a93b 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 also changes OLPC behavior 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.

    v2: combine two patches and revert of_pdt_node_name to original version
    v3: use dp->phandle instead of passing around node

    Signed-off-by: Andres Salomon <dilinger@queued.net>
    ---
    drivers/of/pdt.c | 37 ++++++++++++-------------------------
    1 files changed, 12 insertions(+), 25 deletions(-)

    diff --git a/drivers/of/pdt.c b/drivers/of/pdt.c
    index 28295d0..c4cadeb 100644
    --- a/drivers/of/pdt.c
    +++ b/drivers/of/pdt.c
    @@ -134,7 +134,7 @@ static char * __init of_pdt_get_one_property(phandle node, const char *name)

    static char * __init of_pdt_try_pkg2path(phandle node)
    {
    - char *res, *buf = NULL;
    + char *buf = NULL;
    int len;

    if (!of_pdt_prom_ops->pkg2path)
    @@ -147,29 +147,6 @@ static char * __init of_pdt_try_pkg2path(phandle node)
    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;
    }

    @@ -187,7 +164,7 @@ static struct device_node * __init of_pdt_create_node(phandle node,

    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->phandle = node;

    @@ -203,6 +180,16 @@ static char * __init of_pdt_build_full_name(struct device_node *dp)
    int len, ourlen, plen;
    char *n;

    + /*
    + * When fetching the full name we want the name we see with
    + * package-to-path (ie, '/foo/bar/battery@0') rather than what
    + * we see with the name property (ie, 'battery').
    + */
    + n = of_pdt_try_pkg2path(dp->phandle);
    + if (n)
    + return n;
    +
    + /* Older method for determining full name */
    plen = strlen(dp->parent->full_name);
    ourlen = strlen(of_pdt_node_name(dp));
    len = ourlen + plen + 2;
    --
    1.7.2.3


    \
     
     \ /
      Last update: 2011-02-24 01:37    [W:0.027 / U:31.888 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site