Risc-V 32 bit/64 bit images
v2 cover Risc-V 32 bit/64 bit images
This series adds support for building different images for 32-bit vs 64-bit Risc-V CPUs and also for verifying the target arch of an image before booting it.
Change in v2:
- Rebase to latest master branch
- Improve comment in image.h
- Set arch type in booti for all modes
Changes from RFC:
- Rebase on latest master branch
- Improve commit message for patch 3
Mayuresh Chitale (3):
riscv: image: Add new image type for RV64
riscv: Select appropriate image type
booti/bootm: riscv: Verify image arch type
arch/riscv/dts/binman.dtsi | 14 ++++++++++---- arch/riscv/include/asm/u-boot.h | 4 ++++ arch/riscv/lib/bootm.c | 4 ++++ boot/image.c | 3 ++- cmd/booti.c | 7 +++++-- include/image.h | 3 ++- 6 files changed, 27 insertions(+), 8 deletions(-)
Signature · 1 line
2.43.0
PATCH v2 1/3 riscv: image: Add new image type for RV64
Similar to ARM and X86, introduce a new image type which allows u-boot to distinguish between images built for 32-bit vs 64-bit Risc-V CPUs.
--- boot/image.c | 3 ++- include/image.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
boot/image.c +2 -1
@@ -92,7 +92,8 @@ static const table_entry_t uimage_arch[] = { { IH_ARCH_ARC, "arc", "ARC", }, { IH_ARCH_X86_64, "x86_64", "AMD x86_64", }, { IH_ARCH_XTENSA, "xtensa", "Xtensa", }, - { IH_ARCH_RISCV, "riscv", "RISC-V", }, + { IH_ARCH_RISCV, "riscv", "RISC-V 32 Bit",}, + { IH_ARCH_RISCV64, "riscv64", "RISC-V 64 Bit",}, { -1, "", "", }, };
include/image.h +2 -1
@@ -138,7 +138,8 @@ enum {IH_ARCH_ARC ,/* Synopsys DesignWare ARC */ IH_ARCH_X86_64 ,/* AMD x86_64, Intel and Via */ IH_ARCH_XTENSA ,/* Xtensa */ -IH_ARCH_RISCV ,/* RISC-V */ +IH_ARCH_RISCV ,/* RISC-V 32 bit*/ +IH_ARCH_RISCV64 ,/* RISC-V 64 bit*/ IH_ARCH_COUNT, };
Signature · 1 line
2.43.0
Re: [PATCH v2 1/3] riscv: image: Add new image type for RV64
Quoted 29 lines · Mayuresh Chitale
Similar to ARM and X86, introduce a new image type which allows u-boot to distinguish between images built for 32-bit vs 64-bit Risc-V CPUs.
Signed-off-by Mayuresh Chitale <[email protected]>Reviewed-by Maxim Moskalets <[email protected]>--- boot/image.c | 3 ++- include/image.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)boot/image.c +2
-1@@ -92,7 +92,8 @@ static const table_entry_t uimage_arch[] = { { IH_ARCH_ARC, "arc", "ARC", }, { IH_ARCH_X86_64, "x86_64", "AMD x86_64", }, { IH_ARCH_XTENSA, "xtensa", "Xtensa", }, - { IH_ARCH_RISCV, "riscv", "RISC-V", }, + { IH_ARCH_RISCV, "riscv", "RISC-V 32 Bit",}, + { IH_ARCH_RISCV64, "riscv64", "RISC-V 64 Bit",}, { -1, "", "", }, };include/image.h +0
-0
include/image.h enum { · line 141
Quoted 5 lines
include/image.h +1
-1@@ -138,7 +138,8 @@ enum {IH_ARCH_ARC ,/* Synopsys DesignWare ARC */ IH_ARCH_X86_64 ,/* AMD x86_64, Intel and Via */ IH_ARCH_XTENSA ,/* Xtensa */ - IH_ARCH_RISCV, /* RISC-V */ + IH_ARCH_RISCV, /* RISC-V 32 bit*/
I'll consider IH_ARCH_RISCV32 a better idea, instead of implying 32bit when no suffix attached. We (and the Linux kernel) mix 32-bit and 64-bit variants of RISC-V together, thus it's hard to tell the exact bitwidth of "IH_ARCH_RISCV" without inspecting the code around. To me, it sounds more like "RISC-V, but no bitwidth specified".
It will be nice if we could avoid this kind of ambiguity.
Quoted 6 lines
include/image.h +1
-0+IH_ARCH_RISCV64 ,/* RISC-V 64 bit*/ IH_ARCH_COUNT, };Signature · 1 line
2.43.0
Thanks,
Yao Zi
PATCH v2 2/3 riscv: Select appropriate image type
In reply to Mayuresh ChitaleSelect between the 32-bit or 64-bit arch type for the image headers depending on how the build is configured.
--- arch/riscv/dts/binman.dtsi | 14 ++++++++++---- arch/riscv/include/asm/u-boot.h | 4 ++++ 2 files changed, 14 insertions(+), 4 deletions(-)
arch/riscv/dts/binman.dtsi +10 -4
@@ -5,6 +5,12 @@ #include <config.h> +#ifdef CONFIG_64BIT +#define ARCH "riscv64" +#else +#define ARCH "riscv" + +#endif / { binman: binman { multiple-images;
@@ -31,7 +37,7 @@ description = "U-Boot"; type = "standalone"; os = "U-Boot"; - arch = "riscv"; + arch = ARCH; compression = "none"; load = /bits/ 64 <CONFIG_TEXT_BASE>;
@@ -44,7 +50,7 @@ description = "Linux"; type = "standalone"; os = "Linux"; - arch = "riscv"; + arch = ARCH; compression = "none"; load = /bits/ 64 <CONFIG_TEXT_BASE>;
@@ -57,7 +63,7 @@ tee { description = "OP-TEE"; type = "tee"; - arch = "riscv"; + arch = ARCH; compression = "none"; os = "tee"; load = /bits/ 64 <CONFIG_SPL_OPTEE_LOAD_ADDR>;
@@ -71,7 +77,7 @@ description = "OpenSBI fw_dynamic Firmware"; type = "firmware"; os = "opensbi"; - arch = "riscv"; + arch = ARCH; compression = "none"; load = /bits/ 64 <CONFIG_SPL_OPENSBI_LOAD_ADDR>; entry = /bits/ 64 <CONFIG_SPL_OPENSBI_LOAD_ADDR>;
arch/riscv/include/asm/u-boot.h +4 -0
@@ -23,6 +23,10 @@#include <asm/u-boot-riscv.h> /* For image.h:image_check_target_arch() */ +#ifdef CONFIG_64BIT +#define IH_ARCH_DEFAULT IH_ARCH_RISCV64 +#else #define IH_ARCH_DEFAULT IH_ARCH_RISCV +#endif #endif /* _U_BOOT_H_ */
Signature · 1 line
2.43.0
Re: [PATCH v2 2/3] riscv: Select appropriate image type
Quoted 8 lines · Mayuresh Chitale
Select between the 32-bit or 64-bit arch type for the image headers depending on how the build is configured.
Signed-off-by Mayuresh Chitale <[email protected]>--- arch/riscv/dts/binman.dtsi | 14 ++++++++++---- arch/riscv/include/asm/u-boot.h | 4 ++++ 2 files changed, 14 insertions(+), 4 deletions(-)
PATCH v2 3/3 booti/bootm: riscv: Verify image arch type
In reply to Mayuresh ChitaleUnlike ARM and X86, booting 32-bit images on 64-bit CPUs is currently not supported for Risc-V. Hence, for bootm, disallow booting a FIT or a legacy image that was built for an arch type which is different than the current arch and for booti, set the arch type to be the same as the current arch.
--- arch/riscv/lib/bootm.c | 4 ++++ cmd/booti.c | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-)
arch/riscv/lib/bootm.c +4 -0
@@ -94,6 +94,10 @@ static void boot_jump_linux(struct bootm_headers *images, int flag)announce_and_cleanup (fake);if (!fake) { +if (images->os.arch !=IH_ARCH_DEFAULT ) { +printf ("Image arch not compatible with host arch.\n" ); +hang (); + }if (CONFIG_IS_ENABLED (OF_LIBFDT ) && images->ft_len) {#ifdef CONFIG_SMP ret = smp_call_function(images->ep,
cmd/booti.c +5 -2
@@ -130,8 +130,11 @@ int do_booti(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])bootm_disable_interrupts (); images.os.os =IH_OS_LINUX ; -if (IS_ENABLED (CONFIG_RISCV_SMODE )) - images.os.arch =IH_ARCH_RISCV ; +if (IS_ENABLED (CONFIG_RISCV )) +if (IS_ENABLED (CONFIG_64BIT )) + images.os.arch =IH_ARCH_RISCV64 ; +else + images.os.arch =IH_ARCH_RISCV ;else if (IS_ENABLED (CONFIG_ARM64 )) images.os.arch =IH_ARCH_ARM64 ;
Signature · 1 line
2.43.0