of: Add array read functions with min/max size limits

Add a new set of array reading functions that take a minimum and
maximum size limit and will fail if the property size is not within
the size limits. This makes it more convenient for drivers that
use variable-size DT arrays which must be bounded at both ends -
data must be at least N entries but must not overflow the array
it is being copied into. It is also more efficient than making this
functionality out of existing public functions and avoids duplication.

The existing array functions have been left in the API, since there
are a very large number of clients of those functions and their
existing functionality is still useful. This avoids turning a small
API improvement into a major kernel rework.

The old functions have been turned into mininmal static inlines calling
the new functions. The old functions had no upper limit on the actual
size of the dts entry, to preserve this functionality rather than keeping
two near-identical implementations, if the new function is called with
max=0 there is no limit on the size of the dts entry but only the min
number of elements are read.

Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: Rob Herring <robh@kernel.org>

2 files changed, 234 insertions, 66 deletions

diff --git a/drivers/of/base.c b/drivers/of/base.c
index b85373768ce1..a0bccb54a9bd 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1209,108 +1209,145 @@ int of_property_read_u32_index(const struct device_node *np,
 EXPORT_SYMBOL_GPL(of_property_read_u32_index);
 
 /**
- * of_property_read_u8_array - Find and read an array of u8 from a property.
+ * of_property_read_variable_u8_array - Find and read an array of u8 from a
+ * property, with bounds on the minimum and maximum array size.
  *
  * @np:         device node from which the property value is to be read.
  * @propname:   name of the property to be searched.
  * @out_values: pointer to return value, modified only if return value is 0.
- * @sz:         number of array elements to read
+ * @sz_min:     minimum number of array elements to read
+ * @sz_max:     maximum number of array elements to read, if zero there is no
+ *              upper limit on the number of elements in the dts entry but only
+ *              sz_min will be read.
  *
  * Search for a property in a device node and read 8-bit value(s) 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.
+ * it. Returns number of elements read on success, -EINVAL if the property
+ * does not exist, -ENODATA if property does not have a value, and -EOVERFLOW
+ * if the property data is smaller than sz_min or longer than sz_max.
  *
  * dts entry of array should be like:
  *      property = /bits/ 8 <0x50 0x60 0x70>;
  *
  * The out_values is modified only if a valid u8 value can be decoded.
  */
-int of_property_read_u8_array(const struct device_node *np,
-                        const char *propname, u8 *out_values, size_t sz)
+int of_property_read_variable_u8_array(const struct device_node *np,
+                                        const char *propname, u8 *out_values,
+                                        size_t sz_min, size_t sz_max)
 {
+        size_t sz, count;
         const u8 *val = of_find_property_value_of_size(np, propname,
-                                                (sz * sizeof(*out_values)),
-                                                0,
-                                                NULL);
+                                                (sz_min * sizeof(*out_values)),
+                                                (sz_max * sizeof(*out_values)),
+                                                &sz);
 
         if (IS_ERR(val))
                 return PTR_ERR(val);
 
-        while (sz--)
+        if (!sz_max)
+                sz = sz_min;
+        else
+                sz /= sizeof(*out_values);
+
+        count = sz;
+        while (count--)
                 *out_values++ = *val++;
-        return 0;
+
+        return sz;
 }
-EXPORT_SYMBOL_GPL(of_property_read_u8_array);
+EXPORT_SYMBOL_GPL(of_property_read_variable_u8_array);
 
 /**
- * of_property_read_u16_array - Find and read an array of u16 from a property.
+ * of_property_read_variable_u16_array - Find and read an array of u16 from a
+ * property, with bounds on the minimum and maximum array size.
  *
  * @np:         device node from which the property value is to be read.
  * @propname:   name of the property to be searched.
  * @out_values: pointer to return value, modified only if return value is 0.
- * @sz:         number of array elements to read
+ * @sz_min:     minimum number of array elements to read
+ * @sz_max:     maximum number of array elements to read, if zero there is no
+ *              upper limit on the number of elements in the dts entry but only
+ *              sz_min will be read.
  *
  * Search for a property in a device node and read 16-bit value(s) 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.
+ * it. Returns number of elements read on success, -EINVAL if the property
+ * does not exist, -ENODATA if property does not have a value, and -EOVERFLOW
+ * if the property data is smaller than sz_min or longer than sz_max.
  *
  * dts entry of array should be like:
  *      property = /bits/ 16 <0x5000 0x6000 0x7000>;
  *
  * The out_values is modified only if a valid u16 value can be decoded.
  */
-int of_property_read_u16_array(const struct device_node *np,
-                        const char *propname, u16 *out_values, size_t sz)
+int of_property_read_variable_u16_array(const struct device_node *np,
+                                        const char *propname, u16 *out_values,
+                                        size_t sz_min, size_t sz_max)
 {
+        size_t sz, count;
         const __be16 *val = of_find_property_value_of_size(np, propname,
-                                                (sz * sizeof(*out_values)),
-                                                0,
-                                                NULL);
+                                                (sz_min * sizeof(*out_values)),
+                                                (sz_max * sizeof(*out_values)),
+                                                &sz);
 
         if (IS_ERR(val))
                 return PTR_ERR(val);
 
-        while (sz--)
+        if (!sz_max)
+                sz = sz_min;
+        else
+                sz /= sizeof(*out_values);
+
+        count = sz;
+        while (count--)
                 *out_values++ = be16_to_cpup(val++);
-        return 0;
+
+        return sz;
 }
-EXPORT_SYMBOL_GPL(of_property_read_u16_array);
+EXPORT_SYMBOL_GPL(of_property_read_variable_u16_array);
 
 /**
- * of_property_read_u32_array - Find and read an array of 32 bit integers
- * from a property.
+ * of_property_read_variable_u32_array - Find and read an array of 32 bit
+ * integers from a property, with bounds on the minimum and maximum array size.
  *
  * @np:         device node from which the property value is to be read.
  * @propname:   name of the property to be searched.
  * @out_values: pointer to return value, modified only if return value is 0.
- * @sz:         number of array elements to read
+ * @sz_min:     minimum number of array elements to read
+ * @sz_max:     maximum number of array elements to read, if zero there is no
+ *              upper limit on the number of elements in the dts entry but only
+ *              sz_min will be read.
  *
  * Search for a property in a device node and read 32-bit value(s) 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.
+ * it. Returns number of elements read on success, -EINVAL if the property
+ * does not exist, -ENODATA if property does not have a value, and -EOVERFLOW
+ * if the property data is smaller than sz_min or longer than sz_max.
  *
  * The out_values is modified only if a valid u32 value can be decoded.
  */
-int of_property_read_u32_array(const struct device_node *np,
+int of_property_read_variable_u32_array(const struct device_node *np,
                                const char *propname, u32 *out_values,
-                               size_t sz)
+                               size_t sz_min, size_t sz_max)
 {
+        size_t sz, count;
         const __be32 *val = of_find_property_value_of_size(np, propname,
-                                                (sz * sizeof(*out_values)),
-                                                0,
-                                                NULL);
+                                                (sz_min * sizeof(*out_values)),
+                                                (sz_max * sizeof(*out_values)),
+                                                &sz);
 
         if (IS_ERR(val))
                 return PTR_ERR(val);
 
-        while (sz--)
+        if (!sz_max)
+                sz = sz_min;
+        else
+                sz /= sizeof(*out_values);
+
+        count = sz;
+        while (count--)
                 *out_values++ = be32_to_cpup(val++);
-        return 0;
+
+        return sz;
 }
-EXPORT_SYMBOL_GPL(of_property_read_u32_array);
+EXPORT_SYMBOL_GPL(of_property_read_variable_u32_array);
 
 /**
  * of_property_read_u64 - Find and read a 64 bit integer from a property
@@ -1342,40 +1379,51 @@ int of_property_read_u64(const struct device_node *np, const char *propname,
 EXPORT_SYMBOL_GPL(of_property_read_u64);
 
 /**
- * of_property_read_u64_array - Find and read an array of 64 bit integers
- * from a property.
+ * of_property_read_variable_u64_array - Find and read an array of 64 bit
+ * integers from a property, with bounds on the minimum and maximum array size.
  *
  * @np:         device node from which the property value is to be read.
  * @propname:   name of the property to be searched.
  * @out_values: pointer to return value, modified only if return value is 0.
- * @sz:         number of array elements to read
+ * @sz_min:     minimum number of array elements to read
+ * @sz_max:     maximum number of array elements to read, if zero there is no
+ *              upper limit on the number of elements in the dts entry but only
+ *              sz_min will be read.
  *
  * Search for a property in a device node and read 64-bit value(s) 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.
+ * it. Returns number of elements read on success, -EINVAL if the property
+ * does not exist, -ENODATA if property does not have a value, and -EOVERFLOW
+ * if the property data is smaller than sz_min or longer than sz_max.
  *
  * The out_values is modified only if a valid u64 value can be decoded.
  */
-int of_property_read_u64_array(const struct device_node *np,
+int of_property_read_variable_u64_array(const struct device_node *np,
                                const char *propname, u64 *out_values,
-                               size_t sz)
+                               size_t sz_min, size_t sz_max)
 {
+        size_t sz, count;
         const __be32 *val = of_find_property_value_of_size(np, propname,
-                                                (sz * sizeof(*out_values)),
-                                                0,
-                                                NULL);
+                                                (sz_min * sizeof(*out_values)),
+                                                (sz_max * sizeof(*out_values)),
+                                                &sz);
 
         if (IS_ERR(val))
                 return PTR_ERR(val);
 
-        while (sz--) {
+        if (!sz_max)
+                sz = sz_min;
+        else
+                sz /= sizeof(*out_values);
+
+        count = sz;
+        while (count--) {
                 *out_values++ = of_read_number(val, 2);
                 val += 2;
         }
-        return 0;
+
+        return sz;
 }
-EXPORT_SYMBOL_GPL(of_property_read_u64_array);
+EXPORT_SYMBOL_GPL(of_property_read_variable_u64_array);
 
 /**
  * of_property_read_string - Find and read a string from a property
diff --git a/include/linux/of.h b/include/linux/of.h
index 3d9ff8e9d803..299aeb192727 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -291,20 +291,24 @@ extern int of_property_count_elems_of_size(const struct device_node *np,
 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,
-                        const char *propname, u16 *out_values, size_t sz);
-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_variable_u8_array(const struct device_node *np,
+                                        const char *propname, u8 *out_values,
+                                        size_t sz_min, size_t sz_max);
+extern int of_property_read_variable_u16_array(const struct device_node *np,
+                                        const char *propname, u16 *out_values,
+                                        size_t sz_min, size_t sz_max);
+extern int of_property_read_variable_u32_array(const struct device_node *np,
+                                        const char *propname,
+                                        u32 *out_values,
+                                        size_t sz_min,
+                                        size_t sz_max);
 extern int of_property_read_u64(const struct device_node *np,
                                 const char *propname, u64 *out_value);
-extern int of_property_read_u64_array(const struct device_node *np,
-                                      const char *propname,
-                                      u64 *out_values,
-                                      size_t sz);
+extern int of_property_read_variable_u64_array(const struct device_node *np,
+                                        const char *propname,
+                                        u64 *out_values,
+                                        size_t sz_min,
+                                        size_t sz_max);
 
 extern int of_property_read_string(const struct device_node *np,
                                    const char *propname,
@@ -380,6 +384,122 @@ extern int of_detach_node(struct device_node *);
 
 #define of_match_ptr(_ptr)      (_ptr)
 
+/**
+ * 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.
+ * @propname:   name of the property to be searched.
+ * @out_values: pointer to return value, modified only if return value is 0.
+ * @sz:         number of array elements to read
+ *
+ * Search for a property in a device node and read 8-bit value(s) 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.
+ *
+ * dts entry of array should be like:
+ *      property = /bits/ 8 <0x50 0x60 0x70>;
+ *
+ * The out_values is modified only if a valid u8 value can be decoded.
+ */
+static inline int of_property_read_u8_array(const struct device_node *np,
+                                            const char *propname,
+                                            u8 *out_values, size_t sz)
+{
+        int ret = of_property_read_variable_u8_array(np, propname, out_values,
+                                                     sz, 0);
+        if (ret >= 0)
+                return 0;
+        else
+                return ret;
+}
+
+/**
+ * of_property_read_u16_array - Find and read an array of u16 from a property.
+ *
+ * @np:         device node from which the property value is to be read.
+ * @propname:   name of the property to be searched.
+ * @out_values: pointer to return value, modified only if return value is 0.
+ * @sz:         number of array elements to read
+ *
+ * Search for a property in a device node and read 16-bit value(s) 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.
+ *
+ * dts entry of array should be like:
+ *      property = /bits/ 16 <0x5000 0x6000 0x7000>;
+ *
+ * The out_values is modified only if a valid u16 value can be decoded.
+ */
+static inline int of_property_read_u16_array(const struct device_node *np,
+                                             const char *propname,
+                                             u16 *out_values, size_t sz)
+{
+        int ret = of_property_read_variable_u16_array(np, propname, out_values,
+                                                      sz, 0);
+        if (ret >= 0)
+                return 0;
+        else
+                return ret;
+}
+
+/**
+ * of_property_read_u32_array - Find and read an array of 32 bit integers
+ * from a property.
+ *
+ * @np:         device node from which the property value is to be read.
+ * @propname:   name of the property to be searched.
+ * @out_values: pointer to return value, modified only if return value is 0.
+ * @sz:         number of array elements to read
+ *
+ * Search for a property in a device node and read 32-bit value(s) 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_values is modified only if a valid u32 value can be decoded.
+ */
+static inline int of_property_read_u32_array(const struct device_node *np,
+                                             const char *propname,
+                                             u32 *out_values, size_t sz)
+{
+        int ret = of_property_read_variable_u32_array(np, propname, out_values,
+                                                      sz, 0);
+        if (ret >= 0)
+                return 0;
+        else
+                return ret;
+}
+
+/**
+ * of_property_read_u64_array - Find and read an array of 64 bit integers
+ * from a property.
+ *
+ * @np:         device node from which the property value is to be read.
+ * @propname:   name of the property to be searched.
+ * @out_values: pointer to return value, modified only if return value is 0.
+ * @sz:         number of array elements to read
+ *
+ * Search for a property in a device node and read 64-bit value(s) 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_values is modified only if a valid u64 value can be decoded.
+ */
+static inline int of_property_read_u64_array(const struct device_node *np,
+                                             const char *propname,
+                                             u64 *out_values, size_t sz)
+{
+        int ret = of_property_read_variable_u64_array(np, propname, out_values,
+                                                      sz, 0);
+        if (ret >= 0)
+                return 0;
+        else
+                return ret;
+}
+
 /*
  * struct property *prop;
  * const __be32 *p;