riscv: qemu: Remove the simple-bus driver for the SoC node
PATCH 1/7 riscv: qemu: Remove the simple-bus driver for the SoC node
Prior to QEMU v3.1.0, QEMU generated the 'virt' SoC node with a "riscv-virtio-soc" compatible string, and a "simple-bus" driver was created to accommodate that special case in U-Boot.
Starting from QEMU v3.1.0, the SoC node was set as a "simple-bus", hence the special simple-bus driver is no longer needed.
Update the doc to mention the latest tested QEMU version 4.2.0.
---
arch/riscv/cpu/generic/cpu.c | 14 -------------- doc/board/emulation/qemu-riscv.rst | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-)
arch/riscv/cpu/generic/cpu.c +0 -14
@@ -4,7 +4,6 @@*/ #include <common.h> -#include <dm.h> #include <irq_func.h> /*
@@ -21,16 +20,3 @@ int cleanup_before_linux(void)return 0 ; } - -/* To enumerate devices on the /soc/ node, create a "simple-bus" driver */ -static const struct udevice_id riscv_virtio_soc_ids[] = { - { .compatible ="riscv-virtio-soc" }, - { } -}; - -U_BOOT_DRIVER (riscv_virtio_soc) = { - .name ="riscv_virtio_soc" , - .id =UCLASS_SIMPLE_BUS , - .of_match = riscv_virtio_soc_ids, - .flags =DM_FLAG_PRE_RELOC , -};
doc/board/emulation/qemu-riscv.rst +1 -1
@@ -56,7 +56,7 @@ For instructions on how to run U-Boot in supervisor mode on QEMU with OpenSBI, see the documentation available with OpenSBI: https://github.com/riscv/opensbi/blob/master/docs/platform/qemu_virt.md -These have been tested in QEMU 3.0.0. +These have been tested in QEMU 4.2.0. Running U-Boot SPL ------------------
Signature · 1 line
2.7.4
PATCH 2/7 riscv: Merge unnecessary SMP ifdefs in start.S
Two consecutive SMP ifdefs blocks can be combined into one.
---
arch/riscv/cpu/start.S | 4 ---- 1 file changed, 4 deletions(-)
arch/riscv/cpu/start.S +0 -4
@@ -58,9 +58,7 @@ _start: /* tp: hart id */ li t0, CONFIG_NR_CPUS bge tp, t0, hart_out_of_bounds_loop -#endif -#ifdef CONFIG_SMP /* set xSIE bit to receive IPIs */ #if CONFIG_IS_ENABLED(RISCV_MMODE) li t0, MIE_MSIE
@@ -377,9 +375,7 @@ hart_out_of_bounds_loop: /* Harts in this loop are out of bounds, increase CONFIG_NR_CPUS. */ wfi j hart_out_of_bounds_loop -#endif -#ifdef CONFIG_SMP /* SMP relocation entry */ secondary_hart_relocate: /* a1: new sp */
Signature · 1 line
2.7.4
PATCH 2/7 riscv: Merge unnecessary SMP ifdefs in start.S
Quoted 34 lines · Bin Meng
Two consecutive SMP ifdefs blocks can be combined into one.
Signed-off-by Bin Meng <[email protected]>---
arch/riscv/cpu/start.S | 4 ---- 1 file changed, 4 deletions(-)arch/riscv/cpu/start.S +0
-5@@ -58,9 +58,7 @@ _start: /* tp: hart id */ li t0, CONFIG_NR_CPUS bge tp, t0, hart_out_of_bounds_loop -#endif -#ifdef CONFIG_SMP /* set xSIE bit to receive IPIs */ #if CONFIG_IS_ENABLED(RISCV_MMODE) li t0, MIE_MSIE@@ -377,9 +375,7 @@ hart_out_of_bounds_loop: /* Harts in this loop are out of bounds, increase CONFIG_NR_CPUS. */ wfi j hart_out_of_bounds_loop -#endif -#ifdef CONFIG_SMP /* SMP relocation entry */ secondary_hart_relocate: /* a1: new sp */ --
Quoted 2 lines
2.7.4
Signature · 2 lines
Regards, Atish
PATCH 3/7 riscv: Introduce SPL_SMP Kconfig option for U-Boot SPL
In reply to Bin MengWith SBI v0.2 HSM extension, only a single hart need to boot and enter operating system. The booting hart can bring up secondary harts one by one afterwards.
For U-Boot running in SPL, SMP can be turned on, while in U-Boot proper, SMP can be optionally turned off if using SBI v0.2 HSM.
Introduce a new SPL_SMP Kconfig option to support this.
---
arch/riscv/Kconfig | 13 ++++++++++++- arch/riscv/cpu/start.S | 14 +++++++------- arch/riscv/include/asm/global_data.h | 2 +- arch/riscv/lib/Makefile | 2 +- arch/riscv/lib/spl.c | 2 +- common/spl/spl_opensbi.c | 2 +- 6 files changed, 23 insertions(+), 12 deletions(-)
arch/riscv/Kconfig +12 -1
@@ -200,10 +200,21 @@ config SMP machine. If you say Y here, U-Boot will run on many, but not all, single processor machines. +config SPL_SMP + bool "Symmetric Multi-Processing in SPL" + depends on SPL && SPL_RISCV_MMODE + default y + help + This enables support for systems with more than one CPU in SPL. + If you say N here, U-Boot SPL will run on single and multiprocessor + machines, but will use only one CPU of a multiprocessor + machine. If you say Y here, U-Boot SPL will run on many, but not + all, single processor machines. + config NR_CPUS int "Maximum number of CPUs (2-32)" range 2 32 - depends on SMP + depends on SMP || SPL_SMP default 8 help On multiprocessor machines, U-Boot sets up a stack for each CPU.
arch/riscv/cpu/start.S +7 -7
@@ -53,7 +53,7 @@ _start: /* mask all interrupts */ csrw MODE_PREFIX(ie), zero -#ifdef CONFIG_SMP +#if CONFIG_IS_ENABLED(SMP) /* check if hart is within range */ /* tp: hart id */ li t0, CONFIG_NR_CPUS
@@ -91,7 +91,7 @@ call_board_init_f_0: mv gp, a0 /* setup stack */ -#ifdef CONFIG_SMP +#if CONFIG_IS_ENABLED(SMP) /* tp: hart id */ slli t0, tp, CONFIG_STACK_SIZE_SHIFT sub sp, a0, t0
@@ -182,7 +182,7 @@ spl_stack_gd_setup: mv s0, a0 /* setup stack on main hart */ -#ifdef CONFIG_SMP +#if CONFIG_IS_ENABLED(SMP) /* tp: hart id */ slli t0, tp, CONFIG_STACK_SIZE_SHIFT sub sp, s0, t0
@@ -231,7 +231,7 @@ relocate_code: *Set up the stack */ stack_setup: -#ifdef CONFIG_SMP +#if CONFIG_IS_ENABLED(SMP) /* tp: hart id */ slli t0, tp, CONFIG_STACK_SIZE_SHIFT sub sp, s2, t0
@@ -326,7 +326,7 @@ clbss_l: blt t0, t1, clbss_l relocate_secondary_harts: -#ifdef CONFIG_SMP +#if CONFIG_IS_ENABLED(SMP) /* send relocation IPI */ la t0, secondary_hart_relocate add a0, t0, t6
@@ -370,7 +370,7 @@ call_board_init_r: */ jr t4 /* jump to board_init_r() */ -#ifdef CONFIG_SMP +#if CONFIG_IS_ENABLED(SMP) hart_out_of_bounds_loop: /* Harts in this loop are out of bounds, increase CONFIG_NR_CPUS. */ wfi
@@ -393,7 +393,7 @@ secondary_hart_relocate: secondary_hart_loop: wfi -#ifdef CONFIG_SMP +#if CONFIG_IS_ENABLED(SMP) csrr t0, MODE_PREFIX(ip) #if CONFIG_IS_ENABLED(RISCV_MMODE) andi t0, t0, MIE_MSIE
arch/riscv/include/asm/global_data.h +1 -1
@@ -24,7 +24,7 @@ struct arch_global_data {#ifdef CONFIG_ANDES_PLMT void __iomem *plmt;/* plmt base address */ #endif -#ifdef CONFIG_SMP +#if CONFIG_IS_ENABLED (SMP )struct ipi_data ipi[CONFIG_NR_CPUS ];#endif #ifndef CONFIG_XIP
arch/riscv/lib/Makefile +1 -1
@@ -22,7 +22,7 @@ endif obj-y += interrupts.o obj-y += reset.o obj-y += setjmp.o -obj-$(CONFIG_SMP) += smp.o +obj-$(CONFIG_$(SPL_)SMP) += smp.o obj-$(CONFIG_SPL_BUILD) += spl.o # For building EFI apps
arch/riscv/lib/spl.c +1 -1
@@ -41,7 +41,7 @@ void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)invalidate_icache_all ();debug ("image entry point: 0x%lX\n" , spl_image->entry_point); -#ifdef CONFIG_SMP +#ifdef CONFIG_SPL_SMP ret =smp_call_function (spl_image->entry_point, (ulong )fdt_blob,0 ,0 );if (ret)hang ();
common/spl/spl_opensbi.c +1 -1
@@ -76,7 +76,7 @@ void spl_invoke_opensbi(struct spl_image_info *spl_image) opensbi_entry = (void (*)(ulong ,ulong ,ulong ))spl_image->entry_point;invalidate_icache_all (); -#ifdef CONFIG_SMP +#ifdef CONFIG_SPL_SMP /* * Start OpenSBI on all secondary harts and wait for acknowledgment. *
Signature · 1 line
2.7.4
PATCH 3/7 riscv: Introduce SPL_SMP Kconfig option for U-Boot SPL
Quoted 168 lines · Bin Meng
With SBI v0.2 HSM extension, only a single hart need to boot and enter operating system. The booting hart can bring up secondary harts one by one afterwards.
For U-Boot running in SPL, SMP can be turned on, while in U-Boot proper, SMP can be optionally turned off if using SBI v0.2 HSM.
Introduce a new
SPL_SMPKconfigoption to support this.Signed-off-by Bin Meng <[email protected]>---
arch/riscv/Kconfig | 13 ++++++++++++- arch/riscv/cpu/start.S | 14 +++++++------- arch/riscv/include/asm/global_data.h | 2 +- arch/riscv/lib/Makefile | 2 +- arch/riscv/lib/spl.c | 2 +- common/spl/spl_opensbi.c | 2 +- 6 files changed, 23 insertions(+), 12 deletions(-)arch/riscv/Kconfig +12
-1@@ -200,10 +200,21 @@ config SMP machine. If you say Y here, U-Boot will run on many, but not all, single processor machines. +config SPL_SMP + bool "Symmetric Multi-Processing in SPL" + depends on SPL && SPL_RISCV_MMODE + default y + help + This enables support for systems with more than one CPU in SPL. + If you say N here, U-Boot SPL will run on single and multiprocessor + machines, but will use only one CPU of a multiprocessor + machine. If you say Y here, U-Boot SPL will run on many, but not + all, single processor machines. + config NR_CPUS int "Maximum number of CPUs (2-32)" range 2 32 - depends on SMP + depends on SMP || SPL_SMP default 8 help On multiprocessor machines, U-Boot sets up a stack for each CPU.arch/riscv/cpu/start.S +7
-7@@ -53,7 +53,7 @@ _start: /* mask all interrupts */ csrw MODE_PREFIX(ie), zero -#ifdef CONFIG_SMP +#if CONFIG_IS_ENABLED(SMP) /* check if hart is within range */ /* tp: hart id */ li t0, CONFIG_NR_CPUS@@ -91,7 +91,7 @@ call_board_init_f_0: mv gp, a0 /* setup stack */ -#ifdef CONFIG_SMP +#if CONFIG_IS_ENABLED(SMP) /* tp: hart id */ slli t0, tp, CONFIG_STACK_SIZE_SHIFT sub sp, a0, t0@@ -182,7 +182,7 @@ spl_stack_gd_setup: mv s0, a0 /* setup stack on main hart */ -#ifdef CONFIG_SMP +#if CONFIG_IS_ENABLED(SMP) /* tp: hart id */ slli t0, tp, CONFIG_STACK_SIZE_SHIFT sub sp, s0, t0@@ -231,7 +231,7 @@ relocate_code: *Set up the stack */ stack_setup: -#ifdef CONFIG_SMP +#if CONFIG_IS_ENABLED(SMP) /* tp: hart id */ slli t0, tp, CONFIG_STACK_SIZE_SHIFT sub sp, s2, t0@@ -326,7 +326,7 @@ clbss_l: blt t0, t1, clbss_l relocate_secondary_harts: -#ifdef CONFIG_SMP +#if CONFIG_IS_ENABLED(SMP) /* send relocation IPI */ la t0, secondary_hart_relocate add a0, t0, t6@@ -370,7 +370,7 @@ call_board_init_r: */ jr t4 /* jump to board_init_r() */ -#ifdef CONFIG_SMP +#if CONFIG_IS_ENABLED(SMP) hart_out_of_bounds_loop: /* Harts in this loop are out of bounds, increase CONFIG_NR_CPUS. */ wfi@@ -393,7 +393,7 @@ secondary_hart_relocate: secondary_hart_loop: wfi -#ifdef CONFIG_SMP +#if CONFIG_IS_ENABLED(SMP) csrr t0, MODE_PREFIX(ip) #if CONFIG_IS_ENABLED(RISCV_MMODE) andi t0, t0, MIE_MSIEarch/riscv/include/asm/global_data.h +1
-1@@ -24,7 +24,7 @@ struct arch_global_data {#ifdef CONFIG_ANDES_PLMT void __iomem *plmt;/* plmt base address */ #endif -#ifdef CONFIG_SMP +#if CONFIG_IS_ENABLED (SMP )struct ipi_data ipi[CONFIG_NR_CPUS ];#endif #ifndef CONFIG_XIP arch/riscv/lib/Makefile +1
-1@@ -22,7 +22,7 @@ endif obj-y += interrupts.o obj-y += reset.o obj-y += setjmp.o -obj-$(CONFIG_SMP) += smp.o +obj-$(CONFIG_$(SPL_)SMP) += smp.o obj-$(CONFIG_SPL_BUILD) += spl.o # For building EFI appsarch/riscv/lib/spl.c +1
-1@@ -41,7 +41,7 @@ void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)invalidate_icache_all ();debug ("image entry point: 0x%lX\n" , spl_image->entry_point); -#ifdef CONFIG_SMP +#ifdef CONFIG_SPL_SMP ret =smp_call_function (spl_image->entry_point, (ulong )fdt_blob,0 ,0 );if (ret)hang ();common/spl/spl_opensbi.c +1
-2@@ -76,7 +76,7 @@ void spl_invoke_opensbi(struct spl_image_info *spl_image) opensbi_entry = (void (*)(ulong ,ulong ,ulong ))spl_image->entry_point;invalidate_icache_all (); -#ifdef CONFIG_SMP +#ifdef CONFIG_SPL_SMP /* * Start OpenSBI on all secondary harts and wait for acknowledgment. * --
Quoted 2 lines
2.7.4
Signature · 2 lines
Regards, Atish
PATCH 4/7 riscv: Add SMP Kconfig option dependency for U-Boot proper
In reply to Bin MengU-Boot proper running in S-mode only need SMP support when using SBI v0.1. With SBI v0.2 HSM extension, it does not need implement multicore boot in U-Boot proper.
---
arch/riscv/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/riscv/Kconfig +1 -0
@@ -193,6 +193,7 @@ config SYS_MALLOC_F_LEN config SMP bool "Symmetric Multi-Processing" + depends on SBI_V01 help This enables support for systems with more than one CPU. If you say N here, U-Boot will run on single and multiprocessor
Signature · 1 line
2.7.4
PATCH 4/7 riscv: Add SMP Kconfig option dependency for U-Boot proper
Quoted 15 lines · Bin Meng
U-Boot proper running in S-mode only need SMP support when using SBI v0.1. With SBI v0.2 HSM extension, it does not need implement multicore boot in U-Boot proper.
Signed-off-by Bin Meng <[email protected]>---
arch/riscv/Kconfig | 1 + 1 file changed, 1 insertion(+)arch/riscv/Kconfig +0
-0
arch/riscv/Kconfig config SYS_MALLOC_F_LEN · line 196
Quoted 4 lines
arch/riscv/Kconfig +1
-0@@ -193,6 +193,7 @@ config SYS_MALLOC_F_LEN config SMP bool "Symmetric Multi-Processing" + depends on SBI_V01
So should this be
"depends on SBI_V01 or RISCV_PRIV_1_9"
when the priv spec 1.9 patch gets merged?
arch/riscv/Kconfig config SYS_MALLOC_F_LEN · line 199
Quoted 4 lines
arch/riscv/Kconfig +0
-0help This enables support for systems with more than one CPU. If you say N here, U-Boot will run on single and multiprocessor
--Sean
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 4/7 riscv: Add SMP Kconfig option dependency for U-Boot proper
Hi Sean
Quoted 28 lines
From: Sean Anderson [mailto:seanga2 at gmail.com]
Sent: Wednesday, April 08, 2020 10:21 PM
To: Bin Meng; Rick Jian-Zhi Chen(???); Lukas Auer; Anup Patel; Atish Patra; Pragnesh Patel; U-Boot Mailing List
Subject: Re: [PATCH 4/7] riscv: Add SMPKconfigoption dependency for U-Boot properQuoted 15 lines · Bin Meng
U-Boot proper running in S-mode only need SMP support when using SBI v0.1. With SBI v0.2 HSM extension, it does not need implement multicore boot in U-Boot proper.
Signed-off-by Bin Meng <[email protected]>---
arch/riscv/Kconfig | 1 + 1 file changed, 1 insertion(+)arch/riscv/Kconfig index renamed from arch/riscv/Kconfig +0
-010478ae..502143f 100644
arch/riscv/Kconfig config SYS_MALLOC_F_LEN · line 196
Quoted 4 lines
arch/riscv/Kconfig +1
-0@@ -193,6 +193,7 @@ config SYS_MALLOC_F_LEN config SMP bool "Symmetric Multi-Processing" + depends on SBI_V01So should this be
Quoted 4 lines
"depends on
SBI_V01orRISCV_PRIV_1_9"when the priv spec 1.9 patch gets merged?
Your series: [v7,22/22] riscv: Add Sipeed Maix support
There are some patchs still need to be fixed:
[v7,22/22] riscv: Add Sipeed Maix support
https://patchwork.ozlabs.org/patch/1258463/
[v7,15/22] riscv: Clean up IPI initialization code
https://patchwork.ozlabs.org/patch/1258461/
And there are two patchs about clk still get no positive response from clk maintainer
[v7,05/22] clk: Add functions to register CCF clock structs
https://patchwork.ozlabs.org/patch/1258446/
[v7,04/22] clk: Fix clk_get_by_* handling of index
https://patchwork.ozlabs.org/patch/1258442/
Thanks
Rick
Quoted 7 lines
arch/riscv/Kconfig config SYS_MALLOC_F_LEN · line 199
Quoted 4 lines
arch/riscv/Kconfig +0
-0help This enables support for systems with more than one CPU. If you say N here, U-Boot will run on single and multiprocessor--Sean
PATCH 4/7 riscv: Add SMP Kconfig option dependency for U-Boot proper
Quoted 45 lines · Rick Chen
Hi Sean
Quoted 28 lines
From: Sean Anderson [mailto:seanga2 at gmail.com]
Sent: Wednesday, April 08, 2020 10:21 PM
To: Bin Meng; Rick Jian-Zhi Chen(???); Lukas Auer; Anup Patel; Atish Patra; Pragnesh Patel; U-Boot Mailing List
Subject: Re: [PATCH 4/7] riscv: Add SMPKconfigoption dependency for U-Boot properQuoted 15 lines · Bin Meng
U-Boot proper running in S-mode only need SMP support when using SBI v0.1. With SBI v0.2 HSM extension, it does not need implement multicore boot in U-Boot proper.
Signed-off-by Bin Meng <[email protected]>---
arch/riscv/Kconfig | 1 + 1 file changed, 1 insertion(+)arch/riscv/Kconfig index renamed from arch/riscv/Kconfig +0
-010478ae..502143f 100644
arch/riscv/Kconfig config SYS_MALLOC_F_LEN · line 196
Quoted 4 lines
arch/riscv/Kconfig +1
-0@@ -193,6 +193,7 @@ config SYS_MALLOC_F_LEN config SMP bool "Symmetric Multi-Processing" + depends on SBI_V01So should this be
Quoted 4 lines
"depends on
SBI_V01orRISCV_PRIV_1_9"when the priv spec 1.9 patch gets merged?
Your series: [v7,22/22] riscv: Add Sipeed Maix support
There are some patchs still need to be fixed:
[v7,22/22] riscv: Add Sipeed Maix support
https://patchwork.ozlabs.org/patch/1258463/[v7,15/22] riscv: Clean up IPI initialization code
https://patchwork.ozlabs.org/patch/1258461/
Quoted 8 lines
And there are two patchs about clk still get no positive response from clk maintainer
[v7,05/22] clk: Add functions to register CCF clock structs
https://patchwork.ozlabs.org/patch/1258446/[v7,04/22] clk: Fix clk_get_by_* handling of index
https://patchwork.ozlabs.org/patch/1258442/
Yeah, I was waiting on a response wrt those patches before doing v8. I may try reworking the series so the first patch is unnecessary, but I don't think that will be possible with the second patch. I'm working on other projects at the moment, so I don't know if I'll have time to do that.
--Sean
PATCH 4/7 riscv: Add SMP Kconfig option dependency for U-Boot proper
In reply to Sean AndersonHi Sean,
Quoted 24 lines · Sean Anderson
Quoted 15 lines · Bin Meng
U-Boot proper running in S-mode only need SMP support when using SBI v0.1. With SBI v0.2 HSM extension, it does not need implement multicore boot in U-Boot proper.
Signed-off-by Bin Meng <[email protected]>---
arch/riscv/Kconfig | 1 + 1 file changed, 1 insertion(+)arch/riscv/Kconfig +0
-0arch/riscv/Kconfig config SYS_MALLOC_F_LEN · line 196
Quoted 4 lines
arch/riscv/Kconfig +1
-0@@ -193,6 +193,7 @@ config SYS_MALLOC_F_LEN config SMP bool "Symmetric Multi-Processing" + depends on SBI_V01So should this be
Quoted 3 lines
"depends on
SBI_V01orRISCV_PRIV_1_9"when the priv spec 1.9 patch gets merged?
I will change the dependency only when U-Boot is working in S-mode. For M-mode, this dependency will not be added.
Quoted 5 lines
arch/riscv/Kconfig config SYS_MALLOC_F_LEN · line 199
Quoted 5 lines
arch/riscv/Kconfig +0
-0help This enables support for systems with more than one CPU. If you say N here, U-Boot will run on single and multiprocessor
Regards,
Bin
PATCH 4/7 riscv: Add SMP Kconfig option dependency for U-Boot proper
In reply to Bin MengQuoted 16 lines · Bin Meng
U-Boot proper running in S-mode only need SMP support when using SBI v0.1. With SBI v0.2 HSM extension, it does not need implement multicore boot in U-Boot proper.
Signed-off-by Bin Meng <[email protected]>---
arch/riscv/Kconfig | 1 + 1 file changed, 1 insertion(+)arch/riscv/Kconfig +0
-0
arch/riscv/Kconfig config SYS_MALLOC_F_LEN · line 196
Quoted 4 lines
arch/riscv/Kconfig +1
-0@@ -193,6 +193,7 @@ config SYS_MALLOC_F_LEN config SMP bool "Symmetric Multi-Processing" + depends on SBI_V01
What about RISCV_MMODE ?
Quoted 6 lines
arch/riscv/Kconfig +0
-1help This enables support for systems with more than one CPU. If you say N here, U-Boot will run on single and multiprocessor --2.7.4
Signature · 2 lines
Regards, Atish
PATCH 4/7 riscv: Add SMP Kconfig option dependency for U-Boot proper
Quoted 19 lines · Atish Patra
Quoted 17 lines · Bin Meng
U-Boot proper running in S-mode only need SMP support when using SBI v0.1. With SBI v0.2 HSM extension, it does not need implement multicore boot in U-Boot proper.
Signed-off-by Bin Meng <[email protected]>---
arch/riscv/Kconfig | 1 + 1 file changed, 1 insertion(+)arch/riscv/Kconfig +0
-0@@ -193,6 +193,7 @@ config SYS_MALLOC_F_LEN
Quoted 5 lines
arch/riscv/Kconfig config SYS_MALLOC_F_LEN · line 196
Quoted 3 lines
arch/riscv/Kconfig +1
-0config SMP bool "Symmetric Multi-Processing" + depends on SBI_V01What about
RISCV_MMODE?
Yes this needs to be considered.
Quoted 4 lines
arch/riscv/Kconfig config SYS_MALLOC_F_LEN · line 199
Quoted 4 lines
arch/riscv/Kconfig +0
-0help This enables support for systems with more than one CPU. If you say N here, U-Boot will run on single and multiprocessor
Regards,
Bin
PATCH 5/7 riscv: Add Kconfig option for SBI v0.2
In reply to Bin MengSBI v0.2 is more scalable and extendable to handle future needs for RISC-V supervisor interfaces. For example, with SBI v0.2 HSM extension, only a single hart need to boot and enter operating system. The booting hart can bring up secondary harts one by one afterwards.
---
arch/riscv/Kconfig | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
arch/riscv/Kconfig +19 -1
@@ -226,14 +226,32 @@ config SBI bool default y if RISCV_SMODE || SPL_RISCV_SMODE +choice + prompt "SBI support" + default SBI_V01 + config SBI_V01 bool "SBI v0.1 support" - default y depends on SBI help This config allows kernel to use SBI v0.1 APIs. This will be deprecated in future once legacy M-mode software are no longer in use. +config SBI_V02 + bool "SBI v0.2 support" + depends on SBI + help + This config allows kernel to use SBI v0.2 APIs. SBI v0.2 is more + scalable and extendable to handle future needs for RISC-V supervisor + interfaces. For example, with SBI v0.2 HSM extension, only a single + hart need to boot and enter operating system. The booting hart can + bring up secondary harts one by one afterwards. + + Choose this option if OpenSBI v0.7 or above release is used together + with U-Boot. + +endchoice + config SBI_IPI bool depends on SBI
Signature · 1 line
2.7.4
PATCH 5/7 riscv: Add Kconfig option for SBI v0.2
Quoted 52 lines · Bin Meng
SBI v0.2 is more scalable and extendable to handle future needs for RISC-V supervisor interfaces. For example, with SBI v0.2 HSM extension, only a single hart need to boot and enter operating system. The booting hart can bring up secondary harts one by one afterwards.
Signed-off-by Bin Meng <[email protected]>---
arch/riscv/Kconfig | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)arch/riscv/Kconfig +19
-2@@ -226,14 +226,32 @@ config SBI bool default y if RISCV_SMODE || SPL_RISCV_SMODE +choice + prompt "SBI support" + default SBI_V01 + config SBI_V01 bool "SBI v0.1 support" - default y depends on SBI help This config allows kernel to use SBI v0.1 APIs. This will be deprecated in future once legacy M-mode software are no longer in use. +config SBI_V02 + bool "SBI v0.2 support" + depends on SBI + help + This config allows kernel to use SBI v0.2 APIs. SBI v0.2 is more + scalable and extendable to handle future needs for RISC-V supervisor + interfaces. For example, with SBI v0.2 HSM extension, only a single + hart need to boot and enter operating system. The booting hart can + bring up secondary harts one by one afterwards. + + Choose this option if OpenSBI v0.7 or above release is used together + with U-Boot. + +endchoice + config SBI_IPI bool depends on SBI --
Quoted 2 lines
2.7.4
Signature · 2 lines
Regards, Atish
PATCH 6/7 riscv: Remove CONFIG_IS_ENABLED(SMP) in global data
In reply to Bin MengCurrently generic-asm-offsets.h and asm-offsets.h are generated based on U-Boot proper config options. The same asm-offsets files are used when building U-Boot SPL/TPL.
But the generated macros, e.g.: GD_AVAILABLE_HARTS, create potential mismatch if U-Boot proper has different config options from U-Boot SPL/TPL, like in this case, SMP.
Remove CONFIG_IS_ENABLED(SMP) in global data to get a consistent value of GD_AVAILABLE_HARTS.
---
arch/riscv/include/asm/global_data.h | 2 -- 1 file changed, 2 deletions(-)
arch/riscv/include/asm/global_data.h +0 -2
@@ -24,9 +24,7 @@ struct arch_global_data {#ifdef CONFIG_ANDES_PLMT void __iomem *plmt;/* plmt base address */ #endif -#if CONFIG_IS_ENABLED (SMP )struct ipi_data ipi[CONFIG_NR_CPUS ]; -#endif #ifndef CONFIG_XIP ulong available_harts;#endif
Signature · 1 line
2.7.4
PATCH 6/7 riscv: Remove CONFIG_IS_ENABLED(SMP) in global data
Quoted 23 lines · Bin Meng
Currently
generic-asm-offsets.handasm-offsets.hare generated based on U-Boot proper config options. The same asm-offsets files are used when building U-Boot SPL/TPL.But the generated macros, e.g.:
GD_AVAILABLE_HARTS, create potential mismatch if U-Boot proper has different config options from U-Boot SPL/TPL, like in this case, SMP.Remove
CONFIG_IS_ENABLED(SMP)in global data to get a consistent value ofGD_AVAILABLE_HARTS.Signed-off-by Bin Meng <[email protected]>---
arch/riscv/include/asm/global_data.h | 2 -- 1 file changed, 2 deletions(-)arch/riscv/include/asm/global_data.h +0
-0
arch/riscv/include/asm/global_data.h struct arch_global_data { · line 30
Quoted 9 lines
arch/riscv/include/asm/global_data.h +0
-2@@ -24,9 +24,7 @@ struct arch_global_data {#ifdef CONFIG_ANDES_PLMT void __iomem *plmt;/* plmt base address */ #endif -#if CONFIG_IS_ENABLED (SMP )struct ipi_data ipi[CONFIG_NR_CPUS ]; -#endif #ifndef CONFIG_XIP ulong available_harts;#endif
CONFIG_NR_CPUS is only defined for SMP/SPL_SMP. It will result in compilation error if somebody tries to compile non-smp u-boot.
How about moving available_harts to the top right after boot_hart?
Quoted 3 lines
--
2.7.4
--
Regards,
Atish
PATCH 6/7 riscv: Remove CONFIG_IS_ENABLED(SMP) in global data
Quoted 29 lines · Atish Patra
Quoted 27 lines · Bin Meng
Currently
generic-asm-offsets.handasm-offsets.hare generated based on U-Boot proper config options. The same asm-offsets files are used when building U-Boot SPL/TPL.But the generated macros, e.g.:
GD_AVAILABLE_HARTS, create potential mismatch if U-Boot proper has different config options from U-Boot SPL/TPL, like in this case, SMP.Remove
CONFIG_IS_ENABLED(SMP)in global data to get a consistent value ofGD_AVAILABLE_HARTS.Signed-off-by Bin Meng <[email protected]>---
arch/riscv/include/asm/global_data.h | 2 -- 1 file changed, 2 deletions(-)arch/riscv/include/asm/global_data.h +0
-1@@ -24,9 +24,7 @@ struct arch_global_data {#ifdef CONFIG_ANDES_PLMT void __iomem *plmt;/* plmt base address */ #endif -#if CONFIG_IS_ENABLED (SMP )
Quoted 9 lines
arch/riscv/include/asm/global_data.h struct arch_global_data { · line 30
Quoted 5 lines
arch/riscv/include/asm/global_data.h +0
-1struct ipi_data ipi[CONFIG_NR_CPUS ]; -#endif #ifndef CONFIG_XIP ulong available_harts;#endif
CONFIG_NR_CPUSis only defined for SMP/SPL_SMP. It will result in compilation error if somebody tries to compile non-smp u-boot.
Yes, I noticed when I looked at the CI testing results. Will fix in v2.
Quoted 2 lines
How about moving
available_hartsto the top right afterboot_hart?
Sound good to me.
Regards,
Bin
PATCH 7/7 riscv: Make SBI v0.2 the default SBI version
In reply to Bin MengTo work with latest OpenSBI release (v0.7 or above) that has the HSM extension support, select the SBI v0.2 support by default.
---
arch/riscv/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/Kconfig +1 -1
@@ -228,7 +228,7 @@ config SBI choice prompt "SBI support" - default SBI_V01 + default SBI_V02 config SBI_V01 bool "SBI v0.1 support"
Signature · 1 line
2.7.4
PATCH 7/7 riscv: Make SBI v0.2 the default SBI version
Quoted 4 lines · Bin Meng
To work with latest OpenSBI release (v0.7 or above) that has the HSM extension support, select the SBI v0.2 support by default.
Just for clarification: OpenSBI v0.7 will be available soon after Linux kernel 5.-7-rc1 is available.
Quoted 21 lines
Signed-off-by Bin Meng <[email protected]>---
arch/riscv/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/riscv/Kconfig +1
-2@@ -228,7 +228,7 @@ config SBI choice prompt "SBI support" - default SBI_V01 + default SBI_V02 config SBI_V01 bool "SBI v0.1 support" --
Quoted 2 lines
2.7.4
Signature · 2 lines
Regards, Atish