From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.rutland@arm.com (Mark Rutland) Date: Fri, 17 Jan 2014 16:53:34 +0000 Subject: [PATCH v2] of: add functions to count number of elements in a property In-Reply-To: <1434798.oSb68sYmYT@phil> References: <27256277.YJ687suYy5@phil> <3781679.27UF2dWtKL@phil> <20140117144456.GG19578@e106331-lin.cambridge.arm.com> <1434798.oSb68sYmYT@phil> Message-ID: <20140117165333.GH19578@e106331-lin.cambridge.arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, Jan 17, 2014 at 03:44:14PM +0000, Heiko St?bner wrote: > The need to know the number of array elements in a property is > a common pattern. To prevent duplication of open-coded implementations > add a helper static function that also centralises strict sanity > checking and DTB format details, as well as a set of wrapper functions > for u8, u16, u32 and u64. > > Suggested-by: Mark Rutland > Signed-off-by: Heiko Stuebner > --- > changes since v1: > address comments from Rob Herring and Mark Rutland: > - provide a helper and a set of wrappers for u8-u64 > - get rid of extra len variable, prop->length is enough > - include node name in error message > > drivers/of/base.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > include/linux/of.h | 32 +++++++++++++++++ > 2 files changed, 130 insertions(+) > > diff --git a/drivers/of/base.c b/drivers/of/base.c > index f807d0e..b6e6d4a 100644 > --- a/drivers/of/base.c > +++ b/drivers/of/base.c > @@ -862,6 +862,104 @@ struct device_node *of_find_node_by_phandle(phandle handle) > EXPORT_SYMBOL(of_find_node_by_phandle); > > /** > + * of_count_property_elems_of_size - Count the number of elements in a property > + * > + * @np: device node from which the property value is to be read. > + * @propname: name of the property to be searched. > + * @elem_size: size of the individual element > + */ > +static int of_count_property_elems_of_size(const struct device_node *np, > + const char *propname, int elem_size) As a minor nit, it would be nicer to have 'count' and 'property' switch places in the name (i.e. call this of_property_count_elems_of_size). That way it's concistent with the naming of the wrappers. > +{ > + struct property *prop = of_find_property(np, propname, NULL); > + > + if (!prop) > + return -EINVAL; > + if (!prop->value) > + return -ENODATA; > + > + if (prop->length % elem_size != 0) { > + pr_err("size of %s in node %s is not a multiple of %d\n", > + propname, np->name, elem_size); It would be nice to use np->full_name so you get the absolute path of the node -- it makes finding them easier later. Otherwise, the patch looks good to me, thanks for implementing it! With those changes: Reviewed-by: Mark Rutland Cheers, Mark. From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Rutland Subject: Re: [PATCH v2] of: add functions to count number of elements in a property Date: Fri, 17 Jan 2014 16:53:34 +0000 Message-ID: <20140117165333.GH19578@e106331-lin.cambridge.arm.com> References: <27256277.YJ687suYy5@phil> <3781679.27UF2dWtKL@phil> <20140117144456.GG19578@e106331-lin.cambridge.arm.com> <1434798.oSb68sYmYT@phil> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <1434798.oSb68sYmYT@phil> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Heiko =?utf-8?Q?St=C3=BCbner?= Cc: "devicetree@vger.kernel.org" , Pawel Moll , Stephen Warren , Ian Campbell , "linux-kernel@vger.kernel.org" , "grant.likely@linaro.org" , "linux-arm-kernel@lists.infradead.org" List-Id: devicetree@vger.kernel.org T24gRnJpLCBKYW4gMTcsIDIwMTQgYXQgMDM6NDQ6MTRQTSArMDAwMCwgSGVpa28gU3TDvGJuZXIg d3JvdGU6Cj4gVGhlIG5lZWQgdG8ga25vdyB0aGUgbnVtYmVyIG9mIGFycmF5IGVsZW1lbnRzIGlu IGEgcHJvcGVydHkgaXMKPiBhIGNvbW1vbiBwYXR0ZXJuLiBUbyBwcmV2ZW50IGR1cGxpY2F0aW9u IG9mIG9wZW4tY29kZWQgaW1wbGVtZW50YXRpb25zCj4gYWRkIGEgaGVscGVyIHN0YXRpYyBmdW5j dGlvbiB0aGF0IGFsc28gY2VudHJhbGlzZXMgc3RyaWN0IHNhbml0eQo+IGNoZWNraW5nIGFuZCBE VEIgZm9ybWF0IGRldGFpbHMsIGFzIHdlbGwgYXMgYSBzZXQgb2Ygd3JhcHBlciBmdW5jdGlvbnMK PiBmb3IgdTgsIHUxNiwgdTMyIGFuZCB1NjQuCj4gCj4gU3VnZ2VzdGVkLWJ5OiBNYXJrIFJ1dGxh bmQgPG1hcmsucnV0bGFuZEBhcm0uY29tPgo+IFNpZ25lZC1vZmYtYnk6IEhlaWtvIFN0dWVibmVy IDxoZWlrb0BzbnRlY2guZGU+Cj4gLS0tCj4gY2hhbmdlcyBzaW5jZSB2MToKPiBhZGRyZXNzIGNv bW1lbnRzIGZyb20gUm9iIEhlcnJpbmcgYW5kIE1hcmsgUnV0bGFuZDoKPiAtIHByb3ZpZGUgYSBo ZWxwZXIgYW5kIGEgc2V0IG9mIHdyYXBwZXJzIGZvciB1OC11NjQKPiAtIGdldCByaWQgb2YgZXh0 cmEgbGVuIHZhcmlhYmxlLCBwcm9wLT5sZW5ndGggaXMgZW5vdWdoCj4gLSBpbmNsdWRlIG5vZGUg bmFtZSBpbiBlcnJvciBtZXNzYWdlCj4gCj4gIGRyaXZlcnMvb2YvYmFzZS5jICB8ICAgOTggKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwo+ICBpbmNs dWRlL2xpbnV4L29mLmggfCAgIDMyICsrKysrKysrKysrKysrKysrCj4gIDIgZmlsZXMgY2hhbmdl ZCwgMTMwIGluc2VydGlvbnMoKykKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9vZi9iYXNlLmMg Yi9kcml2ZXJzL29mL2Jhc2UuYwo+IGluZGV4IGY4MDdkMGUuLmI2ZTZkNGEgMTAwNjQ0Cj4gLS0t IGEvZHJpdmVycy9vZi9iYXNlLmMKPiArKysgYi9kcml2ZXJzL29mL2Jhc2UuYwo+IEBAIC04NjIs NiArODYyLDEwNCBAQCBzdHJ1Y3QgZGV2aWNlX25vZGUgKm9mX2ZpbmRfbm9kZV9ieV9waGFuZGxl KHBoYW5kbGUgaGFuZGxlKQo+ICBFWFBPUlRfU1lNQk9MKG9mX2ZpbmRfbm9kZV9ieV9waGFuZGxl KTsKPiAgCj4gIC8qKgo+ICsgKiBvZl9jb3VudF9wcm9wZXJ0eV9lbGVtc19vZl9zaXplIC0gQ291 bnQgdGhlIG51bWJlciBvZiBlbGVtZW50cyBpbiBhIHByb3BlcnR5Cj4gKyAqCj4gKyAqIEBucDoJ CWRldmljZSBub2RlIGZyb20gd2hpY2ggdGhlIHByb3BlcnR5IHZhbHVlIGlzIHRvIGJlIHJlYWQu Cj4gKyAqIEBwcm9wbmFtZToJbmFtZSBvZiB0aGUgcHJvcGVydHkgdG8gYmUgc2VhcmNoZWQuCj4g KyAqIEBlbGVtX3NpemU6CXNpemUgb2YgdGhlIGluZGl2aWR1YWwgZWxlbWVudAo+ICsgKi8KPiAr c3RhdGljIGludCBvZl9jb3VudF9wcm9wZXJ0eV9lbGVtc19vZl9zaXplKGNvbnN0IHN0cnVjdCBk ZXZpY2Vfbm9kZSAqbnAsCj4gKwkJCQljb25zdCBjaGFyICpwcm9wbmFtZSwgaW50IGVsZW1fc2l6 ZSkKCkFzIGEgbWlub3Igbml0LCBpdCB3b3VsZCBiZSBuaWNlciB0byBoYXZlICdjb3VudCcgYW5k ICdwcm9wZXJ0eScgc3dpdGNoCnBsYWNlcyBpbiB0aGUgbmFtZSAoaS5lLiBjYWxsIHRoaXMgb2Zf cHJvcGVydHlfY291bnRfZWxlbXNfb2Zfc2l6ZSkuClRoYXQgd2F5IGl0J3MgY29uY2lzdGVudCB3 aXRoIHRoZSBuYW1pbmcgb2YgdGhlIHdyYXBwZXJzLgoKPiArewo+ICsJc3RydWN0IHByb3BlcnR5 ICpwcm9wID0gb2ZfZmluZF9wcm9wZXJ0eShucCwgcHJvcG5hbWUsIE5VTEwpOwo+ICsKPiArCWlm ICghcHJvcCkKPiArCQlyZXR1cm4gLUVJTlZBTDsKPiArCWlmICghcHJvcC0+dmFsdWUpCj4gKwkJ cmV0dXJuIC1FTk9EQVRBOwo+ICsKPiArCWlmIChwcm9wLT5sZW5ndGggJSBlbGVtX3NpemUgIT0g MCkgewo+ICsJCXByX2Vycigic2l6ZSBvZiAlcyBpbiBub2RlICVzIGlzIG5vdCBhIG11bHRpcGxl IG9mICVkXG4iLAo+ICsJCSAgICAgICBwcm9wbmFtZSwgbnAtPm5hbWUsIGVsZW1fc2l6ZSk7CgpJ dCB3b3VsZCBiZSBuaWNlIHRvIHVzZSBucC0+ZnVsbF9uYW1lIHNvIHlvdSBnZXQgdGhlIGFic29s dXRlIHBhdGggb2YKdGhlIG5vZGUgLS0gaXQgbWFrZXMgZmluZGluZyB0aGVtIGVhc2llciBsYXRl ci4KCk90aGVyd2lzZSwgdGhlIHBhdGNoIGxvb2tzIGdvb2QgdG8gbWUsIHRoYW5rcyBmb3IgaW1w bGVtZW50aW5nIGl0IQoKV2l0aCB0aG9zZSBjaGFuZ2VzOgoKUmV2aWV3ZWQtYnk6IE1hcmsgUnV0 bGFuZCA8bWFyay5ydXRsYW5kQGFybS5jb20+CgpDaGVlcnMsCk1hcmsuCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxp bmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3Rz LmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752706AbaAQQyL (ORCPT ); Fri, 17 Jan 2014 11:54:11 -0500 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:36855 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752155AbaAQQyK (ORCPT ); Fri, 17 Jan 2014 11:54:10 -0500 Date: Fri, 17 Jan 2014 16:53:34 +0000 From: Mark Rutland To: Heiko =?utf-8?Q?St=C3=BCbner?= Cc: Pawel Moll , "linux-arm-kernel@lists.infradead.org" , "grant.likely@linaro.org" , Rob Herring , "devicetree@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Stephen Warren , Ian Campbell Subject: Re: [PATCH v2] of: add functions to count number of elements in a property Message-ID: <20140117165333.GH19578@e106331-lin.cambridge.arm.com> References: <27256277.YJ687suYy5@phil> <3781679.27UF2dWtKL@phil> <20140117144456.GG19578@e106331-lin.cambridge.arm.com> <1434798.oSb68sYmYT@phil> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1434798.oSb68sYmYT@phil> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jan 17, 2014 at 03:44:14PM +0000, Heiko Stübner wrote: > The need to know the number of array elements in a property is > a common pattern. To prevent duplication of open-coded implementations > add a helper static function that also centralises strict sanity > checking and DTB format details, as well as a set of wrapper functions > for u8, u16, u32 and u64. > > Suggested-by: Mark Rutland > Signed-off-by: Heiko Stuebner > --- > changes since v1: > address comments from Rob Herring and Mark Rutland: > - provide a helper and a set of wrappers for u8-u64 > - get rid of extra len variable, prop->length is enough > - include node name in error message > > drivers/of/base.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > include/linux/of.h | 32 +++++++++++++++++ > 2 files changed, 130 insertions(+) > > diff --git a/drivers/of/base.c b/drivers/of/base.c > index f807d0e..b6e6d4a 100644 > --- a/drivers/of/base.c > +++ b/drivers/of/base.c > @@ -862,6 +862,104 @@ struct device_node *of_find_node_by_phandle(phandle handle) > EXPORT_SYMBOL(of_find_node_by_phandle); > > /** > + * of_count_property_elems_of_size - Count the number of elements in a property > + * > + * @np: device node from which the property value is to be read. > + * @propname: name of the property to be searched. > + * @elem_size: size of the individual element > + */ > +static int of_count_property_elems_of_size(const struct device_node *np, > + const char *propname, int elem_size) As a minor nit, it would be nicer to have 'count' and 'property' switch places in the name (i.e. call this of_property_count_elems_of_size). That way it's concistent with the naming of the wrappers. > +{ > + struct property *prop = of_find_property(np, propname, NULL); > + > + if (!prop) > + return -EINVAL; > + if (!prop->value) > + return -ENODATA; > + > + if (prop->length % elem_size != 0) { > + pr_err("size of %s in node %s is not a multiple of %d\n", > + propname, np->name, elem_size); It would be nice to use np->full_name so you get the absolute path of the node -- it makes finding them easier later. Otherwise, the patch looks good to me, thanks for implementing it! With those changes: Reviewed-by: Mark Rutland Cheers, Mark.