[PATCH] dt: add helper to read 64-bit integers

[PATCH] dt: add helper to read 64-bit integers

[Jamie Iles]

Add a helper similar to of_property_read_u32() that handles 64-bit
integers.

v2: constify device node and property name parameters.

Cc: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
Signed-off-by: Jamie Iles <jamie-wmLquQDDieKakBO8gow8eQ@public.gmane.org>
---
 drivers/of/base.c  |   28 ++++++++++++++++++++++++++++
 include/linux/of.h |    8 ++++++++
 2 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 3ff22e3..3808e70 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -632,6 +632,34 @@ int of_property_read_u32_array(const struct device_node *np,
 EXPORT_SYMBOL_GPL(of_property_read_u32_array);
 
 /**
+ * of_property_read_u64 - Find and read a 64 bit integer from a property
+ * @np:		device node from which the property value is to be read.
+ * @propname:	name of the property to be searched.
+ * @out_value:	pointer to return value, modified only if return value is 0.
+ *
+ * Search for a property in a device node and read a 64-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 u64 value can be decoded.
+ */
+int of_property_read_u64(struct device_node *np, char *propname, u64 *out_value)
+{
+	struct property *prop = of_find_property(np, propname, NULL);
+
+	if (!prop)
+		return -EINVAL;
+	if (!prop->value)
+		return -ENODATA;
+	if (sizeof(*out_value) > prop->length)
+		return -EOVERFLOW;
+	*out_value = of_read_number(prop->value, 2);
+	return 0;
+}
+EXPORT_SYMBOL_GPL(of_property_read_u64);
+
+/**
  * of_property_read_string - Find and read a string from a property
  * @np:		device node from which the property value is to be read.
  * @propname:	name of the property to be searched.
diff --git a/include/linux/of.h b/include/linux/of.h
index 0085bb0..d1b98c0 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -199,6 +199,8 @@ extern int of_property_read_u32_array(const struct device_node *np,
 				      const char *propname,
 				      u32 *out_values,
 				      size_t sz);
+extern int of_property_read_u64(const struct device_node *np,
+				const char *propname, u64 *out_value);
 
 extern int of_property_read_string(struct device_node *np,
 				   const char *propname,
@@ -256,6 +258,12 @@ static inline int of_property_read_string(struct device_node *np,
 	return -ENOSYS;
 }
 
+static inline int of_property_read_u64(const struct device_node *np,
+				       const char *propname, u64 *out_value)
+{
+	return -ENOSYS;
+}
+
 #endif /* CONFIG_OF */
 
 static inline int of_property_read_u32(const struct device_node *np,
-- 
1.7.4.1

Re: [PATCH] dt: add helper to read 64-bit integers

[Rob Herring]

On 08/03/2011 08:44 AM, Jamie Iles wrote:
> Add a helper similar to of_property_read_u32() that handles 64-bit
> integers.
> 
> v2: constify device node and property name parameters.
> 
> Cc: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
> Signed-off-by: Jamie Iles <jamie-wmLquQDDieKakBO8gow8eQ@public.gmane.org>
> ---
>  drivers/of/base.c  |   28 ++++++++++++++++++++++++++++
>  include/linux/of.h |    8 ++++++++
>  2 files changed, 36 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/of/base.c b/drivers/of/base.c
> index 3ff22e3..3808e70 100644
> --- a/drivers/of/base.c
> +++ b/drivers/of/base.c
> @@ -632,6 +632,34 @@ int of_property_read_u32_array(const struct device_node *np,
>  EXPORT_SYMBOL_GPL(of_property_read_u32_array);
>  
>  /**
> + * of_property_read_u64 - Find and read a 64 bit integer from a property
> + * @np:		device node from which the property value is to be read.
> + * @propname:	name of the property to be searched.
> + * @out_value:	pointer to return value, modified only if return value is 0.
> + *
> + * Search for a property in a device node and read a 64-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 u64 value can be decoded.
> + */
> +int of_property_read_u64(struct device_node *np, char *propname, u64 *out_value)

Missed a const here...

> +{
> +	struct property *prop = of_find_property(np, propname, NULL);
> +
> +	if (!prop)
> +		return -EINVAL;
> +	if (!prop->value)
> +		return -ENODATA;
> +	if (sizeof(*out_value) > prop->length)
> +		return -EOVERFLOW;
> +	*out_value = of_read_number(prop->value, 2);
> +	return 0;
> +}
> +EXPORT_SYMBOL_GPL(of_property_read_u64);
> +
> +/**
>   * of_property_read_string - Find and read a string from a property
>   * @np:		device node from which the property value is to be read.
>   * @propname:	name of the property to be searched.
> diff --git a/include/linux/of.h b/include/linux/of.h
> index 0085bb0..d1b98c0 100644
> --- a/include/linux/of.h
> +++ b/include/linux/of.h
> @@ -199,6 +199,8 @@ extern int of_property_read_u32_array(const struct device_node *np,
>  				      const char *propname,
>  				      u32 *out_values,
>  				      size_t sz);
> +extern int of_property_read_u64(const struct device_node *np,
> +				const char *propname, u64 *out_value);
>  
>  extern int of_property_read_string(struct device_node *np,
>  				   const char *propname,
> @@ -256,6 +258,12 @@ static inline int of_property_read_string(struct device_node *np,
>  	return -ENOSYS;
>  }
>  
> +static inline int of_property_read_u64(const struct device_node *np,
> +				       const char *propname, u64 *out_value)
> +{
> +	return -ENOSYS;
> +}
> +
>  #endif /* CONFIG_OF */
>  
>  static inline int of_property_read_u32(const struct device_node *np,

Re: [PATCH] dt: add helper to read 64-bit integers

[Jamie Iles]

On Wed, Aug 03, 2011 at 11:17:14AM -0500, Rob Herring wrote:
> On 08/03/2011 08:44 AM, Jamie Iles wrote:
> > Add a helper similar to of_property_read_u32() that handles 64-bit
> > integers.
> > 
> > v2: constify device node and property name parameters.
> > 
> > Cc: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
> > Signed-off-by: Jamie Iles <jamie-wmLquQDDieKakBO8gow8eQ@public.gmane.org>
> > ---
> >  drivers/of/base.c  |   28 ++++++++++++++++++++++++++++
> >  include/linux/of.h |    8 ++++++++
> >  2 files changed, 36 insertions(+), 0 deletions(-)
> > 
> > diff --git a/drivers/of/base.c b/drivers/of/base.c
> > index 3ff22e3..3808e70 100644
> > --- a/drivers/of/base.c
> > +++ b/drivers/of/base.c
> > @@ -632,6 +632,34 @@ int of_property_read_u32_array(const struct device_node *np,
> >  EXPORT_SYMBOL_GPL(of_property_read_u32_array);
> >  
> >  /**
> > + * of_property_read_u64 - Find and read a 64 bit integer from a property
> > + * @np:		device node from which the property value is to be read.
> > + * @propname:	name of the property to be searched.
> > + * @out_value:	pointer to return value, modified only if return value is 0.
> > + *
> > + * Search for a property in a device node and read a 64-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 u64 value can be decoded.
> > + */
> > +int of_property_read_u64(struct device_node *np, char *propname, u64 *out_value)
> 
> Missed a const here...

Doh!  Not sure how I missed that, thanks Rob!  Revised patch below.

Jamie

8<--------

Date: Wed, 3 Aug 2011 14:44:33 +0100
Subject: [PATCH] dt: add helper to read 64-bit integers

Add a helper similar to of_property_read_u32() that handles 64-bit
integers.

v2/v3: constify device node and property name parameters.

Cc: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
Signed-off-by: Jamie Iles <jamie-wmLquQDDieKakBO8gow8eQ@public.gmane.org>
---
 drivers/of/base.c  |   29 +++++++++++++++++++++++++++++
 include/linux/of.h |    8 ++++++++
 2 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 3ff22e3..9361cfe 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -632,6 +632,35 @@ int of_property_read_u32_array(const struct device_node *np,
 EXPORT_SYMBOL_GPL(of_property_read_u32_array);
 
 /**
+ * of_property_read_u64 - Find and read a 64 bit integer from a property
+ * @np:		device node from which the property value is to be read.
+ * @propname:	name of the property to be searched.
+ * @out_value:	pointer to return value, modified only if return value is 0.
+ *
+ * Search for a property in a device node and read a 64-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 u64 value can be decoded.
+ */
+int of_property_read_u64(const struct device_node *np, const char *propname,
+			 u64 *out_value)
+{
+	struct property *prop = of_find_property(np, propname, NULL);
+
+	if (!prop)
+		return -EINVAL;
+	if (!prop->value)
+		return -ENODATA;
+	if (sizeof(*out_value) > prop->length)
+		return -EOVERFLOW;
+	*out_value = of_read_number(prop->value, 2);
+	return 0;
+}
+EXPORT_SYMBOL_GPL(of_property_read_u64);
+
+/**
  * of_property_read_string - Find and read a string from a property
  * @np:		device node from which the property value is to be read.
  * @propname:	name of the property to be searched.
diff --git a/include/linux/of.h b/include/linux/of.h
index 0085bb0..d1b98c0 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -199,6 +199,8 @@ extern int of_property_read_u32_array(const struct device_node *np,
 				      const char *propname,
 				      u32 *out_values,
 				      size_t sz);
+extern int of_property_read_u64(const struct device_node *np,
+				const char *propname, u64 *out_value);
 
 extern int of_property_read_string(struct device_node *np,
 				   const char *propname,
@@ -256,6 +258,12 @@ static inline int of_property_read_string(struct device_node *np,
 	return -ENOSYS;
 }
 
+static inline int of_property_read_u64(const struct device_node *np,
+				       const char *propname, u64 *out_value)
+{
+	return -ENOSYS;
+}
+
 #endif /* CONFIG_OF */
 
 static inline int of_property_read_u32(const struct device_node *np,
-- 
1.7.4.1

Re: [PATCH] dt: add helper to read 64-bit integers

[Rob Herring]

On 08/03/2011 11:33 AM, Jamie Iles wrote:
> On Wed, Aug 03, 2011 at 11:17:14AM -0500, Rob Herring wrote:
>> On 08/03/2011 08:44 AM, Jamie Iles wrote:
>>> Add a helper similar to of_property_read_u32() that handles 64-bit
>>> integers.
>>>
>>> v2: constify device node and property name parameters.
>>>
>>> Cc: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
>>> Signed-off-by: Jamie Iles <jamie-wmLquQDDieKakBO8gow8eQ@public.gmane.org>
>>> ---
>>>  drivers/of/base.c  |   28 ++++++++++++++++++++++++++++
>>>  include/linux/of.h |    8 ++++++++
>>>  2 files changed, 36 insertions(+), 0 deletions(-)
>>>
>>> diff --git a/drivers/of/base.c b/drivers/of/base.c
>>> index 3ff22e3..3808e70 100644
>>> --- a/drivers/of/base.c
>>> +++ b/drivers/of/base.c
>>> @@ -632,6 +632,34 @@ int of_property_read_u32_array(const struct device_node *np,
>>>  EXPORT_SYMBOL_GPL(of_property_read_u32_array);
>>>  
>>>  /**
>>> + * of_property_read_u64 - Find and read a 64 bit integer from a property
>>> + * @np:		device node from which the property value is to be read.
>>> + * @propname:	name of the property to be searched.
>>> + * @out_value:	pointer to return value, modified only if return value is 0.
>>> + *
>>> + * Search for a property in a device node and read a 64-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 u64 value can be decoded.
>>> + */
>>> +int of_property_read_u64(struct device_node *np, char *propname, u64 *out_value)
>>
>> Missed a const here...
> 
> Doh!  Not sure how I missed that, thanks Rob!  Revised patch below.
> 
> Jamie
> 
> 8<--------
> 
> Date: Wed, 3 Aug 2011 14:44:33 +0100
> Subject: [PATCH] dt: add helper to read 64-bit integers
> 
> Add a helper similar to of_property_read_u32() that handles 64-bit
> integers.
> 
> v2/v3: constify device node and property name parameters.
> 
> Cc: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
> Signed-off-by: Jamie Iles <jamie-wmLquQDDieKakBO8gow8eQ@public.gmane.org>

Reviewed-by: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>

> ---
>  drivers/of/base.c  |   29 +++++++++++++++++++++++++++++
>  include/linux/of.h |    8 ++++++++
>  2 files changed, 37 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/of/base.c b/drivers/of/base.c
> index 3ff22e3..9361cfe 100644
> --- a/drivers/of/base.c
> +++ b/drivers/of/base.c
> @@ -632,6 +632,35 @@ int of_property_read_u32_array(const struct device_node *np,
>  EXPORT_SYMBOL_GPL(of_property_read_u32_array);
>  
>  /**
> + * of_property_read_u64 - Find and read a 64 bit integer from a property
> + * @np:		device node from which the property value is to be read.
> + * @propname:	name of the property to be searched.
> + * @out_value:	pointer to return value, modified only if return value is 0.
> + *
> + * Search for a property in a device node and read a 64-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 u64 value can be decoded.
> + */
> +int of_property_read_u64(const struct device_node *np, const char *propname,
> +			 u64 *out_value)
> +{
> +	struct property *prop = of_find_property(np, propname, NULL);
> +
> +	if (!prop)
> +		return -EINVAL;
> +	if (!prop->value)
> +		return -ENODATA;
> +	if (sizeof(*out_value) > prop->length)
> +		return -EOVERFLOW;
> +	*out_value = of_read_number(prop->value, 2);
> +	return 0;
> +}
> +EXPORT_SYMBOL_GPL(of_property_read_u64);
> +
> +/**
>   * of_property_read_string - Find and read a string from a property
>   * @np:		device node from which the property value is to be read.
>   * @propname:	name of the property to be searched.
> diff --git a/include/linux/of.h b/include/linux/of.h
> index 0085bb0..d1b98c0 100644
> --- a/include/linux/of.h
> +++ b/include/linux/of.h
> @@ -199,6 +199,8 @@ extern int of_property_read_u32_array(const struct device_node *np,
>  				      const char *propname,
>  				      u32 *out_values,
>  				      size_t sz);
> +extern int of_property_read_u64(const struct device_node *np,
> +				const char *propname, u64 *out_value);
>  
>  extern int of_property_read_string(struct device_node *np,
>  				   const char *propname,
> @@ -256,6 +258,12 @@ static inline int of_property_read_string(struct device_node *np,
>  	return -ENOSYS;
>  }
>  
> +static inline int of_property_read_u64(const struct device_node *np,
> +				       const char *propname, u64 *out_value)
> +{
> +	return -ENOSYS;
> +}
> +
>  #endif /* CONFIG_OF */
>  
>  static inline int of_property_read_u32(const struct device_node *np,

[PATCH] dt: add helper to read 64-bit integers

[Jamie Iles]

Add a helper similar to of_property_read_u32() that handles 64-bit
integers.

Cc: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
Signed-off-by: Jamie Iles <jamie-wmLquQDDieKakBO8gow8eQ@public.gmane.org>
---
 drivers/of/base.c  |   28 ++++++++++++++++++++++++++++
 include/linux/of.h |    8 ++++++++
 2 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 02ed367..bae5161 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -631,6 +631,34 @@ int of_property_read_u32_array(const struct device_node *np, char *propname,
 EXPORT_SYMBOL_GPL(of_property_read_u32_array);
 
 /**
+ * of_property_read_u64 - Find and read a 64 bit integer from a property
+ * @np:		device node from which the property value is to be read.
+ * @propname:	name of the property to be searched.
+ * @out_value:	pointer to return value, modified only if return value is 0.
+ *
+ * Search for a property in a device node and read a 64-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 u64 value can be decoded.
+ */
+int of_property_read_u64(struct device_node *np, char *propname, u64 *out_value)
+{
+	struct property *prop = of_find_property(np, propname, NULL);
+
+	if (!prop)
+		return -EINVAL;
+	if (!prop->value)
+		return -ENODATA;
+	if (sizeof(*out_value) > prop->length)
+		return -EOVERFLOW;
+	*out_value = of_read_number(prop->value, 2);
+	return 0;
+}
+EXPORT_SYMBOL_GPL(of_property_read_u64);
+
+/**
  * of_property_read_string - Find and read a string from a property
  * @np:		device node from which the property value is to be read.
  * @propname:	name of the property to be searched.
diff --git a/include/linux/of.h b/include/linux/of.h
index bd716f8..9fde908 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -199,6 +199,8 @@ extern int of_property_read_u32_array(const struct device_node *np,
 				      char *propname,
 				      u32 *out_values,
 				      size_t sz);
+extern int of_property_read_u64(struct device_node *np, char *propname,
+				u64 *out_value);
 
 extern int of_property_read_string(struct device_node *np, char *propname,
 					const char **out_string);
@@ -253,6 +255,12 @@ static inline int of_property_read_string(struct device_node *np,
 	return -ENOSYS;
 }
 
+static inline int of_property_read_u64(struct device_node *np, char *propname,
+				       u64 *out_value)
+{
+	return -ENOSYS;
+}
+
 #endif /* CONFIG_OF */
 
 static inline int of_property_read_u32(const struct device_node *np,
-- 
1.7.4.1

Re: [PATCH] dt: add helper to read 64-bit integers

[Rob Herring]

Jamie,

On 08/02/2011 06:06 AM, Jamie Iles wrote:
> Add a helper similar to of_property_read_u32() that handles 64-bit
> integers.
> 
> Cc: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
> Signed-off-by: Jamie Iles <jamie-wmLquQDDieKakBO8gow8eQ@public.gmane.org>
> ---
>  drivers/of/base.c  |   28 ++++++++++++++++++++++++++++
>  include/linux/of.h |    8 ++++++++
>  2 files changed, 36 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/of/base.c b/drivers/of/base.c
> index 02ed367..bae5161 100644
> --- a/drivers/of/base.c
> +++ b/drivers/of/base.c
> @@ -631,6 +631,34 @@ int of_property_read_u32_array(const struct device_node *np, char *propname,
>  EXPORT_SYMBOL_GPL(of_property_read_u32_array);
>  
>  /**
> + * of_property_read_u64 - Find and read a 64 bit integer from a property
> + * @np:		device node from which the property value is to be read.
> + * @propname:	name of the property to be searched.
> + * @out_value:	pointer to return value, modified only if return value is 0.
> + *
> + * Search for a property in a device node and read a 64-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 u64 value can be decoded.
> + */
> +int of_property_read_u64(struct device_node *np, char *propname, u64 *out_value)

First 2 params should have a const.

Rob

> +{
> +	struct property *prop = of_find_property(np, propname, NULL);
> +
> +	if (!prop)
> +		return -EINVAL;
> +	if (!prop->value)
> +		return -ENODATA;
> +	if (sizeof(*out_value) > prop->length)
> +		return -EOVERFLOW;
> +	*out_value = of_read_number(prop->value, 2);
> +	return 0;
> +}
> +EXPORT_SYMBOL_GPL(of_property_read_u64);
> +
> +/**
>   * of_property_read_string - Find and read a string from a property
>   * @np:		device node from which the property value is to be read.
>   * @propname:	name of the property to be searched.
> diff --git a/include/linux/of.h b/include/linux/of.h
> index bd716f8..9fde908 100644
> --- a/include/linux/of.h
> +++ b/include/linux/of.h
> @@ -199,6 +199,8 @@ extern int of_property_read_u32_array(const struct device_node *np,
>  				      char *propname,
>  				      u32 *out_values,
>  				      size_t sz);
> +extern int of_property_read_u64(struct device_node *np, char *propname,
> +				u64 *out_value);
>  
>  extern int of_property_read_string(struct device_node *np, char *propname,
>  					const char **out_string);
> @@ -253,6 +255,12 @@ static inline int of_property_read_string(struct device_node *np,
>  	return -ENOSYS;
>  }
>  
> +static inline int of_property_read_u64(struct device_node *np, char *propname,
> +				       u64 *out_value)
> +{
> +	return -ENOSYS;
> +}
> +
>  #endif /* CONFIG_OF */
>  
>  static inline int of_property_read_u32(const struct device_node *np,