riscv: Expand the DT size before copy reserved memory node

The FDT blob might not have sufficient space to hold a copy of
reserved memory node. Expand it before the copy.

Reported-by: Rick Chen <rick@andestech.com>
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
Reviewed-by: Rick Chen <rick@andestech.com>

diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c
index 5f523f0e07d5e2c6fecdead37b393bb0f92ae98f..160ccca76e02d2b93524d9c3e3cf77d435c17bf3 100644 (file)
--- a/arch/riscv/lib/fdt_fixup.c
+++ b/arch/riscv/lib/fdt_fixup.c
@@ -41,6 +41,18 @@ int riscv_fdt_copy_resv_mem_node(const void *src, void *dst)
                return 0;
        }
 
+       /*
+        * Extend the FDT by the following estimated size:
+        *
+        * Each PMP memory region entry occupies 64 bytes.
+        * With 16 PMP memory regions we need 64 * 16 = 1024 bytes.
+        */
+       err = fdt_open_into(dst, dst, fdt_totalsize(dst) + 1024);
+       if (err < 0) {
+               printf("Device Tree can't be expanded to accommodate new node");
+               return err;
+       }
+
        fdt_for_each_subnode(node, src, offset) {
                name = fdt_get_name(src, node, NULL);