From: Simon Glass <sjg@chromium.org>
Date: Thu, 1 Jun 2023 16:22:31 +0000 (-0600)
Subject: dm: core: Avoid registering an inaccessible tree
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=a6c4f188948eaf957da8595dd76d947b8bad005a;p=u-boot.git

dm: core: Avoid registering an inaccessible tree

At present there are various restrictions on the use of livetree:

- It is only available once the tree is unflattened, i.e. after relocation
- It is designed to be used with the control FDT
- It can (in principle) be used with other FDTs, but only if they are
  unflattened first; this is not supported

Add a few checks to make sure that any tree that is created is actually
valid. Otherwise it can be confusing when nodes and properties cannot
actually be accessed.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index ec574c4460..1d4ab5bb6f 100644
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -60,6 +60,11 @@ static oftree oftree_ensure(void *fdt)
 				return oftree_null();
 			}
 
+			if (of_live_active()) {
+				log_err("Cannot register a flattree when OF_LIVE is active\n");
+				return oftree_null();
+			}
+
 			/* register the new tree */
 			i = oftree_count++;
 			oftree_list[i] = fdt;
@@ -133,6 +138,10 @@ oftree oftree_from_fdt(void *fdt)
 	if (CONFIG_IS_ENABLED(OFNODE_MULTI_TREE))
 		return oftree_ensure(fdt);
 
+#ifdef OF_CHECKS
+	if (of_live_active())
+		return oftree_null();
+#endif
 	tree.fdt = fdt;
 
 	return tree;