From: David Daney <ddaney@caviumnetworks.com> To: linux-mips@linux-mips.org, ralf@linux-mips.org, devicetree-discuss@lists.ozlabs.org, grant.likely@secretlab.ca, linux-kernel@vger.kernel.org Cc: David Daney <ddaney@caviumnetworks.com> Subject: [RFC PATCH v4 2/6] of: Make of_find_node_by_path() traverse /aliases for relative paths. Date: Fri, 20 May 2011 15:25:39 -0700 [thread overview] Message-ID: <1305930343-31259-3-git-send-email-ddaney@caviumnetworks.com> (raw) In-Reply-To: <1305930343-31259-1-git-send-email-ddaney@caviumnetworks.com> Currently all paths passed to of_find_node_by_path() must begin with a '/', indicating a full path to the desired node. Augment the look-up code so that if a path does *not* begin with '/', the path is used as the name of an /aliases property. The value of this alias is then used as the full node path to be found. Signed-off-by: David Daney <ddaney@caviumnetworks.com> --- drivers/of/base.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 45 insertions(+), 3 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index 632ebae..279134b 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -340,22 +340,64 @@ EXPORT_SYMBOL(of_get_next_child); /** * of_find_node_by_path - Find a node matching a full OF path - * @path: The full path to match + * @path: Either the full path to match, or if the path does not + * start with '/', the name of a property of the /aliases + * node (an alias). In the case of an alias, the node + * matching the alias' value will be returned. * * Returns a node pointer with refcount incremented, use * of_node_put() on it when done. */ struct device_node *of_find_node_by_path(const char *path) { - struct device_node *np = allnodes; + struct device_node *np = NULL; + struct device_node *aliases = NULL; + char *alias = NULL; + char *new_path = NULL; read_lock(&devtree_lock); - for (; np; np = np->allnext) { + + if (path[0] != '/') { + const char *ps; + aliases = of_find_node_by_path("/aliases"); + if (!aliases) + goto out; + + ps = strchr(path, '/'); + if (ps) { + size_t len = ps - path; + alias = kstrndup(path, len, GFP_KERNEL); + if (!alias) + goto out; + path = of_get_property(aliases, alias, NULL); + if (!path) + goto out; + + len = strlen(path) + strlen(ps) + 1; + new_path = kmalloc(len, GFP_KERNEL); + if (!new_path) + goto out; + strcpy(new_path, path); + strcat(new_path, ps); + path = new_path; + } else { + path = of_get_property(aliases, path, NULL); + } + if (!path) + goto out; + } + + for (np = allnodes; np; np = np->allnext) { if (np->full_name && (of_node_cmp(np->full_name, path) == 0) && of_node_get(np)) break; } +out: + if (aliases) + of_node_put(aliases); read_unlock(&devtree_lock); + kfree(alias); + kfree(new_path); return np; } EXPORT_SYMBOL(of_find_node_by_path); -- 1.7.2.3
WARNING: multiple messages have this Message-ID (diff)
From: David Daney <ddaney-M3mlKVOIwJVv6pq1l3V1OdBPR1lH4CV8@public.gmane.org> To: linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org, ralf-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: David Daney <ddaney-M3mlKVOIwJVv6pq1l3V1OdBPR1lH4CV8@public.gmane.org> Subject: [RFC PATCH v4 2/6] of: Make of_find_node_by_path() traverse /aliases for relative paths. Date: Fri, 20 May 2011 15:25:39 -0700 [thread overview] Message-ID: <1305930343-31259-3-git-send-email-ddaney@caviumnetworks.com> (raw) In-Reply-To: <1305930343-31259-1-git-send-email-ddaney-M3mlKVOIwJVv6pq1l3V1OdBPR1lH4CV8@public.gmane.org> Currently all paths passed to of_find_node_by_path() must begin with a '/', indicating a full path to the desired node. Augment the look-up code so that if a path does *not* begin with '/', the path is used as the name of an /aliases property. The value of this alias is then used as the full node path to be found. Signed-off-by: David Daney <ddaney-M3mlKVOIwJVv6pq1l3V1OdBPR1lH4CV8@public.gmane.org> --- drivers/of/base.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 45 insertions(+), 3 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index 632ebae..279134b 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -340,22 +340,64 @@ EXPORT_SYMBOL(of_get_next_child); /** * of_find_node_by_path - Find a node matching a full OF path - * @path: The full path to match + * @path: Either the full path to match, or if the path does not + * start with '/', the name of a property of the /aliases + * node (an alias). In the case of an alias, the node + * matching the alias' value will be returned. * * Returns a node pointer with refcount incremented, use * of_node_put() on it when done. */ struct device_node *of_find_node_by_path(const char *path) { - struct device_node *np = allnodes; + struct device_node *np = NULL; + struct device_node *aliases = NULL; + char *alias = NULL; + char *new_path = NULL; read_lock(&devtree_lock); - for (; np; np = np->allnext) { + + if (path[0] != '/') { + const char *ps; + aliases = of_find_node_by_path("/aliases"); + if (!aliases) + goto out; + + ps = strchr(path, '/'); + if (ps) { + size_t len = ps - path; + alias = kstrndup(path, len, GFP_KERNEL); + if (!alias) + goto out; + path = of_get_property(aliases, alias, NULL); + if (!path) + goto out; + + len = strlen(path) + strlen(ps) + 1; + new_path = kmalloc(len, GFP_KERNEL); + if (!new_path) + goto out; + strcpy(new_path, path); + strcat(new_path, ps); + path = new_path; + } else { + path = of_get_property(aliases, path, NULL); + } + if (!path) + goto out; + } + + for (np = allnodes; np; np = np->allnext) { if (np->full_name && (of_node_cmp(np->full_name, path) == 0) && of_node_get(np)) break; } +out: + if (aliases) + of_node_put(aliases); read_unlock(&devtree_lock); + kfree(alias); + kfree(new_path); return np; } EXPORT_SYMBOL(of_find_node_by_path); -- 1.7.2.3
next prev parent reply other threads:[~2011-05-20 22:26 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-05-20 22:25 [RFC PATCH v4 0/6] MIPS: Octeon: Use Device Tree David Daney 2011-05-20 22:25 ` David Daney 2011-05-20 22:25 ` [RFC PATCH v4 1/6] of: Allow scripts/dtc/libfdt to be used from kernel code David Daney 2011-05-20 22:25 ` David Daney 2011-05-21 6:33 ` David Gibson 2011-05-21 6:33 ` David Gibson 2011-05-23 16:47 ` David Daney 2011-05-27 3:24 ` David Gibson 2011-05-27 3:24 ` David Gibson 2011-05-27 16:49 ` David Daney 2011-05-27 16:49 ` David Daney 2011-05-27 20:12 ` Grant Likely 2011-05-20 22:25 ` David Daney [this message] 2011-05-20 22:25 ` [RFC PATCH v4 2/6] of: Make of_find_node_by_path() traverse /aliases for relative paths David Daney 2011-05-27 2:48 ` Grant Likely 2011-05-27 2:48 ` Grant Likely 2011-05-20 22:25 ` [RFC PATCH v4 3/6] MIPS: Octeon: Add device tree source files David Daney 2011-05-20 22:25 ` David Daney 2011-05-27 1:56 ` Grant Likely 2011-05-27 17:00 ` David Daney 2011-05-27 17:00 ` David Daney 2011-05-27 20:13 ` Grant Likely 2011-05-20 22:25 ` [RFC PATCH v4 4/6] MIPS: Prune some target specific code out of prom.c David Daney 2011-05-20 22:25 ` David Daney 2011-05-27 1:58 ` Grant Likely 2011-05-27 1:58 ` Grant Likely 2011-05-27 17:05 ` David Daney 2011-05-20 22:25 ` [RFC PATCH v4 5/6] MIPS: Octeon: Add irq_create_of_mapping() and GPIO interrupts David Daney 2011-05-20 22:25 ` David Daney 2011-05-20 22:25 ` [RFC PATCH v4 6/6] MIPS: Octeon: Initialize and fixup device tree David Daney 2011-05-20 22:25 ` David Daney
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1305930343-31259-3-git-send-email-ddaney@caviumnetworks.com \ --to=ddaney@caviumnetworks.com \ --cc=devicetree-discuss@lists.ozlabs.org \ --cc=grant.likely@secretlab.ca \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mips@linux-mips.org \ --cc=ralf@linux-mips.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.