um: Unconditionally call unflatten_device_tree()

Call this function unconditionally so that we can populate an empty DTB
on platforms that don't boot with a command line provided DTB.  There's
no harm in calling unflatten_device_tree() unconditionally. If there
isn't a valid initial_boot_params dtb then unflatten_device_tree()
returns early.

Cc: Rob Herring <robh+dt@kernel.org>
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: linux-um@lists.infradead.org
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Link: https://lore.kernel.org/r/20240217010557.2381548-4-sboyd@kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>

diff --git a/arch/um/kernel/dtb.c b/arch/um/kernel/dtb.c
index 484141b06938ffcd222a7c40055acd07155b04a1..4954188a6a0908363654d541f6a2faeb36bbe651 100644 (file)
--- a/arch/um/kernel/dtb.c
+++ b/arch/um/kernel/dtb.c
@@ -16,16 +16,16 @@ void uml_dtb_init(void)
        void *area;
 
        area = uml_load_file(dtb, &size);
-       if (!area)
-               return;
-
-       if (!early_init_dt_scan(area)) {
-               pr_err("invalid DTB %s\n", dtb);
-               memblock_free(area, size);
-               return;
+       if (area) {
+               if (!early_init_dt_scan(area)) {
+                       pr_err("invalid DTB %s\n", dtb);
+                       memblock_free(area, size);
+                       return;
+               }
+
+               early_init_fdt_scan_reserved_mem();
        }
 
-       early_init_fdt_scan_reserved_mem();
        unflatten_device_tree();
 }
 

diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index cfd60e35a8992d7d1bf7ee1ea42c10b6f43a7a2e..891752a20a5f740c5aca6ee6fedeeecf55d640cc 100644 (file)
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -4087,10 +4087,6 @@ static int __init of_unittest(void)
        add_taint(TAINT_TEST, LOCKDEP_STILL_OK);
 
        /* adding data for unittest */
-
-       if (IS_ENABLED(CONFIG_UML))
-               unittest_unflatten_overlay_base();
-
        res = unittest_data_add();
        if (res)
                return res;