From patchwork Tue Apr 2 23:42:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 2383301 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 0427A3FDDA for ; Tue, 2 Apr 2013 23:45:02 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UNAqC-0005Mz-CN; Tue, 02 Apr 2013 23:42:12 +0000 Received: from mail-qa0-f41.google.com ([209.85.216.41]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UNAq9-0005MC-3H for linux-arm-kernel@lists.infradead.org; Tue, 02 Apr 2013 23:42:10 +0000 Received: by mail-qa0-f41.google.com with SMTP id bs12so1781454qab.0 for ; Tue, 02 Apr 2013 16:42:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:cc :subject:references:in-reply-to:content-type :content-transfer-encoding; bh=yJHWjbD0CKlF4ROSo1Jf3h0u0qNh1hT+kciOmvdD788=; b=R4j5zUrE8hvE+qB5Yz/t6sW9TT71lLSX/Mvmzz1PjjFC9Fu1B5nqmpXJ1NQLQiPXwg jNXSug8LJNrI5qQBAFrgWYYy3Db5wNBm3q9QIjxZLu98bu/6zOXzCO1Nldt95U24KT/5 F0ydf1n8ntAN/o80SgXIGHTmQFwwaTi5tTZtw2/vOXPyQnevuSCAKF5lX31Yg1ADXWAo cHP7Shdz+l7xTro22F1Y7w5EJfaGN5e5PMgrwXfjOLtUUJsTYzHTXZtYiYwJl5MDqL1L 0xiTN+9VLG8fCd4+jgNUWxdU67ZtZjOFHnSxXEv+ite+GoDV8LJp1BN2GQP2tgVao38A hfNQ== X-Received: by 10.229.111.205 with SMTP id t13mr7014962qcp.152.1364946127790; Tue, 02 Apr 2013 16:42:07 -0700 (PDT) Received: from [10.10.10.90] ([173.226.190.126]) by mx.google.com with ESMTPS id o6sm4223103qek.3.2013.04.02.16.42.06 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Apr 2013 16:42:07 -0700 (PDT) Message-ID: <515B6CCD.9060703@gmail.com> Date: Tue, 02 Apr 2013 18:42:05 -0500 From: Rob Herring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130308 Thunderbird/17.0.4 MIME-Version: 1.0 To: Tony Prisk Subject: Re: [PATCHv4 1/6] of: Add support for reading a u32 from a multi-value property. References: <1364877661-26086-1-git-send-email-linux@prisktech.co.nz> <1364877661-26086-2-git-send-email-linux@prisktech.co.nz> In-Reply-To: <1364877661-26086-2-git-send-email-linux@prisktech.co.nz> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130402_194209_230707_2D104C26 X-CRM114-Status: GOOD ( 22.47 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.216.41 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (robherring2[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (robherring2[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: vt8500-wm8505-linux-kernel@googlegroups.com, linus.walleij@linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, swarren@wwwdotorg.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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 On 04/01/2013 11:40 PM, Tony Prisk wrote: > This patch adds an of_property_read_u32_index() function to allow > reading a single indexed u32 value from a property containing multiple > u32 values. > > Signed-off-by: Tony Prisk > Reviewed-by: Stephen Warren > --- > drivers/of/base.c | 33 +++++++++++++++++++++++++++++++++ > include/linux/of.h | 9 +++++++++ > 2 files changed, 42 insertions(+) > > diff --git a/drivers/of/base.c b/drivers/of/base.c > index 321d3ef..f6c89ed 100644 > --- a/drivers/of/base.c > +++ b/drivers/of/base.c > @@ -746,6 +746,39 @@ struct device_node *of_find_node_by_phandle(phandle handle) > EXPORT_SYMBOL(of_find_node_by_phandle); > > /** > + * of_property_read_u32_index - Find and read a u32 from a multi-value property. > + * > + * @np: device node from which the property value is to be read. > + * @propname: name of the property to be searched. > + * @index: index of the u32 in the list of values > + * @out_value: pointer to return value, modified only if no error. > + * > + * Search for a property in a device node and read nth 32-bit value from > + * it. Returns 0 on success, -EINVAL if the property does not exist, > + * -ENODATA if property does not have a value, and -EOVERFLOW if the > + * property data isn't large enough. > + * > + * The out_value is modified only if a valid u32 value can be decoded. > + */ > +int of_property_read_u32_index(const struct device_node *np, > + const char *propname, > + u32 index, u32 *out_value) > +{ > + struct property *prop = of_find_property(np, propname, NULL); > + > + if (!prop) > + return -EINVAL; > + if (!prop->value) > + return -ENODATA; > + if (((index + 1) * sizeof(*out_value)) > prop->length) > + return -EOVERFLOW; Yet another copy of almost the same code... Can you re-factor things to do something like this: > + *out_value = be32_to_cpup(((__be32 *)prop->value) + index); > + return 0; > +} > +EXPORT_SYMBOL_GPL(of_property_read_u32_index); > + > +/** > * of_property_read_u8_array - Find and read an array of u8 from a property. > * > * @np: device node from which the property value is to be read. > diff --git a/include/linux/of.h b/include/linux/of.h > index a0f1292..c0747a4 100644 > --- a/include/linux/of.h > +++ b/include/linux/of.h > @@ -235,6 +235,9 @@ extern struct device_node *of_find_node_with_property( > extern struct property *of_find_property(const struct device_node *np, > const char *name, > int *lenp); > +extern int of_property_read_u32_index(const struct device_node *np, > + const char *propname, > + u32 index, u32 *out_value); > extern int of_property_read_u8_array(const struct device_node *np, > const char *propname, u8 *out_values, size_t sz); > extern int of_property_read_u16_array(const struct device_node *np, > @@ -394,6 +397,12 @@ static inline struct device_node *of_find_compatible_node( > return NULL; > } > > +static inline int of_property_read_u32_index(const struct device_node *np, > + const char *propname, u32 index, u32 *out_value) > +{ > + return -ENOSYS; > +} > + > static inline int of_property_read_u8_array(const struct device_node *np, > const char *propname, u8 *out_values, size_t sz) > { > diff --git a/drivers/of/base.c b/drivers/of/base.c index 321d3ef..482d29c 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -745,6 +745,21 @@ struct device_node *of_find_node_by_phandle(phandle handle) } EXPORT_SYMBOL(of_find_node_by_phandle); +static void *of_find_property_value_of_size(const struct device_node *np, + const char *propname, u32 len) +{ + struct property *prop = of_find_property(np, propname, NULL); + + if (!prop) + return -EINVAL; + if (!prop->value) + return -ENODATA; + if (len > prop->length) + return -EOVERFLOW; + + return prop->value; +} + /** * of_property_read_u8_array - Find and read an array of u8 from a property. * @@ -766,17 +781,11 @@ EXPORT_SYMBOL(of_find_node_by_phandle); int of_property_read_u8_array(const struct device_node *np, const char *propname, u8 *out_values, size_t sz) { - struct property *prop = of_find_property(np, propname, NULL); - const u8 *val; + const u8 *val = of_find_property_value_of_size(np, propname, sz * sizeof(*out_values)); - if (!prop) - return -EINVAL; - if (!prop->value) - return -ENODATA; - if ((sz * sizeof(*out_values)) > prop->length) - return -EOVERFLOW; + if (IS_ERR(val)) + return PTR_ERR(val); - val = prop->value; while (sz--) *out_values++ = *val++; return 0;