| Message ID | 1593070646-6774-2-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v3,1/3] riscv: Avoid the reserved memory fixup if src and dst point to the same place | expand |
On Thu, Jun 25, 2020 at 12:39 AM Bin Meng <bmeng.cn at gmail.com> wrote: > > From: Bin Meng <bin.meng at windriver.com> > > 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 at andestech.com> > Signed-off-by: Bin Meng <bin.meng at windriver.com> > --- > > Changes in v3: > - Extend the FDT size by 1024 bytes > > arch/riscv/lib/fdt_fixup.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c > index 5f523f0..160ccca 100644 > --- 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); > > -- > 2.7.4 > Reviewed-by: Atish Patra <atish.patra at wdc.com>
diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c index 5f523f0..160ccca 100644 --- 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);