riscv: sifive_u: Improve the emulation fidelity of sifive_u machine
Subsystems (2)
v8 cover riscv: sifive_u: Improve the emulation fidelity of sifive_u machine
As of today, the QEMU 'sifive_u' machine is a special target that does not boot the upstream OpenSBI/U-Boot firmware images built for the real SiFive HiFive Unleashed board. Hence OpenSBI supports a special platform "qemu/sifive_u". For U-Boot, the sifive_fu540_defconfig is referenced in the OpenSBI doc as its payload, but that does not boot at all due to various issues in current QEMU 'sifive_u' machine codes.
This series aims to improve the emulation fidelity of sifive_u machine, so that the upstream OpenSBI, U-Boot and kernel images built for the SiFive HiFive Unleashed board can be used out of the box without any special hack.
The major changes include:
- Heterogeneous harts creation supported, so that we can create a CPU that exactly mirrors the real hardware: 1 E51 + 4 U54.
- Implemented a PRCI model for FU540
- Implemented an OTP model for FU540, primarily used for storing serial number of the board
- Fixed GEM support that was seriously broken on sifive_u
- Synced device tree with upstream Linux kernel on sifive_u
OpenSBI v0.4 image built for sifive/fu540 is included as the default bios image for 'sifive_u' machine.
The series is tested against OpenSBI v0.4 image for sifive/fu540 paltform, U-Boot v2019.10-rc1 image for sifive_fu540_defconfig, and Linux kernel v5.3-rc3 image with the following patch:
macb: Update compatibility string for SiFive FU540-C000 [1]
OpenSBI + U-Boot, ping/tftpboot with U-Boot MACB driver works well. Boot Linux 64-bit defconfig image, verified that system console on the serial 0 and ping host work pretty well.
An OpenSBI patch [2] was sent to drop the special "qemu/sifive_u" platform support in OpenSBI. The original plan was to get the drop patch applied after this QEMU series is merged. However after discussion in the OpenSBI mailing list, it seems the best option for us is to let OpenSBI continue shipping the special "qemu/sifive_u" platform support to work with QEMU version <= 4.1 and deprecate the support sometime in the future. A patch will need to be sent to OpenSBI mailing list to update its document.
v4 is now rebased on Palmer's QEMU RISC-V repo "for-master" branch. Dropped the following v3 patch that was already done by someone else.
- riscv: sifive_u: Generate an aliases node in the device tree
- riscv: sifive_u: Support loading initramfs
The following v3 patch was dropped too due to a different cluster approach suggested by Richard Henderson is used in v4:
- riscv: hart: Support heterogeneous harts population
v8 is now rebased again on Palmer's QEMU RISC-V repo "for-master" branch, and resolved conflicts and build errors. To ease patch inter-dependencies, v8 includes the following 2 patches so that all of them can be applied cleanly on Palmer's QEMU RISC-V "for-master" branch.
- riscv: hw: Remove duplicated "hw/hw.h" inclusion [3]
- riscv: sifive_test: Add reset functionality [4]
The whole patch series is also available at
https://github.com/lbmeng/qemu repo, "sifive_u_cluster" branch.
[1]: https://patchwork.kernel.org/patch/11050003/
[2]: http://lists.infradead.org/pipermail/opensbi/2019-August/000335.html
[3]: http://patchwork.ozlabs.org/patch/1159063/
[4]: http://patchwork.ozlabs.org/patch/1158526/
Changes in v8:
- select UNIMP in sifive_e Kconfig due to applied commit "hw/misc: Add a config switch for the "unimplemented" device" in latest qemu/master
- Don't cast addr to an int, use the correct macros in sifive_u_otp_read() and sifive_u_otp_write()
- Include "hw/qdev-properties.h" in sifive_u_otp.c
- select UNIMP in sifive_u Kconfig due to applied commit "hw/misc: Add a config switch for the "unimplemented" device" in latest qemu/master
Changes in v7:
- use s->hartid_base + idx directly
Changes in v6:
- use s->hartid_base directly, instead of an extra variable
- generate u cpus unconditionally (not test ms->smp.cpus > 1) since the minimal required number of cpu is now 2, due to this patch is reordered
- fix incorrectly indented comment lines
- remove unneeded brackets around assignment
Changes in v5:
- new patch to change to use qemu_log_mask(LOG_GUEST_ERROR,...) instead in various sifive models
- new patch to remove the unnecessary include of target/riscv/cpu.h
- change to use defines instead of enums
- change to use qemu_log_mask(LOG_GUEST_ERROR,...) in sifive_u_prci
- creating a 32-bit val variable and using that instead of casting everywhere in sifive_u_prci_write()
- move all register initialization to sifive_u_prci_reset() function
- drop sifive_u_prci_create()
- s/codes that worked/code that works/g
- create sifive_u_prci block directly in the machine codes, instead of calling sifive_u_prci_create()
- change to use defines instead of enums
- change to use qemu_log_mask(LOG_GUEST_ERROR,...) in sifive_u_otp
- creating a 32-bit val variable and using that instead of casting everywhere in sifive_u_otp_write()
- move all register initialization to sifive_u_otp_reset() function
- drop sifive_u_otp_create()
- create sifive_u_otp block directly in the machine codes, instead of calling sifive_u_otp_create()
- add the missing "local-mac-address" property in the ethernet node
Changes in v4:
- remove 2 more "linux,phandle" instances in sifive_u.c and spike.c after rebasing on Palmer's QEMU RISC-V tree
- change create_fdt() to return void in sifive_u.c too, after rebasing on Palmer's QEMU RISC-V tree
- new patch to remove executable attribute of opensbi images
- prefix all macros/variables/functions with SIFIVE_E/sifive_e in the sifive_e_prci driver
- new patch to add a "hartid-base" property to RISC-V hart array
- changed to create clusters for each cpu type
- prefix all macros/variables/functions with SIFIVE_U/sifive_u in the sifive_u_prci driver
- prefix all macros/variables/functions with SIFIVE_U/sifive_u in the sifive_u_otp driver
- new patch to remove handcrafted clock nodes for UART and ethernet
Changes in v3:
- use management cpu count + 1 for the min_cpus
- changed to use macros for management and compute cpu count
- update IRQ numbers of both UARTs to match hardware as well
Changes in v2:
- fix build error in the "for-master" branch of Palmer's RISC-V repo that was rebased on QEMU master
- keep the PLIC compatible string unchanged as OpenSBI uses that for DT fix up
- drop patch "riscv: sifive: Move sifive_mmio_emulate() to a common place"
- new patch "riscv: sifive_e: Drop sifive_mmio_emulate()"
- update the file header to indicate at least 2 harts are created
- fixed the "interrupts-extended" property size
- use create_unimplemented_device() to create the GEM management block instead of sifive_mmio_emulate()
- add "phy-handle" property to the ethernet node
Bin Meng (32):
riscv: hw: Remove duplicated "hw/hw.h" inclusion
riscv: sifive_test: Add reset functionality
riscv: hw: Remove superfluous "linux,phandle" property
riscv: hw: Use qemu_fdt_setprop_cell() for property with only 1 cell
riscv: hw: Remove not needed PLIC properties in device tree
riscv: hw: Change create_fdt() to return void
riscv: hw: Change to use qemu_log_mask(LOG_GUEST_ERROR,...) instead
riscv: hw: Remove the unnecessary include of target/riscv/cpu.h
riscv: roms: Remove executable attribute of opensbi images
riscv: sifive_u: Remove the unnecessary include of prci header
riscv: sifive: Rename sifive_prci.{c,h} to sifive_e_prci.{c,h}
riscv: sifive_e: prci: Fix a typo of hfxosccfg register programming
riscv: sifive_e: prci: Update the PRCI register block size
riscv: sifive_e: Drop sifive_mmio_emulate()
riscv: Add a sifive_cpu.h to include both E and U cpu type defines
riscv: hart: Extract hart realize to a separate routine
riscv: hart: Add a "hartid-base" property to RISC-V hart array
riscv: sifive_u: Set the minimum number of cpus to 2
riscv: sifive_u: Update hart configuration to reflect the real FU540
SoC
riscv: sifive_u: Update PLIC hart topology configuration string
riscv: sifive: Implement PRCI model for FU540
riscv: sifive_u: Generate hfclk and rtcclk nodes
riscv: sifive_u: Add PRCI block to the SoC
riscv: sifive_u: Reference PRCI clocks in UART and ethernet nodes
riscv: sifive_u: Update UART base addresses and IRQs
riscv: sifive_u: Change UART node name in device tree
riscv: roms: Update default bios for sifive_u machine
riscv: sifive: Implement a model for SiFive FU540 OTP
riscv: sifive_u: Instantiate OTP memory with a serial number
riscv: sifive_u: Fix broken GEM support
riscv: sifive_u: Remove handcrafted clock nodes for UART and ethernet
riscv: sifive_u: Update model and compatible strings in device tree
hw/riscv/Kconfig | 2 + hw/riscv/Makefile.objs | 4 +- hw/riscv/riscv_hart.c | 34 ++-- hw/riscv/sifive_e.c | 27 ++- hw/riscv/sifive_e_prci.c | 124 +++++++++++++ hw/riscv/sifive_prci.c | 125 ------------- hw/riscv/sifive_test.c | 11 +- hw/riscv/sifive_u.c | 255 ++++++++++++++++++--------- hw/riscv/sifive_u_otp.c | 191 ++++++++++++++++++++ hw/riscv/sifive_u_prci.c | 169 ++++++++++++++++++ hw/riscv/sifive_uart.c | 10 +- hw/riscv/spike.c | 1 - hw/riscv/virt.c | 40 ++--- include/hw/riscv/riscv_hart.h | 1 + include/hw/riscv/sifive_cpu.h | 31 ++++ include/hw/riscv/sifive_e.h | 7 +- include/hw/riscv/sifive_e_prci.h | 71 ++++++++ include/hw/riscv/sifive_prci.h | 71 -------- include/hw/riscv/sifive_test.h | 3 +- include/hw/riscv/sifive_u.h | 31 ++-- include/hw/riscv/sifive_u_otp.h | 80 +++++++++ include/hw/riscv/sifive_u_prci.h | 91 ++++++++++ pc-bios/opensbi-riscv32-virt-fw_jump.bin | Bin pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin | Bin 40968 -> 45064 bytes pc-bios/opensbi-riscv64-virt-fw_jump.bin | Bin roms/Makefile | 4 +- 26 files changed, 1017 insertions(+), 366 deletions(-) create mode 100644 hw/riscv/sifive_e_prci.c delete mode 100644 hw/riscv/sifive_prci.c create mode 100644 hw/riscv/sifive_u_otp.c create mode 100644 hw/riscv/sifive_u_prci.c create mode 100644 include/hw/riscv/sifive_cpu.h create mode 100644 include/hw/riscv/sifive_e_prci.h delete mode 100644 include/hw/riscv/sifive_prci.h create mode 100644 include/hw/riscv/sifive_u_otp.h create mode 100644 include/hw/riscv/sifive_u_prci.h mode change 100755 => 100644 pc-bios/opensbi-riscv32-virt-fw_jump.bin mode change 100755 => 100644 pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin mode change 100755 => 100644 pc-bios/opensbi-riscv64-virt-fw_jump.bin
Signature · 1 line
2.7.4
PATCH v8 1/32 riscv: hw: Remove duplicated "hw/hw.h" inclusion
Commit a27bd6c779ba ("Include hw/qdev-properties.h less") wrongly added "hw/hw.h" to sifive_prci.c and sifive_test.c.
Another inclusion of "hw/hw.h" was later added via commit 650d103d3ea9 ("Include hw/hw.h exactly where needed"), that resulted in duplicated inclusion of "hw/hw.h".
---
Changes in v8:
- newly included in v8 to ease patch inter dependencies
hw/riscv/sifive_prci.c | 1 - hw/riscv/sifive_test.c | 1 - 2 files changed, 2 deletions(-)
hw/riscv/sifive_prci.c +0 -1
@@ -19,7 +19,6 @@*/ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "target/riscv/cpu.h"
hw/riscv/sifive_test.c +0 -1
@@ -19,7 +19,6 @@*/ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "target/riscv/cpu.h"
Signature · 1 line
2.7.4
Re: [Qemu-devel] [PATCH v8 01/32] riscv: hw: Remove duplicated "hw/hw.h" inclusion
Quoted 10 lines · Bin Meng
Commit
a27bd6c779ba("Includehw/qdev-properties.hless") wrongly added "hw/hw.h" tosifive_prci.candsifive_test.c.Another inclusion of "
hw/hw.h" was later added via commit650d103d3ea9("Includehw/hw.hexactly where needed"), that resulted in duplicated inclusion of "hw/hw.h".Fixes a27bd6c779ba ("Include hw/qdev-properties.h less")Signed-off-by Bin Meng <[email protected]>
Alistair
Quoted 38 lines
---
Changes in v8:
- newly included in v8 to ease patch inter dependencieshw/riscv/sifive_prci.c | 1 - hw/riscv/sifive_test.c | 1 - 2 files changed, 2 deletions(-)hw/riscv/sifive_prci.c +0
-1@@ -19,7 +19,6 @@*/ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "target/riscv/cpu.h" hw/riscv/sifive_test.c +0
-2@@ -19,7 +19,6 @@*/ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "target/riscv/cpu.h" --2.7.4
Re: [Qemu-devel] [PATCH v8 01/32] riscv: hw: Remove duplicated "hw/hw.h" inclusion
In reply to Bin MengQuoted 36 lines · On Fri, 06 Sep 2019 09:19:48 PDT (-0700), [email protected] wrote:
Commit
a27bd6c779ba("Includehw/qdev-properties.hless") wrongly added "hw/hw.h" tosifive_prci.candsifive_test.c.Another inclusion of "
hw/hw.h" was later added via commit650d103d3ea9("Includehw/hw.hexactly where needed"), that resulted in duplicated inclusion of "hw/hw.h".Fixes a27bd6c779ba ("Include hw/qdev-properties.h less")Signed-off-by Bin Meng <[email protected]>---
Changes in v8:
- newly included in v8 to ease patch inter dependencieshw/riscv/sifive_prci.c | 1 - hw/riscv/sifive_test.c | 1 - 2 files changed, 2 deletions(-)hw/riscv/sifive_prci.c +0
-1@@ -19,7 +19,6 @@*/ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "target/riscv/cpu.h" hw/riscv/sifive_test.c +0
-0
hw/riscv/sifive_test.c line 24
Quoted 7 lines
hw/riscv/sifive_test.c +0
-1@@ -19,7 +19,6 @@*/ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "target/riscv/cpu.h"
PATCH v8 2/32 riscv: sifive_test: Add reset functionality
In reply to Bin MengThis adds a reset opcode for sifive_test device to trigger a system reset for testing purpose.
---
Changes in v8:
- newly included in v8 to ease patch inter dependencies
hw/riscv/sifive_test.c | 4 ++++ include/hw/riscv/sifive_test.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)
hw/riscv/sifive_test.c +4 -0
@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/module.h" +#include "sysemu/runstate.h" #include "target/riscv/cpu.h" #include "hw/hw.h" #include "hw/riscv/sifive_test.h"
@@ -41,6 +42,9 @@ static void sifive_test_write(void *opaque, hwaddr addr,exit (code);case FINISHER_PASS :exit (0 ); +case FINISHER_RESET : +qemu_system_reset_request (SHUTDOWN_CAUSE_GUEST_RESET ); +return ;default :break ; }
include/hw/riscv/sifive_test.h +2 -1
@@ -36,7 +36,8 @@ typedef struct SiFiveTestState {enum {FINISHER_FAIL =0x3333 , -FINISHER_PASS =0x5555 +FINISHER_PASS =0x5555 , +FINISHER_RESET =0x7777 };DeviceState *sifive_test_create (hwaddr addr);
Signature · 1 line
2.7.4
PATCH v8 3/32 riscv: hw: Remove superfluous "linux, phandle" property
In reply to Bin Meng"linux,phandle" property is optional. Remove all instances in the sifive_u, virt and spike machine device trees.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4:
- remove 2 more "linux,phandle" instances in sifive_u.c and spike.c after rebasing on Palmer's QEMU RISC-V tree
Changes in v3: None
Changes in v2: None
hw/riscv/sifive_u.c | 4 ---- hw/riscv/spike.c | 1 - hw/riscv/virt.c | 3 --- 3 files changed, 8 deletions(-)
hw/riscv/sifive_u.c +0 -4
@@ -126,7 +126,6 @@ static void *create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_string (fdt, nodename,"device_type" ,"cpu" );qemu_fdt_add_subnode (fdt, intc);qemu_fdt_setprop_cell (fdt, intc,"phandle" , cpu_phandle); -qemu_fdt_setprop_cell (fdt, intc,"linux,phandle" , cpu_phandle);qemu_fdt_setprop_string (fdt, intc,"compatible" ,"riscv,cpu-intc" );qemu_fdt_setprop (fdt, intc,"interrupt-controller" ,NULL ,0 );qemu_fdt_setprop_cell (fdt, intc,"#interrupt-cells" ,1 );
@@ -185,7 +184,6 @@ static void *create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cell (fdt, nodename,"riscv,max-priority" ,7 );qemu_fdt_setprop_cell (fdt, nodename,"riscv,ndev" ,0x35 );qemu_fdt_setprop_cells (fdt, nodename,"phandle" , plic_phandle); -qemu_fdt_setprop_cells (fdt, nodename,"linux,phandle" , plic_phandle); plic_phandle =qemu_fdt_get_phandle (fdt, nodename);g_free (cells);g_free (nodename);
@@ -198,7 +196,6 @@ static void *create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cell (fdt, nodename,"clock-frequency" ,SIFIVE_U_GEM_CLOCK_FREQ );qemu_fdt_setprop_cell (fdt, nodename,"phandle" , ethclk_phandle); -qemu_fdt_setprop_cell (fdt, nodename,"linux,phandle" , ethclk_phandle); ethclk_phandle =qemu_fdt_get_phandle (fdt, nodename);g_free (nodename);
@@ -234,7 +231,6 @@ static void *create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cell (fdt, nodename,"#clock-cells" ,0x0 );qemu_fdt_setprop_cell (fdt, nodename,"clock-frequency" ,3686400 );qemu_fdt_setprop_cell (fdt, nodename,"phandle" , uartclk_phandle); -qemu_fdt_setprop_cell (fdt, nodename,"linux,phandle" , uartclk_phandle); uartclk_phandle =qemu_fdt_get_phandle (fdt, nodename);g_free (nodename);
hw/riscv/spike.c +0 -1
@@ -112,7 +112,6 @@ static void create_fdt(SpikeState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_string (fdt, nodename,"device_type" ,"cpu" );qemu_fdt_add_subnode (fdt, intc);qemu_fdt_setprop_cell (fdt, intc,"phandle" ,1 ); -qemu_fdt_setprop_cell (fdt, intc,"linux,phandle" ,1 );qemu_fdt_setprop_string (fdt, intc,"compatible" ,"riscv,cpu-intc" );qemu_fdt_setprop (fdt, intc,"interrupt-controller" ,NULL ,0 );qemu_fdt_setprop_cell (fdt, intc,"#interrupt-cells" ,1 );
hw/riscv/virt.c +0 -3
@@ -170,11 +170,9 @@ static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cell (fdt, nodename,"reg" , cpu);qemu_fdt_setprop_string (fdt, nodename,"device_type" ,"cpu" );qemu_fdt_setprop_cell (fdt, nodename,"phandle" , cpu_phandle); -qemu_fdt_setprop_cell (fdt, nodename,"linux,phandle" , cpu_phandle); intc_phandle = phandle++;qemu_fdt_add_subnode (fdt, intc);qemu_fdt_setprop_cell (fdt, intc,"phandle" , intc_phandle); -qemu_fdt_setprop_cell (fdt, intc,"linux,phandle" , intc_phandle);qemu_fdt_setprop_string (fdt, intc,"compatible" ,"riscv,cpu-intc" );qemu_fdt_setprop (fdt, intc,"interrupt-controller" ,NULL ,0 );qemu_fdt_setprop_cell (fdt, intc,"#interrupt-cells" ,1 );
@@ -250,7 +248,6 @@ static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cell (fdt, nodename,"riscv,max-priority" ,7 );qemu_fdt_setprop_cell (fdt, nodename,"riscv,ndev" ,VIRTIO_NDEV );qemu_fdt_setprop_cells (fdt, nodename,"phandle" , plic_phandle); -qemu_fdt_setprop_cells (fdt, nodename,"linux,phandle" , plic_phandle); plic_phandle =qemu_fdt_get_phandle (fdt, nodename);g_free (cells);g_free (nodename);
Signature · 1 line
2.7.4
PATCH v8 4/32 riscv: hw: Use qemu_fdt_setprop_cell() for property with only 1 cell
In reply to Bin MengSome of the properties only have 1 cell so we should use qemu_fdt_setprop_cell() instead of qemu_fdt_setprop_cells().
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
hw/riscv/sifive_u.c | 18 +++++++++--------- hw/riscv/virt.c | 24 ++++++++++++------------ 2 files changed, 21 insertions(+), 21 deletions(-)
hw/riscv/sifive_u.c +9 -9
@@ -183,7 +183,7 @@ static void *create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_string (fdt, nodename,"reg-names" ,"control" );qemu_fdt_setprop_cell (fdt, nodename,"riscv,max-priority" ,7 );qemu_fdt_setprop_cell (fdt, nodename,"riscv,ndev" ,0x35 ); -qemu_fdt_setprop_cells (fdt, nodename,"phandle" , plic_phandle); +qemu_fdt_setprop_cell (fdt, nodename,"phandle" , plic_phandle); plic_phandle =qemu_fdt_get_phandle (fdt, nodename);g_free (cells);g_free (nodename);
@@ -208,20 +208,20 @@ static void *create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, 0x0, memmap[SIFIVE_U_GEM].size);qemu_fdt_setprop_string (fdt, nodename,"reg-names" ,"control" );qemu_fdt_setprop_string (fdt, nodename,"phy-mode" ,"gmii" ); -qemu_fdt_setprop_cells (fdt, nodename,"interrupt-parent" , plic_phandle); -qemu_fdt_setprop_cells (fdt, nodename,"interrupts" ,SIFIVE_U_GEM_IRQ ); +qemu_fdt_setprop_cell (fdt, nodename,"interrupt-parent" , plic_phandle); +qemu_fdt_setprop_cell (fdt, nodename,"interrupts" ,SIFIVE_U_GEM_IRQ );qemu_fdt_setprop_cells (fdt, nodename,"clocks" , ethclk_phandle, ethclk_phandle, ethclk_phandle);qemu_fdt_setprop (fdt, nodename,"clock-names" , ethclk_names,sizeof (ethclk_names)); -qemu_fdt_setprop_cells (fdt, nodename,"#address-cells" ,1 ); -qemu_fdt_setprop_cells (fdt, nodename,"#size-cells" ,0 ); +qemu_fdt_setprop_cell (fdt, nodename,"#address-cells" ,1 ); +qemu_fdt_setprop_cell (fdt, nodename,"#size-cells" ,0 );g_free (nodename); nodename =g_strdup_printf ("/soc/ethernet@%lx/ethernet-phy@0" , (long )memmap[SIFIVE_U_GEM ].base);qemu_fdt_add_subnode (fdt, nodename); -qemu_fdt_setprop_cells (fdt, nodename,"reg" ,0x0 ); +qemu_fdt_setprop_cell (fdt, nodename,"reg" ,0x0 );g_free (nodename); uartclk_phandle = phandle++;
@@ -241,9 +241,9 @@ static void *create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cells (fdt, nodename,"reg" ,0x0 , memmap[SIFIVE_U_UART0 ].base,0x0 , memmap[SIFIVE_U_UART0 ].size); -qemu_fdt_setprop_cells (fdt, nodename,"clocks" , uartclk_phandle); -qemu_fdt_setprop_cells (fdt, nodename,"interrupt-parent" , plic_phandle); -qemu_fdt_setprop_cells (fdt, nodename,"interrupts" ,SIFIVE_U_UART0_IRQ ); +qemu_fdt_setprop_cell (fdt, nodename,"clocks" , uartclk_phandle); +qemu_fdt_setprop_cell (fdt, nodename,"interrupt-parent" , plic_phandle); +qemu_fdt_setprop_cell (fdt, nodename,"interrupts" ,SIFIVE_U_UART0_IRQ );qemu_fdt_add_subnode (fdt,"/chosen" );qemu_fdt_setprop_string (fdt,"/chosen" ,"stdout-path" , nodename);
hw/riscv/virt.c +12 -12
@@ -233,8 +233,8 @@ static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, nodename =g_strdup_printf ("/soc/interrupt-controller@%lx" , (long )memmap[VIRT_PLIC ].base);qemu_fdt_add_subnode (fdt, nodename); -qemu_fdt_setprop_cells (fdt, nodename,"#address-cells" , -FDT_PLIC_ADDR_CELLS ); +qemu_fdt_setprop_cell (fdt, nodename,"#address-cells" , +FDT_PLIC_ADDR_CELLS );qemu_fdt_setprop_cell (fdt, nodename,"#interrupt-cells" ,FDT_PLIC_INT_CELLS );qemu_fdt_setprop_string (fdt, nodename,"compatible" ,"riscv,plic0" );
@@ -247,7 +247,7 @@ static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_string (fdt, nodename,"reg-names" ,"control" );qemu_fdt_setprop_cell (fdt, nodename,"riscv,max-priority" ,7 );qemu_fdt_setprop_cell (fdt, nodename,"riscv,ndev" ,VIRTIO_NDEV ); -qemu_fdt_setprop_cells (fdt, nodename,"phandle" , plic_phandle); +qemu_fdt_setprop_cell (fdt, nodename,"phandle" , plic_phandle); plic_phandle =qemu_fdt_get_phandle (fdt, nodename);g_free (cells);g_free (nodename);
@@ -260,19 +260,19 @@ static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cells (fdt, nodename,"reg" ,0x0 , memmap[VIRT_VIRTIO ].base + i * memmap[VIRT_VIRTIO ].size,0x0 , memmap[VIRT_VIRTIO ].size); -qemu_fdt_setprop_cells (fdt, nodename,"interrupt-parent" , plic_phandle); -qemu_fdt_setprop_cells (fdt, nodename,"interrupts" ,VIRTIO_IRQ + i); +qemu_fdt_setprop_cell (fdt, nodename,"interrupt-parent" , plic_phandle); +qemu_fdt_setprop_cell (fdt, nodename,"interrupts" ,VIRTIO_IRQ + i);g_free (nodename); } nodename =g_strdup_printf ("/soc/pci@%lx" , (long ) memmap[VIRT_PCIE_ECAM ].base);qemu_fdt_add_subnode (fdt, nodename); -qemu_fdt_setprop_cells (fdt, nodename,"#address-cells" , -FDT_PCI_ADDR_CELLS ); -qemu_fdt_setprop_cells (fdt, nodename,"#interrupt-cells" , -FDT_PCI_INT_CELLS ); -qemu_fdt_setprop_cells (fdt, nodename,"#size-cells" ,0x2 ); +qemu_fdt_setprop_cell (fdt, nodename,"#address-cells" , +FDT_PCI_ADDR_CELLS ); +qemu_fdt_setprop_cell (fdt, nodename,"#interrupt-cells" , +FDT_PCI_INT_CELLS ); +qemu_fdt_setprop_cell (fdt, nodename,"#size-cells" ,0x2 );qemu_fdt_setprop_string (fdt, nodename,"compatible" ,"pci-host-ecam-generic" );qemu_fdt_setprop_string (fdt, nodename,"device_type" ,"pci" );
@@ -309,8 +309,8 @@ static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap,0x0 , memmap[VIRT_UART0 ].base, 0x0, memmap[VIRT_UART0].size);qemu_fdt_setprop_cell (fdt, nodename,"clock-frequency" ,3686400 ); -qemu_fdt_setprop_cells (fdt, nodename,"interrupt-parent" , plic_phandle); -qemu_fdt_setprop_cells (fdt, nodename,"interrupts" ,UART0_IRQ ); +qemu_fdt_setprop_cell (fdt, nodename,"interrupt-parent" , plic_phandle); +qemu_fdt_setprop_cell (fdt, nodename,"interrupts" ,UART0_IRQ );qemu_fdt_add_subnode (fdt,"/chosen" );qemu_fdt_setprop_string (fdt,"/chosen" ,"stdout-path" , nodename);
Signature · 1 line
2.7.4
PATCH v8 5/32 riscv: hw: Remove not needed PLIC properties in device tree
In reply to Bin MengThis removes "reg-names" and "riscv,max-priority" properties of the PLIC node from device tree.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2:
- keep the PLIC compatible string unchanged as OpenSBI uses that for DT fix up
hw/riscv/sifive_u.c | 2 -- hw/riscv/virt.c | 2 -- 2 files changed, 4 deletions(-)
hw/riscv/sifive_u.c +0 -2
@@ -180,8 +180,6 @@ static void *create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cells (fdt, nodename,"reg" ,0x0 , memmap[SIFIVE_U_PLIC ].base,0x0 , memmap[SIFIVE_U_PLIC ].size); -qemu_fdt_setprop_string (fdt, nodename,"reg-names" ,"control" ); -qemu_fdt_setprop_cell (fdt, nodename,"riscv,max-priority" ,7 );qemu_fdt_setprop_cell (fdt, nodename,"riscv,ndev" ,0x35 );qemu_fdt_setprop_cell (fdt, nodename,"phandle" , plic_phandle); plic_phandle =qemu_fdt_get_phandle (fdt, nodename);
hw/riscv/virt.c +0 -2
@@ -244,8 +244,6 @@ static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cells (fdt, nodename,"reg" ,0x0 , memmap[VIRT_PLIC ].base,0x0 , memmap[VIRT_PLIC ].size); -qemu_fdt_setprop_string (fdt, nodename,"reg-names" ,"control" ); -qemu_fdt_setprop_cell (fdt, nodename,"riscv,max-priority" ,7 );qemu_fdt_setprop_cell (fdt, nodename,"riscv,ndev" ,VIRTIO_NDEV );qemu_fdt_setprop_cell (fdt, nodename,"phandle" , plic_phandle); plic_phandle =qemu_fdt_get_phandle (fdt, nodename);
Signature · 1 line
2.7.4
PATCH v8 6/32 riscv: hw: Change create_fdt() to return void
In reply to Bin MengThere is no need to return fdt at the end of create_fdt() because it's already saved in s->fdt.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4:
- change create_fdt() to return void in sifive_u.c too, after rebasing on Palmer's QEMU RISC-V tree
Changes in v3: None
Changes in v2: None
hw/riscv/sifive_u.c | 11 ++++------- hw/riscv/virt.c | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-)
hw/riscv/sifive_u.c +4 -7
@@ -67,7 +67,7 @@ static const struct MemmapEntry {#define GEM_REVISION 0x10070109 -static void *create_fdt (SiFiveUState *s,const struct MemmapEntry *memmap, +static void create_fdt (SiFiveUState *s,const struct MemmapEntry *memmap,uint64_t mem_size,const char *cmdline) {void *fdt;
@@ -253,14 +253,11 @@ static void *create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_string (fdt,"/aliases" ,"serial0" , nodename);g_free (nodename); - -return fdt; }static void riscv_sifive_u_init (MachineState *machine) {const struct MemmapEntry *memmap = sifive_u_memmap; -void *fdt;SiFiveUState *s =g_new0 (SiFiveUState,1 );MemoryRegion *system_memory =get_system_memory ();
@@ -281,7 +278,7 @@ static void riscv_sifive_u_init(MachineState *machine) main_mem);/* create device tree */ - fdt =create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline); +create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline);riscv_find_and_load_firmware (machine,BIOS_FILENAME , memmap[SIFIVE_U_DRAM ].base);
@@ -294,9 +291,9 @@ static void riscv_sifive_u_init(MachineState *machine)hwaddr end =riscv_load_initrd (machine->initrd_filename, machine->ram_size, kernel_entry, &start); -qemu_fdt_setprop_cell (fdt,"/chosen" , +qemu_fdt_setprop_cell (s->fdt,"/chosen" ,"linux,initrd-start" , start); -qemu_fdt_setprop_cell (fdt,"/chosen" ,"linux,initrd-end" , +qemu_fdt_setprop_cell (s->fdt,"/chosen" ,"linux,initrd-end" , end); } }
hw/riscv/virt.c +4 -7
@@ -112,7 +112,7 @@ static void create_pcie_irq_map(void *fdt, char *nodename, 0x1800, 0, 0, 0x7); } -static void *create_fdt (RISCVVirtState *s,const struct MemmapEntry *memmap, +static void create_fdt (RISCVVirtState *s,const struct MemmapEntry *memmap,uint64_t mem_size,const char *cmdline) {void *fdt;
@@ -316,8 +316,6 @@ static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , cmdline); }g_free (nodename); - -return fdt; }
@@ -373,7 +371,6 @@ static void riscv_virt_board_init(MachineState *machine)size_t plic_hart_config_len;int i;unsigned int smp_cpus = machine->smp.cpus; -void *fdt;/* Initialize SOC */ object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),
@@ -392,7 +389,7 @@ static void riscv_virt_board_init(MachineState *machine) main_mem);/* create device tree */ - fdt =create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline); +create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline);/* boot rom */ memory_region_init_rom(mask_rom, NULL, "riscv_virt_board.mrom",
@@ -411,9 +408,9 @@ static void riscv_virt_board_init(MachineState *machine)hwaddr end =riscv_load_initrd (machine->initrd_filename, machine->ram_size, kernel_entry, &start); -qemu_fdt_setprop_cell (fdt,"/chosen" , +qemu_fdt_setprop_cell (s->fdt,"/chosen" ,"linux,initrd-start" , start); -qemu_fdt_setprop_cell (fdt,"/chosen" ,"linux,initrd-end" , +qemu_fdt_setprop_cell (s->fdt,"/chosen" ,"linux,initrd-end" , end); } }
Signature · 1 line
2.7.4
PATCH v8 7/32 riscv: hw: Change to use qemu_log_mask(LOG_GUEST_ERROR, ...) instead
In reply to Bin MengReplace the call to hw_error() with qemu_log_mask(LOG_GUEST_ERROR,...) in various sifive models.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5:
- new patch to change to use qemu_log_mask(LOG_GUEST_ERROR,...) instead in various sifive models
Changes in v4: None
Changes in v3: None
Changes in v2: None
hw/riscv/sifive_prci.c | 8 +++++--- hw/riscv/sifive_test.c | 5 +++-- hw/riscv/sifive_uart.c | 9 +++++---- 3 files changed, 13 insertions(+), 9 deletions(-)
hw/riscv/sifive_prci.c +5 -3
@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" +#include "qemu/log.h" #include "qemu/module.h" #include "target/riscv/cpu.h" #include "hw/hw.h"
@@ -38,7 +39,8 @@ static uint64_t sifive_prci_read(void *opaque, hwaddr addr, unsigned int size)case SIFIVE_PRCI_PLLOUTDIV :return s->plloutdiv; } -hw_error ("%s: read: addr=0x%x\n" , __func__, (int )addr); +qemu_log_mask (LOG_GUEST_ERROR ,"%s: read: addr=0x%x\n" , + __func__, (int )addr);return 0 ; }
@@ -66,8 +68,8 @@ static void sifive_prci_write(void *opaque, hwaddr addr, s->plloutdiv = (uint32_t ) val64;break ;default : -hw_error ("%s: bad write: addr=0x%x v=0x%x\n" , - __func__, (int )addr, (int )val64); +qemu_log_mask (LOG_GUEST_ERROR ,"%s: bad write: addr=0x%x v=0x%x\n" , + __func__, (int )addr, (int )val64); } }
hw/riscv/sifive_test.c +3 -2
@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" +#include "qemu/log.h" #include "qemu/module.h" #include "sysemu/runstate.h" #include "target/riscv/cpu.h"
@@ -49,8 +50,8 @@ static void sifive_test_write(void *opaque, hwaddr addr,break ; } } -hw_error ("%s: write: addr=0x%x val=0x%016" PRIx64"\n" , - __func__, (int )addr, val64); +qemu_log_mask (LOG_GUEST_ERROR ,"%s: write: addr=0x%x val=0x%016" PRIx64"\n" , + __func__, (int )addr, val64); }static const MemoryRegionOps sifive_test_ops = {
hw/riscv/sifive_uart.c +5 -4
@@ -18,6 +18,7 @@#include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/log.h" #include "hw/sysbus.h" #include "chardev/char.h" #include "chardev/char-fe.h"
@@ -95,8 +96,8 @@ uart_read(void *opaque, hwaddr addr, unsigned int size)return s->div; } -hw_error ("%s: bad read: addr=0x%x\n" , - __func__, (int )addr); +qemu_log_mask (LOG_GUEST_ERROR ,"%s: bad read: addr=0x%x\n" , + __func__, (int )addr);return 0 ; }
@@ -127,8 +128,8 @@ uart_write(void *opaque, hwaddr addr, s->div = val64;return ; } -hw_error ("%s: bad write: addr=0x%x v=0x%x\n" , - __func__, (int )addr, (int )value); +qemu_log_mask (LOG_GUEST_ERROR ,"%s: bad write: addr=0x%x v=0x%x\n" , + __func__, (int )addr, (int )value); }static const MemoryRegionOps uart_ops = {
Signature · 1 line
2.7.4
PATCH v8 8/32 riscv: hw: Remove the unnecessary include of target/riscv/cpu.h
In reply to Bin MengThe inclusion of "target/riscv/cpu.h" is unnecessary in various sifive model drivers.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5:
- new patch to remove the unnecessary include of target/riscv/cpu.h
Changes in v4: None
Changes in v3: None
Changes in v2: None
hw/riscv/sifive_prci.c | 1 - hw/riscv/sifive_test.c | 1 - hw/riscv/sifive_uart.c | 1 - 3 files changed, 3 deletions(-)
hw/riscv/sifive_prci.c +0 -1
@@ -22,7 +22,6 @@#include "hw/sysbus.h" #include "qemu/log.h" #include "qemu/module.h" -#include "target/riscv/cpu.h" #include "hw/hw.h" #include "hw/riscv/sifive_prci.h"
hw/riscv/sifive_test.c +0 -1
@@ -23,7 +23,6 @@#include "qemu/log.h" #include "qemu/module.h" #include "sysemu/runstate.h" -#include "target/riscv/cpu.h" #include "hw/hw.h" #include "hw/riscv/sifive_test.h"
hw/riscv/sifive_uart.c +0 -1
@@ -22,7 +22,6 @@#include "hw/sysbus.h" #include "chardev/char.h" #include "chardev/char-fe.h" -#include "target/riscv/cpu.h" #include "hw/hw.h" #include "hw/irq.h" #include "hw/riscv/sifive_uart.h"
Signature · 1 line
2.7.4
PATCH v8 9/32 riscv: roms: Remove executable attribute of opensbi images
In reply to Bin MengLike other binary files, the executable attribute of opensbi images should not be set.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4:
- new patch to remove executable attribute of opensbi images
Changes in v3: None
Changes in v2: None
pc-bios/opensbi-riscv32-virt-fw_jump.bin | Bin pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin | Bin pc-bios/opensbi-riscv64-virt-fw_jump.bin | Bin 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 pc-bios/opensbi-riscv32-virt-fw_jump.bin mode change 100755 => 100644 pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin mode change 100755 => 100644 pc-bios/opensbi-riscv64-virt-fw_jump.bin
pc-bios/opensbi-riscv32-virt-fw_jump.bin +0 -0
pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin +0 -0
pc-bios/opensbi-riscv64-virt-fw_jump.bin +0 -0
Signature · 1 line
2.7.4
Re: [Qemu-devel] [PATCH v8 09/32] riscv: roms: Remove executable attribute of opensbi images
Quoted 2 lines · Bin Meng
Like other binary files, the executable attribute of opensbi images should not be set.
Ideally we'd have checkpatch warning for incorrect permissions when adding blobs under pc-bios/.
Quoted 3 lines
Signed-off-by Bin Meng <[email protected]>Reviewed-by Alistair Francis <[email protected]>
Quoted 30 lines
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4:
- new patch to remove executable attribute of opensbi imagesChanges in v3: None
Changes in v2: Nonepc-bios/opensbi-riscv32-virt-fw_jump.bin | Bin pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin | Bin pc-bios/opensbi-riscv64-virt-fw_jump.bin | Bin 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 pc-bios/opensbi-riscv32-virt-fw_jump.bin mode change 100755 => 100644 pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin mode change 100755 => 100644 pc-bios/opensbi-riscv64-virt-fw_jump.binpc-bios/opensbi-riscv32-virt-fw_jump.bin +0
-0pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin +0
-0pc-bios/opensbi-riscv64-virt-fw_jump.bin +0
-0
PATCH v8 10/32 riscv: sifive_u: Remove the unnecessary include of prci header
In reply to Bin Mengsifive_u machine does not use PRCI as of today. Remove the prci header inclusion.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
hw/riscv/sifive_u.c | 1 - 1 file changed, 1 deletion(-)
hw/riscv/sifive_u.c +0 -1
@@ -38,7 +38,6 @@#include "hw/riscv/sifive_plic.h" #include "hw/riscv/sifive_clint.h" #include "hw/riscv/sifive_uart.h" -#include "hw/riscv/sifive_prci.h" #include "hw/riscv/sifive_u.h" #include "hw/riscv/boot.h" #include "chardev/char.h"
Signature · 1 line
2.7.4
PATCH v8 11/32 riscv: sifive: Rename sifive_prci.{c, h} to sifive_e_prci.{c, h}
In reply to Bin MengCurrent SiFive PRCI model only works with sifive_e machine, as it only emulates registers or PRCI block in the FE310 SoC.
Rename the file name to make it clear that it is for sifive_e. This also prefix "sifive_e"/"SIFIVE_E" for all macros, variables and functions.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4:
- prefix all macros/variables/functions with SIFIVE_E/sifive_e in the sifive_e_prci driver
Changes in v3: None
Changes in v2: None
hw/riscv/Makefile.objs | 2 +-
hw/riscv/sifive_e.c | 4 +-
hw/riscv/{sifive_prci.c => sifive_e_prci.c} | 79 ++++++++++++++---------------
include/hw/riscv/sifive_e_prci.h | 69 +++++++++++++++++++++++++
include/hw/riscv/sifive_prci.h | 71 --------------------------
5 files changed, 111 insertions(+), 114 deletions(-)
rename hw/riscv/{sifive_prci.c => sifive_e_prci.c} (51%)
create mode 100644 include/hw/riscv/sifive_e_prci.h
delete mode 100644 include/hw/riscv/sifive_prci.hhw/riscv/Makefile.objs +1 -1
@@ -2,9 +2,9 @@ obj-y += boot.o obj-$(CONFIG_SPIKE) += riscv_htif.o obj-$(CONFIG_HART) += riscv_hart.o obj-$(CONFIG_SIFIVE_E) += sifive_e.o +obj-$(CONFIG_SIFIVE_E) += sifive_e_prci.o obj-$(CONFIG_SIFIVE) += sifive_clint.o obj-$(CONFIG_SIFIVE) += sifive_gpio.o -obj-$(CONFIG_SIFIVE) += sifive_prci.o obj-$(CONFIG_SIFIVE) += sifive_plic.o obj-$(CONFIG_SIFIVE) += sifive_test.o obj-$(CONFIG_SIFIVE_U) += sifive_u.o
hw/riscv/sifive_e.c +2 -2
@@ -40,9 +40,9 @@#include "hw/riscv/riscv_hart.h" #include "hw/riscv/sifive_plic.h" #include "hw/riscv/sifive_clint.h" -#include "hw/riscv/sifive_prci.h" #include "hw/riscv/sifive_uart.h" #include "hw/riscv/sifive_e.h" +#include "hw/riscv/sifive_e_prci.h" #include "hw/riscv/boot.h" #include "chardev/char.h" #include "sysemu/arch_init.h"
@@ -174,7 +174,7 @@ static void riscv_sifive_e_soc_realize(DeviceState *dev, Error **errp) SIFIVE_SIP_BASE, SIFIVE_TIMECMP_BASE, SIFIVE_TIME_BASE);sifive_mmio_emulate (sys_mem,"riscv.sifive.e.aon" , memmap[SIFIVE_E_AON ].base, memmap[SIFIVE_E_AON ].size); -sifive_prci_create (memmap[SIFIVE_E_PRCI ].base); +sifive_e_prci_create (memmap[SIFIVE_E_PRCI ].base);/* GPIO */
hw/riscv/sifive_e_prci.c renamed from hw/riscv/sifive_prci.c +39 -40
142 lines not on this page · raw message
include/hw/riscv/sifive_e_prci.h new file +69 -0
69 lines not on this page · raw message
include/hw/riscv/sifive_prci.h deleted +0 -71
71 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v8 12/32 riscv: sifive_e: prci: Fix a typo of hfxosccfg register programming
In reply to Bin MengFor hfxosccfg register programming, SIFIVE_E_PRCI_HFXOSCCFG_RDY and SIFIVE_E_PRCI_HFXOSCCFG_EN should be used.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
hw/riscv/sifive_e_prci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/riscv/sifive_e_prci.c +1 -1
@@ -91,7 +91,7 @@ static void sifive_e_prci_init(Object *obj)sysbus_init_mmio (SYS_BUS_DEVICE (obj), &s->mmio); s->hfrosccfg = (SIFIVE_E_PRCI_HFROSCCFG_RDY |SIFIVE_E_PRCI_HFROSCCFG_EN ); - s->hfxosccfg = (SIFIVE_E_PRCI_HFROSCCFG_RDY |SIFIVE_E_PRCI_HFROSCCFG_EN ); + s->hfxosccfg = (SIFIVE_E_PRCI_HFXOSCCFG_RDY |SIFIVE_E_PRCI_HFXOSCCFG_EN ); s->pllcfg = (SIFIVE_E_PRCI_PLLCFG_REFSEL |SIFIVE_E_PRCI_PLLCFG_BYPASS |SIFIVE_E_PRCI_PLLCFG_LOCK ); s->plloutdiv =SIFIVE_E_PRCI_PLLOUTDIV_DIV1 ;
Signature · 1 line
2.7.4
PATCH v8 13/32 riscv: sifive_e: prci: Update the PRCI register block size
In reply to Bin MengCurrently the PRCI register block size is set to 0x8000, but in fact 0x1000 is enough, which is also what the manual says.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
hw/riscv/sifive_e_prci.c | 2 +- include/hw/riscv/sifive_e_prci.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
hw/riscv/sifive_e_prci.c +1 -1
@@ -87,7 +87,7 @@ static void sifive_e_prci_init(Object *obj)SiFiveEPRCIState *s =SIFIVE_E_PRCI (obj);memory_region_init_io (&s->mmio, obj, &sifive_e_prci_ops, s, -TYPE_SIFIVE_E_PRCI ,0x8000 ); +TYPE_SIFIVE_E_PRCI ,SIFIVE_E_PRCI_REG_SIZE );sysbus_init_mmio (SYS_BUS_DEVICE (obj), &s->mmio); s->hfrosccfg = (SIFIVE_E_PRCI_HFROSCCFG_RDY |SIFIVE_E_PRCI_HFROSCCFG_EN );
include/hw/riscv/sifive_e_prci.h +2 -0
@@ -47,6 +47,8 @@ enum { SIFIVE_E_PRCI_PLLOUTDIV_DIV1 = (1 << 8) }; +#define SIFIVE_E_PRCI_REG_SIZE 0x1000 +#define TYPE_SIFIVE_E_PRCI "riscv.sifive.e.prci"#define SIFIVE_E_PRCI (obj) \
Signature · 1 line
2.7.4
PATCH v8 14/32 riscv: sifive_e: Drop sifive_mmio_emulate()
In reply to Bin MengUse create_unimplemented_device() instead.
---
Changes in v8:
- select UNIMP in sifive_e Kconfig due to applied commit "hw/misc: Add a config switch for the "unimplemented" device" in latest qemu/master
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2:
- drop patch "riscv: sifive: Move sifive_mmio_emulate() to a common place"
- new patch "riscv: sifive_e: Drop sifive_mmio_emulate()"
hw/riscv/Kconfig | 1 + hw/riscv/sifive_e.c | 23 ++++++++--------------- 2 files changed, 9 insertions(+), 15 deletions(-)
hw/riscv/Kconfig +1 -0
@@ -12,6 +12,7 @@ config SIFIVE_E bool select HART select SIFIVE + select UNIMP config SIFIVE_U bool
hw/riscv/sifive_e.c +8 -15
@@ -36,6 +36,7 @@#include "hw/loader.h" #include "hw/sysbus.h" #include "hw/char/serial.h" +#include "hw/misc/unimp.h" #include "target/riscv/cpu.h" #include "hw/riscv/riscv_hart.h" #include "hw/riscv/sifive_plic.h"
@@ -74,14 +75,6 @@ static const struct MemmapEntry { [SIFIVE_E_DTIM] = { 0x80000000, 0x4000 } }; -static void sifive_mmio_emulate (MemoryRegion *parent,const char *name, -uintptr_t offset,uintptr_t length) -{ -MemoryRegion *mock_mmio =g_new (MemoryRegion,1 ); -memory_region_init_ram (mock_mmio,NULL , name, length, &error_fatal); -memory_region_add_subregion (parent, offset, mock_mmio); -} -static void riscv_sifive_e_init (MachineState *machine) {const struct MemmapEntry *memmap = sifive_e_memmap;
@@ -172,7 +165,7 @@ static void riscv_sifive_e_soc_realize(DeviceState *dev, Error **errp)sifive_clint_create (memmap[SIFIVE_E_CLINT ].base, memmap[SIFIVE_E_CLINT ].size, ms->smp.cpus,SIFIVE_SIP_BASE ,SIFIVE_TIMECMP_BASE ,SIFIVE_TIME_BASE ); -sifive_mmio_emulate (sys_mem,"riscv.sifive.e.aon" , +create_unimplemented_device ("riscv.sifive.e.aon" , memmap[SIFIVE_E_AON ].base, memmap[SIFIVE_E_AON ].size);sifive_e_prci_create (memmap[SIFIVE_E_PRCI ].base);
@@ -199,19 +192,19 @@ static void riscv_sifive_e_soc_realize(DeviceState *dev, Error **errp)sifive_uart_create (sys_mem, memmap[SIFIVE_E_UART0 ].base,serial_hd (0 ),qdev_get_gpio_in (DEVICE (s->plic),SIFIVE_E_UART0_IRQ )); -sifive_mmio_emulate (sys_mem,"riscv.sifive.e.qspi0" , +create_unimplemented_device ("riscv.sifive.e.qspi0" , memmap[SIFIVE_E_QSPI0 ].base, memmap[SIFIVE_E_QSPI0 ].size); -sifive_mmio_emulate (sys_mem,"riscv.sifive.e.pwm0" , +create_unimplemented_device ("riscv.sifive.e.pwm0" , memmap[SIFIVE_E_PWM0 ].base, memmap[SIFIVE_E_PWM0 ].size);sifive_uart_create (sys_mem, memmap[SIFIVE_E_UART1 ].base,serial_hd (1 ),qdev_get_gpio_in (DEVICE (s->plic),SIFIVE_E_UART1_IRQ )); -sifive_mmio_emulate (sys_mem,"riscv.sifive.e.qspi1" , +create_unimplemented_device ("riscv.sifive.e.qspi1" , memmap[SIFIVE_E_QSPI1 ].base, memmap[SIFIVE_E_QSPI1 ].size); -sifive_mmio_emulate (sys_mem,"riscv.sifive.e.pwm1" , +create_unimplemented_device ("riscv.sifive.e.pwm1" , memmap[SIFIVE_E_PWM1 ].base, memmap[SIFIVE_E_PWM1 ].size); -sifive_mmio_emulate (sys_mem,"riscv.sifive.e.qspi2" , +create_unimplemented_device ("riscv.sifive.e.qspi2" , memmap[SIFIVE_E_QSPI2 ].base, memmap[SIFIVE_E_QSPI2 ].size); -sifive_mmio_emulate (sys_mem,"riscv.sifive.e.pwm2" , +create_unimplemented_device ("riscv.sifive.e.pwm2" , memmap[SIFIVE_E_PWM2 ].base, memmap[SIFIVE_E_PWM2 ].size);/* Flash memory */
Signature · 1 line
2.7.4
PATCH v8 15/32 riscv: Add a sifive_cpu.h to include both E and U cpu type defines
In reply to Bin MengGroup SiFive E and U cpu type defines into one header file.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
include/hw/riscv/sifive_cpu.h | 31 +++++++++++++++++++++++++++++++ include/hw/riscv/sifive_e.h | 7 +------ include/hw/riscv/sifive_u.h | 7 +------ 3 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 include/hw/riscv/sifive_cpu.h
include/hw/riscv/sifive_cpu.h new file +31 -0
@@ -0,0 +1,31 @@ +/* +* SiFive CPU types +* +* Copyright (c) 2017 SiFive, Inc. +* Copyright (c) 2019 Bin Meng <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms and conditions of the GNU General Public License, +* version 2 or later, as published by the Free Software Foundation. +* +* This program is distributed in the hope it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License along with +* this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef HW_SIFIVE_CPU_H +#define HW_SIFIVE_CPU_H + +#if defined(TARGET_RISCV32 ) +#define SIFIVE_E_CPU TYPE_RISCV_CPU_SIFIVE_E31 +#define SIFIVE_U_CPU TYPE_RISCV_CPU_SIFIVE_U34 +#elif defined(TARGET_RISCV64 ) +#define SIFIVE_E_CPU TYPE_RISCV_CPU_SIFIVE_E51 +#define SIFIVE_U_CPU TYPE_RISCV_CPU_SIFIVE_U54 +#endif + +#endif /* HW_SIFIVE_CPU_H */
include/hw/riscv/sifive_e.h +1 -6
@@ -20,6 +20,7 @@#define HW_SIFIVE_E_H #include "hw/riscv/riscv_hart.h" +#include "hw/riscv/sifive_cpu.h" #include "hw/riscv/sifive_gpio.h" #define TYPE_RISCV_E_SOC "riscv.sifive.e.soc"
@@ -84,10 +85,4 @@ enum {#define SIFIVE_E_PLIC_CONTEXT_BASE 0x200000#define SIFIVE_E_PLIC_CONTEXT_STRIDE 0x1000 -#if defined(TARGET_RISCV32 ) -#define SIFIVE_E_CPU TYPE_RISCV_CPU_SIFIVE_E31 -#elif defined(TARGET_RISCV64 ) -#define SIFIVE_E_CPU TYPE_RISCV_CPU_SIFIVE_E51 -#endif -#endif
include/hw/riscv/sifive_u.h +1 -6
@@ -21,6 +21,7 @@#include "hw/net/cadence_gem.h" #include "hw/riscv/riscv_hart.h" +#include "hw/riscv/sifive_cpu.h" #define TYPE_RISCV_U_SOC "riscv.sifive.u.soc"#define RISCV_U_SOC (obj) \
@@ -78,10 +79,4 @@ enum {#define SIFIVE_U_PLIC_CONTEXT_BASE 0x200000#define SIFIVE_U_PLIC_CONTEXT_STRIDE 0x1000 -#if defined(TARGET_RISCV32 ) -#define SIFIVE_U_CPU TYPE_RISCV_CPU_SIFIVE_U34 -#elif defined(TARGET_RISCV64 ) -#define SIFIVE_U_CPU TYPE_RISCV_CPU_SIFIVE_U54 -#endif -#endif
Signature · 1 line
2.7.4
PATCH v8 16/32 riscv: hart: Extract hart realize to a separate routine
In reply to Bin MengCurrently riscv_harts_realize() creates all harts based on the same cpu type given in the hart array property. With current implementation it can only create homogeneous harts. Exact the hart realize to a separate routine in preparation for supporting multiple hart arrays.
Note the file header says the RISC-V hart array holds the state of a heterogeneous array of RISC-V harts, which is not true. Update the comment to mention homogeneous array of RISC-V harts.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
hw/riscv/riscv_hart.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-)
hw/riscv/riscv_hart.c +20 -13
@@ -3,7 +3,7 @@* * Copyright (c) 2017 SiFive, Inc. * -* Holds the state of a heterogenous array of RISC-V harts +* Holds the state of a homogeneous array of RISC-V harts * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License,
@@ -39,26 +39,33 @@ static void riscv_harts_cpu_reset(void *opaque)cpu_reset (CPU (cpu)); } +static void riscv_hart_realize (RISCVHartArrayState *s,int idx, +char *cpu_type,Error **errp) +{ +Error *err =NULL ; + +object_initialize_child (OBJECT (s),"harts[*]" , &s->harts[idx], +sizeof (RISCVCPU ), cpu_type, + &error_abort,NULL ); + s->harts[idx].env.mhartid = idx; +qemu_register_reset (riscv_harts_cpu_reset, &s->harts[idx]); +object_property_set_bool (OBJECT (&s->harts[idx]), true, +"realized" , &err); +if (err) { +error_propagate (errp, err); +return ; + } +} +static void riscv_harts_realize (DeviceState *dev,Error **errp) {RISCVHartArrayState *s =RISCV_HART_ARRAY (dev); -Error *err =NULL ;int n; s->harts =g_new0 (RISCVCPU , s->num_harts);for (n =0 ; n < s->num_harts; n++) { -object_initialize_child (OBJECT (s),"harts[*]" , &s->harts[n], -sizeof (RISCVCPU ), s->cpu_type, - &error_abort,NULL ); - s->harts[n].env.mhartid = n; -qemu_register_reset (riscv_harts_cpu_reset, &s->harts[n]); -object_property_set_bool (OBJECT (&s->harts[n]), true, -"realized" , &err); -if (err) { -error_propagate (errp, err); -return ; - } +riscv_hart_realize (s, n, s->cpu_type, errp); } }
Signature · 1 line
2.7.4
PATCH v8 17/32 riscv: hart: Add a "hartid-base" property to RISC-V hart array
In reply to Bin MengAt present each hart's hartid in a RISC-V hart array is assigned the same value of its index in the hart array. But for a system that has multiple hart arrays, this is not the case any more.
Add a new "hartid-base" property so that hartid number can be assigned based on the property value.
---
Changes in v8: None
Changes in v7:
- use s->hartid_base + idx directly
Changes in v6:
- use s->hartid_base directly, instead of an extra variable
Changes in v5: None
Changes in v4:
- new patch to add a "hartid-base" property to RISC-V hart array
Changes in v3: None
Changes in v2: None
hw/riscv/riscv_hart.c | 3 ++- include/hw/riscv/riscv_hart.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
hw/riscv/riscv_hart.c +2 -1
@@ -29,6 +29,7 @@static Property riscv_harts_props[] = {DEFINE_PROP_UINT32 ("num-harts" , RISCVHartArrayState, num_harts,1 ), +DEFINE_PROP_UINT32 ("hartid-base" , RISCVHartArrayState, hartid_base,0 ),DEFINE_PROP_STRING ("cpu-type" , RISCVHartArrayState, cpu_type),DEFINE_PROP_END_OF_LIST (), };
@@ -47,7 +48,7 @@ static void riscv_hart_realize(RISCVHartArrayState *s, int idx,object_initialize_child (OBJECT (s),"harts[*]" , &s->harts[idx],sizeof (RISCVCPU ), cpu_type, &error_abort,NULL ); - s->harts[idx].env.mhartid = idx; + s->harts[idx].env.mhartid = s->hartid_base + idx;qemu_register_reset (riscv_harts_cpu_reset, &s->harts[idx]);object_property_set_bool (OBJECT (&s->harts[idx]), true,"realized" , &err);
include/hw/riscv/riscv_hart.h +1 -0
@@ -35,6 +35,7 @@ typedef struct RISCVHartArrayState {/*< public >*/ uint32_t num_harts; +uint32_t hartid_base;char *cpu_type;RISCVCPU *harts; } RISCVHartArrayState;
Signature · 1 line
2.7.4
PATCH v8 18/32 riscv: sifive_u: Set the minimum number of cpus to 2
In reply to Bin MengIt is not useful if we only have one management CPU.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3:
- use management cpu count + 1 for the min_cpus
Changes in v2:
- update the file header to indicate at least 2 harts are created
hw/riscv/sifive_u.c | 4 +++- include/hw/riscv/sifive_u.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)
hw/riscv/sifive_u.c +3 -1
@@ -10,7 +10,8 @@* 1) CLINT (Core Level Interruptor) * 2) PLIC (Platform Level Interrupt Controller) * -* This board currently uses a hardcoded devicetree that indicates one hart. +* This board currently generates devicetree dynamically that indicates at least +* two harts. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License,
@@ -433,6 +434,7 @@ static void riscv_sifive_u_machine_init(MachineClass *mc)* management CPU. */ mc->max_cpus =4 ; + mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; }DEFINE_MACHINE ("sifive_u" , riscv_sifive_u_machine_init)
include/hw/riscv/sifive_u.h +2 -0
@@ -69,6 +69,8 @@ enum { SIFIVE_U_GEM_CLOCK_FREQ = 125000000 }; +#define SIFIVE_U_MANAGEMENT_CPU_COUNT 1 +#define SIFIVE_U_PLIC_HART_CONFIG "MS"#define SIFIVE_U_PLIC_NUM_SOURCES 54#define SIFIVE_U_PLIC_NUM_PRIORITIES 7
Signature · 1 line
2.7.4
Re: [Qemu-devel] [PATCH v8 18/32] riscv: sifive_u: Set the minimum number of cpus to 2
Quoted 49 lines · On Fri, 06 Sep 2019 09:20:05 PDT (-0700), [email protected] wrote:
It is not useful if we only have one management CPU.
Signed-off-by Bin Meng <[email protected]>Reviewed-by Alistair Francis <[email protected]>---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3:
- use management cpu count + 1 for themin_cpusChanges in v2:
- update the file header to indicate at least 2 harts are createdhw/riscv/sifive_u.c | 4 +++- include/hw/riscv/sifive_u.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)hw/riscv/sifive_u.c +3
-1@@ -10,7 +10,8 @@* 1) CLINT (Core Level Interruptor) * 2) PLIC (Platform Level Interrupt Controller) * -* This board currently uses a hardcoded devicetree that indicates one hart. +* This board currently generates devicetree dynamically that indicates at least +* two harts. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -433,6 +434,7 @@ static void riscv_sifive_u_machine_init(MachineClass *mc)* management CPU. */ mc->max_cpus =4 ; + mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; }DEFINE_MACHINE ("sifive_u" , riscv_sifive_u_machine_init)include/hw/riscv/sifive_u.h +0
-0
include/hw/riscv/sifive_u.h enum { · line 76
Quoted 8 lines
include/hw/riscv/sifive_u.h +2
-0@@ -69,6 +69,8 @@ enum { SIFIVE_U_GEM_CLOCK_FREQ = 125000000 }; +#define SIFIVE_U_MANAGEMENT_CPU_COUNT 1 +#define SIFIVE_U_PLIC_HART_CONFIG "MS"#define SIFIVE_U_PLIC_NUM_SOURCES 54#define SIFIVE_U_PLIC_NUM_PRIORITIES 7
This fails "make check", so I'm going to squash in this
hw/riscv/sifive_u.c +1 -0
@@ -528,6 +528,7 @@ static void riscv_sifive_u_machine_init(MachineClass *mc) mc->init = riscv_sifive_u_init; mc->max_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +SIFIVE_U_COMPUTE_CPU_COUNT ; mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; + mc->default_cpus = mc->max_cpus;
}
DEFINE_MACHINE("sifive_u", riscv_sifive_u_machine_init)
Re: [Qemu-devel] [PATCH v8 18/32] riscv: sifive_u: Set the minimum number of cpus to 2
Hi Palmer,
Quoted 67 lines · Palmer Dabbelt
Quoted 49 lines · On Fri, 06 Sep 2019 09:20:05 PDT (-0700), [email protected] wrote:
It is not useful if we only have one management CPU.
Signed-off-by Bin Meng <[email protected]>Reviewed-by Alistair Francis <[email protected]>---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3:
- use management cpu count + 1 for themin_cpusChanges in v2:
- update the file header to indicate at least 2 harts are createdhw/riscv/sifive_u.c | 4 +++- include/hw/riscv/sifive_u.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)hw/riscv/sifive_u.c +3
-1@@ -10,7 +10,8 @@* 1) CLINT (Core Level Interruptor) * 2) PLIC (Platform Level Interrupt Controller) * -* This board currently uses a hardcoded devicetree that indicates one hart. +* This board currently generates devicetree dynamically that indicates at least +* two harts. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -433,6 +434,7 @@ static void riscv_sifive_u_machine_init(MachineClass *mc)* management CPU. */ mc->max_cpus =4 ; + mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; }DEFINE_MACHINE ("sifive_u" , riscv_sifive_u_machine_init)include/hw/riscv/sifive_u.h +0
-0include/hw/riscv/sifive_u.h enum { · line 76
Quoted 8 lines
include/hw/riscv/sifive_u.h +2
-0@@ -69,6 +69,8 @@ enum { SIFIVE_U_GEM_CLOCK_FREQ = 125000000 }; +#define SIFIVE_U_MANAGEMENT_CPU_COUNT 1 +#define SIFIVE_U_PLIC_HART_CONFIG "MS"#define SIFIVE_U_PLIC_NUM_SOURCES 54#define SIFIVE_U_PLIC_NUM_PRIORITIES 7This fails "make check", so I'm going to squash in this
hw/riscv/sifive_u.c +0
-0
hw/riscv/sifive_u.c static void riscv_sifive_u_machine_init(MachineClass *mc) · line 531
Quoted 4 lines
hw/riscv/sifive_u.c +1
-0@@ -528,6 +528,7 @@ static void riscv_sifive_u_machine_init(MachineClass *mc) mc->init = riscv_sifive_u_init; mc->max_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +SIFIVE_U_COMPUTE_CPU_COUNT ; mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; + mc->default_cpus = mc->max_cpus;
Thank you for fixing the 'make check'. Shouldn't it be:
mc->default_cpus = mc->min_cpus;
?
hw/riscv/sifive_u.c static void riscv_sifive_u_machine_init(MachineClass *mc) · line 534
Quoted 3 lines
hw/riscv/sifive_u.c +0
-0}DEFINE_MACHINE ("sifive_u" , riscv_sifive_u_machine_init)
Regards,
Bin
Re: [Qemu-devel] [PATCH v8 18/32] riscv: sifive_u: Set the minimum number of cpus to 2
Quoted 77 lines · On Fri, 13 Sep 2019 08:25:21 PDT (-0700), [email protected] wrote:
Hi Palmer,
Quoted 67 lines · Palmer Dabbelt
Quoted 49 lines · On Fri, 06 Sep 2019 09:20:05 PDT (-0700), [email protected] wrote:
It is not useful if we only have one management CPU.
Signed-off-by Bin Meng <[email protected]>Reviewed-by Alistair Francis <[email protected]>---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3:
- use management cpu count + 1 for themin_cpusChanges in v2:
- update the file header to indicate at least 2 harts are createdhw/riscv/sifive_u.c | 4 +++- include/hw/riscv/sifive_u.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)hw/riscv/sifive_u.c +3
-1@@ -10,7 +10,8 @@* 1) CLINT (Core Level Interruptor) * 2) PLIC (Platform Level Interrupt Controller) * -* This board currently uses a hardcoded devicetree that indicates one hart. +* This board currently generates devicetree dynamically that indicates at least +* two harts. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -433,6 +434,7 @@ static void riscv_sifive_u_machine_init(MachineClass *mc)* management CPU. */ mc->max_cpus =4 ; + mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; }DEFINE_MACHINE ("sifive_u" , riscv_sifive_u_machine_init)include/hw/riscv/sifive_u.h +0
-0include/hw/riscv/sifive_u.h enum { · line 76
Quoted 8 lines
include/hw/riscv/sifive_u.h +2
-0@@ -69,6 +69,8 @@ enum { SIFIVE_U_GEM_CLOCK_FREQ = 125000000 }; +#define SIFIVE_U_MANAGEMENT_CPU_COUNT 1 +#define SIFIVE_U_PLIC_HART_CONFIG "MS"#define SIFIVE_U_PLIC_NUM_SOURCES 54#define SIFIVE_U_PLIC_NUM_PRIORITIES 7This fails "make check", so I'm going to squash in this
hw/riscv/sifive_u.c +0
-0hw/riscv/sifive_u.c static void riscv_sifive_u_machine_init(MachineClass *mc) · line 531
Quoted 4 lines
hw/riscv/sifive_u.c +1
-0@@ -528,6 +528,7 @@ static void riscv_sifive_u_machine_init(MachineClass *mc) mc->init = riscv_sifive_u_init; mc->max_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +SIFIVE_U_COMPUTE_CPU_COUNT ; mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; + mc->default_cpus = mc->max_cpus;Thank you for fixing the 'make check'. Shouldn't it be:
Quoted 1 line
mc->default_cpus=mc->min_cpus;
We have 5 harts on the board that this matches, so I figured that'd be the better default.
Quoted 9 lines
?
hw/riscv/sifive_u.c static void riscv_sifive_u_machine_init(MachineClass *mc) · line 534
Quoted 3 lines
hw/riscv/sifive_u.c +0
-0}DEFINE_MACHINE ("sifive_u" , riscv_sifive_u_machine_init)Regards,
Bin
Re: [Qemu-devel] [PATCH v8 18/32] riscv: sifive_u: Set the minimum number of cpus to 2
Hi Palmer,
Quoted 79 lines · Palmer Dabbelt
Quoted 77 lines · On Fri, 13 Sep 2019 08:25:21 PDT (-0700), [email protected] wrote:
Hi Palmer,
Quoted 67 lines · Palmer Dabbelt
Quoted 49 lines · On Fri, 06 Sep 2019 09:20:05 PDT (-0700), [email protected] wrote:
It is not useful if we only have one management CPU.
Signed-off-by Bin Meng <[email protected]>Reviewed-by Alistair Francis <[email protected]>---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3:
- use management cpu count + 1 for themin_cpusChanges in v2:
- update the file header to indicate at least 2 harts are createdhw/riscv/sifive_u.c | 4 +++- include/hw/riscv/sifive_u.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)hw/riscv/sifive_u.c +3
-1@@ -10,7 +10,8 @@* 1) CLINT (Core Level Interruptor) * 2) PLIC (Platform Level Interrupt Controller) * -* This board currently uses a hardcoded devicetree that indicates one hart. +* This board currently generates devicetree dynamically that indicates at least +* two harts. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -433,6 +434,7 @@ static void riscv_sifive_u_machine_init(MachineClass *mc)* management CPU. */ mc->max_cpus =4 ; + mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; }DEFINE_MACHINE ("sifive_u" , riscv_sifive_u_machine_init)include/hw/riscv/sifive_u.h +0
-0include/hw/riscv/sifive_u.h enum { · line 76
Quoted 8 lines
include/hw/riscv/sifive_u.h +2
-0@@ -69,6 +69,8 @@ enum { SIFIVE_U_GEM_CLOCK_FREQ = 125000000 }; +#define SIFIVE_U_MANAGEMENT_CPU_COUNT 1 +#define SIFIVE_U_PLIC_HART_CONFIG "MS"#define SIFIVE_U_PLIC_NUM_SOURCES 54#define SIFIVE_U_PLIC_NUM_PRIORITIES 7This fails "make check", so I'm going to squash in this
hw/riscv/sifive_u.c +0
-0hw/riscv/sifive_u.c static void riscv_sifive_u_machine_init(MachineClass *mc) · line 531
Quoted 4 lines
hw/riscv/sifive_u.c +1
-0@@ -528,6 +528,7 @@ static void riscv_sifive_u_machine_init(MachineClass *mc) mc->init = riscv_sifive_u_init; mc->max_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +SIFIVE_U_COMPUTE_CPU_COUNT ; mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; + mc->default_cpus = mc->max_cpus;Thank you for fixing the 'make check'. Shouldn't it be:
Quoted 5 lines
Quoted 1 line
mc->default_cpus=mc->min_cpus;We have 5 harts on the board that this matches, so I figured that'd be the better default.
Per my understanding mc->default_cpus is used when invoking QEMU without passing '-smp n' (that's what 'make check' uses), and with the updated sifive_u machine, '-smp 2' is the actual useful configuration to boot Linux. For consistency with user experience on other machines, without '-smp' means we want a uni-processor machine hence I would suggest we set "mc->default_cpus = mc->min_cpus".
Regards,
Bin
Re: [Qemu-devel] [PATCH v8 18/32] riscv: sifive_u: Set the minimum number of cpus to 2
Quoted 88 lines · On Sun, 15 Sep 2019 06:07:18 PDT (-0700), [email protected] wrote:
Hi Palmer,
Quoted 79 lines · Palmer Dabbelt
Quoted 77 lines · On Fri, 13 Sep 2019 08:25:21 PDT (-0700), [email protected] wrote:
Hi Palmer,
Quoted 67 lines · Palmer Dabbelt
Quoted 49 lines · On Fri, 06 Sep 2019 09:20:05 PDT (-0700), [email protected] wrote:
It is not useful if we only have one management CPU.
Signed-off-by Bin Meng <[email protected]>Reviewed-by Alistair Francis <[email protected]>---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3:
- use management cpu count + 1 for themin_cpusChanges in v2:
- update the file header to indicate at least 2 harts are createdhw/riscv/sifive_u.c | 4 +++- include/hw/riscv/sifive_u.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)hw/riscv/sifive_u.c +3
-1@@ -10,7 +10,8 @@* 1) CLINT (Core Level Interruptor) * 2) PLIC (Platform Level Interrupt Controller) * -* This board currently uses a hardcoded devicetree that indicates one hart. +* This board currently generates devicetree dynamically that indicates at least +* two harts. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -433,6 +434,7 @@ static void riscv_sifive_u_machine_init(MachineClass *mc)* management CPU. */ mc->max_cpus =4 ; + mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; }DEFINE_MACHINE ("sifive_u" , riscv_sifive_u_machine_init)include/hw/riscv/sifive_u.h +0
-0include/hw/riscv/sifive_u.h enum { · line 76
Quoted 8 lines
include/hw/riscv/sifive_u.h +2
-0@@ -69,6 +69,8 @@ enum { SIFIVE_U_GEM_CLOCK_FREQ = 125000000 }; +#define SIFIVE_U_MANAGEMENT_CPU_COUNT 1 +#define SIFIVE_U_PLIC_HART_CONFIG "MS"#define SIFIVE_U_PLIC_NUM_SOURCES 54#define SIFIVE_U_PLIC_NUM_PRIORITIES 7This fails "make check", so I'm going to squash in this
hw/riscv/sifive_u.c +0
-0hw/riscv/sifive_u.c static void riscv_sifive_u_machine_init(MachineClass *mc) · line 531
Quoted 4 lines
hw/riscv/sifive_u.c +1
-0@@ -528,6 +528,7 @@ static void riscv_sifive_u_machine_init(MachineClass *mc) mc->init = riscv_sifive_u_init; mc->max_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +SIFIVE_U_COMPUTE_CPU_COUNT ; mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; + mc->default_cpus = mc->max_cpus;Thank you for fixing the 'make check'. Shouldn't it be:
Quoted 5 lines
Quoted 1 line
mc->default_cpus=mc->min_cpus;We have 5 harts on the board that this matches, so I figured that'd be the better default.
Quoted 6 lines
Per my understanding
mc->default_cpusis used when invoking QEMU without passing '-smp n' (that's what 'make check' uses), and with the updatedsifive_umachine, '-smp 2' is the actual useful configuration to boot Linux. For consistency with user experience on other machines, without '-smp' means we want a uni-processor machine hence I would suggest we set "mc->default_cpus=mc->min_cpus".
OK, I've spun a v3. I never sent out v2 but I had tagged it, unless there's any opposition I'll send this out when I'm back on normal internet.
Re: [Qemu-devel] [Qemu-riscv] [PATCH v8 18/32] riscv: sifive_u: Set the minimum number of cpus to 2
Has there been testing with "-smp 2"? A while back I thought I read that the included uboot firmware was using a hard-coded device tree that indicated 4+1 CPUs, which I would have expected to cause Linux boot issues?
Jonathan
Quoted 112 lines · Palmer Dabbelt
Quoted 3 lines · On Sun, 15 Sep 2019 06:07:18 PDT (-0700), [email protected] wrote:
Hi Palmer,
On Sun, Sep 15, 2019 at 3:00 AM Palmer Dabbelt <[email protected]>
Quoted 5 lines · wrote:
Quoted 5 lines · On Fri, 13 Sep 2019 08:25:21 PDT (-0700), [email protected] wrote:
Quoted 3 lines
Hi Palmer,
On Fri, Sep 13, 2019 at 10:33 PM Palmer Dabbelt <[email protected]>
Quoted 24 lines · wrote:
Quoted 24 lines
Quoted 24 lines
Quoted 24 lines · On Fri, 06 Sep 2019 09:20:05 PDT (-0700), [email protected] wrote:
Quoted 22 lines
It is not useful if we only have one management CPU.
Signed-off-by Bin Meng <[email protected]>Reviewed-by Alistair Francis <[email protected]>---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3:
- use management cpu count + 1 for themin_cpusChanges in v2:
- update the file header to indicate at least 2 harts are createdhw/riscv/sifive_u.c | 4 +++- include/hw/riscv/sifive_u.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
hw/riscv/sifive_u.c line 13
Quoted 9 lines
hw/riscv/sifive_u.c +0
-1@@ -10,7 +10,8 @@* 1) CLINT (Core Level Interruptor) * 2) PLIC (Platform Level Interrupt Controller) * -* This board currently uses a hardcoded devicetree that indicates one hart.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
hw/riscv/sifive_u.c line 13
Quoted 1 line
hw/riscv/sifive_u.c +1
-0+* This board currently generates devicetree dynamically that indicates at least
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
hw/riscv/sifive_u.c line 16
Quoted 3 lines
hw/riscv/sifive_u.c +1
-0+* two harts. * * This program is free software; you can redistribute it and/or modify it
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
hw/riscv/sifive_u.c line 17
Quoted 1 line
hw/riscv/sifive_u.c +0
-0* under the terms and conditions of the GNU General Public License,
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
hw/riscv/sifive_u.c static void
Quoted 1 line
hw/riscv/sifive_u.c +0
-0@@ -433,6 +434,7 @@ static void
riscv_sifive_u_machine_init(MachineClass *mc)Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Review
Quoted 8 lines
hw/riscv/sifive_u.c +1
-0* management CPU. */ mc->max_cpus =4 ; + mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; }DEFINE_MACHINE ("sifive_u" , riscv_sifive_u_machine_init)(quoted diff) +0
-0
b/include/hw/riscv/sifive_u.hQuoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
include/hw/riscv/sifive_u.h enum { · line 76
Quoted 12 lines
index f25bad8..6d22741 100644
include/hw/riscv/sifive_u.h +2
-0@@ -69,6 +69,8 @@ enum { SIFIVE_U_GEM_CLOCK_FREQ = 125000000 }; +#define SIFIVE_U_MANAGEMENT_CPU_COUNT 1 +#define SIFIVE_U_PLIC_HART_CONFIG "MS"#define SIFIVE_U_PLIC_NUM_SOURCES 54#define SIFIVE_U_PLIC_NUM_PRIORITIES 7This fails "make check", so I'm going to squash in this
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
hw/riscv/sifive_u.c static void
Quoted 5 lines
hw/riscv/sifive_u.c +0
-0@@ -528,6 +528,7 @@ static void
riscv_sifive_u_machine_init(MachineClass *mc)Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
hw/riscv/sifive_u.c static void · line 529
Quoted 2 lines
hw/riscv/sifive_u.c +0
-0mc->init = riscv_sifive_u_init; mc->max_cpus = SIFIVE_U_MANAGEMENT_CPU_COUNT +
SIFIVE_U_COMPUTE_CPU_COUNT;Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
hw/riscv/sifive_u.c static void riscv_sifive_u_machine_init(MachineClass *mc) · line 531
Quoted 2 lines
hw/riscv/sifive_u.c +1
-0mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; + mc->default_cpus = mc->max_cpus;Thank you for fixing the 'make check'. Shouldn't it be:
mc->default_cpus=mc->min_cpus;We have 5 harts on the board that this matches, so I figured that'd be
the
Quoted 9 lines
Quoted 2 lines
better default.
Per my understanding
mc->default_cpusis used when invoking QEMU without passing '-smp n' (that's what 'make check' uses), and with the updatedsifive_umachine, '-smp 2' is the actual useful configuration to boot Linux. For consistency with user experience on other machines, without '-smp' means we want a uni-processor machine hence I would suggest we set "mc->default_cpus=mc->min_cpus".OK, I've spun a v3. I never sent out v2 but I had tagged it, unless there's
any opposition I'll send this out when I'm back on normal internet.
Re: [Qemu-devel] [Qemu-riscv] [PATCH v8 18/32] riscv: sifive_u: Set the minimum number of cpus to 2
Quoted 3 lines · On Sun, 15 Sep 2019 10:39:38 PDT (-0700), [email protected] wrote:
Has there been testing with "-smp 2"? A while back I thought I read that the included uboot firmware was using a hard-coded device tree that indicated 4+1 CPUs, which I would have expected to cause Linux boot issues?
It works for me.
Quoted 117 lines
Jonathan
Quoted 112 lines · Palmer Dabbelt
Quoted 3 lines · On Sun, 15 Sep 2019 06:07:18 PDT (-0700), [email protected] wrote:
Hi Palmer,
On Sun, Sep 15, 2019 at 3:00 AM Palmer Dabbelt <[email protected]>
Quoted 5 lines · wrote:
Quoted 5 lines · On Fri, 13 Sep 2019 08:25:21 PDT (-0700), [email protected] wrote:
Quoted 3 lines
Hi Palmer,
On Fri, Sep 13, 2019 at 10:33 PM Palmer Dabbelt <[email protected]>
Quoted 24 lines · wrote:
Quoted 24 lines
Quoted 24 lines
Quoted 24 lines · On Fri, 06 Sep 2019 09:20:05 PDT (-0700), [email protected] wrote:
Quoted 22 lines
It is not useful if we only have one management CPU.
Signed-off-by Bin Meng <[email protected]>Reviewed-by Alistair Francis <[email protected]>---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3:
- use management cpu count + 1 for themin_cpusChanges in v2:
- update the file header to indicate at least 2 harts are createdhw/riscv/sifive_u.c | 4 +++- include/hw/riscv/sifive_u.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
hw/riscv/sifive_u.c line 13
Quoted 9 lines
hw/riscv/sifive_u.c +0
-1@@ -10,7 +10,8 @@* 1) CLINT (Core Level Interruptor) * 2) PLIC (Platform Level Interrupt Controller) * -* This board currently uses a hardcoded devicetree that indicates one hart.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
hw/riscv/sifive_u.c line 13
Quoted 1 line
hw/riscv/sifive_u.c +1
-0+* This board currently generates devicetree dynamically that indicates at least
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
hw/riscv/sifive_u.c line 16
Quoted 3 lines
hw/riscv/sifive_u.c +1
-0+* two harts. * * This program is free software; you can redistribute it and/or modify it
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
hw/riscv/sifive_u.c line 17
Quoted 1 line
hw/riscv/sifive_u.c +0
-0* under the terms and conditions of the GNU General Public License,
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
hw/riscv/sifive_u.c static void
Quoted 1 line
hw/riscv/sifive_u.c +0
-0@@ -433,6 +434,7 @@ static void
riscv_sifive_u_machine_init(MachineClass *mc)Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Review
Quoted 8 lines
hw/riscv/sifive_u.c +1
-0* management CPU. */ mc->max_cpus =4 ; + mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; }DEFINE_MACHINE ("sifive_u" , riscv_sifive_u_machine_init)(quoted diff) +0
-0
b/include/hw/riscv/sifive_u.hQuoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
include/hw/riscv/sifive_u.h enum { · line 76
Quoted 12 lines
index f25bad8..6d22741 100644
include/hw/riscv/sifive_u.h +2
-0@@ -69,6 +69,8 @@ enum { SIFIVE_U_GEM_CLOCK_FREQ = 125000000 }; +#define SIFIVE_U_MANAGEMENT_CPU_COUNT 1 +#define SIFIVE_U_PLIC_HART_CONFIG "MS"#define SIFIVE_U_PLIC_NUM_SOURCES 54#define SIFIVE_U_PLIC_NUM_PRIORITIES 7This fails "make check", so I'm going to squash in this
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
hw/riscv/sifive_u.c static void
Quoted 5 lines
hw/riscv/sifive_u.c +0
-0@@ -528,6 +528,7 @@ static void
riscv_sifive_u_machine_init(MachineClass *mc)Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
hw/riscv/sifive_u.c static void · line 529
Quoted 2 lines
hw/riscv/sifive_u.c +0
-0mc->init = riscv_sifive_u_init; mc->max_cpus = SIFIVE_U_MANAGEMENT_CPU_COUNT +
SIFIVE_U_COMPUTE_CPU_COUNT;Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
hw/riscv/sifive_u.c static void riscv_sifive_u_machine_init(MachineClass *mc) · line 531
Quoted 2 lines
hw/riscv/sifive_u.c +1
-0mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; + mc->default_cpus = mc->max_cpus;Thank you for fixing the 'make check'. Shouldn't it be:
mc->default_cpus=mc->min_cpus;We have 5 harts on the board that this matches, so I figured that'd be
the
Quoted 9 lines
Quoted 2 lines
better default.
Per my understanding
mc->default_cpusis used when invoking QEMU without passing '-smp n' (that's what 'make check' uses), and with the updatedsifive_umachine, '-smp 2' is the actual useful configuration to boot Linux. For consistency with user experience on other machines, without '-smp' means we want a uni-processor machine hence I would suggest we set "mc->default_cpus=mc->min_cpus".OK, I've spun a v3. I never sent out v2 but I had tagged it, unless there's
any opposition I'll send this out when I'm back on normal internet.
Re: [Qemu-devel] [Qemu-riscv] [PATCH v8 18/32] riscv: sifive_u: Set the minimum number of cpus to 2
In reply to Jonathan BehrensHi Jonathan,
Quoted 3 lines · Jonathan Behrens
Has there been testing with "-smp 2"? A while back I thought I read that the included uboot firmware was using a hard-coded device tree that indicated 4+1 CPUs, which I would have expected to cause Linux boot issues?
No, U-Boot is using DTB that was passed from previous stage firmware - OpenSBI.
On a real board this is 4 + 1. On QEMU, DTB is dynamically generated per "-smp n" settings. So there should be no problem.
Regards,
Bin
Re: [Qemu-devel] [PATCH v8 18/32] riscv: sifive_u: Set the minimum number of cpus to 2
In reply to Bin MengQuoted 89 lines · Bin Meng
Hi Palmer,
Quoted 79 lines · Palmer Dabbelt
Quoted 77 lines · On Fri, 13 Sep 2019 08:25:21 PDT (-0700), [email protected] wrote:
Hi Palmer,
Quoted 67 lines · Palmer Dabbelt
Quoted 49 lines · On Fri, 06 Sep 2019 09:20:05 PDT (-0700), [email protected] wrote:
It is not useful if we only have one management CPU.
Signed-off-by Bin Meng <[email protected]>Reviewed-by Alistair Francis <[email protected]>---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3:
- use management cpu count + 1 for themin_cpusChanges in v2:
- update the file header to indicate at least 2 harts are createdhw/riscv/sifive_u.c | 4 +++- include/hw/riscv/sifive_u.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)hw/riscv/sifive_u.c +3
-1@@ -10,7 +10,8 @@* 1) CLINT (Core Level Interruptor) * 2) PLIC (Platform Level Interrupt Controller) * -* This board currently uses a hardcoded devicetree that indicates one hart. +* This board currently generates devicetree dynamically that indicates at least +* two harts. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -433,6 +434,7 @@ static void riscv_sifive_u_machine_init(MachineClass *mc)* management CPU. */ mc->max_cpus =4 ; + mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; }DEFINE_MACHINE ("sifive_u" , riscv_sifive_u_machine_init)include/hw/riscv/sifive_u.h +0
-0include/hw/riscv/sifive_u.h enum { · line 76
Quoted 8 lines
include/hw/riscv/sifive_u.h +2
-0@@ -69,6 +69,8 @@ enum { SIFIVE_U_GEM_CLOCK_FREQ = 125000000 }; +#define SIFIVE_U_MANAGEMENT_CPU_COUNT 1 +#define SIFIVE_U_PLIC_HART_CONFIG "MS"#define SIFIVE_U_PLIC_NUM_SOURCES 54#define SIFIVE_U_PLIC_NUM_PRIORITIES 7This fails "make check", so I'm going to squash in this
hw/riscv/sifive_u.c +0
-0hw/riscv/sifive_u.c static void riscv_sifive_u_machine_init(MachineClass *mc) · line 531
Quoted 4 lines
hw/riscv/sifive_u.c +1
-0@@ -528,6 +528,7 @@ static void riscv_sifive_u_machine_init(MachineClass *mc) mc->init = riscv_sifive_u_init; mc->max_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +SIFIVE_U_COMPUTE_CPU_COUNT ; mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; + mc->default_cpus = mc->max_cpus;Thank you for fixing the 'make check'. Shouldn't it be:
Quoted 5 lines
Quoted 1 line
mc->default_cpus=mc->min_cpus;We have 5 harts on the board that this matches, so I figured that'd be the better default.
Quoted 6 lines
Per my understanding
mc->default_cpusis used when invoking QEMU without passing '-smp n' (that's what 'make check' uses), and with the updatedsifive_umachine, '-smp 2' is the actual useful configuration to boot Linux. For consistency with user experience on other machines, without '-smp' means we want a uni-processor machine hence I would suggest we set "mc->default_cpus=mc->min_cpus".
Agreed!
Alistair
Quoted 4 lines
Regards,
Bin
PATCH v8 19/32 riscv: sifive_u: Update hart configuration to reflect the real FU540 SoC
In reply to Bin MengThe FU540-C000 includes a 64-bit E51 RISC-V core and four 64-bit U54 RISC-V cores. Currently the sifive_u machine only populates 4 U54 cores. Update the max cpu number to 5 to reflect the real hardware, by creating 2 CPU clusters as containers for RISC-V hart arrays to populate heterogeneous harts.
The cpu nodes in the generated DTS have been updated as well.
---
Changes in v8: None
Changes in v7: None
Changes in v6:
- generate u cpus unconditionally (not test ms->smp.cpus > 1) since the minimal required number of cpu is now 2, due to this patch is reordered
Changes in v5: None
Changes in v4:
- changed to create clusters for each cpu type
Changes in v3:
- changed to use macros for management and compute cpu count
Changes in v2:
- fixed the "interrupts-extended" property size
hw/riscv/sifive_u.c | 92 +++++++++++++++++++++++++++++++++------------ include/hw/riscv/sifive_u.h | 6 ++- 2 files changed, 72 insertions(+), 26 deletions(-)
hw/riscv/sifive_u.c +67 -25
@@ -11,7 +11,7 @@* 2) PLIC (Platform Level Interrupt Controller) * * This board currently generates devicetree dynamically that indicates at least -* two harts. +* two harts and up to five harts. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License,
@@ -34,6 +34,7 @@#include "hw/loader.h" #include "hw/sysbus.h" #include "hw/char/serial.h" +#include "hw/cpu/cluster.h" #include "target/riscv/cpu.h" #include "hw/riscv/riscv_hart.h" #include "hw/riscv/sifive_plic.h"
@@ -70,6 +71,7 @@ static const struct MemmapEntry {static void create_fdt (SiFiveUState *s,const struct MemmapEntry *memmap,uint64_t mem_size,const char *cmdline) { +MachineState *ms =MACHINE (qdev_get_machine ());void *fdt;int cpu;uint32_t *cells;
@@ -110,15 +112,21 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cell (fdt,"/cpus" ,"#size-cells" ,0x0 );qemu_fdt_setprop_cell (fdt,"/cpus" ,"#address-cells" ,0x1 ); -for (cpu = s->soc.cpus.num_harts -1 ; cpu >=0 ; cpu--) { +for (cpu = ms->smp.cpus -1 ; cpu >=0 ; cpu--) {int cpu_phandle = phandle++; nodename =g_strdup_printf ("/cpus/cpu@%d" , cpu);char *intc =g_strdup_printf ("/cpus/cpu@%d/interrupt-controller" , cpu); -char *isa =riscv_isa_string (&s->soc.cpus.harts[cpu]); +char *isa;qemu_fdt_add_subnode (fdt, nodename);qemu_fdt_setprop_cell (fdt, nodename,"clock-frequency" ,SIFIVE_U_CLOCK_FREQ ); -qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv48" ); +/* cpu 0 is the management hart that does not have mmu */ +if (cpu !=0 ) { +qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv48" ); + isa =riscv_isa_string (&s->soc.u_cpus.harts[cpu -1 ]); + }else { + isa =riscv_isa_string (&s->soc.e_cpus.harts[0 ]); + }qemu_fdt_setprop_string (fdt, nodename,"riscv,isa" , isa);qemu_fdt_setprop_string (fdt, nodename,"compatible" ,"riscv" );qemu_fdt_setprop_string (fdt, nodename,"status" ,"okay" );
@@ -134,8 +142,8 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,g_free (nodename); } - cells =g_new0 (uint32_t, s->soc.cpus.num_harts *4 ); -for (cpu =0 ; cpu < s->soc.cpus.num_harts; cpu++) { + cells =g_new0 (uint32_t, ms->smp.cpus *4 ); +for (cpu =0 ; cpu < ms->smp.cpus; cpu++) { nodename =g_strdup_printf ("/cpus/cpu@%d/interrupt-controller" , cpu);uint32_t intc_phandle =qemu_fdt_get_phandle (fdt, nodename);
@@ -153,20 +161,26 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,0x0 , memmap[SIFIVE_U_CLINT ].base, 0x0, memmap[SIFIVE_U_CLINT].size);qemu_fdt_setprop (fdt, nodename,"interrupts-extended" , - cells, s->soc.cpus.num_harts *sizeof (uint32_t ) *4 ); + cells, ms->smp.cpus *sizeof (uint32_t ) *4 );g_free (cells);g_free (nodename); plic_phandle = phandle++; - cells =g_new0 (uint32_t, s->soc.cpus.num_harts *4 ); -for (cpu =0 ; cpu < s->soc.cpus.num_harts; cpu++) { + cells =g_new0 (uint32_t, ms->smp.cpus *4 -2 ); +for (cpu =0 ; cpu < ms->smp.cpus; cpu++) { nodename =g_strdup_printf ("/cpus/cpu@%d/interrupt-controller" , cpu);uint32_t intc_phandle =qemu_fdt_get_phandle (fdt, nodename); - cells[cpu *4 +0 ] =cpu_to_be32 (intc_phandle); - cells[cpu *4 +1 ] =cpu_to_be32 (IRQ_M_EXT ); - cells[cpu *4 +2 ] =cpu_to_be32 (intc_phandle); - cells[cpu *4 +3 ] =cpu_to_be32 (IRQ_S_EXT ); +/* cpu 0 is the management hart that does not have S-mode */ +if (cpu ==0 ) { + cells[0 ] =cpu_to_be32 (intc_phandle); + cells[1 ] =cpu_to_be32 (IRQ_M_EXT ); + }else { + cells[cpu *4 -2 ] =cpu_to_be32 (intc_phandle); + cells[cpu *4 -1 ] =cpu_to_be32 (IRQ_M_EXT ); + cells[cpu *4 +0 ] =cpu_to_be32 (intc_phandle); + cells[cpu *4 +1 ] =cpu_to_be32 (IRQ_S_EXT ); + }g_free (nodename); } nodename = g_strdup_printf("/soc/interrupt-controller@%lx",
@@ -176,7 +190,7 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_string (fdt, nodename,"compatible" ,"riscv,plic0" );qemu_fdt_setprop (fdt, nodename,"interrupt-controller" ,NULL ,0 );qemu_fdt_setprop (fdt, nodename,"interrupts-extended" , - cells, s->soc.cpus.num_harts *sizeof (uint32_t ) *4 ); + cells, (ms->smp.cpus *4 -2 ) *sizeof (uint32_t ));qemu_fdt_setprop_cells (fdt, nodename,"reg" ,0x0 , memmap[SIFIVE_U_PLIC ].base,0x0 , memmap[SIFIVE_U_PLIC ].size);
@@ -339,12 +353,31 @@ static void riscv_sifive_u_soc_init(Object *obj)MachineState *ms =MACHINE (qdev_get_machine ());SiFiveUSoCState *s =RISCV_U_SOC (obj); -object_initialize_child (obj,"cpus" , &s->cpus,sizeof (s->cpus), -TYPE_RISCV_HART_ARRAY , &error_abort,NULL ); -object_property_set_str (OBJECT (&s->cpus),SIFIVE_U_CPU ,"cpu-type" , - &error_abort); -object_property_set_int (OBJECT (&s->cpus), ms->smp.cpus,"num-harts" , - &error_abort); +object_initialize_child (obj,"e-cluster" , &s->e_cluster, +sizeof (s->e_cluster),TYPE_CPU_CLUSTER , + &error_abort,NULL ); +qdev_prop_set_uint32 (DEVICE (&s->e_cluster),"cluster-id" ,0 ); + +object_initialize_child (OBJECT (&s->e_cluster),"e-cpus" , + &s->e_cpus,sizeof (s->e_cpus), +TYPE_RISCV_HART_ARRAY , &error_abort, +NULL ); +qdev_prop_set_uint32 (DEVICE (&s->e_cpus),"num-harts" ,1 ); +qdev_prop_set_uint32 (DEVICE (&s->e_cpus),"hartid-base" ,0 ); +qdev_prop_set_string (DEVICE (&s->e_cpus),"cpu-type" ,SIFIVE_E_CPU ); + +object_initialize_child (obj,"u-cluster" , &s->u_cluster, +sizeof (s->u_cluster),TYPE_CPU_CLUSTER , + &error_abort,NULL ); +qdev_prop_set_uint32 (DEVICE (&s->u_cluster),"cluster-id" ,1 ); + +object_initialize_child (OBJECT (&s->u_cluster),"u-cpus" , + &s->u_cpus,sizeof (s->u_cpus), +TYPE_RISCV_HART_ARRAY , &error_abort, +NULL ); +qdev_prop_set_uint32 (DEVICE (&s->u_cpus),"num-harts" , ms->smp.cpus -1 ); +qdev_prop_set_uint32 (DEVICE (&s->u_cpus),"hartid-base" ,1 ); +qdev_prop_set_string (DEVICE (&s->u_cpus),"cpu-type" ,SIFIVE_U_CPU );sysbus_init_child_obj (obj,"gem" , &s->gem,sizeof (s->gem),TYPE_CADENCE_GEM );
@@ -364,7 +397,19 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp)Error *err =NULL ;NICInfo *nd = &nd_table[0 ]; -object_property_set_bool (OBJECT (&s->cpus), true,"realized" , +object_property_set_bool (OBJECT (&s->e_cpus), true,"realized" , + &error_abort); +object_property_set_bool (OBJECT (&s->u_cpus), true,"realized" , + &error_abort); +/* +* The cluster must be realized after the RISC-V hart array container, +* as the container's CPU object is only created on realize, and the +* CPU must exist and have been parented into the cluster before the +* cluster is realized. +*/ +object_property_set_bool (OBJECT (&s->e_cluster), true,"realized" , + &error_abort); +object_property_set_bool (OBJECT (&s->u_cluster), true,"realized" , &error_abort);/* boot rom */
@@ -430,10 +475,7 @@ static void riscv_sifive_u_machine_init(MachineClass *mc) { mc->desc ="RISC-V Board compatible with SiFive U SDK" ; mc->init = riscv_sifive_u_init; -/* The real hardware has 5 CPUs, but one of them is a small embedded power -* management CPU. -*/ - mc->max_cpus =4 ; + mc->max_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +SIFIVE_U_COMPUTE_CPU_COUNT ; mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; }
include/hw/riscv/sifive_u.h +5 -1
@@ -32,7 +32,10 @@ typedef struct SiFiveUSoCState {SysBusDevice parent_obj;/*< public >*/ -RISCVHartArrayState cpus; +CPUClusterState e_cluster; +CPUClusterState u_cluster; +RISCVHartArrayState e_cpus; +RISCVHartArrayState u_cpus;DeviceState *plic;CadenceGEMState gem; } SiFiveUSoCState;
@@ -70,6 +73,7 @@ enum { };#define SIFIVE_U_MANAGEMENT_CPU_COUNT 1 +#define SIFIVE_U_COMPUTE_CPU_COUNT 4#define SIFIVE_U_PLIC_HART_CONFIG "MS"#define SIFIVE_U_PLIC_NUM_SOURCES 54
Signature · 1 line
2.7.4
PATCH v8 20/32 riscv: sifive_u: Update PLIC hart topology configuration string
In reply to Bin MengWith heterogeneous harts config, the PLIC hart topology configuration string are "M,MS,.." because of the monitor hart #0.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
hw/riscv/sifive_u.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
hw/riscv/sifive_u.c +4 -3
@@ -424,10 +424,11 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp) plic_hart_config =g_malloc0 (plic_hart_config_len);for (i =0 ; i < ms->smp.cpus; i++) {if (i !=0 ) { -strncat (plic_hart_config,"," , plic_hart_config_len); +strncat (plic_hart_config,"," SIFIVE_U_PLIC_HART_CONFIG , + plic_hart_config_len); + }else { +strncat (plic_hart_config,"M" , plic_hart_config_len); } -strncat (plic_hart_config,SIFIVE_U_PLIC_HART_CONFIG , - plic_hart_config_len); plic_hart_config_len -= (strlen (SIFIVE_U_PLIC_HART_CONFIG ) +1 ); }
Signature · 1 line
2.7.4
PATCH v8 21/32 riscv: sifive: Implement PRCI model for FU540
In reply to Bin MengThis adds a simple PRCI model for FU540 (sifive_u). It has different register layout from the existing PRCI model for FE310 (sifive_e).
---
Changes in v8: None
Changes in v7: None
Changes in v6:
- fix incorrectly indented comment lines
- remove unneeded brackets around assignment
Changes in v5:
- change to use defines instead of enums
- change to use qemu_log_mask(LOG_GUEST_ERROR,...) in sifive_u_prci
- creating a 32-bit val variable and using that instead of casting everywhere in sifive_u_prci_write()
- move all register initialization to sifive_u_prci_reset() function
- drop sifive_u_prci_create()
- s/codes that worked/code that works/g
Changes in v4:
- prefix all macros/variables/functions with SIFIVE_U/sifive_u in the sifive_u_prci driver
Changes in v3: None
Changes in v2: None
hw/riscv/Makefile.objs | 1 + hw/riscv/sifive_u_prci.c | 169 +++++++++++++++++++++++++++++++++++++++ include/hw/riscv/sifive_u_prci.h | 81 +++++++++++++++++++ 3 files changed, 251 insertions(+) create mode 100644 hw/riscv/sifive_u_prci.c create mode 100644 include/hw/riscv/sifive_u_prci.h
hw/riscv/Makefile.objs +1 -0
@@ -8,6 +8,7 @@ obj-$(CONFIG_SIFIVE) += sifive_gpio.o obj-$(CONFIG_SIFIVE) += sifive_plic.o obj-$(CONFIG_SIFIVE) += sifive_test.o obj-$(CONFIG_SIFIVE_U) += sifive_u.o +obj-$(CONFIG_SIFIVE_U) += sifive_u_prci.o obj-$(CONFIG_SIFIVE) += sifive_uart.o obj-$(CONFIG_SPIKE) += spike.o obj-$(CONFIG_RISCV_VIRT) += virt.o
hw/riscv/sifive_u_prci.c new file +169 -0
169 lines not on this page · raw message
include/hw/riscv/sifive_u_prci.h new file +81 -0
81 lines not on this page · raw message
Signature · 1 line
2.7.4
Re: [Qemu-devel] [PATCH v8 21/32] riscv: sifive: Implement PRCI model for FU540
Quoted 261 lines · On Fri, 06 Sep 2019 09:20:08 PDT (-0700), [email protected] wrote:
This adds a simple PRCI model for FU540 (
sifive_u). It has different register layout from the existing PRCI model for FE310 (sifive_e).Signed-off-by Bin Meng <[email protected]>Reviewed-by Alistair Francis <[email protected]>---
Changes in v8: None
Changes in v7: None
Changes in v6:
- fix incorrectly indented comment lines
- remove unneeded brackets around assignmentChanges in v5:
- change to use defines instead of enums
- change to useqemu_log_mask(LOG_GUEST_ERROR,...)insifive_u_prci
- creating a 32-bit val variable and using that instead of casting everywhere insifive_u_prci_write()
- move all register initialization tosifive_u_prci_reset()function
- dropsifive_u_prci_create()
- s/codes that worked/code that works/gChanges in v4:
- prefix all macros/variables/functions with SIFIVE_U/sifive_u in thesifive_u_prcidriverChanges in v3: None
Changes in v2: Nonehw/riscv/Makefile.objs | 1 + hw/riscv/sifive_u_prci.c | 169 +++++++++++++++++++++++++++++++++++++++ include/hw/riscv/sifive_u_prci.h | 81 +++++++++++++++++++ 3 files changed, 251 insertions(+) create mode 100644 hw/riscv/sifive_u_prci.c create mode 100644 include/hw/riscv/sifive_u_prci.hhw/riscv/Makefile.objs +1
-0@@ -8,6 +8,7 @@ obj-$(CONFIG_SIFIVE) += sifive_gpio.o obj-$(CONFIG_SIFIVE) += sifive_plic.o obj-$(CONFIG_SIFIVE) += sifive_test.o obj-$(CONFIG_SIFIVE_U) += sifive_u.o +obj-$(CONFIG_SIFIVE_U) += sifive_u_prci.o obj-$(CONFIG_SIFIVE) += sifive_uart.o obj-$(CONFIG_SPIKE) += spike.o obj-$(CONFIG_RISCV_VIRT) += virt.ohw/riscv/sifive_u_prci.c new file +169
-0@@ -0,0 +1,169 @@ +/* +* QEMU SiFive U PRCI (Power, Reset, Clock, Interrupt) +* +* Copyright (c) 2019 Bin Meng <[email protected]> +* +* Simple model of the PRCI to emulate register reads made by the SDK BSP +* +* This program is free software; you can redistribute it and/or modify it +* under the terms and conditions of the GNU General Public License, +* version 2 or later, as published by the Free Software Foundation. +* +* This program is distributed in the hope it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License along with +* this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "qemu/osdep.h" +#include "hw/sysbus.h" +#include "qemu/log.h" +#include "qemu/module.h" +#include "hw/riscv/sifive_u_prci.h" + +static uint64_t sifive_u_prci_read (void *opaque,hwaddr addr,unsigned int size) +{ +SiFiveUPRCIState *s = opaque; + +switch (addr) { +case SIFIVE_U_PRCI_HFXOSCCFG : +return s->hfxosccfg; +case SIFIVE_U_PRCI_COREPLLCFG0 : +return s->corepllcfg0; +case SIFIVE_U_PRCI_DDRPLLCFG0 : +return s->ddrpllcfg0; +case SIFIVE_U_PRCI_DDRPLLCFG1 : +return s->ddrpllcfg1; +case SIFIVE_U_PRCI_GEMGXLPLLCFG0 : +return s->gemgxlpllcfg0; +case SIFIVE_U_PRCI_GEMGXLPLLCFG1 : +return s->gemgxlpllcfg1; +case SIFIVE_U_PRCI_CORECLKSEL : +return s->coreclksel; +case SIFIVE_U_PRCI_DEVICESRESET : +return s->devicesreset; +case SIFIVE_U_PRCI_CLKMUXSTATUS : +return s->clkmuxstatus; + } + +qemu_log_mask (LOG_GUEST_ERROR ,"%s: read: addr=0x%" HWADDR_PRIx"\n" , + __func__, addr); + +return 0 ; +} + +static void sifive_u_prci_write (void *opaque,hwaddr addr, +uint64_t val64,unsigned int size) +{ +SiFiveUPRCIState *s = opaque; +uint32_t val32 = (uint32_t )val64; + +switch (addr) { +case SIFIVE_U_PRCI_HFXOSCCFG : + s->hfxosccfg = val32; +/* OSC stays ready */ + s->hfxosccfg |=SIFIVE_U_PRCI_HFXOSCCFG_RDY ; +break ; +case SIFIVE_U_PRCI_COREPLLCFG0 : + s->corepllcfg0 = val32; +/* internal feedback */ + s->corepllcfg0 |=SIFIVE_U_PRCI_PLLCFG0_FSE ; +/* PLL stays locked */ + s->corepllcfg0 |=SIFIVE_U_PRCI_PLLCFG0_LOCK ; +break ; +case SIFIVE_U_PRCI_DDRPLLCFG0 : + s->ddrpllcfg0 = val32; +/* internal feedback */ + s->ddrpllcfg0 |=SIFIVE_U_PRCI_PLLCFG0_FSE ; +/* PLL stays locked */ + s->ddrpllcfg0 |=SIFIVE_U_PRCI_PLLCFG0_LOCK ; +break ; +case SIFIVE_U_PRCI_DDRPLLCFG1 : + s->ddrpllcfg1 = val32; +break ; +case SIFIVE_U_PRCI_GEMGXLPLLCFG0 : + s->gemgxlpllcfg0 = val32; +/* internal feedback */ + s->gemgxlpllcfg0 |=SIFIVE_U_PRCI_PLLCFG0_FSE ; +/* PLL stays locked */ + s->gemgxlpllcfg0 |=SIFIVE_U_PRCI_PLLCFG0_LOCK ; +break ; +case SIFIVE_U_PRCI_GEMGXLPLLCFG1 : + s->gemgxlpllcfg1 = val32; +break ; +case SIFIVE_U_PRCI_CORECLKSEL : + s->coreclksel = val32; +break ; +case SIFIVE_U_PRCI_DEVICESRESET : + s->devicesreset = val32; +break ; +case SIFIVE_U_PRCI_CLKMUXSTATUS : + s->clkmuxstatus = val32; +break ; +default : +qemu_log_mask (LOG_GUEST_ERROR ,"%s: bad write: addr=0x%" HWADDR_PRIx +" v=0x%x\n" , __func__, addr, val32); + } +} + +static const MemoryRegionOps sifive_u_prci_ops = { + .read = sifive_u_prci_read, + .write = sifive_u_prci_write, + .endianness =DEVICE_NATIVE_ENDIAN , + .valid = { + .min_access_size =4 , + .max_access_size =4 + } +}; + +static void sifive_u_prci_realize (DeviceState *dev,Error **errp) +{ +SiFiveUPRCIState *s =SIFIVE_U_PRCI (dev); + +memory_region_init_io (&s->mmio,OBJECT (dev), &sifive_u_prci_ops, s, +TYPE_SIFIVE_U_PRCI ,SIFIVE_U_PRCI_REG_SIZE ); +sysbus_init_mmio (SYS_BUS_DEVICE (dev), &s->mmio); +} + +static void sifive_u_prci_reset (DeviceState *dev) +{ +SiFiveUPRCIState *s =SIFIVE_U_PRCI (dev); + +/* Initialize register to power-on-reset values */ + s->hfxosccfg =SIFIVE_U_PRCI_HFXOSCCFG_RDY |SIFIVE_U_PRCI_HFXOSCCFG_EN ; + s->corepllcfg0 =SIFIVE_U_PRCI_PLLCFG0_DIVR |SIFIVE_U_PRCI_PLLCFG0_DIVF | +SIFIVE_U_PRCI_PLLCFG0_DIVQ |SIFIVE_U_PRCI_PLLCFG0_FSE | +SIFIVE_U_PRCI_PLLCFG0_LOCK ; + s->ddrpllcfg0 =SIFIVE_U_PRCI_PLLCFG0_DIVR |SIFIVE_U_PRCI_PLLCFG0_DIVF | +SIFIVE_U_PRCI_PLLCFG0_DIVQ |SIFIVE_U_PRCI_PLLCFG0_FSE | +SIFIVE_U_PRCI_PLLCFG0_LOCK ; + s->gemgxlpllcfg0 =SIFIVE_U_PRCI_PLLCFG0_DIVR |SIFIVE_U_PRCI_PLLCFG0_DIVF | +SIFIVE_U_PRCI_PLLCFG0_DIVQ |SIFIVE_U_PRCI_PLLCFG0_FSE | +SIFIVE_U_PRCI_PLLCFG0_LOCK ; + s->coreclksel =SIFIVE_U_PRCI_CORECLKSEL_HFCLK ; +} + +static void sifive_u_prci_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->realize = sifive_u_prci_realize; + dc->reset = sifive_u_prci_reset; +} + +static const TypeInfo sifive_u_prci_info = { + .name =TYPE_SIFIVE_U_PRCI , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (SiFiveUPRCIState), + .class_init = sifive_u_prci_class_init, +}; + +static void sifive_u_prci_register_types (void ) +{ +type_register_static (&sifive_u_prci_info); +} + +type_init (sifive_u_prci_register_types)include/hw/riscv/sifive_u_prci.h new file +31
-0@@ -0,0 +1,81 @@ +/* +* QEMU SiFive U PRCI (Power, Reset, Clock, Interrupt) interface +* +* Copyright (c) 2019 Bin Meng <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms and conditions of the GNU General Public License, +* version 2 or later, as published by the Free Software Foundation. +* +* This program is distributed in the hope it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License along with +* this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef HW_SIFIVE_U_PRCI_H +#define HW_SIFIVE_U_PRCI_H + +#define SIFIVE_U_PRCI_HFXOSCCFG 0x00 +#define SIFIVE_U_PRCI_COREPLLCFG0 0x04 +#define SIFIVE_U_PRCI_DDRPLLCFG0 0x0C +#define SIFIVE_U_PRCI_DDRPLLCFG1 0x10 +#define SIFIVE_U_PRCI_GEMGXLPLLCFG0 0x1C +#define SIFIVE_U_PRCI_GEMGXLPLLCFG1 0x20 +#define SIFIVE_U_PRCI_CORECLKSEL 0x24 +#define SIFIVE_U_PRCI_DEVICESRESET 0x28 +#define SIFIVE_U_PRCI_CLKMUXSTATUS 0x2C +
include/hw/riscv/sifive_u_prci.h line 41
Quoted 10 lines
include/hw/riscv/sifive_u_prci.h new file +10
-0+/* +* Current FU540-C000 manual says ready bit is at bit 29, but +* freedom-u540-c000-bootloader codes (ux00prci.h) says it is at bit 31. +* We have to trust the actual code that works. +* +* see https://github.com/sifive/freedom-u540-c000-bootloader +*/ + +#define SIFIVE_U_PRCI_HFXOSCCFG_EN (1 << 30) +#define SIFIVE_U_PRCI_HFXOSCCFG_RDY (1 << 31)
Thanks for finding this. I checked the RTL and it is in fact bit 31, I've pinged our documentation guy to see if we can get a new PDF built.
Quoted 30 lines
include/hw/riscv/sifive_u_prci.h new file +30
-0+ +/* xxxPLLCFG0 register bits */ +#define SIFIVE_U_PRCI_PLLCFG0_DIVR (1 << 0) +#define SIFIVE_U_PRCI_PLLCFG0_DIVF (31 << 6) +#define SIFIVE_U_PRCI_PLLCFG0_DIVQ (3 << 15) +#define SIFIVE_U_PRCI_PLLCFG0_FSE (1 << 25) +#define SIFIVE_U_PRCI_PLLCFG0_LOCK (1 << 31) + +/* xxxPLLCFG1 register bits */ +#define SIFIVE_U_PRCI_PLLCFG1_CKE (1 << 24) + +/* coreclksel register bits */ +#define SIFIVE_U_PRCI_CORECLKSEL_HFCLK (1 << 0) + + +#define SIFIVE_U_PRCI_REG_SIZE 0x1000 + +#define TYPE_SIFIVE_U_PRCI "riscv.sifive.u.prci" + +#define SIFIVE_U_PRCI (obj) \ + OBJECT_CHECK(SiFiveUPRCIState, (obj), TYPE_SIFIVE_U_PRCI) + +typedef struct SiFiveUPRCIState { + /*< private >*/ + SysBusDevice parent_obj; + + /*< public >*/ + MemoryRegion mmio; + uint32_t hfxosccfg; + uint32_t corepllcfg0;
include/hw/riscv/sifive_u_prci.h line 81
Quoted 10 lines
include/hw/riscv/sifive_u_prci.h new file +10
-0+uint32_t ddrpllcfg0; +uint32_t ddrpllcfg1; +uint32_t gemgxlpllcfg0; +uint32_t gemgxlpllcfg1; +uint32_t coreclksel; +uint32_t devicesreset; + uint32_t clkmuxstatus; +} SiFiveUPRCIState; + +#endif /* HW_SIFIVE_U_PRCI_H */
PATCH v8 22/32 riscv: sifive_u: Generate hfclk and rtcclk nodes
In reply to Bin MengTo keep in sync with Linux kernel device tree, generate hfclk and rtcclk nodes in the device tree, to be referenced by PRCI node.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
hw/riscv/sifive_u.c | 23 +++++++++++++++++++++++ include/hw/riscv/sifive_u.h | 2 ++ 2 files changed, 25 insertions(+)
hw/riscv/sifive_u.c +23 -0
@@ -79,6 +79,7 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,char ethclk_names[] ="pclk\0hclk\0tx_clk" ;uint32_t plic_phandle, ethclk_phandle, phandle =1 ;uint32_t uartclk_phandle; +uint32_t hfclk_phandle, rtcclk_phandle; fdt = s->fdt =create_device_tree (&s->fdt_size);if (!fdt) {
@@ -97,6 +98,28 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cell (fdt,"/soc" ,"#size-cells" ,0x2 );qemu_fdt_setprop_cell (fdt,"/soc" ,"#address-cells" ,0x2 ); + hfclk_phandle = phandle++; + nodename =g_strdup_printf ("/hfclk" ); +qemu_fdt_add_subnode (fdt, nodename); +qemu_fdt_setprop_cell (fdt, nodename,"phandle" , hfclk_phandle); +qemu_fdt_setprop_string (fdt, nodename,"clock-output-names" ,"hfclk" ); +qemu_fdt_setprop_cell (fdt, nodename,"clock-frequency" , +SIFIVE_U_HFCLK_FREQ ); +qemu_fdt_setprop_string (fdt, nodename,"compatible" ,"fixed-clock" ); +qemu_fdt_setprop_cell (fdt, nodename,"#clock-cells" ,0x0 ); +g_free (nodename); + + rtcclk_phandle = phandle++; + nodename =g_strdup_printf ("/rtcclk" ); +qemu_fdt_add_subnode (fdt, nodename); +qemu_fdt_setprop_cell (fdt, nodename,"phandle" , rtcclk_phandle); +qemu_fdt_setprop_string (fdt, nodename,"clock-output-names" ,"rtcclk" ); +qemu_fdt_setprop_cell (fdt, nodename,"clock-frequency" , +SIFIVE_U_RTCCLK_FREQ ); +qemu_fdt_setprop_string (fdt, nodename,"compatible" ,"fixed-clock" ); +qemu_fdt_setprop_cell (fdt, nodename,"#clock-cells" ,0x0 ); +g_free (nodename); + nodename =g_strdup_printf ("/memory@%lx" , (long )memmap[SIFIVE_U_DRAM ].base);qemu_fdt_add_subnode (fdt, nodename);
include/hw/riscv/sifive_u.h +2 -0
@@ -69,6 +69,8 @@ enum {enum {SIFIVE_U_CLOCK_FREQ =1000000000 , +SIFIVE_U_HFCLK_FREQ =33333333 , +SIFIVE_U_RTCCLK_FREQ =1000000 ,SIFIVE_U_GEM_CLOCK_FREQ =125000000 };
Signature · 1 line
2.7.4
PATCH v8 23/32 riscv: sifive_u: Add PRCI block to the SoC
In reply to Bin MengAdd PRCI mmio base address and size mappings to sifive_u machine, and generate the corresponding device tree node.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5:
- create sifive_u_prci block directly in the machine codes, instead of calling sifive_u_prci_create()
Changes in v4: None
Changes in v3: None
Changes in v2: None
hw/riscv/sifive_u.c | 24 +++++++++++++++++++++++- include/hw/riscv/sifive_u.h | 3 +++ 2 files changed, 26 insertions(+), 1 deletion(-)
hw/riscv/sifive_u.c +23 -1
@@ -9,6 +9,7 @@* 0) UART * 1) CLINT (Core Level Interruptor) * 2) PLIC (Platform Level Interrupt Controller) +* 3) PRCI (Power, Reset, Clock, Interrupt) * * This board currently generates devicetree dynamically that indicates at least * two harts and up to five harts.
@@ -60,6 +61,7 @@ static const struct MemmapEntry { [SIFIVE_U_MROM] = { 0x1000, 0x11000 }, [SIFIVE_U_CLINT] = { 0x2000000, 0x10000 }, [SIFIVE_U_PLIC] = { 0xc000000, 0x4000000 }, + [SIFIVE_U_PRCI] = { 0x10000000, 0x1000 }, [SIFIVE_U_UART0] = { 0x10013000, 0x1000 }, [SIFIVE_U_UART1] = { 0x10023000, 0x1000 }, [SIFIVE_U_DRAM] = { 0x80000000, 0x0 },
@@ -77,7 +79,7 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,uint32_t *cells;char *nodename;char ethclk_names[] ="pclk\0hclk\0tx_clk" ; -uint32_t plic_phandle, ethclk_phandle, phandle =1 ; +uint32_t plic_phandle, prci_phandle, ethclk_phandle, phandle =1 ;uint32_t uartclk_phandle;uint32_t hfclk_phandle, rtcclk_phandle;
@@ -188,6 +190,21 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,g_free (cells);g_free (nodename); + prci_phandle = phandle++; + nodename =g_strdup_printf ("/soc/clock-controller@%lx" , + (long )memmap[SIFIVE_U_PRCI ].base); +qemu_fdt_add_subnode (fdt, nodename); +qemu_fdt_setprop_cell (fdt, nodename,"phandle" , prci_phandle); +qemu_fdt_setprop_cell (fdt, nodename,"#clock-cells" ,0x1 ); +qemu_fdt_setprop_cells (fdt, nodename,"clocks" , + hfclk_phandle, rtcclk_phandle); +qemu_fdt_setprop_cells (fdt, nodename,"reg" , +0x0 , memmap[SIFIVE_U_PRCI ].base, +0x0 , memmap[SIFIVE_U_PRCI ].size); +qemu_fdt_setprop_string (fdt, nodename,"compatible" , +"sifive,fu540-c000-prci" ); +g_free (nodename); + plic_phandle = phandle++; cells =g_new0 (uint32_t, ms->smp.cpus *4 -2 );for (cpu =0 ; cpu < ms->smp.cpus; cpu++) {
@@ -402,6 +419,8 @@ static void riscv_sifive_u_soc_init(Object *obj)qdev_prop_set_uint32 (DEVICE (&s->u_cpus),"hartid-base" ,1 );qdev_prop_set_string (DEVICE (&s->u_cpus),"cpu-type" ,SIFIVE_U_CPU ); +sysbus_init_child_obj (obj,"prci" , &s->prci,sizeof (s->prci), +TYPE_SIFIVE_U_PRCI );sysbus_init_child_obj (obj,"gem" , &s->gem,sizeof (s->gem),TYPE_CADENCE_GEM ); }
@@ -475,6 +494,9 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp) memmap[SIFIVE_U_CLINT ].size, ms->smp.cpus, SIFIVE_SIP_BASE, SIFIVE_TIMECMP_BASE, SIFIVE_TIME_BASE); +object_property_set_bool (OBJECT (&s->prci), true,"realized" , &err); +sysbus_mmio_map (SYS_BUS_DEVICE (&s->prci),0 , memmap[SIFIVE_U_PRCI ].base); +for (i =0 ; i <SIFIVE_U_PLIC_NUM_SOURCES ; i++) { plic_gpios[i] =qdev_get_gpio_in (DEVICE (s->plic), i); }
include/hw/riscv/sifive_u.h +3 -0
@@ -22,6 +22,7 @@#include "hw/net/cadence_gem.h" #include "hw/riscv/riscv_hart.h" #include "hw/riscv/sifive_cpu.h" +#include "hw/riscv/sifive_u_prci.h" #define TYPE_RISCV_U_SOC "riscv.sifive.u.soc"#define RISCV_U_SOC (obj) \
@@ -37,6 +38,7 @@ typedef struct SiFiveUSoCState {RISCVHartArrayState e_cpus;RISCVHartArrayState u_cpus;DeviceState *plic; +SiFiveUPRCIState prci;CadenceGEMState gem; } SiFiveUSoCState;
@@ -55,6 +57,7 @@ enum {SIFIVE_U_MROM ,SIFIVE_U_CLINT ,SIFIVE_U_PLIC , +SIFIVE_U_PRCI ,SIFIVE_U_UART0 ,SIFIVE_U_UART1 , SIFIVE_U_DRAM,
Signature · 1 line
2.7.4
PATCH v8 24/32 riscv: sifive_u: Reference PRCI clocks in UART and ethernet nodes
In reply to Bin MengNow that we have added a PRCI node, update existing UART and ethernet nodes to reference PRCI as their clock sources, to keep in sync with the Linux kernel device tree.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
hw/riscv/sifive_u.c | 7 ++++--- include/hw/riscv/sifive_u_prci.h | 10 ++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-)
hw/riscv/sifive_u.c +4 -3
@@ -78,7 +78,7 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,int cpu;uint32_t *cells;char *nodename; -char ethclk_names[] ="pclk\0hclk\0tx_clk" ; +char ethclk_names[] ="pclk\0hclk" ;uint32_t plic_phandle, prci_phandle, ethclk_phandle, phandle =1 ;uint32_t uartclk_phandle;uint32_t hfclk_phandle, rtcclk_phandle;
@@ -263,7 +263,7 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cell (fdt, nodename,"interrupt-parent" , plic_phandle);qemu_fdt_setprop_cell (fdt, nodename,"interrupts" ,SIFIVE_U_GEM_IRQ );qemu_fdt_setprop_cells (fdt, nodename,"clocks" , - ethclk_phandle, ethclk_phandle, ethclk_phandle); + prci_phandle,PRCI_CLK_GEMGXLPLL , prci_phandle,PRCI_CLK_GEMGXLPLL );qemu_fdt_setprop (fdt, nodename,"clock-names" , ethclk_names,sizeof (ethclk_names));qemu_fdt_setprop_cell (fdt, nodename,"#address-cells" ,1 );
@@ -293,7 +293,8 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cells (fdt, nodename,"reg" ,0x0 , memmap[SIFIVE_U_UART0 ].base,0x0 , memmap[SIFIVE_U_UART0 ].size); -qemu_fdt_setprop_cell (fdt, nodename,"clocks" , uartclk_phandle); +qemu_fdt_setprop_cells (fdt, nodename,"clocks" , + prci_phandle,PRCI_CLK_TLCLK );qemu_fdt_setprop_cell (fdt, nodename,"interrupt-parent" , plic_phandle);qemu_fdt_setprop_cell (fdt, nodename,"interrupts" ,SIFIVE_U_UART0_IRQ );
include/hw/riscv/sifive_u_prci.h +10 -0
@@ -78,4 +78,14 @@ typedef struct SiFiveUPRCIState { uint32_t clkmuxstatus; } SiFiveUPRCIState; +/* +* Clock indexes for use by Device Tree data and the PRCI driver. +* +* These values are from sifive-fu540-prci.h in the Linux kernel. +*/ +#define PRCI_CLK_COREPLL 0 +#define PRCI_CLK_DDRPLL 1 +#define PRCI_CLK_GEMGXLPLL 2 +#define PRCI_CLK_TLCLK 3 +#endif /* HW_SIFIVE_U_PRCI_H */
Signature · 1 line
2.7.4
PATCH v8 25/32 riscv: sifive_u: Update UART base addresses and IRQs
In reply to Bin MengThis updates the UART base address and IRQs to match the hardware.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3:
- update IRQ numbers of both UARTs to match hardware as well
Changes in v2: None
hw/riscv/sifive_u.c | 4 ++-- include/hw/riscv/sifive_u.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
hw/riscv/sifive_u.c +2 -2
@@ -62,8 +62,8 @@ static const struct MemmapEntry { [SIFIVE_U_CLINT] = { 0x2000000, 0x10000 }, [SIFIVE_U_PLIC] = { 0xc000000, 0x4000000 }, [SIFIVE_U_PRCI] = { 0x10000000, 0x1000 }, - [SIFIVE_U_UART0] = { 0x10013000, 0x1000 }, - [SIFIVE_U_UART1] = { 0x10023000, 0x1000 }, + [SIFIVE_U_UART0] = { 0x10010000, 0x1000 }, + [SIFIVE_U_UART1] = { 0x10011000, 0x1000 }, [SIFIVE_U_DRAM] = { 0x80000000, 0x0 }, [SIFIVE_U_GEM] = { 0x100900FC, 0x2000 }, };
include/hw/riscv/sifive_u.h +2 -2
@@ -65,8 +65,8 @@ enum { };enum { -SIFIVE_U_UART0_IRQ =3 , -SIFIVE_U_UART1_IRQ =4 , +SIFIVE_U_UART0_IRQ =4 , +SIFIVE_U_UART1_IRQ =5 ,SIFIVE_U_GEM_IRQ =0x35 };
Signature · 1 line
2.7.4
PATCH v8 26/32 riscv: sifive_u: Change UART node name in device tree
In reply to Bin MengOpenSBI for fu540 does DT fix up (see fu540_modify_dt()) by updating chosen "stdout-path" to point to "/soc/serial@...", and U-Boot will use this information to locate the serial node and probe its driver. However currently we generate the UART node name as "/soc/uart@...", causing U-Boot fail to find the serial node in DT.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
hw/riscv/sifive_u.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/riscv/sifive_u.c +1 -1
@@ -286,7 +286,7 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, uartclk_phandle =qemu_fdt_get_phandle (fdt, nodename);g_free (nodename); - nodename =g_strdup_printf ("/soc/uart@%lx" , + nodename =g_strdup_printf ("/soc/serial@%lx" , (long )memmap[SIFIVE_U_UART0 ].base);qemu_fdt_add_subnode (fdt, nodename);qemu_fdt_setprop_string (fdt, nodename,"compatible" ,"sifive,uart0" );
Signature · 1 line
2.7.4
PATCH v8 27/32 riscv: roms: Update default bios for sifive_u machine
In reply to Bin MengWith the support of heterogeneous harts and PRCI model, it's now possible to use the OpenSBI image (PLATFORM=sifive/fu540) built for the real hardware.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin | Bin 40968 -> 45064 bytes roms/Makefile | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-)
pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin binary +0 -0
roms/Makefile +2 -2
@@ -182,8 +182,8 @@ opensbi64-virt: opensbi64-sifive_u: $(MAKE) -C opensbi \ CROSS_COMPILE=$(riscv64_cross_prefix) \ - PLATFORM="qemu/sifive_u" - cp opensbi/build/platform/qemu/sifive_u/firmware/fw_jump.bin ../pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin + PLATFORM="sifive/fu540" + cp opensbi/build/platform/sifive/fu540/firmware/fw_jump.bin ../pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin clean: rm -rf seabios/.config seabios/out seabios/builds
Signature · 1 line
2.7.4
PATCH v8 28/32 riscv: sifive: Implement a model for SiFive FU540 OTP
In reply to Bin MengThis implements a simple model for SiFive FU540 OTP (One-Time Programmable) Memory interface, primarily for reading out the stored serial number from the first 1 KiB of the 16 KiB OTP memory reserved by SiFive for internal use.
---
Changes in v8:
- Don't cast addr to an int, use the correct macros in sifive_u_otp_read() and sifive_u_otp_write()
- Include "hw/qdev-properties.h" in sifive_u_otp.c
Changes in v7: None
Changes in v6: None
Changes in v5:
- change to use defines instead of enums
- change to use qemu_log_mask(LOG_GUEST_ERROR,...) in sifive_u_otp
- creating a 32-bit val variable and using that instead of casting everywhere in sifive_u_otp_write()
- move all register initialization to sifive_u_otp_reset() function
- drop sifive_u_otp_create()
Changes in v4:
- prefix all macros/variables/functions with SIFIVE_U/sifive_u in the sifive_u_otp driver
Changes in v3: None
Changes in v2: None
hw/riscv/Makefile.objs | 1 + hw/riscv/sifive_u_otp.c | 191 ++++++++++++++++++++++++++++++++++++++++ include/hw/riscv/sifive_u_otp.h | 80 +++++++++++++++++ 3 files changed, 272 insertions(+) create mode 100644 hw/riscv/sifive_u_otp.c create mode 100644 include/hw/riscv/sifive_u_otp.h
hw/riscv/Makefile.objs +1 -0
@@ -8,6 +8,7 @@ obj-$(CONFIG_SIFIVE) += sifive_gpio.o obj-$(CONFIG_SIFIVE) += sifive_plic.o obj-$(CONFIG_SIFIVE) += sifive_test.o obj-$(CONFIG_SIFIVE_U) += sifive_u.o +obj-$(CONFIG_SIFIVE_U) += sifive_u_otp.o obj-$(CONFIG_SIFIVE_U) += sifive_u_prci.o obj-$(CONFIG_SIFIVE) += sifive_uart.o obj-$(CONFIG_SPIKE) += spike.o
hw/riscv/sifive_u_otp.c new file +191 -0
191 lines not on this page · raw message
include/hw/riscv/sifive_u_otp.h new file +80 -0
80 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v8 29/32 riscv: sifive_u: Instantiate OTP memory with a serial number
In reply to Bin MengThis adds an OTP memory with a given serial number to the sifive_u machine. With such support, the upstream U-Boot for sifive_fu540 boots out of the box on the sifive_u machine.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5:
- create sifive_u_otp block directly in the machine codes, instead of calling sifive_u_otp_create()
Changes in v4: None
Changes in v3: None
Changes in v2: None
hw/riscv/sifive_u.c | 9 +++++++++ include/hw/riscv/sifive_u.h | 3 +++ 2 files changed, 12 insertions(+)
hw/riscv/sifive_u.c +9 -0
@@ -10,6 +10,7 @@* 1) CLINT (Core Level Interruptor) * 2) PLIC (Platform Level Interrupt Controller) * 3) PRCI (Power, Reset, Clock, Interrupt) +* 4) OTP (One-Time Programmable) memory with stored serial number * * This board currently generates devicetree dynamically that indicates at least * two harts and up to five harts.
@@ -64,10 +65,12 @@ static const struct MemmapEntry { [SIFIVE_U_PRCI] = { 0x10000000, 0x1000 }, [SIFIVE_U_UART0] = { 0x10010000, 0x1000 }, [SIFIVE_U_UART1] = { 0x10011000, 0x1000 }, + [SIFIVE_U_OTP] = { 0x10070000, 0x1000 }, [SIFIVE_U_DRAM] = { 0x80000000, 0x0 }, [SIFIVE_U_GEM] = { 0x100900FC, 0x2000 }, }; +#define OTP_SERIAL 1#define GEM_REVISION 0x10070109 static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,
@@ -422,6 +425,9 @@ static void riscv_sifive_u_soc_init(Object *obj)sysbus_init_child_obj (obj,"prci" , &s->prci,sizeof (s->prci),TYPE_SIFIVE_U_PRCI ); +sysbus_init_child_obj (obj,"otp" , &s->otp,sizeof (s->otp), +TYPE_SIFIVE_U_OTP ); +qdev_prop_set_uint32 (DEVICE (&s->otp),"serial" ,OTP_SERIAL );sysbus_init_child_obj (obj,"gem" , &s->gem,sizeof (s->gem),TYPE_CADENCE_GEM ); }
@@ -498,6 +504,9 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp)object_property_set_bool (OBJECT (&s->prci), true,"realized" , &err);sysbus_mmio_map (SYS_BUS_DEVICE (&s->prci),0 , memmap[SIFIVE_U_PRCI ].base); +object_property_set_bool (OBJECT (&s->otp), true,"realized" , &err); +sysbus_mmio_map (SYS_BUS_DEVICE (&s->otp),0 , memmap[SIFIVE_U_OTP ].base); +for (i =0 ; i <SIFIVE_U_PLIC_NUM_SOURCES ; i++) { plic_gpios[i] =qdev_get_gpio_in (DEVICE (s->plic), i); }
include/hw/riscv/sifive_u.h +3 -0
@@ -23,6 +23,7 @@#include "hw/riscv/riscv_hart.h" #include "hw/riscv/sifive_cpu.h" #include "hw/riscv/sifive_u_prci.h" +#include "hw/riscv/sifive_u_otp.h" #define TYPE_RISCV_U_SOC "riscv.sifive.u.soc"#define RISCV_U_SOC (obj) \
@@ -39,6 +40,7 @@ typedef struct SiFiveUSoCState {RISCVHartArrayState u_cpus;DeviceState *plic;SiFiveUPRCIState prci; +SiFiveUOTPState otp;CadenceGEMState gem; } SiFiveUSoCState;
@@ -60,6 +62,7 @@ enum {SIFIVE_U_PRCI ,SIFIVE_U_UART0 ,SIFIVE_U_UART1 , +SIFIVE_U_OTP ,SIFIVE_U_DRAM , SIFIVE_U_GEM };
Signature · 1 line
2.7.4
PATCH v8 30/32 riscv: sifive_u: Fix broken GEM support
In reply to Bin MengAt present the GEM support in sifive_u machine is seriously broken. The GEM block register base was set to a weird number (0x100900FC), which for no way could work with the cadence_gem model in QEMU.
Not like other GEM variants, the FU540-specific GEM has a management block to control 10/100/1000Mbps link speed changes, that is mapped to 0x100a0000. We can simply map it into MMIO space without special handling using create_unimplemented_device().
Update the GEM node compatible string to use the official name used by the upstream Linux kernel, and add the management block reg base & size to the <reg> property encoding.
Tested with upstream U-Boot and Linux kernel MACB drivers.
---
Changes in v8:
- select UNIMP in sifive_u Kconfig due to applied commit "hw/misc: Add a config switch for the "unimplemented" device" in latest qemu/master
Changes in v7: None
Changes in v6: None
Changes in v5:
- add the missing "local-mac-address" property in the ethernet node
Changes in v4: None
Changes in v3: None
Changes in v2:
- use create_unimplemented_device() to create the GEM management block instead of sifive_mmio_emulate()
- add "phy-handle" property to the ethernet node
hw/riscv/Kconfig | 1 + hw/riscv/sifive_u.c | 24 ++++++++++++++++++++---- include/hw/riscv/sifive_u.h | 3 ++- 3 files changed, 23 insertions(+), 5 deletions(-)
hw/riscv/Kconfig +1 -0
@@ -19,6 +19,7 @@ config SIFIVE_U select CADENCE select HART select SIFIVE + select UNIMP config SPIKE bool
hw/riscv/sifive_u.c +20 -4
@@ -3,6 +3,7 @@* * Copyright (c) 2016-2017 Sagar Karandikar, [email protected] * Copyright (c) 2017 SiFive, Inc. +* Copyright (c) 2019 Bin Meng <[email protected]> * * Provides a board compatible with the SiFive Freedom U SDK: *
@@ -11,6 +12,7 @@* 2) PLIC (Platform Level Interrupt Controller) * 3) PRCI (Power, Reset, Clock, Interrupt) * 4) OTP (One-Time Programmable) memory with stored serial number +* 5) GEM (Gigabit Ethernet Controller) and management block * * This board currently generates devicetree dynamically that indicates at least * two harts and up to five harts.
@@ -37,6 +39,7 @@#include "hw/sysbus.h" #include "hw/char/serial.h" #include "hw/cpu/cluster.h" +#include "hw/misc/unimp.h" #include "target/riscv/cpu.h" #include "hw/riscv/riscv_hart.h" #include "hw/riscv/sifive_plic.h"
@@ -45,6 +48,7 @@#include "hw/riscv/sifive_u.h" #include "hw/riscv/boot.h" #include "chardev/char.h" +#include "net/eth.h" #include "sysemu/arch_init.h" #include "sysemu/device_tree.h" #include "sysemu/sysemu.h"
@@ -67,7 +71,8 @@ static const struct MemmapEntry { [SIFIVE_U_UART1] = { 0x10011000, 0x1000 }, [SIFIVE_U_OTP] = { 0x10070000, 0x1000 }, [SIFIVE_U_DRAM] = { 0x80000000, 0x0 }, - [SIFIVE_U_GEM] = { 0x100900FC, 0x2000 }, + [SIFIVE_U_GEM] = { 0x10090000, 0x2000 }, + [SIFIVE_U_GEM_MGMT] = { 0x100a0000, 0x1000 }, };#define OTP_SERIAL 1
@@ -84,7 +89,7 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,char ethclk_names[] ="pclk\0hclk" ;uint32_t plic_phandle, prci_phandle, ethclk_phandle, phandle =1 ;uint32_t uartclk_phandle; -uint32_t hfclk_phandle, rtcclk_phandle; +uint32_t hfclk_phandle, rtcclk_phandle, phy_phandle; fdt = s->fdt =create_device_tree (&s->fdt_size);if (!fdt) {
@@ -254,21 +259,28 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, ethclk_phandle =qemu_fdt_get_phandle (fdt, nodename);g_free (nodename); + phy_phandle = phandle++; nodename =g_strdup_printf ("/soc/ethernet@%lx" , (long )memmap[SIFIVE_U_GEM ].base);qemu_fdt_add_subnode (fdt, nodename); -qemu_fdt_setprop_string (fdt, nodename,"compatible" ,"cdns,macb" ); +qemu_fdt_setprop_string (fdt, nodename,"compatible" , +"sifive,fu540-c000-gem" );qemu_fdt_setprop_cells (fdt, nodename,"reg" ,0x0 , memmap[SIFIVE_U_GEM ].base, -0x0 , memmap[SIFIVE_U_GEM ].size); +0x0 , memmap[SIFIVE_U_GEM ].size, +0x0 , memmap[SIFIVE_U_GEM_MGMT ].base, +0x0 , memmap[SIFIVE_U_GEM_MGMT ].size);qemu_fdt_setprop_string (fdt, nodename,"reg-names" ,"control" );qemu_fdt_setprop_string (fdt, nodename,"phy-mode" ,"gmii" ); +qemu_fdt_setprop_cell (fdt, nodename,"phy-handle" , phy_phandle);qemu_fdt_setprop_cell (fdt, nodename,"interrupt-parent" , plic_phandle);qemu_fdt_setprop_cell (fdt, nodename,"interrupts" ,SIFIVE_U_GEM_IRQ );qemu_fdt_setprop_cells (fdt, nodename,"clocks" , prci_phandle,PRCI_CLK_GEMGXLPLL , prci_phandle,PRCI_CLK_GEMGXLPLL );qemu_fdt_setprop (fdt, nodename,"clock-names" , ethclk_names,sizeof (ethclk_names)); +qemu_fdt_setprop (fdt, nodename,"local-mac-address" , + s->soc.gem.conf.macaddr.a,ETH_ALEN );qemu_fdt_setprop_cell (fdt, nodename,"#address-cells" ,1 );qemu_fdt_setprop_cell (fdt, nodename,"#size-cells" ,0 );g_free (nodename);
@@ -276,6 +288,7 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, nodename =g_strdup_printf ("/soc/ethernet@%lx/ethernet-phy@0" , (long )memmap[SIFIVE_U_GEM ].base);qemu_fdt_add_subnode (fdt, nodename); +qemu_fdt_setprop_cell (fdt, nodename,"phandle" , phy_phandle);qemu_fdt_setprop_cell (fdt, nodename,"reg" ,0x0 );g_free (nodename);
@@ -525,6 +538,9 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (SYS_BUS_DEVICE (&s->gem),0 , memmap[SIFIVE_U_GEM ].base);sysbus_connect_irq (SYS_BUS_DEVICE (&s->gem),0 , plic_gpios[SIFIVE_U_GEM_IRQ ]); + +create_unimplemented_device ("riscv.sifive.u.gem-mgmt" , + memmap[SIFIVE_U_GEM_MGMT ].base, memmap[SIFIVE_U_GEM_MGMT ].size); }static void riscv_sifive_u_machine_init (MachineClass *mc)
include/hw/riscv/sifive_u.h +2 -1
@@ -64,7 +64,8 @@ enum {SIFIVE_U_UART1 ,SIFIVE_U_OTP ,SIFIVE_U_DRAM , -SIFIVE_U_GEM +SIFIVE_U_GEM , +SIFIVE_U_GEM_MGMT }; enum {
Signature · 1 line
2.7.4
PATCH v8 31/32 riscv: sifive_u: Remove handcrafted clock nodes for UART and ethernet
In reply to Bin MengIn the past we did not have a model for PRCI, hence two handcrafted clock nodes ("/soc/ethclk" and "/soc/uartclk") were created for the purpose of supplying hard-coded clock frequencies. But now since we have added the PRCI support in QEMU, we don't need them any more.
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4:
- new patch to remove handcrafted clock nodes for UART and ethernet
Changes in v3: None
Changes in v2: None
hw/riscv/sifive_u.c | 24 +----------------------- include/hw/riscv/sifive_u.h | 3 +-- 2 files changed, 2 insertions(+), 25 deletions(-)
hw/riscv/sifive_u.c +1 -23
@@ -87,8 +87,7 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,uint32_t *cells;char *nodename;char ethclk_names[] ="pclk\0hclk" ; -uint32_t plic_phandle, prci_phandle, ethclk_phandle, phandle =1 ; -uint32_t uartclk_phandle; +uint32_t plic_phandle, prci_phandle, phandle =1 ;uint32_t hfclk_phandle, rtcclk_phandle, phy_phandle; fdt = s->fdt =create_device_tree (&s->fdt_size);
@@ -248,17 +247,6 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,g_free (cells);g_free (nodename); - ethclk_phandle = phandle++; - nodename =g_strdup_printf ("/soc/ethclk" ); -qemu_fdt_add_subnode (fdt, nodename); -qemu_fdt_setprop_string (fdt, nodename,"compatible" ,"fixed-clock" ); -qemu_fdt_setprop_cell (fdt, nodename,"#clock-cells" ,0x0 ); -qemu_fdt_setprop_cell (fdt, nodename,"clock-frequency" , -SIFIVE_U_GEM_CLOCK_FREQ ); -qemu_fdt_setprop_cell (fdt, nodename,"phandle" , ethclk_phandle); - ethclk_phandle =qemu_fdt_get_phandle (fdt, nodename); -g_free (nodename); - phy_phandle = phandle++; nodename =g_strdup_printf ("/soc/ethernet@%lx" , (long )memmap[SIFIVE_U_GEM ].base);
@@ -292,16 +280,6 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cell (fdt, nodename,"reg" ,0x0 );g_free (nodename); - uartclk_phandle = phandle++; - nodename =g_strdup_printf ("/soc/uartclk" ); -qemu_fdt_add_subnode (fdt, nodename); -qemu_fdt_setprop_string (fdt, nodename,"compatible" ,"fixed-clock" ); -qemu_fdt_setprop_cell (fdt, nodename,"#clock-cells" ,0x0 ); -qemu_fdt_setprop_cell (fdt, nodename,"clock-frequency" ,3686400 ); -qemu_fdt_setprop_cell (fdt, nodename,"phandle" , uartclk_phandle); - uartclk_phandle =qemu_fdt_get_phandle (fdt, nodename); -g_free (nodename); - nodename =g_strdup_printf ("/soc/serial@%lx" , (long )memmap[SIFIVE_U_UART0 ].base);qemu_fdt_add_subnode (fdt, nodename);
include/hw/riscv/sifive_u.h +1 -2
@@ -77,8 +77,7 @@ enum {enum {SIFIVE_U_CLOCK_FREQ =1000000000 ,SIFIVE_U_HFCLK_FREQ =33333333 , -SIFIVE_U_RTCCLK_FREQ =1000000 , -SIFIVE_U_GEM_CLOCK_FREQ =125000000 +SIFIVE_U_RTCCLK_FREQ =1000000 };#define SIFIVE_U_MANAGEMENT_CPU_COUNT 1
Signature · 1 line
2.7.4
PATCH v8 32/32 riscv: sifive_u: Update model and compatible strings in device tree
In reply to Bin MengThis updates model and compatible strings to use the same strings as used in the Linux kernel device tree (hifive-unleashed-a00.dts).
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
hw/riscv/sifive_u.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
hw/riscv/sifive_u.c +3 -2
@@ -96,8 +96,9 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,exit (1 ); } -qemu_fdt_setprop_string (fdt,"/" ,"model" ,"ucbbar,spike-bare,qemu" ); -qemu_fdt_setprop_string (fdt,"/" ,"compatible" ,"ucbbar,spike-bare-dev" ); +qemu_fdt_setprop_string (fdt,"/" ,"model" ,"SiFive HiFive Unleashed A00" ); +qemu_fdt_setprop_string (fdt,"/" ,"compatible" , +"sifive,hifive-unleashed-a00" );qemu_fdt_setprop_cell (fdt,"/" ,"#size-cells" ,0x2 );qemu_fdt_setprop_cell (fdt,"/" ,"#address-cells" ,0x2 );
Signature · 1 line
2.7.4