From 085d59411ca7cde4ca5c70beeab4fdcea209aed6 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Tue, 6 Sep 2022 20:27:21 -0600
Subject: [PATCH] dm: core: Add ofnode functions to obtain an oftree

At present dm_test_ofnode_root() does this manually. Add some inline
functions to handle it, so this code can be centralised.

Add oftree functions to produce a null tree and to check whether a tree
is valid or not.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 include/dm/ofnode.h | 63 +++++++++++++++++++++++++++++++++++++++++++++
 test/dm/ofnode.c    |  7 +++--
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h
index f68896711e..328e1edad4 100644
--- a/include/dm/ofnode.h
+++ b/include/dm/ofnode.h
@@ -173,6 +173,38 @@ static inline bool ofnode_equal(ofnode ref1, ofnode ref2)
 	return ref1.of_offset == ref2.of_offset;
 }
 
+/**
+ * oftree_valid() - check if an oftree is valid
+ *
+ * @tree: Reference containing oftree
+ * Return: true if the reference contains a valid oftree, false if node
+ */
+static inline bool oftree_valid(oftree tree)
+{
+	if (of_live_active())
+		return tree.np;
+	else
+		return tree.fdt;
+}
+
+/**
+ * oftree_null() - Obtain a null oftree
+ *
+ * This returns an oftree which points to no tree. It works both with the flat
+ * tree and livetree.
+ */
+static inline oftree oftree_null(void)
+{
+	oftree tree;
+
+	if (of_live_active())
+		tree.np = NULL;
+	else
+		tree.fdt = NULL;
+
+	return tree;
+}
+
 /**
  * ofnode_null() - Obtain a null ofnode
  *
@@ -234,6 +266,37 @@ static inline oftree oftree_default(void)
 	return tree;
 }
 
+/**
+ * oftree_from_np() - Returns an oftree from a node pointer
+ *
+ * @root: Root node of the tree
+ * Returns: reference to the given node
+ */
+static inline oftree oftree_from_np(struct device_node *root)
+{
+	oftree tree;
+
+	tree.np = root;
+
+	return tree;
+}
+
+/**
+ * oftree_from_fdt() - Returns an oftree from a flat device tree pointer
+ *
+ * @fdt: Device tree to use
+ *
+ * Returns: reference to the given node
+ */
+static inline oftree oftree_from_fdt(void *fdt)
+{
+	oftree tree;
+
+	tree.fdt = fdt;
+
+	return tree;
+}
+
 /**
  * ofnode_name_eq() - Check if the node name is equivalent to a given name
  *                    ignoring the unit address
diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c
index eac0c50364..f146b52d62 100644
--- a/test/dm/ofnode.c
+++ b/test/dm/ofnode.c
@@ -518,13 +518,16 @@ static int dm_test_ofnode_root(struct unit_test_state *uts)
 	ut_assert(ofnode_valid(node));
 	ut_asserteq_str("sbe5", ofnode_get_name(node));
 
+	ut_assert(!oftree_valid(oftree_null()));
+
 	ut_assertok(make_ofnode_fdt(uts, fdt, sizeof(fdt)));
 	if (of_live_active()) {
 		ut_assertok(unflatten_device_tree(fdt, &root));
-		tree.np = root;
+		tree = oftree_from_np(root);
 	} else {
-		tree.fdt = fdt;
+		tree = oftree_from_fdt(fdt);
 	}
+	ut_assert(oftree_valid(tree));
 
 	/* Make sure they don't work on this new tree */
 	node = ofnode_path_root(tree, "mmc0");
-- 
2.39.5