Risc-V 32 bit/64 bit images
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.
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 | 5 ++++- include/image.h | 1 + 6 files changed, 25 insertions(+), 6 deletions(-)
Signature · 1 line
2.43.0
PATCH 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 | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
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 +1 -0
@@ -139,6 +139,7 @@ enum {IH_ARCH_X86_64 ,/* AMD x86_64, Intel and Via */ IH_ARCH_XTENSA ,/* Xtensa */ IH_ARCH_RISCV ,/* RISC-V */ +IH_ARCH_RISCV64 ,/* RISC-V 64 bit*/ IH_ARCH_COUNT, };
Signature · 1 line
2.43.0
Re: [PATCH v1 1/3] riscv: image: Add new image type for RV64
вт, 11 мар. 2025 г. в 16:35, Mayuresh Chitale <[email protected]>:
Quoted 28 lines
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]>--- boot/image.c | 3 ++- include/image.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)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 142
Quoted 4 lines
include/image.h +0
-0@@ -139,6 +139,7 @@ enum {IH_ARCH_X86_64 ,/* AMD x86_64, Intel and Via */ IH_ARCH_XTENSA ,/* Xtensa */ IH_ARCH_RISCV, /* RISC-V */
I believe s/RISC-V/RISC-V 32 bit/ is more explicit. Looks good.
Quoted 8 lines
include/image.h +1
-0+IH_ARCH_RISCV64 ,/* RISC-V 64 bit*/ IH_ARCH_COUNT,};
--
2.43.0
Re: [PATCH v1 1/3] riscv: image: Add new image type for RV64
Quoted 41 lines · Максим Москалец
вт, 11 мар. 2025 г. в 16:35, Mayuresh Chitale <[email protected]>:
Quoted 29 lines
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]>--- boot/image.c | 3 ++- include/image.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)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
-0include/image.h enum { · line 141
Quoted 3 lines
include/image.h +0
-0@@ -139,6 +139,7 @@ enum {IH_ARCH_X86_64 ,/* AMD x86_64, Intel and Via */ IH_ARCH_XTENSA ,/* Xtensa */ IH_ARCH_RISCV, /* RISC-V */I believe s/RISC-V/RISC-V 32 bit/ is more explicit. Looks good.
Quoted 1 line
Reviewed-by Maxim Moskalets <[email protected]>
Thanks. I will update the patch.
Quoted 9 lines
Quoted 9 lines
include/image.h +1
-1+IH_ARCH_RISCV64 ,/* RISC-V 64 bit*/ IH_ARCH_COUNT, }; --2.43.0
PATCH 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
PATCH 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 | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)
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 +4 -1
@@ -131,7 +131,10 @@ int do_booti(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) images.os.os =IH_OS_LINUX ;if (IS_ENABLED (CONFIG_RISCV_SMODE )) - images.os.arch =IH_ARCH_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
Re: [PATCH v1 3/3] booti/bootm: riscv: Verify image arch type
Quoted 32 lines · Mayuresh Chitale
Unlike 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.
Signed-off-by Mayuresh Chitale <[email protected]>--- arch/riscv/lib/bootm.c | 4 ++++ cmd/booti.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)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 +0
-0
cmd/booti.c int do_booti(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) · line 133
Quoted 3 lines
cmd/booti.c +0
-0@@ -131,7 +131,10 @@ int do_booti(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) images.os.os =IH_OS_LINUX ;if (IS_ENABLED (CONFIG_RISCV_SMODE ))
Why do we check for S-mode here? Wouldn't checking CONFIG_RISCV be more adequate? Think of a micro-controller with only M and U mode.
sipeed_maix_bitm_defconfig has CONFIG_RISCV_MMODE=y, CONFIG_CMD_BOOTI=y.
Cf. 3cedc97479ff ("RISCV: image: Add booti support")
Otherwise looks good.
Quoted 8 lines
cmd/booti.c +4
-1- images.os.arch =IH_ARCH_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;
Re: [PATCH v1 3/3] booti/bootm: riscv: Verify image arch type
Quoted 41 lines · Heinrich Schuchardt
Quoted 32 lines · Mayuresh Chitale
Unlike 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.
Signed-off-by Mayuresh Chitale <[email protected]>--- arch/riscv/lib/bootm.c | 4 ++++ cmd/booti.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)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 +0
-0cmd/booti.c int do_booti(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) · line 133
Quoted 3 lines
cmd/booti.c +0
-0@@ -131,7 +131,10 @@ int do_booti(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) images.os.os =IH_OS_LINUX ;if (IS_ENABLED (CONFIG_RISCV_SMODE ))Why do we check for S-mode here? Wouldn't checking
CONFIG_RISCVbe more adequate? Think of a micro-controller with only M and U mode.
Quoted 5 lines
sipeed_maix_bitm_defconfighasCONFIG_RISCV_MMODE=y,CONFIG_CMD_BOOTI=y.Cf.
3cedc97479ff("RISCV: image: Add booti support")Otherwise looks good.
Thanks Heinrich. I will update the patch.
Quoted 12 lines
Reviewed-by Heinrich Schuchardt <[email protected]>Quoted 8 lines
cmd/booti.c +4
-1- images.os.arch =IH_ARCH_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;