From patchwork Wed Mar 4 15:45:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Hurley X-Patchwork-Id: 5937391 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B44DDBF440 for ; Wed, 4 Mar 2015 15:47:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9640420254 for ; Wed, 4 Mar 2015 15:47:56 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3A7F72024F for ; Wed, 4 Mar 2015 15:47:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YTBUV-0002mi-Az; Wed, 04 Mar 2015 15:45:43 +0000 Received: from mail-qc0-f178.google.com ([209.85.216.178]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YTBUP-0002Qr-BV for linux-arm-kernel@lists.infradead.org; Wed, 04 Mar 2015 15:45:38 +0000 Received: by qcxr5 with SMTP id r5so37893839qcx.13 for ; Wed, 04 Mar 2015 07:45:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=Rk8XuPU6luq/inOloNLtxeGMCyh4j48nQ6QiLqeX1uE=; b=Kwl3wNYRhyMlOc+7OT8J+QIph1bzc3nBw9wvp/XYdiLB36Jisl5uEIjRlocyUla2M/ EWzPXQAYv/B381BZ39oQuXkeF7YNFSyru0VzT67NhmbCkptc5cRhC1RdX46DXk/Yk/Xo +DILXiF36IpNLszqg04tjzgCQ0KzKauEupp3QD/hvQUnrplK+3JOXq2wu5Ym9n4s6tzH E9RQQTiBDlN6xo1SxYzkbEQkOdm5EP1MQPnxFN+7uPakbt/UdkOGQyyKWjuj8khG9nNg UlEaTJ8AfSu9NUdR8fwWLqdHiIAoizUx3IURBlXLTYj+kKCs2EVDrL/rVUvZiCJvuliu bUcw== X-Gm-Message-State: ALoCoQnW71UMdOac5zEupY/dQdS12u/QpmEk3RiY0e6lklUhmH0OxBY5Gk7NFrLSjWWhybrqvnI+ X-Received: by 10.229.65.8 with SMTP id g8mr6703871qci.15.1425483913253; Wed, 04 Mar 2015 07:45:13 -0800 (PST) Received: from [192.168.1.139] (h96-61-87-245.cntcnh.dsl.dynamic.tds.net. [96.61.87.245]) by mx.google.com with ESMTPSA id 8sm2400040qhr.32.2015.03.04.07.45.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Mar 2015 07:45:12 -0800 (PST) Message-ID: <54F7287E.6060302@hurleysoftware.com> Date: Wed, 04 Mar 2015 10:45:02 -0500 From: Peter Hurley User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Leif Lindholm Subject: Re: [PATCH v3 2/3] of: add optional options parameter to of_find_node_by_path() References: <1417110967-16284-1-git-send-email-leif.lindholm@linaro.org> <1417110967-16284-3-git-send-email-leif.lindholm@linaro.org> In-Reply-To: <1417110967-16284-3-git-send-email-leif.lindholm@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150304_074537_472198_52F2D2B9 X-CRM114-Status: GOOD ( 25.73 ) X-Spam-Score: -0.7 (/) Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, andrew@lunn.ch, s.hauer@pengutronix.de, linux-kernel@vger.kernel.org, robh+dt@kernel.org, ijc@debian.org, grant.likely@linaro.org, plagnioj@jcrosoft.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Leif, On 11/27/2014 12:56 PM, Leif Lindholm wrote: > Update of_find_node_by_path(): > 1) Rename function to of_find_node_opts_by_path(), adding an optional > pointer argument. Provide a static inline wrapper version of > of_find_node_by_path() which calls the new function with NULL as > the optional argument. > 2) Ignore any part of the path beyond and including the ':' separator. > 3) Set the new provided pointer argument to the beginning of the string > following the ':' separator. > 4: Add tests. > > Signed-off-by: Leif Lindholm > --- > drivers/of/base.c | 21 +++++++++++++++++---- > drivers/of/selftest.c | 12 ++++++++++++ > include/linux/of.h | 14 +++++++++++++- > 3 files changed, 42 insertions(+), 5 deletions(-) > > diff --git a/drivers/of/base.c b/drivers/of/base.c > index 3823edf..7f0e5f7 100644 > --- a/drivers/of/base.c > +++ b/drivers/of/base.c > @@ -699,10 +699,15 @@ static struct device_node *__of_find_node_by_path(struct device_node *parent, > { > struct device_node *child; > int len = strchrnul(path, '/') - path; > + int term; > > if (!len) > return NULL; > > + term = strchrnul(path, ':') - path; > + if (term < len) > + len = term; > + > __for_each_child_of_node(parent, child) { > const char *name = strrchr(child->full_name, '/'); > if (WARN(!name, "malformed device_node %s\n", child->full_name)) > @@ -715,11 +720,14 @@ static struct device_node *__of_find_node_by_path(struct device_node *parent, > } > > /** > - * of_find_node_by_path - Find a node matching a full OF path > + * of_find_node_opts_by_path - Find a node matching a full OF path > * @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. > + * @opts: Address of a pointer into which to store the start of > + * an options string appended to the end of the path with > + * a ':' separator. > * > * Valid paths: > * /foo/bar Full path > @@ -729,19 +737,24 @@ static struct device_node *__of_find_node_by_path(struct device_node *parent, > * 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 *of_find_node_opts_by_path(const char *path, const char **opts) > { > struct device_node *np = NULL; > struct property *pp; > unsigned long flags; > + char *separator; > > if (strcmp(path, "/") == 0) > return of_node_get(of_allnodes); > > + separator = strchr(path, ':'); > + if (separator && opts) > + *opts = separator + 1; > + > /* The path could begin with an alias */ > if (*path != '/') { > char *p = strchrnul(path, '/'); > - int len = p - path; > + int len = separator ? separator - path : p - path; > > /* of_aliases must not be NULL */ > if (!of_aliases) > @@ -770,7 +783,7 @@ struct device_node *of_find_node_by_path(const char *path) > raw_spin_unlock_irqrestore(&devtree_lock, flags); > return np; > } > -EXPORT_SYMBOL(of_find_node_by_path); > +EXPORT_SYMBOL(of_find_node_opts_by_path); > > /** > * of_find_node_by_name - Find a node by its "name" property > diff --git a/drivers/of/selftest.c b/drivers/of/selftest.c > index e2d79af..c298065 100644 > --- a/drivers/of/selftest.c > +++ b/drivers/of/selftest.c > @@ -43,6 +43,7 @@ static bool selftest_live_tree; > static void __init of_selftest_find_node_by_name(void) > { > struct device_node *np; > + const char *options; > > np = of_find_node_by_path("/testcase-data"); > selftest(np && !strcmp("/testcase-data", np->full_name), > @@ -83,6 +84,17 @@ static void __init of_selftest_find_node_by_name(void) > np = of_find_node_by_path("testcase-alias/missing-path"); > selftest(!np, "non-existent alias with relative path returned node %s\n", np->full_name); > of_node_put(np); > + > + np = of_find_node_opts_by_path("/testcase-data:testoption", &options); > + selftest(np && !strcmp("testoption", options), > + "option path test failed\n"); > + of_node_put(np); > + > + np = of_find_node_opts_by_path("testcase-alias:testaliasoption", > + &options); > + selftest(np && !strcmp("testaliasoption", options), > + "option alias path test failed\n"); > + of_node_put(np); > } The path parsing gets lost if the string after ':' contains '/'. The selftests below fail with: [ 1.365528] ### dt-test ### FAIL of_selftest_find_node_by_name():99 option path test failed [ 1.365610] ### dt-test ### FAIL of_selftest_find_node_by_name():115 option alias path test failed Regards, Peter Hurley --- >% --- diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 41a4a13..07ba5aa 100644 > static void __init of_selftest_dynamic(void) > diff --git a/include/linux/of.h b/include/linux/of.h > index 29f0adc..a36be70 100644 > --- a/include/linux/of.h > +++ b/include/linux/of.h > @@ -228,7 +228,13 @@ extern struct device_node *of_find_matching_node_and_match( > const struct of_device_id *matches, > const struct of_device_id **match); > > -extern struct device_node *of_find_node_by_path(const char *path); > +extern struct device_node *of_find_node_opts_by_path(const char *path, > + const char **opts); > +static inline struct device_node *of_find_node_by_path(const char *path) > +{ > + return of_find_node_opts_by_path(path, NULL); > +} > + > extern struct device_node *of_find_node_by_phandle(phandle handle); > extern struct device_node *of_get_parent(const struct device_node *node); > extern struct device_node *of_get_next_parent(struct device_node *node); > @@ -385,6 +391,12 @@ static inline struct device_node *of_find_node_by_path(const char *path) > return NULL; > } > > +static inline struct device_node *of_find_node_opts_by_path(const char *path, > + const char **opts) > +{ > + return NULL; > +} > + > static inline struct device_node *of_get_parent(const struct device_node *node) > { > return NULL; > --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -94,6 +94,11 @@ static void __init of_selftest_find_node_by_name(void) "option path test failed\n"); of_node_put(np); + np = of_find_node_opts_by_path("/testcase-data:test/option", &options); + selftest(np && !strcmp("test/option", options), + "option path test failed\n"); + of_node_put(np); + np = of_find_node_opts_by_path("/testcase-data:testoption", NULL); selftest(np, "NULL option path test failed\n"); of_node_put(np); @@ -104,6 +109,12 @@ static void __init of_selftest_find_node_by_name(void) "option alias path test failed\n"); of_node_put(np); + np = of_find_node_opts_by_path("testcase-alias:test/alias/option", + &options); + selftest(np && !strcmp("test/alias/option", options), + "option alias path test failed\n"); + of_node_put(np); + np = of_find_node_opts_by_path("testcase-alias:testaliasoption", NULL); selftest(np, "NULL option alias path test failed\n"); of_node_put(np);