riscv: Avoid the reserved memory fixup if src and dst point to the same place
Subsystems (2)
PATCH v4 1/3 riscv: Avoid the reserved memory fixup if src and dst point to the same place
From: Bin Meng <[email protected]>
The copy of reserved memory node from source dtb to destination dtb can be avoided if they point to the same place. This is useful when OF_PRIOR_STAGE is used.
---
(no changes since v1)
arch/riscv/lib/fdt_fixup.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
arch/riscv/lib/fdt_fixup.c +8 -4
@@ -82,10 +82,9 @@ int riscv_fdt_copy_resv_mem_node(const void *src, void *dst)* @fdt: Pointer to the device tree in which reserved memory node needs to be * added. * -* In RISC-V, any board compiled with OF_SEPARATE needs to copy the reserved -* memory node from the device tree provided by the firmware to the device tree -* used by U-Boot. This is a common function that individual board fixup -* functions can invoke. +* In RISC-V, any board needs to copy the reserved memory node from the device +* tree provided by the firmware to the device tree used by U-Boot. This is a +* common function that individual board fixup functions can invoke. * * Return: 0 on success or error otherwise. */
@@ -95,6 +94,11 @@ int riscv_board_reserved_mem_fixup(void *fdt)void *src_fdt_addr; src_fdt_addr =map_sysmem (gd->arch.firmware_fdt_addr,0 ); + +/* avoid the copy if we are using the same device tree */ +if (src_fdt_addr == fdt) +return 0 ; + err =riscv_fdt_copy_resv_mem_node (src_fdt_addr, fdt);if (err <0 )return err;
Signature · 1 line
2.7.4
PATCH v4 2/3 riscv: Expand the DT size before copy reserved memory node
From: Bin Meng <[email protected]>
The FDT blob might not have sufficient space to hold a copy of reserved memory node. Expand it before the copy.
---
(no changes since v3)
Changes in v3:
- Extend the FDT size by 1024 bytes
arch/riscv/lib/fdt_fixup.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/riscv/lib/fdt_fixup.c +12 -0
@@ -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 );
Signature · 1 line
2.7.4
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v4 2/3 riscv: Expand the DT size before copy reserved memory node
Quoted 15 lines
From: Bin Meng [mailto:bmeng.cn at gmail.com]
Sent: Friday, June 26, 2020 9:16 AM
To: Rick Jian-Zhi Chen(???); U-Boot Mailing List
Cc: Atish Patra; Bin Meng
Subject: [PATCH v4 2/3] riscv: Expand the DT size before copy reserved memory nodeFrom: Bin Meng <[email protected]>
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 <[email protected]>Signed-off-by Bin Meng <[email protected]>Reviewed-by Atish Patra <[email protected]>---
Quoted 8 lines
(no changes since v3)
Changes in v3:
- Extend the FDT size by 1024 bytesarch/riscv/lib/fdt_fixup.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
Quoted 24 lines
arch/riscv/lib/fdt_fixup.c +12
-1@@ -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
PATCH v4 3/3 riscv: Enable CONFIG_OF_BOARD_FIXUP by default for OF_SEPARATE
In reply to Bin MengFrom: Bin Meng <[email protected]>
Starting from OpenSBI v0.7, the SBI firmware inserts/fixes up the reserved memory node for PMP protected memory regions. All RISC-V boards need to copy the reserved memory node from the device tree provided by the firmware to the device tree used by U-Boot.
Turn on CONFIG_OF_BOARD_FIXUP by default for OF_SEPARATE.
---
Changes in v4:
- /s/needs/need in the commit message
Changes in v3:
- change to "default y if OF_SEPARATE"
arch/riscv/Kconfig | 3 +++ configs/sifive_fu540_defconfig | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)
arch/riscv/Kconfig +3 -0
@@ -273,4 +273,7 @@ config STACK_SIZE_SHIFT int default 14 +config OF_BOARD_FIXUP + default y if OF_SEPARATE + endmenu
configs/sifive_fu540_defconfig +0 -1
@@ -16,7 +16,6 @@ CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_YMODEM_SUPPORT=y -CONFIG_OF_BOARD_FIXUP=y CONFIG_DEFAULT_DEVICE_TREE="hifive-unleashed-a00" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SPL_CLK=y
Signature · 1 line
2.7.4
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v4 3/3 riscv: Enable CONFIG_OF_BOARD_FIXUP by default for OF_SEPARATE
Quoted 19 lines
From: Bin Meng [mailto:bmeng.cn at gmail.com]
Sent: Friday, June 26, 2020 9:16 AM
To: Rick Jian-Zhi Chen(???); U-Boot Mailing List
Cc: Atish Patra; Bin Meng
Subject: [PATCH v4 3/3] riscv: EnableCONFIG_OF_BOARD_FIXUPby default forOF_SEPARATEFrom: Bin Meng <[email protected]>
Starting from OpenSBI v0.7, the SBI firmware inserts/fixes up the reserved memory node for PMP protected memory regions. All RISC-V boards need to copy the reserved memory node from the device tree provided by the firmware to the device tree used by U-Boot.
Turn on
CONFIG_OF_BOARD_FIXUPby default forOF_SEPARATE.Signed-off-by Bin Meng <[email protected]>Reviewed-by Atish Patra <[email protected]>---
Changes in v4:
- /s/needs/need in the commit message
Quoted 6 lines
Changes in v3:
- change to "default y ifOF_SEPARATE"arch/riscv/Kconfig | 3 +++ configs/sifive_fu540_defconfig | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)
Quoted 20 lines
arch/riscv/Kconfig +3
-0@@ -273,4 +273,7 @@ config STACK_SIZE_SHIFT int default 14 +config OF_BOARD_FIXUP + default y if OF_SEPARATE + endmenuconfigs/sifive_fu540_defconfig +0
-1@@ -16,7 +16,6 @@ CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_YMODEM_SUPPORT=y -CONFIG_OF_BOARD_FIXUP=y CONFIG_DEFAULT_DEVICE_TREE="hifive-unleashed-a00" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SPL_CLK=y --2.7.4