lk2nd: util: lkfdt: Add more uint32_t/phandle helpers used in qebspil

These are not used in lk2nd yet, but might come useful in the future.

Author: stephan-gh

lk2nd/include/lk2nd/util/lkfdt.h

@@ -48,6 +48,30 @@ bool lkfdt_node_is_available(const void *fdt, int node) __PURE;
  */
 int lkfdt_get_reg(const void *fdt, int parent, int node, uint32_t *addr, uint32_t *size) __PURE;
 
+/**
+ * lkfdt_getprop_u32() - Read 32-bit number (e.g. phandle) from property.
+ * @fdt: Device tree blob
+ * @node: Device tree node offset
+ * @prop: Name of property that contains the uint32_t value
+ * @val: Output variable that is filled with the decoded uint32_t value
+ *
+ * Return: 0 if successful, <0 libfdt error
+ */
+int lkfdt_getprop_u32(const void *fdt, int node, const char *prop, uint32_t *val) __PURE;
+
+/**
+ * lkfdt_u32list_get() - Read one specific 32-bit number from a list.
+ * @fdt: Device tree blob
+ * @node: Device tree node offset
+ * @prop: Name of property that contains the uint32_t list
+ * @idx: Index of uint32_t to return from the list (must be >= 0)
+ * @val: Output variable that is filled with the uint32_t value
+ *
+ * Return: 0 if successful, <0 libfdt error (e.g. -FDT_ERR_NOTFOUND)
+ */
+int lkfdt_u32list_get(const void *fdt, int node, const char *prop,
+		      int idx, uint32_t *val) __PURE;
+
 /**
  * lkfdt_lookup_phandle() - Read phandle from property and search for the node.
  * @fdt: Device tree blob
@@ -60,6 +84,21 @@ int lkfdt_get_reg(const void *fdt, int parent, int node, uint32_t *addr, uint32_
  */
 int lkfdt_lookup_phandle(const void *fdt, int node, const char *prop) __PURE;
 
+/**
+ * lkfdt_subnode_offset_by_phandle() - Return subnode that matches a phandle.
+ * @fdt: Device tree blob
+ * @parent: Device tree node offset of parent
+ * @phandle: The phandle to search for
+ *
+ * Iterate over all subnodes of the "parent" and look for the node that has
+ * the specified "phandle".
+ *
+ * Return:
+ * * >= 0 - The offset of the subnode that matches the phandle, if successful
+ * *  < 0 - libfdt error (<0), otherwise
+ */
+int lkfdt_subnode_offset_by_phandle(const void *fdt, int parent, uint32_t phandle) __PURE;
+
 /**
  * lkfdt_stringlist_get_all() - Obtain array of strings for a given prop
  * @fdt: Device tree blob

lk2nd/util/lkfdt.c

@@ -66,18 +66,63 @@ int lkfdt_get_reg(const void *fdt, int parent, int node,
 	return 0;
 }
 
-int lkfdt_lookup_phandle(const void *fdt, int node, const char *prop)
+int lkfdt_getprop_u32(const void *fdt, int node, const char *prop, uint32_t *val)
 {
-	const fdt32_t *phandle;
+	const fdt32_t *fval;
 	int len;
 
-	phandle = fdt_getprop(fdt, node, prop, &len);
+	fval = fdt_getprop(fdt, node, prop, &len);
 	if (len < 0)
 		return len;
-	if (len != sizeof(*phandle))
+	if (len != sizeof(*fval))
 		return -FDT_ERR_BADVALUE;
 
-	return fdt_node_offset_by_phandle(fdt, fdt32_to_cpu(*phandle));
+	*val = fdt32_to_cpu(*fval);
+	return 0;
+}
+
+int lkfdt_u32list_get(const void *fdt, int node, const char *prop,
+		      int idx, uint32_t *val)
+{
+	const fdt32_t *fvals;
+	int len;
+
+	if (idx < 0 || idx >= (INT_MAX / (int)sizeof(*fvals)))
+		return -FDT_ERR_BADOFFSET;
+
+	fvals = fdt_getprop(fdt, node, prop, &len);
+	if (len < 0)
+		return len;
+	if (len % sizeof(*fvals))
+		return -FDT_ERR_BADVALUE;
+	if (len < ((idx + 1) * (int)sizeof(*fvals)))
+		return -FDT_ERR_NOTFOUND;
+
+	*val = fdt32_to_cpu(fvals[idx]);
+	return 0;
+}
+
+int lkfdt_lookup_phandle(const void *fdt, int node, const char *prop)
+{
+	uint32_t phandle;
+	int ret;
+
+	ret = lkfdt_getprop_u32(fdt, node, prop, &phandle);
+	if (ret < 0)
+		return ret;
+
+	return fdt_node_offset_by_phandle(fdt, phandle);
+}
+
+int lkfdt_subnode_offset_by_phandle(const void *fdt, int parent, uint32_t phandle)
+{
+	int node;
+
+	fdt_for_each_subnode(node, fdt, parent) {
+		if (fdt_get_phandle(fdt, node) == phandle)
+			return node;
+	}
+	return node;
 }
 
 /**