platform: sifive: fu540: Expand FDT size before any patching
authorBin Meng <bmeng.cn@gmail.com>
Thu, 8 Aug 2019 07:20:23 +0000 (00:20 -0700)
committerAnup Patel <anup@brainfault.org>
Fri, 9 Aug 2019 07:00:06 +0000 (12:30 +0530)
We should expand the FDT size before any patching, otherwise it's
possible the "status" fix up might fail due to insufficient space.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Anup Patel <anup.patel@wdc.com>
platform/sifive/fu540/platform.c

index ee90790..827e294 100644 (file)
@@ -62,6 +62,12 @@ static void fu540_modify_dt(void *fdt)
        char cpu_node[32] = "";
        const char *mmu_type;
 
+       size = fdt_totalsize(fdt);
+       err  = fdt_open_into(fdt, fdt, size + 256);
+       if (err < 0)
+               sbi_printf(
+                       "Device Tree can't be expanded to accmodate new node");
+
        for (i = 0; i < FU540_HART_COUNT; i++) {
                sbi_sprintf(cpu_node, "/cpus/cpu@%d", i);
                cpu_offset = fdt_path_offset(fdt, cpu_node);
@@ -74,11 +80,6 @@ static void fu540_modify_dt(void *fdt)
                                           "disabled");
                memset(cpu_node, 0, sizeof(cpu_node));
        }
-       size = fdt_totalsize(fdt);
-       err  = fdt_open_into(fdt, fdt, size + 256);
-       if (err < 0)
-               sbi_printf(
-                       "Device Tree can't be expanded to accmodate new node");
 
        chosen_offset = fdt_path_offset(fdt, "/chosen");
        fdt_setprop_string(fdt, chosen_offset, "stdout-path",