[PATCH 0/2] devicetree overlay small fixes

[PATCH 0/2] devicetree overlay small fixes

[Michal Suchanek]

Hello,

while testing overlay loading I found some issues with applying the overlay.

I sent these like a year ago already. One was since fixed but two still apply.

Thanks

Michal

Michal Suchanek (2):
  of: overlay: add resolver error prints
  of: fdt: mark unflattened tree as detached

 drivers/of/fdt.c      | 12 +++++++++---
 drivers/of/resolver.c |  6 ++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

-- 
2.8.1

[PATCH 1/2] of: overlay: add resolver error prints

[Michal Suchanek]

Applying overlay fails silently in case of an error. Add error prints.
Most notably the lack of symbols in the live tree is not reported.

Signed-off-by: Michal Suchanek <hramrach@gmail.com>
---
 drivers/of/resolver.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c
index d313d49..5d24a4b 100644
--- a/drivers/of/resolver.c
+++ b/drivers/of/resolver.c
@@ -313,6 +313,11 @@ int of_resolve_phandles(struct device_node *resolve)
 	phandle phandle, phandle_delta;
 	int err;
 
+	if (!resolve)
+		pr_err("%s: null node\n", __func__);
+	if (resolve && !of_node_check_flag(resolve, OF_DETACHED))
+		pr_err("%s: node %s not detached\n", __func__,
+			 resolve->full_name);
 	/* the resolve node must exist, and be detached */
 	if (!resolve || !of_node_check_flag(resolve, OF_DETACHED))
 		return -EINVAL;
@@ -369,6 +374,7 @@ int of_resolve_phandles(struct device_node *resolve)
 
 	/* we need to fixup, but no root symbols... */
 	if (!root_sym) {
+		pr_err("%s: no symbols in root of device tree.\n", __func__);
 		err = -EINVAL;
 		goto out;
 	}
-- 
2.8.1

Re: [PATCH 1/2] of: overlay: add resolver error prints

[Rob Herring]

On Sun, Jun 26, 2016 at 3:11 PM, Michal Suchanek <hramrach@gmail.com> wrote:
> Applying overlay fails silently in case of an error. Add error prints.
> Most notably the lack of symbols in the live tree is not reported.
>
> Signed-off-by: Michal Suchanek <hramrach@gmail.com>
> ---
>  drivers/of/resolver.c | 6 ++++++
>  1 file changed, 6 insertions(+)

Applied, thanks.

Rob

[PATCH 2/2] of: fdt: mark unflattened tree as detached

[Michal Suchanek]

The tree returned from of_fdt_unflatten_tree cannot be attached to the
live tree because it is not marked as detached so mark it as such. The
dt resolver checks the flag and refuses to process the tree otherwise.

Signed-off-by: Michal Suchanek <hramrach@gmail.com>
---
 drivers/of/fdt.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 3349d2a..7b075cf 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -384,7 +384,8 @@ static void * unflatten_dt_node(const void *blob,
  */
 static void __unflatten_device_tree(const void *blob,
 			     struct device_node **mynodes,
-			     void * (*dt_alloc)(u64 size, u64 align))
+			     void * (*dt_alloc)(u64 size, u64 align),
+			     bool detached)
 {
 	unsigned long size;
 	int start;
@@ -428,6 +429,10 @@ static void __unflatten_device_tree(const void *blob,
 	if (be32_to_cpup(mem + size) != 0xdeadbeef)
 		pr_warning("End of tree marker overwritten: %08x\n",
 			   be32_to_cpup(mem + size));
+	if (detached) {
+		of_node_set_flag(*mynodes, OF_DETACHED);
+		pr_debug("unflattened tree is detached\n");
+	}
 
 	pr_debug(" <- unflatten_device_tree()\n");
 }
@@ -451,7 +456,7 @@ void of_fdt_unflatten_tree(const unsigned long *blob,
 			struct device_node **mynodes)
 {
 	mutex_lock(&of_fdt_unflatten_mutex);
-	__unflatten_device_tree(blob, mynodes, &kernel_tree_alloc);
+	__unflatten_device_tree(blob, mynodes, &kernel_tree_alloc, true);
 	mutex_unlock(&of_fdt_unflatten_mutex);
 }
 EXPORT_SYMBOL_GPL(of_fdt_unflatten_tree);
@@ -1119,7 +1124,8 @@ bool __init early_init_dt_scan(void *params)
 void __init unflatten_device_tree(void)
 {
 	__unflatten_device_tree(initial_boot_params, &of_root,
-				early_init_dt_alloc_memory_arch);
+				early_init_dt_alloc_memory_arch,
+				false);
 
 	/* Get pointer to "/chosen" and "/aliases" nodes for use everywhere */
 	of_alias_scan(early_init_dt_alloc_memory_arch);
-- 
2.8.1

Re: [PATCH 2/2] of: fdt: mark unflattened tree as detached

[Rob Herring]

On Sun, Jun 26, 2016 at 3:11 PM, Michal Suchanek <hramrach@gmail.com> wrote:
> The tree returned from of_fdt_unflatten_tree cannot be attached to the
> live tree because it is not marked as detached so mark it as such. The
> dt resolver checks the flag and refuses to process the tree otherwise.
>
> Signed-off-by: Michal Suchanek <hramrach@gmail.com>
> ---
>  drivers/of/fdt.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)

This doesn't apply because the unflattening code has been re-written.
Please rebase to current -rc and resend.

Rob

[PATCH] of: fdt: mark unflattened tree as detached

[Michal Suchanek]

The tree returned from of_fdt_unflatten_tree cannot be attached to the
live tree because it is not marked as detached so mark it as such. The
dt resolver checks the flag and refuses to process the tree otherwise.

Signed-off-by: Michal Suchanek <hramrach@gmail.com>
---
 - rebase on top of 4.7rc
---
 drivers/of/fdt.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 33daffc..f5c802d 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -472,7 +472,8 @@ static int unflatten_dt_nodes(const void *blob,
 static void *__unflatten_device_tree(const void *blob,
 				     struct device_node *dad,
 				     struct device_node **mynodes,
-				     void *(*dt_alloc)(u64 size, u64 align))
+				     void *(*dt_alloc)(u64 size, u64 align),
+				     bool detached)
 {
 	int size;
 	void *mem;
@@ -516,6 +517,11 @@ static void *__unflatten_device_tree(const void *blob,
 		pr_warning("End of tree marker overwritten: %08x\n",
 			   be32_to_cpup(mem + size));
 
+	if (detached) {
+		of_node_set_flag(*mynodes, OF_DETACHED);
+		pr_debug("unflattened tree is detached\n");
+	}
+
 	pr_debug(" <- unflatten_device_tree()\n");
 	return mem;
 }
@@ -548,7 +554,8 @@ void *of_fdt_unflatten_tree(const unsigned long *blob,
 	void *mem;
 
 	mutex_lock(&of_fdt_unflatten_mutex);
-	mem = __unflatten_device_tree(blob, dad, mynodes, &kernel_tree_alloc);
+	mem = __unflatten_device_tree(blob, dad, mynodes, &kernel_tree_alloc,
+				      true);
 	mutex_unlock(&of_fdt_unflatten_mutex);
 
 	return mem;
@@ -1224,7 +1231,7 @@ bool __init early_init_dt_scan(void *params)
 void __init unflatten_device_tree(void)
 {
 	__unflatten_device_tree(initial_boot_params, NULL, &of_root,
-				early_init_dt_alloc_memory_arch);
+				early_init_dt_alloc_memory_arch, false);
 
 	/* Get pointer to "/chosen" and "/aliases" nodes for use everywhere */
 	of_alias_scan(early_init_dt_alloc_memory_arch);
-- 
2.8.1

Re: [PATCH] of: fdt: mark unflattened tree as detached

[Rob Herring]

On Mon, Jul 18, 2016 at 5:01 PM, Michal Suchanek <hramrach@gmail.com> wrote:
> The tree returned from of_fdt_unflatten_tree cannot be attached to the
> live tree because it is not marked as detached so mark it as such. The
> dt resolver checks the flag and refuses to process the tree otherwise.
>
> Signed-off-by: Michal Suchanek <hramrach@gmail.com>
> ---
>  - rebase on top of 4.7rc

Applied, thanks.

Rob