libfdt: Export overlay_apply_node() as fdt_overlay_apply_node()
Subsystems (4)
PATCH 1/5 libfdt: Export overlay_apply_node() as fdt_overlay_apply_node()
This function is useful to merge a subset of DT into another DT, for example if some prior-stage firmware passes a DT fragment to U-Boot and U-Boot needs to merge it into its own DT. Export this function to permit implementing such functionality.
--- scripts/dtc/libfdt/fdt_overlay.c | 5 +++++ scripts/dtc/libfdt/libfdt.h | 7 +++++++ 2 files changed, 12 insertions(+)
scripts/dtc/libfdt/fdt_overlay.c +5 -0
@@ -879,3 +879,8 @@ err:return ret; } + +int fdt_overlay_apply_node (void *fdt,int target,void *fdto,int node) +{ +return overlay_apply_node (fdt, target, fdto, node); +}
scripts/dtc/libfdt/libfdt.h +7 -0
@@ -2032,6 +2032,13 @@ int fdt_del_node(void *fdt, int nodeoffset);*/ int fdt_overlay_apply (void *fdt,void *fdto); +/** +* fdt_overlay_apply_node - Merges a node into the base device tree +* +* See overlay_apply_node() for details. +*/ +int fdt_overlay_apply_node (void *fdt,int target,void *fdto,int node); +/**********************************************************************/ /* Debugging / informational functions */ /**********************************************************************/
Signature · 1 line
2.25.1
PATCH 2/5 fdtdec: Add weak function to patch U-Boot DT right after fdtdec_setup()
Add weak function which is called right after fdtdec_setup() configured the U-Boot DT. This permits board-specific adjustments to the U-Boot DT before U-Boot starts parsing the DT. This could be used e.g. to patch in various custom nodes or merge in DT fragments from prior-stage firmware.
--- lib/fdtdec.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
lib/fdtdec.c +10 -1
@@ -1466,8 +1466,14 @@ int fdtdec_set_carveout(void *blob, const char *node, const char *prop_name,return 0 ; } +__weak int fdtdec_board_setup (const void *fdt_blob) +{ +return 0 ; +} +int fdtdec_setup (void ) { +int ret;#if CONFIG_IS_ENABLED (OF_CONTROL )# if CONFIG_IS_ENABLED (MULTI_DTB_FIT )void *fdt_blob;
@@ -1520,7 +1526,10 @@ int fdtdec_setup(void)# endif #endif -return fdtdec_prepare_fdt (); + ret =fdtdec_prepare_fdt (); +if (!ret) + ret =fdtdec_board_setup (gd->fdt_blob); +return ret; }#if CONFIG_IS_ENABLED (MULTI_DTB_FIT )
Signature · 1 line
2.25.1
PATCH 2/5 fdtdec: Add weak function to patch U-Boot DT right after fdtdec_setup()
Hi Marek,
Quoted 19 lines · Marek Vasut
Add weak function which is called right after
fdtdec_setup()configured the U-Boot DT. This permits board-specific adjustments to the U-Boot DT before U-Boot starts parsing the DT. This could be used e.g. to patch in various custom nodes or merge in DT fragments from prior-stage firmware.Signed-off-by Marek Vasut <[email protected]>Cc Nobuhiro Iwamatsu <[email protected]>Cc Simon Glass <[email protected]>Cc Tom Rini <[email protected]>--- lib/fdtdec.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)lib/fdtdec.c +0
-0
lib/fdtdec.c int fdtdec_set_carveout(void *blob, const char *node, const char *prop_name, · line 1469
Quoted 4 lines
lib/fdtdec.c +1
-0@@ -1466,8 +1466,14 @@ int fdtdec_set_carveout(void *blob, const char *node, const char *prop_name,return 0 ; } +__weak int fdtdec_board_setup (const void *fdt_blob)
Please declare this in fdtdec.h. Also, do you want it to be const?
Also update README.fdt-control
Quoted 23 lines
lib/fdtdec.c +9
-2+{ +return 0 ; +} +int fdtdec_setup (void ) { +int ret;#if CONFIG_IS_ENABLED (OF_CONTROL )# if CONFIG_IS_ENABLED (MULTI_DTB_FIT )void *fdt_blob;@@ -1520,7 +1526,10 @@ int fdtdec_setup(void)# endif #endif -return fdtdec_prepare_fdt (); + ret =fdtdec_prepare_fdt (); +if (!ret) + ret =fdtdec_board_setup (gd->fdt_blob); +return ret; }#if CONFIG_IS_ENABLED (MULTI_DTB_FIT ) --
Quoted 2 lines
2.25.1
Regards,
Simon
PATCH 3/5 ARM: dts: rmobile: Reserve space in R-Car Gen3 DTs
In reply to Marek VasutReserve 4 kiB of space in R-Car Gen3 DTs when those DTs are compiled to permit patching in OpTee-OS /firmware node, /reserved-memory node and possibly also additional /memory@ nodes.
--- arch/arm/dts/Makefile | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/dts/Makefile +4 -0
@@ -749,6 +749,10 @@ dtb-$(CONFIG_RCAR_GEN3) += \ r8a77990-ebisu-u-boot.dtb \ r8a77995-draak-u-boot.dtb +ifdef CONFIG_RCAR_GEN3 +DTC_FLAGS += -R 4 -p 0x1000 +endif + dtb-$(CONFIG_RZA1) += \ r7s72100-gr-peach-u-boot.dtb
Signature · 1 line
2.25.1
PATCH 3/5 ARM: dts: rmobile: Reserve space in R-Car Gen3 DTs
Hi Marek,
Quoted 5 lines · Marek Vasut
Reserve 4 kiB of space in R-Car Gen3 DTs when those DTs are compiled to permit patching in OpTee-OS /firmware node, /reserved-memory node and possibly also additional /memory@ nodes.
Quoted 7 lines
Signed-off-by Marek Vasut <[email protected]>Cc Nobuhiro Iwamatsu <[email protected]>Cc Simon Glass <[email protected]>Cc Tom Rini <[email protected]>--- arch/arm/dts/Makefile | 4 ++++ 1 file changed, 4 insertions(+)
Perhaps we should have a CONFIG_DTC_RESERVE option to set the reserved size?
Quoted 17 lines
arch/arm/dts/Makefile +4
-1@@ -749,6 +749,10 @@ dtb-$(CONFIG_RCAR_GEN3) += \ r8a77990-ebisu-u-boot.dtb \ r8a77995-draak-u-boot.dtb +ifdef CONFIG_RCAR_GEN3 +DTC_FLAGS += -R 4 -p 0x1000 +endif + dtb-$(CONFIG_RZA1) += \ r7s72100-gr-peach-u-boot.dtb --
Quoted 2 lines
2.25.1
Regards,
Simon
PATCH 3/5 ARM: dts: rmobile: Reserve space in R-Car Gen3 DTs
Quoted 16 lines · Simon Glass
Hi Marek,
Quoted 5 lines · Marek Vasut
Reserve 4 kiB of space in R-Car Gen3 DTs when those DTs are compiled to permit patching in OpTee-OS /firmware node, /reserved-memory node and possibly also additional /memory@ nodes.
Quoted 7 lines
Signed-off-by Marek Vasut <[email protected]>Cc Nobuhiro Iwamatsu <[email protected]>Cc Simon Glass <[email protected]>Cc Tom Rini <[email protected]>--- arch/arm/dts/Makefile | 4 ++++ 1 file changed, 4 insertions(+)
Quoted 3 lines
Reviewed-by Simon Glass <[email protected]>Perhaps we should have a
CONFIG_DTC_RESERVEoption to set the reserved size?
Perhaps this is also related to the patch Michal posted about modifying the reserve size? Thanks!
Quoted 23 lines
Quoted 18 lines
arch/arm/dts/Makefile +4
-1@@ -749,6 +749,10 @@ dtb-$(CONFIG_RCAR_GEN3) += \ r8a77990-ebisu-u-boot.dtb \ r8a77995-draak-u-boot.dtb +ifdef CONFIG_RCAR_GEN3 +DTC_FLAGS += -R 4 -p 0x1000 +endif + dtb-$(CONFIG_RZA1) += \ r7s72100-gr-peach-u-boot.dtb --Quoted 2 lines
2.25.1
Regards,
Simon
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200420/f66b815c/attachment.sig>
PATCH 4/5 ARM: rmobile: Merge prior-stage firmware DT fragment into U-Boot DT on Gen3
In reply to Marek VasutThe prior-stage firmware generates DT fragment containing the /firmware node, /reserved-memory node and /memory@ nodes. Merge these nodes into the U-Boot DT, so U-Boot can use this information.
--- board/renesas/rcar-common/common.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-)
board/renesas/rcar-common/common.c +10 -18
@@ -19,32 +19,24 @@ DECLARE_GLOBAL_DATA_PTR;/* If the firmware passed a device tree use it for U-Boot DRAM setup. */ extern u64 rcar_atf_boot_args[]; -int dram_init (void ) +int fdtdec_board_setup (const void *fdt_blob) { -const void *atf_fdt_blob = (const void *)(rcar_atf_boot_args[1 ]); -const void *blob; +void *atf_fdt_blob = (void *)(rcar_atf_boot_args[1 ]); -/* Check if ATF passed us DTB. If not, fall back to builtin DTB. */ if (fdt_magic (atf_fdt_blob) ==FDT_MAGIC ) - blob = atf_fdt_blob; -else - blob = gd->fdt_blob; +fdt_overlay_apply_node ((void *)fdt_blob,0 , atf_fdt_blob,0 ); -return fdtdec_setup_mem_size_base_fdt (blob); +return 0 ; } -int dram_init_banksize (void ) +int dram_init (void ) { -const void *atf_fdt_blob = (const void *)(rcar_atf_boot_args[1 ]); -const void *blob; - -/* Check if ATF passed us DTB. If not, fall back to builtin DTB. */ -if (fdt_magic (atf_fdt_blob) ==FDT_MAGIC ) - blob = atf_fdt_blob; -else - blob = gd->fdt_blob; +return fdtdec_setup_mem_size_base_fdt (gd->fdt_blob); +} -fdtdec_setup_memory_banksize_fdt (blob); +int dram_init_banksize (void ) +{ +fdtdec_setup_memory_banksize_fdt (gd->fdt_blob);return 0 ; }
Signature · 1 line
2.25.1
PATCH 4/5 ARM: rmobile: Merge prior-stage firmware DT fragment into U-Boot DT on Gen3
Quoted 5 lines · Marek Vasut
The prior-stage firmware generates DT fragment containing the /firmware node, /reserved-memory node and /memory@ nodes. Merge these nodes into the U-Boot DT, so U-Boot can use this information.
Quoted 7 lines
Signed-off-by Marek Vasut <[email protected]>Cc Nobuhiro Iwamatsu <[email protected]>Cc Simon Glass <[email protected]>Cc Tom Rini <[email protected]>--- board/renesas/rcar-common/common.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-)
PATCH 5/5 ARM: rmobile: Enable support for OpTee on Gen3
In reply to Marek VasutEnable OpTee support on R-Car Gen3, so that U-Boot would copy the OpTee /firmware and /reserved-memory nodes into the Linux DT.
--- configs/r8a77970_eagle_defconfig | 2 ++ configs/r8a77980_condor_defconfig | 2 ++ configs/r8a77990_ebisu_defconfig | 2 ++ configs/r8a77995_draak_defconfig | 2 ++ configs/rcar3_salvator-x_defconfig | 2 ++ configs/rcar3_ulcb_defconfig | 2 ++ 6 files changed, 12 insertions(+)
configs/r8a77970_eagle_defconfig +2 -0
@@ -56,6 +56,8 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SCIF_CONSOLE=y +CONFIG_TEE=y +CONFIG_OPTEE=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_RENESAS_RPC_SPI=y
configs/r8a77980_condor_defconfig +2 -0
@@ -60,6 +60,8 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SCIF_CONSOLE=y +CONFIG_TEE=y +CONFIG_OPTEE=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_RENESAS_RPC_SPI=y
configs/r8a77990_ebisu_defconfig +2 -0
@@ -54,6 +54,8 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SCIF_CONSOLE=y +CONFIG_TEE=y +CONFIG_OPTEE=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y
configs/r8a77995_draak_defconfig +2 -0
@@ -62,6 +62,8 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SCIF_CONSOLE=y +CONFIG_TEE=y +CONFIG_OPTEE=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y
configs/rcar3_salvator-x_defconfig +2 -0
@@ -60,6 +60,8 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SCIF_CONSOLE=y +CONFIG_TEE=y +CONFIG_OPTEE=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y
configs/rcar3_ulcb_defconfig +2 -0
@@ -57,6 +57,8 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SCIF_CONSOLE=y +CONFIG_TEE=y +CONFIG_OPTEE=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_DM_USB=y
Signature · 1 line
2.25.1
PATCH 1/5 libfdt: Export overlay_apply_node() as fdt_overlay_apply_node()
In reply to Marek VasutHi Marek,
Quoted 6 lines · Marek Vasut
This function is useful to merge a subset of DT into another DT, for example if some prior-stage firmware passes a DT fragment to U-Boot and U-Boot needs to merge it into its own DT. Export this function to permit implementing such functionality.
Quoted 8 lines
Signed-off-by Marek Vasut <[email protected]>Cc Nobuhiro Iwamatsu <[email protected]>Cc Simon Glass <[email protected]>Cc Tom Rini <[email protected]>--- scripts/dtc/libfdt/fdt_overlay.c | 5 +++++ scripts/dtc/libfdt/libfdt.h | 7 +++++++ 2 files changed, 12 insertions(+)
This is fine but please send the patch upstream as we just copy this file.
Regards,
Simon
PATCH 1/5 libfdt: Export overlay_apply_node() as fdt_overlay_apply_node()
Quoted 18 lines · Simon Glass
Hi Marek,
Quoted 6 lines · Marek Vasut
This function is useful to merge a subset of DT into another DT, for example if some prior-stage firmware passes a DT fragment to U-Boot and U-Boot needs to merge it into its own DT. Export this function to permit implementing such functionality.
Quoted 8 lines
Signed-off-by Marek Vasut <[email protected]>Cc Nobuhiro Iwamatsu <[email protected]>Cc Simon Glass <[email protected]>Cc Tom Rini <[email protected]>--- scripts/dtc/libfdt/fdt_overlay.c | 5 +++++ scripts/dtc/libfdt/libfdt.h | 7 +++++++ 2 files changed, 12 insertions(+)
Quoted 1 line
This is fine but please send the patch upstream as we just copy this file.
PR is open here:
https://github.com/dgibson/dtc/pull/35
Signature · 2 lines
Best regards, Marek Vasut
PATCH 1/5 libfdt: Export overlay_apply_node() as fdt_overlay_apply_node()
Quoted 20 lines · Marek Vasut
Quoted 18 lines · Simon Glass
Hi Marek,
Quoted 14 lines · Marek Vasut
This function is useful to merge a subset of DT into another DT, for example if some prior-stage firmware passes a DT fragment to U-Boot and U-Boot needs to merge it into its own DT. Export this function to permit implementing such functionality.
Signed-off-by Marek Vasut <[email protected]>Cc Nobuhiro Iwamatsu <[email protected]>Cc Simon Glass <[email protected]>Cc Tom Rini <[email protected]>--- scripts/dtc/libfdt/fdt_overlay.c | 5 +++++ scripts/dtc/libfdt/libfdt.h | 7 +++++++ 2 files changed, 12 insertions(+)
Quoted 5 lines
Quoted 1 line
This is fine but please send the patch upstream as we just copy this file.
PR is open here:
https://github.com/dgibson/dtc/pull/35