hw/riscv: sifive_u: Add Mode Select (MSEL[3:0]) support
Subsystems (2)
v2 cover hw/riscv: sifive_u: Add Mode Select (MSEL[3:0]) support
From: Bin Meng <[email protected]>
This series updates the 'sifive_u' machine support:
- Change SiFive E/U series CPU reset vector to 0x1004
- Support Mode Select (MSEL[3:0]) settings at 0x1000 via a new "msel" machine property
- Add a dummy DDR memory controller device
With this series, QEMU can boot U-Boot SPL built for SiFive FU540 all the way up to loading U-Boot proper from MMC:
$ qemu-system-riscv64 -nographic -M sifive_u,msel=6 -m 8G -bios u-boot-spl.bin
U-Boot SPL 2020.07-rc3-00208-g88bd5b1 (Jun 08 2020 - 20:16:10 +0800) Trying to boot from MMC1
Unhandled exception: Load access fault
EPC: 0000000008009be6 TVAL: 0000000010050014
The last big gap for the 'sifive_u' machine is the QSPI modeling.
Changes in v2:
- Drop the already applied patch 01 to 11 in v1
- new patch: Rename IBEX CPU init routine
- rebase on https://github.com/alistair23/qemu riscv-to-apply.next branch
- rename SiFive E/U CPU init routine names
Bin Meng (5):
target/riscv: Rename IBEX CPU init routine
hw/riscv: sifive: Change SiFive E/U CPU reset vector to 0x1004 hw/riscv: sifive_u: Support different boot source per MSEL pin state hw/riscv: sifive_u: Sort the SoC memmap table entries hw/riscv: sifive_u: Add a dummy DDR memory controller device
hw/riscv/sifive_e.c | 10 +++++---- hw/riscv/sifive_u.c | 51 ++++++++++++++++++++++++++++++++++----------- include/hw/riscv/sifive_u.h | 7 +++++++ target/riscv/cpu.c | 20 +++++++++--------- 4 files changed, 62 insertions(+), 26 deletions(-)
Signature · 1 line
2.7.4
PATCH v2 1/5 target/riscv: Rename IBEX CPU init routine
From: Bin Meng <[email protected]>
Current IBEX CPU init routine name seems to be too generic. Since it uses a different reset vector from the generic one, it merits a dedicated name.
---
Changes in v2:
- new patch: Rename IBEX CPU init routine
target/riscv/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
target/riscv/cpu.c +2 -2
@@ -153,7 +153,7 @@ static void rvxx_imacu_nommu_cpu_init(Object *obj)#if defined(TARGET_RISCV32 ) -static void rv32_imcu_nommu_cpu_init (Object *obj) +static void rv32_ibex_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RV32 |RVI |RVM |RVC |RVU );
@@ -577,7 +577,7 @@ static const TypeInfo riscv_cpu_type_infos[] = { DEFINE_CPU(TYPE_RISCV_CPU_ANY, riscv_any_cpu_init),#if defined(TARGET_RISCV32 )DEFINE_CPU (TYPE_RISCV_CPU_BASE32 , riscv_base_cpu_init), -DEFINE_CPU (TYPE_RISCV_CPU_IBEX , rv32_imcu_nommu_cpu_init), +DEFINE_CPU (TYPE_RISCV_CPU_IBEX , rv32_ibex_cpu_init),DEFINE_CPU (TYPE_RISCV_CPU_SIFIVE_E31 , rvxx_imacu_nommu_cpu_init),DEFINE_CPU (TYPE_RISCV_CPU_SIFIVE_E34 , rv32_imafcu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rvxx_gcsu_priv1_10_0_cpu_init),
Signature · 1 line
2.7.4
Re: [PATCH v2 1/5] target/riscv: Rename IBEX CPU init routine
Quoted 8 lines · Bin Meng
From: Bin Meng <[email protected]>
Current IBEX CPU init routine name seems to be too generic. Since it uses a different reset vector from the generic one, it merits a dedicated name.
Signed-off-by Bin Meng <[email protected]>
Alistair
Quoted 35 lines
---
Changes in v2:
- new patch: Rename IBEX CPU init routinetarget/riscv/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)target/riscv/cpu.c +2
-3@@ -153,7 +153,7 @@ static void rvxx_imacu_nommu_cpu_init(Object *obj)#if defined(TARGET_RISCV32 ) -static void rv32_imcu_nommu_cpu_init (Object *obj) +static void rv32_ibex_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RV32 |RVI |RVM |RVC |RVU );@@ -577,7 +577,7 @@ static const TypeInfo riscv_cpu_type_infos[] = { DEFINE_CPU(TYPE_RISCV_CPU_ANY, riscv_any_cpu_init),#if defined(TARGET_RISCV32 )DEFINE_CPU (TYPE_RISCV_CPU_BASE32 , riscv_base_cpu_init), -DEFINE_CPU (TYPE_RISCV_CPU_IBEX , rv32_imcu_nommu_cpu_init), +DEFINE_CPU (TYPE_RISCV_CPU_IBEX , rv32_ibex_cpu_init),DEFINE_CPU (TYPE_RISCV_CPU_SIFIVE_E31 , rvxx_imacu_nommu_cpu_init),DEFINE_CPU (TYPE_RISCV_CPU_SIFIVE_E34 , rv32_imafcu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rvxx_gcsu_priv1_10_0_cpu_init), --2.7.4
PATCH v2 2/5 hw/riscv: sifive: Change SiFive E/U CPU reset vector to 0x1004
In reply to Bin MengFrom: Bin Meng <[email protected]>
Per the SiFive manual, all E/U series CPU cores' reset vector is at 0x1004. Update our codes to match the hardware.
---
Changes in v2:
- rebase on https://github.com/alistair23/qemu riscv-to-apply.next branch
- rename SiFive E/U CPU init routine names
hw/riscv/sifive_e.c | 10 ++++++---- hw/riscv/sifive_u.c | 6 +++--- target/riscv/cpu.c | 16 ++++++++-------- 3 files changed, 17 insertions(+), 15 deletions(-)
hw/riscv/sifive_e.c +6 -4
@@ -98,14 +98,16 @@ static void sifive_e_machine_init(MachineState *machine) memmap[SIFIVE_E_DTIM].base, main_mem);/* Mask ROM reset vector */ -uint32_t reset_vec[2 ]; +uint32_t reset_vec[4 ];if (s->revb) { - reset_vec[0 ] =0x200102b7 ;/* 0x1000: lui t0,0x20010 */ + reset_vec[1 ] =0x200102b7 ;/* 0x1004: lui t0,0x20010 */ }else { - reset_vec[0 ] =0x204002b7 ;/* 0x1000: lui t0,0x20400 */ + reset_vec[1 ] =0x204002b7 ;/* 0x1004: lui t0,0x20400 */ } - reset_vec[1 ] =0x00028067 ;/* 0x1004: jr t0 */ + reset_vec[2 ] =0x00028067 ;/* 0x1008: jr t0 */ + + reset_vec[0 ] = reset_vec[3 ] =0 ;/* copy in the reset vector in little_endian byte order */ for (i =0 ; i <sizeof (reset_vec) >>2 ; i++) {
hw/riscv/sifive_u.c +3 -3
@@ -433,18 +433,18 @@ static void sifive_u_machine_init(MachineState *machine)/* reset vector */ uint32_t reset_vec[8 ] = { +0x00000000 ,0x00000297 ,/* 1: auipc t0, %pcrel_hi(dtb) */ -0x02028593 ,/* addi a1, t0, %pcrel_lo(1b) */ +0x01c28593 ,/* addi a1, t0, %pcrel_lo(1b) */ 0xf1402573 ,/* csrr a0, mhartid */ #if defined(TARGET_RISCV32)0x0182a283 ,/* lw t0, 24(t0) */ #elif defined(TARGET_RISCV64) -0x0182b283 ,/* ld t0, 24(t0) */ +0x0182e283 ,/* lwu t0, 24(t0) */ #endif0x00028067 ,/* jr t0 */ 0x00000000 , start_addr,/* start: .dword */ -0x00000000 ,/* dtb: */ };
target/riscv/cpu.c +8 -8
@@ -134,20 +134,20 @@ static void riscv_base_cpu_init(Object *obj)set_resetvec (env,DEFAULT_RSTVEC ); } -static void rvxx_gcsu_priv1_10_0_cpu_init (Object *obj) +static void rvxx_sifive_u_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RVXLEN |RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU );set_priv_version (env,PRIV_VERSION_1_10_0 ); -set_resetvec (env,DEFAULT_RSTVEC ); +set_resetvec (env,0x1004 ); } -static void rvxx_imacu_nommu_cpu_init (Object *obj) +static void rvxx_sifive_e_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RVXLEN |RVI |RVM |RVA |RVC |RVU );set_priv_version (env,PRIV_VERSION_1_10_0 ); -set_resetvec (env,DEFAULT_RSTVEC ); +set_resetvec (env,0x1004 );qdev_prop_set_bit (DEVICE (obj),"mmu" , false); }
@@ -578,13 +578,13 @@ static const TypeInfo riscv_cpu_type_infos[] = {#if defined(TARGET_RISCV32 ) DEFINE_CPU(TYPE_RISCV_CPU_BASE32, riscv_base_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_IBEX, rv32_ibex_cpu_init), - DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E31, rvxx_imacu_nommu_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E31, rvxx_sifive_e_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E34, rv32_imafcu_nommu_cpu_init), - DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rvxx_gcsu_priv1_10_0_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rvxx_sifive_u_cpu_init), #elif defined(TARGET_RISCV64) DEFINE_CPU(TYPE_RISCV_CPU_BASE64, riscv_base_cpu_init), - DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E51, rvxx_imacu_nommu_cpu_init), - DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U54, rvxx_gcsu_priv1_10_0_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E51, rvxx_sifive_e_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U54, rvxx_sifive_u_cpu_init),#endif };
Signature · 1 line
2.7.4
Re: [PATCH v2 2/5] hw/riscv: sifive: Change SiFive E/U CPU reset vector to 0x1004
Quoted 7 lines · Bin Meng
From: Bin Meng <[email protected]>
Per the SiFive manual, all E/U series CPU cores' reset vector is at
0x1004. Update our codes to match the hardware.Signed-off-by Bin Meng <[email protected]>
Alistair
Quoted 114 lines
---
Changes in v2:
- rebase on https://github.com/alistair23/qemu riscv-to-apply.next branch
- rename SiFive E/U CPU init routine nameshw/riscv/sifive_e.c | 10 ++++++---- hw/riscv/sifive_u.c | 6 +++--- target/riscv/cpu.c | 16 ++++++++-------- 3 files changed, 17 insertions(+), 15 deletions(-)hw/riscv/sifive_e.c +6
-4@@ -98,14 +98,16 @@ static void sifive_e_machine_init(MachineState *machine) memmap[SIFIVE_E_DTIM].base, main_mem);/* Mask ROM reset vector */ -uint32_t reset_vec[2 ]; +uint32_t reset_vec[4 ];if (s->revb) { - reset_vec[0 ] =0x200102b7 ;/* 0x1000: lui t0,0x20010 */ + reset_vec[1 ] =0x200102b7 ;/* 0x1004: lui t0,0x20010 */ }else { - reset_vec[0 ] =0x204002b7 ;/* 0x1000: lui t0,0x20400 */ + reset_vec[1 ] =0x204002b7 ;/* 0x1004: lui t0,0x20400 */ } - reset_vec[1 ] =0x00028067 ;/* 0x1004: jr t0 */ + reset_vec[2 ] =0x00028067 ;/* 0x1008: jr t0 */ + + reset_vec[0 ] = reset_vec[3 ] =0 ;/* copy in the reset vector in little_endian byte order */ for (i =0 ; i <sizeof (reset_vec) >>2 ; i++) {hw/riscv/sifive_u.c +3
-3@@ -433,18 +433,18 @@ static void sifive_u_machine_init(MachineState *machine)/* reset vector */ uint32_t reset_vec[8 ] = { +0x00000000 ,0x00000297 ,/* 1: auipc t0, %pcrel_hi(dtb) */ -0x02028593 ,/* addi a1, t0, %pcrel_lo(1b) */ +0x01c28593 ,/* addi a1, t0, %pcrel_lo(1b) */ 0xf1402573 ,/* csrr a0, mhartid */ #if defined(TARGET_RISCV32)0x0182a283 ,/* lw t0, 24(t0) */ #elif defined(TARGET_RISCV64) -0x0182b283 ,/* ld t0, 24(t0) */ +0x0182e283 ,/* lwu t0, 24(t0) */ #endif0x00028067 ,/* jr t0 */ 0x00000000 , start_addr,/* start: .dword */ -0x00000000 ,/* dtb: */ };target/riscv/cpu.c +8
-9@@ -134,20 +134,20 @@ static void riscv_base_cpu_init(Object *obj)set_resetvec (env,DEFAULT_RSTVEC ); } -static void rvxx_gcsu_priv1_10_0_cpu_init (Object *obj) +static void rvxx_sifive_u_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RVXLEN |RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU );set_priv_version (env,PRIV_VERSION_1_10_0 ); -set_resetvec (env,DEFAULT_RSTVEC ); +set_resetvec (env,0x1004 ); } -static void rvxx_imacu_nommu_cpu_init (Object *obj) +static void rvxx_sifive_e_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RVXLEN |RVI |RVM |RVA |RVC |RVU );set_priv_version (env,PRIV_VERSION_1_10_0 ); -set_resetvec (env,DEFAULT_RSTVEC ); +set_resetvec (env,0x1004 );qdev_prop_set_bit (DEVICE (obj),"mmu" , false); }@@ -578,13 +578,13 @@ static const TypeInfo riscv_cpu_type_infos[] = {#if defined(TARGET_RISCV32 ) DEFINE_CPU(TYPE_RISCV_CPU_BASE32, riscv_base_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_IBEX, rv32_ibex_cpu_init), - DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E31, rvxx_imacu_nommu_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E31, rvxx_sifive_e_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E34, rv32_imafcu_nommu_cpu_init), - DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rvxx_gcsu_priv1_10_0_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rvxx_sifive_u_cpu_init), #elif defined(TARGET_RISCV64) DEFINE_CPU(TYPE_RISCV_CPU_BASE64, riscv_base_cpu_init), -DEFINE_CPU (TYPE_RISCV_CPU_SIFIVE_E51 , rvxx_imacu_nommu_cpu_init), -DEFINE_CPU (TYPE_RISCV_CPU_SIFIVE_U54 , rvxx_gcsu_priv1_10_0_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E51, rvxx_sifive_e_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U54, rvxx_sifive_u_cpu_init),#endif }; --2.7.4
Re: [PATCH v2 2/5] hw/riscv: sifive: Change SiFive E/U CPU reset vector to 0x1004
In reply to Bin MengQuoted 7 lines · Bin Meng
From: Bin Meng <[email protected]>
Per the SiFive manual, all E/U series CPU cores' reset vector is at
0x1004. Update our codes to match the hardware.Signed-off-by Bin Meng <[email protected]>
This commit breaks my Oreboot test.
Oreboot starts in flash and we run the command with the sifive_u,start-in-flash=true machine.
I have removed this and the later patches from the RISC-V branch. I want to send a PR today. After that I'll look into this.
Alistair
Quoted 114 lines
---
Changes in v2:
- rebase on https://github.com/alistair23/qemu riscv-to-apply.next branch
- rename SiFive E/U CPU init routine nameshw/riscv/sifive_e.c | 10 ++++++---- hw/riscv/sifive_u.c | 6 +++--- target/riscv/cpu.c | 16 ++++++++-------- 3 files changed, 17 insertions(+), 15 deletions(-)hw/riscv/sifive_e.c +6
-4@@ -98,14 +98,16 @@ static void sifive_e_machine_init(MachineState *machine) memmap[SIFIVE_E_DTIM].base, main_mem);/* Mask ROM reset vector */ -uint32_t reset_vec[2 ]; +uint32_t reset_vec[4 ];if (s->revb) { - reset_vec[0 ] =0x200102b7 ;/* 0x1000: lui t0,0x20010 */ + reset_vec[1 ] =0x200102b7 ;/* 0x1004: lui t0,0x20010 */ }else { - reset_vec[0 ] =0x204002b7 ;/* 0x1000: lui t0,0x20400 */ + reset_vec[1 ] =0x204002b7 ;/* 0x1004: lui t0,0x20400 */ } - reset_vec[1 ] =0x00028067 ;/* 0x1004: jr t0 */ + reset_vec[2 ] =0x00028067 ;/* 0x1008: jr t0 */ + + reset_vec[0 ] = reset_vec[3 ] =0 ;/* copy in the reset vector in little_endian byte order */ for (i =0 ; i <sizeof (reset_vec) >>2 ; i++) {hw/riscv/sifive_u.c +3
-3@@ -433,18 +433,18 @@ static void sifive_u_machine_init(MachineState *machine)/* reset vector */ uint32_t reset_vec[8 ] = { +0x00000000 ,0x00000297 ,/* 1: auipc t0, %pcrel_hi(dtb) */ -0x02028593 ,/* addi a1, t0, %pcrel_lo(1b) */ +0x01c28593 ,/* addi a1, t0, %pcrel_lo(1b) */ 0xf1402573 ,/* csrr a0, mhartid */ #if defined(TARGET_RISCV32)0x0182a283 ,/* lw t0, 24(t0) */ #elif defined(TARGET_RISCV64) -0x0182b283 ,/* ld t0, 24(t0) */ +0x0182e283 ,/* lwu t0, 24(t0) */ #endif0x00028067 ,/* jr t0 */ 0x00000000 , start_addr,/* start: .dword */ -0x00000000 ,/* dtb: */ };target/riscv/cpu.c +8
-9@@ -134,20 +134,20 @@ static void riscv_base_cpu_init(Object *obj)set_resetvec (env,DEFAULT_RSTVEC ); } -static void rvxx_gcsu_priv1_10_0_cpu_init (Object *obj) +static void rvxx_sifive_u_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RVXLEN |RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU );set_priv_version (env,PRIV_VERSION_1_10_0 ); -set_resetvec (env,DEFAULT_RSTVEC ); +set_resetvec (env,0x1004 ); } -static void rvxx_imacu_nommu_cpu_init (Object *obj) +static void rvxx_sifive_e_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RVXLEN |RVI |RVM |RVA |RVC |RVU );set_priv_version (env,PRIV_VERSION_1_10_0 ); -set_resetvec (env,DEFAULT_RSTVEC ); +set_resetvec (env,0x1004 );qdev_prop_set_bit (DEVICE (obj),"mmu" , false); }@@ -578,13 +578,13 @@ static const TypeInfo riscv_cpu_type_infos[] = {#if defined(TARGET_RISCV32 ) DEFINE_CPU(TYPE_RISCV_CPU_BASE32, riscv_base_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_IBEX, rv32_ibex_cpu_init), - DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E31, rvxx_imacu_nommu_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E31, rvxx_sifive_e_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E34, rv32_imafcu_nommu_cpu_init), - DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rvxx_gcsu_priv1_10_0_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rvxx_sifive_u_cpu_init), #elif defined(TARGET_RISCV64) DEFINE_CPU(TYPE_RISCV_CPU_BASE64, riscv_base_cpu_init), -DEFINE_CPU (TYPE_RISCV_CPU_SIFIVE_E51 , rvxx_imacu_nommu_cpu_init), -DEFINE_CPU (TYPE_RISCV_CPU_SIFIVE_U54 , rvxx_gcsu_priv1_10_0_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E51, rvxx_sifive_e_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U54, rvxx_sifive_u_cpu_init),#endif }; --2.7.4
Re: [PATCH v2 2/5] hw/riscv: sifive: Change SiFive E/U CPU reset vector to 0x1004
Hi Alistair,
Quoted 8 lines · Alistair Francis
Quoted 6 lines · Bin Meng
From: Bin Meng <[email protected]>
Per the SiFive manual, all E/U series CPU cores' reset vector is at
0x1004. Update our codes to match the hardware.
Quoted 6 lines
Quoted 1 line
Signed-off-by Bin Meng <[email protected]>This commit breaks my Oreboot test.
Oreboot starts in flash and we run the command with the
sifive_u,start-in-flash=truemachine.
Could you please post an Oreboot binary for testing somewhere, or some instructions so that I can test this?
Quoted 3 lines
I have removed this and the later patches from the RISC-V branch. I want to send a PR today. After that I'll look into this.
Regards,
Bin
Re: [PATCH v2 2/5] hw/riscv: sifive: Change SiFive E/U CPU reset vector to 0x1004
Hi Alistair,
Quoted 14 lines · Bin Meng
Hi Alistair,
Quoted 10 lines · Alistair Francis
Quoted 7 lines · Bin Meng
From: Bin Meng <[email protected]>
Per the SiFive manual, all E/U series CPU cores' reset vector is at
0x1004. Update our codes to match the hardware.Signed-off-by Bin Meng <[email protected]>
Quoted 8 lines
Quoted 4 lines
This commit breaks my Oreboot test.
Oreboot starts in flash and we run the command with the
sifive_u,start-in-flash=truemachine.Could you please post an Oreboot binary for testing somewhere, or some instructions so that I can test this?
I have figured out where the issue is. The issue is inside the Oreboot codes that its QEMU detecting logic should be updated to match this change.
I've sent pull request to Oreboot to fix this:
https://github.com/oreboot/oreboot/pull/264
Quoted 4 lines
Quoted 3 lines
I have removed this and the later patches from the RISC-V branch. I want to send a PR today. After that I'll look into this.
I don't think we should drop this patch and later ones in this series.
Regards,
Bin
Re: [PATCH v2 2/5] hw/riscv: sifive: Change SiFive E/U CPU reset vector to 0x1004
Quoted 27 lines · Bin Meng
Hi Alistair,
Quoted 14 lines · Bin Meng
Hi Alistair,
Quoted 10 lines · Alistair Francis
Quoted 7 lines · Bin Meng
From: Bin Meng <[email protected]>
Per the SiFive manual, all E/U series CPU cores' reset vector is at
0x1004. Update our codes to match the hardware.Signed-off-by Bin Meng <[email protected]>Quoted 8 lines
Quoted 4 lines
This commit breaks my Oreboot test.
Oreboot starts in flash and we run the command with the
sifive_u,start-in-flash=truemachine.Could you please post an Oreboot binary for testing somewhere, or some instructions so that I can test this?
Quoted 6 lines
I have figured out where the issue is. The issue is inside the Oreboot codes that its QEMU detecting logic should be updated to match this change.
I've sent pull request to Oreboot to fix this:
https://github.com/oreboot/oreboot/pull/264
Thanks for that.
Quoted 7 lines
Quoted 5 lines
Quoted 4 lines
I have removed this and the later patches from the RISC-V branch. I want to send a PR today. After that I'll look into this.
I don't think we should drop this patch and later ones in this series.
Applied again then.
Alistair
Quoted 3 lines
Regards,
Bin
PATCH v2 3/5 hw/riscv: sifive_u: Support different boot source per MSEL pin state
In reply to Bin MengFrom: Bin Meng <[email protected]>
SiFive FU540 SoC supports booting from several sources, which are controlled using the Mode Select (MSEL[3:0]) pins on the chip. Typically, the boot process runs through several stages before it begins execution of user-provided programs.
The SoC supports booting from memory-mapped QSPI flash, which is how start_in_flash property is used for at present. This matches MSEL = 1 configuration (QSPI0).
Typical booting flows involve the Zeroth Stage Boot Loader (ZSBL). It's not necessary for QEMU to implement the full ZSBL ROM codes, because we know ZSBL downloads the next stage program into the L2 LIM at address 0x8000000 and executes from there. We can bypass the whole ZSBL execution and use "-bios" to load the next stage program directly if MSEL indicates a ZSBL booting flow.
---
(no changes since v1)
hw/riscv/sifive_u.c | 39 +++++++++++++++++++++++++++++++-------- include/hw/riscv/sifive_u.h | 6 ++++++ 2 files changed, 37 insertions(+), 8 deletions(-)
hw/riscv/sifive_u.c +31 -8
@@ -408,8 +408,34 @@ static void sifive_u_machine_init(MachineState *machine)/* create device tree */ create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline); -riscv_find_and_load_firmware (machine,BIOS_FILENAME , - memmap[SIFIVE_U_DRAM ].base,NULL ); +if (s->start_in_flash) { +/* +* If start_in_flash property is given, assign s->msel to a value +* that representing booting from QSPI0 memory-mapped flash. +* +* This also means that when both start_in_flash and msel properties +* are given, start_in_flash takes the precedence over msel. +* +* Note this is to keep backward compatibility not to break existing +* users that use start_in_flash property. +*/ + s->msel =MSEL_MEMMAP_QSPI0_FLASH ; + } + +switch (s->msel) { +case MSEL_MEMMAP_QSPI0_FLASH : + start_addr = memmap[SIFIVE_U_FLASH0 ].base; +break ; +case MSEL_L2LIM_QSPI0_FLASH : +case MSEL_L2LIM_QSPI2_SD : + start_addr = memmap[SIFIVE_U_L2LIM ].base; +break ; +default : + start_addr = memmap[SIFIVE_U_DRAM ].base; +break ; + } + +riscv_find_and_load_firmware (machine,BIOS_FILENAME , start_addr,NULL );if (machine->kernel_filename) { uint64_t kernel_entry = riscv_load_kernel(machine->kernel_filename,
@@ -427,13 +453,9 @@ static void sifive_u_machine_init(MachineState *machine) } } -if (s->start_in_flash) { - start_addr = memmap[SIFIVE_U_FLASH0 ].base; - } -/* reset vector */ uint32_t reset_vec[8 ] = { -0x00000000 , + s->msel,/* MSEL pin state */ 0x00000297 ,/* 1: auipc t0, %pcrel_hi(dtb) */ 0x01c28593 ,/* addi a1, t0, %pcrel_lo(1b) */ 0xf1402573 ,/* csrr a0, mhartid */
@@ -505,7 +527,8 @@ static void sifive_u_machine_instance_init(Object *obj) sifive_u_machine_set_start_in_flash);object_property_set_description (obj,"start-in-flash" ,"Set on to tell QEMU's ROM to jump to " -"flash. Otherwise QEMU will jump to DRAM" ); +"flash. Otherwise QEMU will jump to DRAM " +"or L2LIM depending on the msel value" ); s->msel =0 ; object_property_add(obj, "msel", "uint32",
include/hw/riscv/sifive_u.h +6 -0
@@ -111,6 +111,12 @@ enum { SIFIVE_U_RTCCLK_FREQ = 1000000 }; +enum { +MSEL_MEMMAP_QSPI0_FLASH =1 , +MSEL_L2LIM_QSPI0_FLASH =6 , +MSEL_L2LIM_QSPI2_SD =11 +}; +#define SIFIVE_U_MANAGEMENT_CPU_COUNT 1#define SIFIVE_U_COMPUTE_CPU_COUNT 4
Signature · 1 line
2.7.4
PATCH v2 4/5 hw/riscv: sifive_u: Sort the SoC memmap table entries
In reply to Bin MengFrom: Bin Meng <[email protected]>
Move the flash and DRAM to the end of the SoC memmap table.
---
(no changes since v1)
hw/riscv/sifive_u.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/riscv/sifive_u.c +2 -2
@@ -80,10 +80,10 @@ static const struct MemmapEntry { [SIFIVE_U_UART1] = { 0x10011000, 0x1000 }, [SIFIVE_U_GPIO] = { 0x10060000, 0x1000 }, [SIFIVE_U_OTP] = { 0x10070000, 0x1000 }, - [SIFIVE_U_FLASH0] = { 0x20000000, 0x10000000 }, - [SIFIVE_U_DRAM] = { 0x80000000, 0x0 }, [SIFIVE_U_GEM] = { 0x10090000, 0x2000 }, [SIFIVE_U_GEM_MGMT] = { 0x100a0000, 0x1000 }, + [SIFIVE_U_FLASH0] = { 0x20000000, 0x10000000 }, + [SIFIVE_U_DRAM] = { 0x80000000, 0x0 }, };#define OTP_SERIAL 1
Signature · 1 line
2.7.4
PATCH v2 5/5 hw/riscv: sifive_u: Add a dummy DDR memory controller device
In reply to Bin MengFrom: Bin Meng <[email protected]>
It is enough to simply map the SiFive FU540 DDR memory controller into the MMIO space using create_unimplemented_device(), to make the upstream U-Boot v2020.07 DDR memory initialization codes happy.
Note we do not generate device tree fragment for the DDR memory controller. Since the controller data in device tree consumes a very large space (see fu540-hifive-unleashed-a00-ddr.dtsi in the U-Boot source), and it is only needed by U-Boot SPL but not any operating system, we choose not to generate the fragment here. This also means when testing with U-Boot SPL, the device tree has to come from U-Boot SPL itself, but not the one generated by QEMU on the fly. The memory has to be set to 8GiB to match the real HiFive Unleashed board when invoking QEMU (-m 8G).
With this commit, QEMU can boot U-Boot SPL built for SiFive FU540 all the way up to loading U-Boot proper from MMC:
$ qemu-system-riscv64 -nographic -M sifive_u,msel=6 -m 8G -bios u-boot-spl.bin
U-Boot SPL 2020.07-rc3-00208-g88bd5b1 (Jun 08 2020 - 20:16:10 +0800) Trying to boot from MMC1
Unhandled exception: Load access fault
EPC: 0000000008009be6 TVAL: 0000000010050014
The above exception is expected because QSPI is unsupported yet.
---
(no changes since v1)
hw/riscv/sifive_u.c | 4 ++++ include/hw/riscv/sifive_u.h | 1 + 2 files changed, 5 insertions(+)
hw/riscv/sifive_u.c +4 -0
@@ -82,6 +82,7 @@ static const struct MemmapEntry { [SIFIVE_U_OTP] = { 0x10070000, 0x1000 }, [SIFIVE_U_GEM] = { 0x10090000, 0x2000 }, [SIFIVE_U_GEM_MGMT] = { 0x100a0000, 0x1000 }, + [SIFIVE_U_DMC] = { 0x100b0000, 0x10000 }, [SIFIVE_U_FLASH0] = { 0x20000000, 0x10000000 }, [SIFIVE_U_DRAM] = { 0x80000000, 0x0 }, };
@@ -733,6 +734,9 @@ static void sifive_u_soc_realize(DeviceState *dev, Error **errp)create_unimplemented_device ("riscv.sifive.u.gem-mgmt" , memmap[SIFIVE_U_GEM_MGMT ].base, memmap[SIFIVE_U_GEM_MGMT ].size); + +create_unimplemented_device ("riscv.sifive.u.dmc" , + memmap[SIFIVE_U_DMC ].base, memmap[SIFIVE_U_DMC ].size); }static Property sifive_u_soc_props[] = {
include/hw/riscv/sifive_u.h +1 -0
@@ -78,6 +78,7 @@ enum {SIFIVE_U_UART1 ,SIFIVE_U_GPIO ,SIFIVE_U_OTP , +SIFIVE_U_DMC ,SIFIVE_U_FLASH0 ,SIFIVE_U_DRAM , SIFIVE_U_GEM,
Signature · 1 line
2.7.4
Alistair Francis
AppliedQuoted 28 lines · Bin Meng
From: Bin Meng <[email protected]>
This series updates the '
sifive_u' machine support:- Change SiFive E/U series CPU reset vector to
0x1004
- Support Mode Select (MSEL[3:0]) settings at0x1000via a new "msel" machine property
- Add a dummy DDR memory controller deviceWith this series, QEMU can boot U-Boot SPL built for SiFive FU540 all the way up to loading U-Boot proper from MMC:
$ qemu-system-riscv64 -nographic -M sifive_u,msel=6 -m 8G -bios u-boot-spl.binU-Boot SPL 2020.07-rc3-00208-g88bd5b1 (Jun 08 2020 - 20:16:10 +0800) Trying to boot from MMC1
Unhandled exception: Load access fault
EPC:0000000008009be6TVAL: 0000000010050014The last big gap for the '
sifive_u' machine is the QSPI modeling.Changes in v2:
- Drop the already applied patch 01 to 11 in v1
- new patch: Rename IBEX CPU init routine
- rebase on https://github.com/alistair23/qemu riscv-to-apply.next branch
- rename SiFive E/U CPU init routine names
Quoted 6 lines
Bin Meng (5):
target/riscv: Rename IBEX CPU init routine
hw/riscv: sifive: Change SiFive E/U CPU reset vector to0x1004hw/riscv:sifive_u: Support different boot source per MSEL pin state hw/riscv:sifive_u: Sort the SoC memmap table entries hw/riscv:sifive_u: Add a dummy DDR memory controller device
Applied to the RISC-V tree
Alistair
Quoted 11 lines
hw/riscv/sifive_e.c | 10 +++++---- hw/riscv/sifive_u.c | 51 ++++++++++++++++++++++++++++++++++----------- include/hw/riscv/sifive_u.h | 7 +++++++ target/riscv/cpu.c | 20 +++++++++--------- 4 files changed, 62 insertions(+), 26 deletions(-)--
2.7.4