[U-Boot,1/2] ofnode: add ofnode_by_prop_value()

Message ID 20180810125410.19393-2-jens.wiklander@linaro.org
State New
Delegated to: Simon Glass
Headers show
Series
  • Convert fdtdec_setup_memory_banksize() to use livetree
Related show

Commit Message

Jens Wiklander Aug. 10, 2018, 12:54 p.m.
Adds ofnode_by_prop_value() to search for nodes with a given property
and value, an ofnode version of fdt_node_offset_by_prop_value().

Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
 drivers/core/of_access.c | 27 +++++++++++++++++++++++++++
 drivers/core/ofnode.c    | 14 ++++++++++++++
 include/dm/of_access.h   | 16 ++++++++++++++++
 include/dm/ofnode.h      | 14 ++++++++++++++
 4 files changed, 71 insertions(+)

Comments

Simon Glass Aug. 17, 2018, 12:48 p.m. | #1
Hi Jens,

On 10 August 2018 at 06:54, Jens Wiklander <jens.wiklander@linaro.org> wrote:
> Adds ofnode_by_prop_value() to search for nodes with a given property
> and value, an ofnode version of fdt_node_offset_by_prop_value().
>
> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
> ---
>  drivers/core/of_access.c | 27 +++++++++++++++++++++++++++
>  drivers/core/ofnode.c    | 14 ++++++++++++++
>  include/dm/of_access.h   | 16 ++++++++++++++++
>  include/dm/ofnode.h      | 14 ++++++++++++++
>  4 files changed, 71 insertions(+)

This looks good, but please add some test code for this function.

E.g. at test/dm/ofnode.c

Regards,
Simon

Patch

diff --git a/drivers/core/of_access.c b/drivers/core/of_access.c
index 0729dfcdb3b8..14c020a687b7 100644
--- a/drivers/core/of_access.c
+++ b/drivers/core/of_access.c
@@ -376,6 +376,33 @@  struct device_node *of_find_compatible_node(struct device_node *from,
 	return np;
 }
 
+static int of_device_has_prop_value(const struct device_node *device,
+				    const char *propname, const void *propval,
+				    int proplen)
+{
+	struct property *prop = of_find_property(device, propname, NULL);
+
+	if (!prop || !prop->value || prop->length != proplen)
+		return 0;
+	return !memcmp(prop->value, propval, proplen);
+}
+
+struct device_node *of_find_node_by_prop_value(struct device_node *from,
+					       const char *propname,
+					       const void *propval, int proplen)
+{
+	struct device_node *np;
+
+	for_each_of_allnodes_from(from, np) {
+		if (of_device_has_prop_value(np, propname, propval, proplen) &&
+		    of_node_get(np))
+			break;
+	}
+	of_node_put(from);
+
+	return np;
+}
+
 struct device_node *of_find_node_by_phandle(phandle handle)
 {
 	struct device_node *np;
diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index 0cfb0fbabb00..a7e192772324 100644
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -777,3 +777,17 @@  ofnode ofnode_by_compatible(ofnode from, const char *compat)
 				gd->fdt_blob, ofnode_to_offset(from), compat));
 	}
 }
+
+ofnode ofnode_by_prop_value(ofnode from, const char *propname,
+			    const void *propval, int proplen)
+{
+	if (of_live_active()) {
+		return np_to_ofnode(of_find_node_by_prop_value(
+			(struct device_node *)ofnode_to_np(from), propname,
+			propval, proplen));
+	} else {
+		return offset_to_ofnode(fdt_node_offset_by_prop_value(
+				gd->fdt_blob, ofnode_to_offset(from),
+				propname, propval, proplen));
+	}
+}
diff --git a/include/dm/of_access.h b/include/dm/of_access.h
index dd1abb8e97b4..5ed1a0cdb427 100644
--- a/include/dm/of_access.h
+++ b/include/dm/of_access.h
@@ -193,6 +193,22 @@  static inline struct device_node *of_find_node_by_path(const char *path)
 struct device_node *of_find_compatible_node(struct device_node *from,
 				const char *type, const char *compatible);
 
+/**
+ * of_find_node_by_prop_value() - find a node with a given property value
+ *
+ * Find a node based on a property value.
+ * @from: Node to start searching from or NULL. the node you pass will not be
+ *	searched, only the next one will; typically, you pass what the previous
+ *	call returned.
+ * @propname: property name to check
+ * @propval: property value to search for
+ * @proplen: length of the value in propval
+ * @return node pointer or NULL if not found
+ */
+struct device_node *of_find_node_by_prop_value(struct device_node *from,
+					       const char *propname,
+					       const void *propval,
+					       int proplen);
 /**
  * of_find_node_by_phandle() - Find a node given a phandle
  *
diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h
index ab36b74c4ca4..c06d77849c73 100644
--- a/include/dm/ofnode.h
+++ b/include/dm/ofnode.h
@@ -702,6 +702,20 @@  int ofnode_read_resource_byname(ofnode node, const char *name,
  */
 ofnode ofnode_by_compatible(ofnode from, const char *compat);
 
+/**
+ * ofnode_by_prop_value() - Find the next node with given property value
+ *
+ * Find the next node after @from that has a @propname with a value
+ * @propval and a length @proplen.
+ *
+ * @from: ofnode to start from (use ofnode_null() to start at the
+ * beginning) @propname: property name to check @propval: property value to
+ * search for @proplen: length of the value in propval @return ofnode
+ * found, or ofnode_null() if none
+ */
+ofnode ofnode_by_prop_value(ofnode from, const char *propname,
+			    const void *propval, int proplen);
+
 /**
  * ofnode_for_each_subnode() - iterate over all subnodes of a parent
  *