Add initial CVA6 implementaiton
Subsystems (2)
This implements the CVA6 (the corev_apu from the fpga) model.
v2:
- fixed whitespace and rebased patches
PATCH v2 1/3 hw/riscv: add CVA6 machine
Add a (currently Genesy2 based) CVA6 machine.
Has SPI and UART, the GPIO and Ethernet are currently black-holed as there is no hardware model for them (lowRISC ethernet and Xilinx GPIO)
---
v2:
- whitespace fixes
- use g_autofree on plic
v1:
- squashed in fixes for sd-card and new qemu init
- move to spdx for cva6 machine
- code cleanups missed in first review
--- hw/riscv/Kconfig | 10 ++ hw/riscv/cva6.c | 229 ++++++++++++++++++++++++++++++++++++++++ hw/riscv/meson.build | 1 + include/hw/riscv/cva6.h | 85 +++++++++++++++ 4 files changed, 325 insertions(+) create mode 100644 hw/riscv/cva6.c create mode 100644 include/hw/riscv/cva6.h
hw/riscv/Kconfig +10 -0
@@ -9,6 +9,16 @@ config IBEX # RISC-V machines in alphabetical order +config CVA6 + bool + default y + depends on RISCV32 || RISCV64 + select DEVICE_TREE + select SIFIVE_PLIC + select XILINX_SPI + select RISCV_ACLINT + select UNIMP + config MICROCHIP_PFSOC bool default y
hw/riscv/cva6.c new file +229 -0
229 lines not on this page · raw message
hw/riscv/meson.build +1 -0
@@ -2,6 +2,7 @@ riscv_ss = ss.source_set() riscv_ss.add(files('boot.c')) riscv_ss.add(when: 'CONFIG_RISCV_NUMA', if_true: files('numa.c')) riscv_ss.add(files('riscv_hart.c')) +riscv_ss.add(when: 'CONFIG_CVA6', if_true: files('cva6.c')) riscv_ss.add(when: 'CONFIG_OPENTITAN', if_true: files('opentitan.c')) riscv_ss.add(when: 'CONFIG_RISCV_VIRT', if_true: files('virt.c')) riscv_ss.add(when: 'CONFIG_SHAKTI_C', if_true: files('shakti_c.c'))
include/hw/riscv/cva6.h new file +85 -0
85 lines not on this page · raw message
Signature · 1 line
2.37.2.352.g3c44437643
Re: [PATCH v2 1/3] hw/riscv: add CVA6 machine
Quoted 363 lines · Ben Dooks
Add a (currently Genesy2 based) CVA6 machine.
Has SPI and UART, the GPIO and Ethernet are currently black-holed as there is no hardware model for them (lowRISC ethernet and Xilinx GPIO)
Signed-off-by Ben Dooks <[email protected]>---
v2:
- whitespace fixes
- useg_autofreeon plic
v1:
- squashed in fixes for sd-card and new qemu init
- move to spdx for cva6 machine
- code cleanups missed in first review--- hw/riscv/Kconfig | 10 ++ hw/riscv/cva6.c | 229 ++++++++++++++++++++++++++++++++++++++++ hw/riscv/meson.build | 1 + include/hw/riscv/cva6.h | 85 +++++++++++++++ 4 files changed, 325 insertions(+)create mode 100644
hw/riscv/cva6.c
create mode 100644include/hw/riscv/cva6.hhw/riscv/Kconfig +10
-0@@ -9,6 +9,16 @@ config IBEX # RISC-V machines in alphabetical order +config CVA6 + bool + default y + depends on RISCV32 || RISCV64 + select DEVICE_TREE + select SIFIVE_PLIC + select XILINX_SPI + select RISCV_ACLINT + select UNIMP + config MICROCHIP_PFSOC bool default yhw/riscv/cva6.c new file +229
-0@@ -0,0 +1,229 @@ +/* +* QEMU RISC-V Board for OpenHW CVA6 SoC +* +* Copyright (c) 2025 Codethink Ltd +* Ben Dooks <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#include "qemu/osdep.h" +#include "qemu/error-report.h" +#include "qemu/units.h" +#include "qapi/error.h" +#include "qapi/visitor.h" +#include "hw/boards.h" +#include "hw/irq.h" +#include "hw/loader.h" +#include "hw/sysbus.h" +#include "hw/misc/unimp.h" + +#include "hw/sd/sd.h" +#include "hw/ssi/ssi.h" + +#include "hw/riscv/cva6.h" +#include "hw/riscv/boot.h" +#include "hw/intc/riscv_aclint.h" + +#include "system/system.h" + +#include <libfdt.h> + +#define CVA6_ROM_BASE 0x10000 + +static const MemMapEntry cva6_memmap[] = { + [CVA6_DEBUG ] = {0x0000000 ,0x1000 }, + [CVA6_ROM ] = {CVA6_ROM_BASE ,0x10000 }, + [CVA6_CLINT ] = {0x2000000 ,0xC0000 }, + [CVA6_PLIC ] = {0xC000000 ,0x4000000 }, + [CVA6_UART ] = {0x10000000 ,0x1000 }, + [CVA6_TIMER ] = {0x18000000 ,0x10000 }, + [CVA6_SPI ] = {0x20000000 ,0x800000 }, + [CVA6_ETHERNET ] = {0x30000000 ,0x10000 }, + [CVA6_GPIO ] = {0x40000000 ,0x1000 }, + [CVA6_DRAM ] = {0x80000000 ,0x40000000 }, +}; + +static void cva6_machine_init (MachineState *machine) +{ +MachineClass *mc =MACHINE_GET_CLASS (machine); +MemoryRegion *sys_mem =get_system_memory (); +hwaddr dram_addr = cva6_memmap[CVA6_DRAM ].base; +CVA6State *s =CVA6_MACHINE (machine); +RISCVBootInfo boot_info; + +object_initialize_child (OBJECT (machine),"soc" , &s->soc,TYPE_RISCV_CVA6 ); +qdev_realize (DEVICE (&s->soc),NULL , &error_fatal); + +if (machine->ram_size > mc->default_ram_size) { +error_report ("RAM size is too big for DRAM area" ); +exit (EXIT_FAILURE ); + } + +memory_region_add_subregion (sys_mem, dram_addr, machine->ram); +riscv_boot_info_init (&boot_info, &s->soc.cpus); + +if (machine->firmware) { +hwaddr firmware_load_addr = cva6_memmap[CVA6_ROM ].base; +riscv_load_firmware (machine->firmware, &firmware_load_addr,NULL ); + } + +if (machine->kernel_filename) { +/* note - we've not tested just loading the kernel w/o uboot */ +riscv_load_kernel (machine, &boot_info, dram_addr, false,NULL ); + } + +} + +static void cva6_machine_class_init (ObjectClass *oc,const void *data) +{ +MachineClass *mc =MACHINE_CLASS (oc); + + mc->desc ="RISC-V board for CVA6" ; + mc->init = cva6_machine_init; + mc->max_cpus =1 ; + mc->default_ram_id ="cva6.ram" ; +/* start with "max" cpu type until we sort out CVA6 type */ + mc->default_cpu_type =TYPE_RISCV_CPU_MAX ; + mc->default_ram_size = cva6_memmap[CVA6_DRAM ].size; +}; + +static void cva6_soc_init (Object *obj) +{ +CVA6SoCState *s =RISCV_CVA6 (obj); + +object_initialize_child (obj,"cpus" , &s->cpus,TYPE_RISCV_HART_ARRAY ); +} + +static void cva6_add_spi (CVA6SoCState *s,const MemMapEntry *map) +{ +DriveInfo *dinfo; +BlockBackend *blk; +DeviceState *card_dev; +qemu_irq sd_cs; +DeviceState *sddev; +SysBusDevice *busdev; +DeviceState *spi_dev; +SSIBus *spi; + + spi_dev =qdev_new ("xlnx.xps-spi" ); +qdev_prop_set_uint8 (spi_dev,"num-ss-bits" ,1 ); +qdev_prop_set_string (spi_dev,"endianness" ,"little" ); + + busdev =SYS_BUS_DEVICE (spi_dev); +sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_mmio_map (busdev,0 , map->base); +sysbus_connect_irq (busdev,0 ,qdev_get_gpio_in (DEVICE (s->plic),CVA6_SPI_IRQ )); + + spi = (SSIBus *)qdev_get_child_bus (spi_dev,"spi" ); + + sddev =ssi_create_peripheral (spi,"ssi-sd" ); + sd_cs =qdev_get_gpio_in_named (sddev,SSI_GPIO_CS ,0 ); +sysbus_connect_irq (busdev,1 , sd_cs); + + dinfo =drive_get (IF_SD ,0 ,0 ); + blk = dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ; + card_dev =qdev_new (TYPE_SD_CARD_SPI ); +qdev_prop_set_drive_err (card_dev,"drive" , blk, &error_fatal); + +qdev_realize_and_unref (card_dev,qdev_get_child_bus (sddev,"sd-bus" ), &error_fatal); +} + +static void not_implemented (const char *name,const MemMapEntry *map) +{ +create_unimplemented_device (name, map->base, map->size); +} + +static void cva6_soc_realize (DeviceState *dev_soc,Error **errp) +{ +MemoryRegion *system_memory =get_system_memory (); +MachineState *ms =MACHINE (qdev_get_machine ()); +CVA6SoCState *s =RISCV_CVA6 (dev_soc); +const MemMapEntry *memmap = cva6_memmap; +MemoryRegion *rom =g_new (MemoryRegion,1 ); + g_autofree char *plic_hart_config; + +object_property_set_str (OBJECT (&s->cpus),"cpu-type" , ms->cpu_type, + &error_abort); +object_property_set_int (OBJECT (&s->cpus),"num-harts" , ms->smp.cpus, + &error_abort); +object_property_set_int (OBJECT (&s->cpus),"resetvec" ,CVA6_ROM_BASE , + &error_abort); +sysbus_realize (SYS_BUS_DEVICE (&s->cpus), &error_fatal); + +/* boot rom */ +memory_region_init_rom (rom,OBJECT (dev_soc),"riscv.cva6.bootrom" , + memmap[CVA6_ROM ].size, &error_fatal); +memory_region_add_subregion (system_memory, memmap[CVA6_ROM ].base, + rom); + +/* create PLIC hart topology configuration string */ + plic_hart_config =riscv_plic_hart_config_string (ms->smp.cpus); + +/* MMIO */ + s->plic =sifive_plic_create (memmap[CVA6_PLIC ].base, + plic_hart_config, ms->smp.cpus,0 , +CVA6_PLIC_NUM_SOURCES , +CVA6_PLIC_NUM_PRIORITIES , +CVA6_PLIC_PRIORITY_BASE , +CVA6_PLIC_PENDING_BASE , +CVA6_PLIC_ENABLE_BASE , +CVA6_PLIC_ENABLE_STRIDE , +CVA6_PLIC_CONTEXT_BASE , +CVA6_PLIC_CONTEXT_STRIDE , + memmap[CVA6_PLIC ].size); + +riscv_aclint_swi_create (memmap[CVA6_CLINT ].base,0 , + ms->smp.cpus, false); + +riscv_aclint_mtimer_create ( + memmap[CVA6_CLINT ].base +RISCV_ACLINT_SWI_SIZE , +RISCV_ACLINT_DEFAULT_MTIMER_SIZE ,0 , ms->smp.cpus, +RISCV_ACLINT_DEFAULT_MTIMECMP ,RISCV_ACLINT_DEFAULT_MTIME , +CLINT_TIMEBASE_FREQ , true); + +/* something in cva6-sdk uboot seems to prod the debug +* unit by accident, so make it not implemented */ +not_implemented ("debug" , &memmap[CVA6_DEBUG ]); + +/* 16550 uart, one 32bit register per 32bit word */ + +serial_mm_init (system_memory, memmap[CVA6_UART ].base,2 , +qdev_get_gpio_in (DEVICE (s->plic),CVA6_UART_IRQ ), +50 *1000 *10000 , +serial_hd (0 ),DEVICE_LITTLE_ENDIAN ); + +/* just unimplement the timers, network and gpio here for now. +* no-one seems to be using the apb timer block anyway*/ +not_implemented ("net" , &memmap[CVA6_ETHERNET ]); +not_implemented ("gpio" , &memmap[CVA6_GPIO ]); +not_implemented ("timer" , &memmap[CVA6_TIMER ]); + +/* connect xilinx spi block here */ +cva6_add_spi (s, &memmap[CVA6_SPI ]); +} + +static void cva6_soc_class_init (ObjectClass *oc,const void *data) +{ +DeviceClass *dc =DEVICE_CLASS (oc); + + dc->realize = cva6_soc_realize; + dc->user_creatable = false; +}; + +static const TypeInfo cva6_types[] = { + { + .name =TYPE_RISCV_CVA6 , + .parent =TYPE_DEVICE , + .instance_size =sizeof (CVA6SoCState), + .instance_init = cva6_soc_init, + .class_init = cva6_soc_class_init, + }, { + .name =TYPE_CVA6_MACHINE , + .parent =TYPE_MACHINE , + .instance_size =sizeof (CVA6State), + .class_init = cva6_machine_class_init, + } +}; + +DEFINE_TYPES (cva6_types)hw/riscv/meson.build +1
-0@@ -2,6 +2,7 @@ riscv_ss = ss.source_set() riscv_ss.add(files('boot.c')) riscv_ss.add(when: 'CONFIG_RISCV_NUMA', if_true: files('numa.c')) riscv_ss.add(files('riscv_hart.c')) +riscv_ss.add(when: 'CONFIG_CVA6', if_true: files('cva6.c')) riscv_ss.add(when: 'CONFIG_OPENTITAN', if_true: files('opentitan.c')) riscv_ss.add(when: 'CONFIG_RISCV_VIRT', if_true: files('virt.c')) riscv_ss.add(when: 'CONFIG_SHAKTI_C', if_true: files('shakti_c.c'))include/hw/riscv/cva6.h new file +65
-0@@ -0,0 +1,85 @@ +/* +* QEMU RISC-V Board for OpenHW CVA6 SoC +* https://github.com/openhwgroup/cva6/tree/master/corev_apu +* +* Copyright (c) 2025 Codethink Ltd +* Ben Dooks <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#ifndef HW_CVA6_H +#define HW_CVA6_H + +#include "hw/riscv/riscv_hart.h" +#include "hw/intc/sifive_plic.h" +#include "hw/char/serial-mm.h" + +#include "hw/boards.h" +#include "hw/sysbus.h" +#include "qom/object.h" + +#define TYPE_RISCV_CVA6 "riscv.cva6.soc" +OBJECT_DECLARE_SIMPLE_TYPE(CVA6SoCState, RISCV_CVA6) + +typedef struct CVA6SoCState { +/*< private >*/ +DeviceState parent_obj; + +/*< public >*/ +RISCVHartArrayState cpus; +DeviceState *plic; +MemoryRegion rom; + +uint32_t resetvec; +}CVA6SoCState ; + +#define TYPE_CVA6_MACHINE MACHINE_TYPE_NAME("cva6") +OBJECT_DECLARE_SIMPLE_TYPE(CVA6State, CVA6_MACHINE) + +typedef struct CVA6State { +/*< private >*/ +MachineState parent_obj; + +/*< public >*/ +CVA6SoCState soc; +} +CVA6State ; + +enum { +CVA6_DEBUG , +CVA6_ROM , +CVA6_CLINT , +CVA6_PLIC , +CVA6_UART , +CVA6_TIMER , +CVA6_SPI , +CVA6_ETHERNET , +CVA6_GPIO , +CVA6_DRAM , +}; + +enum { +CVA6_UART_IRQ =1 , +CVA6_SPI_IRQ =2 , + CVA6_ETH_IRQ = 3,
include/hw/riscv/cva6.h line 75
Quoted 10 lines
include/hw/riscv/cva6.h new file +10
-0+CVA6_TIMER0_OVF_IRQ =4 , +CVA6_TIMER0_CMP_IRQ =5 , +CVA6_TIMER1_OVF_IRQ =6 , + CVA6_TIMER1_CMP_IRQ = 7, +}; + +#define CLINT_TIMEBASE_FREQ 25000000 + +/* plic register interface in corev_apu/rv_plic/rtl/plic_regmap.sv */ +
I believe you've missed my comment in v1:
"Where is this file? It's not on QEMU or Linux.
I'm assuming that you're referring to plic_regmap.sv from this repo:
https://github.com/openhwgroup/cva6/tree/master/corev_apu
If that's the case we need to point to this repo in the comment. The commit msg also works."
Please add the github link in the comment. Thanks,
Daniel
Quoted 10 lines
include/hw/riscv/cva6.h new file +10
-0+#define CVA6_PLIC_NUM_SOURCES 32 +#define CVA6_PLIC_NUM_PRIORITIES 7 +#define CVA6_PLIC_PRIORITY_BASE 0x0000 +#define CVA6_PLIC_PENDING_BASE 0x1000 +#define CVA6_PLIC_ENABLE_BASE 0x2000 +#define CVA6_PLIC_ENABLE_STRIDE 0x80 +#define CVA6_PLIC_CONTEXT_BASE 0x200000 +#define CVA6_PLIC_CONTEXT_STRIDE 0x1000 + +#endif /* HW_CVA6_H */
Re: [PATCH v2 1/3] hw/riscv: add CVA6 machine
Quoted 5 lines · Daniel Henrique Barboza
Quoted 2 lines · Ben Dooks
Add a (currently Genesy2 based) CVA6 machine.
Quoted 7 lines
Quoted 7 lines
Has SPI and UART, the GPIO and Ethernet are currently black-holed as there is no hardware model for them (lowRISC ethernet and Xilinx GPIO)
Signed-off-by Ben Dooks <[email protected]>---
v2:
Apologie,s looks like it this got rebased out of the release
Quoted 5 lines
include/hw/riscv/cva6.h line 75
Quoted 2 lines
include/hw/riscv/cva6.h new file +2
-0+/* plic register interface in corev_apu/rv_plic/rtl/plic_regmap.sv */ +I believe you've missed my comment in v1:
would this be ok
/*
* plic register interface in corev_apu/rv_plic/rtl/plic_regmap.sv
* https://github.com/pulp-platform/rv_plic/blob/master/rtl/plic_regmap.sv
*/
Signature · 4 lines
Ben Dooks http://www.codethink.co.uk/ Senior Engineer Codethink - Providing Genius https://www.codethink.co.uk/privacy.html
Re: [PATCH v2 1/3] hw/riscv: add CVA6 machine
Quoted 22 lines · Ben Dooks
Quoted 5 lines · Daniel Henrique Barboza
Quoted 2 lines · Ben Dooks
Add a (currently Genesy2 based) CVA6 machine.
Quoted 7 lines
Quoted 7 lines
Has SPI and UART, the GPIO and Ethernet are currently black-holed as there is no hardware model for them (lowRISC ethernet and Xilinx GPIO)
Signed-off-by Ben Dooks <[email protected]>---
v2:Apologie,s looks like it this got rebased out of the release
Quoted 5 lines
include/hw/riscv/cva6.h line 75
Quoted 2 lines
include/hw/riscv/cva6.h new file +2
-0+/* plic register interface in corev_apu/rv_plic/rtl/plic_regmap.sv */ +I believe you've missed my comment in v1:
Quoted 6 lines
would this be ok
/*
* plic register interface in corev_apu/rv_plic/rtl/plic_regmap.sv
* https://github.com/pulp-platform/rv_plic/blob/master/rtl/plic_regmap.sv
*/
LGTM.
Thanks,
Daniel
Quoted 1 line
PATCH v2 2/3 target/riscv: add cva6 core type
In reply to Ben DooksAdd TYPE_RISCV_CPU_CVA6 for the CVA6 core
--- target/riscv/cpu-qom.h | 1 + target/riscv/cpu.c | 11 +++++++++++ 2 files changed, 12 insertions(+)
target/riscv/cpu-qom.h +1 -0
@@ -34,6 +34,7 @@#define TYPE_RISCV_CPU_BASE32 RISCV_CPU_TYPE_NAME("rv32")#define TYPE_RISCV_CPU_BASE64 RISCV_CPU_TYPE_NAME("rv64")#define TYPE_RISCV_CPU_BASE128 RISCV_CPU_TYPE_NAME("x-rv128") +#define TYPE_RISCV_CPU_CVA6 RISCV_CPU_TYPE_NAME("cva6")#define TYPE_RISCV_CPU_RV32I RISCV_CPU_TYPE_NAME("rv32i")#define TYPE_RISCV_CPU_RV32E RISCV_CPU_TYPE_NAME("rv32e")#define TYPE_RISCV_CPU_RV64I RISCV_CPU_TYPE_NAME("rv64i")
target/riscv/cpu.c +11 -0
@@ -3009,6 +3009,17 @@ static const TypeInfo riscv_cpu_type_infos[] = { .misa_mxl_max = MXL_RV64, ), +DEFINE_RISCV_CPU (TYPE_RISCV_CPU_CVA6 ,TYPE_RISCV_VENDOR_CPU , + .misa_ext = RVI | RVM | RVA | RVF | RVD | RVC | RVB | RVS | RVU, + .misa_mxl_max = MXL_RV64, + .cfg.max_satp_mode = VM_1_10_SV39, + .priv_spec = PRIV_VERSION_1_12_0, + .cfg.pmp = true, + .cfg.mmu = true, + .cfg.ext_zifencei = true, + .cfg.ext_zicsr = true, + ), +DEFINE_RISCV_CPU (TYPE_RISCV_CPU_SIFIVE_E51 ,TYPE_RISCV_CPU_SIFIVE_E , .misa_mxl_max = MXL_RV64 ),
Signature · 1 line
2.37.2.352.g3c44437643
Re: [PATCH v2 2/3] target/riscv: add cva6 core type
Quoted 29 lines · Ben Dooks
Add
TYPE_RISCV_CPU_CVA6for the CVA6 coreSigned-off-by Ben Dooks <[email protected]>--- target/riscv/cpu-qom.h | 1 + target/riscv/cpu.c | 11 +++++++++++ 2 files changed, 12 insertions(+)target/riscv/cpu-qom.h +1
-0@@ -34,6 +34,7 @@#define TYPE_RISCV_CPU_BASE32 RISCV_CPU_TYPE_NAME("rv32")#define TYPE_RISCV_CPU_BASE64 RISCV_CPU_TYPE_NAME("rv64")#define TYPE_RISCV_CPU_BASE128 RISCV_CPU_TYPE_NAME("x-rv128") +#define TYPE_RISCV_CPU_CVA6 RISCV_CPU_TYPE_NAME("cva6")#define TYPE_RISCV_CPU_RV32I RISCV_CPU_TYPE_NAME("rv32i")#define TYPE_RISCV_CPU_RV32E RISCV_CPU_TYPE_NAME("rv32e")#define TYPE_RISCV_CPU_RV64I RISCV_CPU_TYPE_NAME("rv64i")target/riscv/cpu.c +1
-0@@ -3009,6 +3009,17 @@ static const TypeInfo riscv_cpu_type_infos[] = { .misa_mxl_max = MXL_RV64, ), + DEFINE_RISCV_CPU(TYPE_RISCV_CPU_CVA6, TYPE_RISCV_VENDOR_CPU,
target/riscv/cpu.c static const TypeInfo riscv_cpu_type_infos[] = { · line 3022
Quoted 10 lines
target/riscv/cpu.c +10
-0+ .misa_ext = RVI | RVM | RVA | RVF | RVD | RVC | RVB | RVS | RVU, + .misa_mxl_max = MXL_RV64, + .cfg.max_satp_mode = VM_1_10_SV39, + .priv_spec = PRIV_VERSION_1_12_0, + .cfg.pmp = true, + .cfg.mmu = true, + .cfg.ext_zifencei = true, + .cfg.ext_zicsr = true, + ), +
The CPU is being added inside a "#if defined(TARGET_RISCV64)" block, meaning that it's a 64-bit CPU only. But the CVA6 board added in patch 1 is being added for both 32 and 64 bit emulations in hw/riscv/Kconfig:
config CVA6
bool
default y
depends on RISCV32 || RISCV64 <------------------This setup (after patch 3 is added) triggered a test failure in 'check-qtest', when polling all available boards in qemu-system-riscv32, because it didn't find a default 32 bit CPU for the cva6 board:
# starting QEMU: exec ./qemu-system-riscv32 -qtest unix:/tmp/qtest-1683816.sock -qtest-log /dev/null -chardev socket,path=/tmp/qtest-1683816.qmp,id=char0 -mon chardev=char0,mode=control -display none -audio none -machine cva6 -accel qtest ----------------------------------- stderr ----------------------------------- qemu-system-riscv32: ../hw/core/machine.c:1574: is_cpu_type_supported: Assertion `cc != NULL' failed. Broken pipe ../tests/qtest/libqtest.c:208: kill_qemu() detected QEMU death from signal 6 (Aborted) (core dumped)
We have 2 options here:
- if the CVA6 board is supposed to run in RISCV32 and RISCV64, then its default CPU must be 32 bit compliant too. The CPU declaration in this patch must be moved outside the "#if defined(TARGET_RISCV64)" block (e.g right after TYPE_RISCV_CPU_SIFIVE_U);
- if the board is 64 bit only then the CPU declaration is fine, and we need to change the board hw/riscv/Kconfig entry to "depends on RISCV64".
Thanks,
Daniel
Quoted 3 lines
target/riscv/cpu.c +0
-0DEFINE_RISCV_CPU (TYPE_RISCV_CPU_SIFIVE_E51 ,TYPE_RISCV_CPU_SIFIVE_E , .misa_mxl_max = MXL_RV64 ),
Re: [PATCH v2 2/3] target/riscv: add cva6 core type
Quoted 37 lines · Daniel Henrique Barboza
Quoted 34 lines · Ben Dooks
Add
TYPE_RISCV_CPU_CVA6for the CVA6 coreSigned-off-by Ben Dooks <[email protected]>---
target/riscv/cpu-qom.h| 1 +
target/riscv/cpu.c | 11 +++++++++++2 files changed, 12 insertions(+)target/riscv/cpu-qom.h +1
-0@@ -34,6 +34,7 @@ #define TYPE_RISCV_CPU_BASE32 RISCV_CPU_TYPE_NAME("rv32") #define TYPE_RISCV_CPU_BASE64 RISCV_CPU_TYPE_NAME("rv64") #define TYPE_RISCV_CPU_BASE128 RISCV_CPU_TYPE_NAME("x-rv128") +#define TYPE_RISCV_CPU_CVA6 RISCV_CPU_TYPE_NAME("cva6") #define TYPE_RISCV_CPU_RV32I RISCV_CPU_TYPE_NAME("rv32i") #define TYPE_RISCV_CPU_RV32E RISCV_CPU_TYPE_NAME("rv32e") #define TYPE_RISCV_CPU_RV64I RISCV_CPU_TYPE_NAME("rv64i")target/riscv/cpu.c +7
-0@@ -3009,6 +3009,17 @@ static const TypeInfo riscv_cpu_type_infos[] = { .misa_mxl_max = MXL_RV64, ), + DEFINE_RISCV_CPU(TYPE_RISCV_CPU_CVA6, TYPE_RISCV_VENDOR_CPU, + .misa_ext = RVI | RVM | RVA | RVF | RVD | RVC | RVB | RVS | RVU, + .misa_mxl_max = MXL_RV64, + .cfg.max_satp_mode = VM_1_10_SV39, + .priv_spec = PRIV_VERSION_1_12_0, + .cfg.pmp = true, + .cfg.mmu = true,
Quoted 8 lines
target/riscv/cpu.c static const TypeInfo riscv_cpu_type_infos[] = { · line 3022
Quoted 4 lines
target/riscv/cpu.c +4
-0+ .cfg.ext_zifencei = true, + .cfg.ext_zicsr = true, + ), +The CPU is being added inside a "#if
defined(TARGET_RISCV64)" block, meaning that it's a 64-bit CPU only. But the CVA6 board added in patch 1 is being added for both 32 and 64 bit emulations in hw/riscv/Kconfig:
Ah yes, it is possible to make a cva6 32bit, is it ok just to ove this into a different place or is there anything else needed to allow 32 or 64bit?
I've only been building a 64bit userland to test so didn't notice the lack of 32bit was an issue.
Quoted 27 lines
config CVA6
bool
default y
depends on RISCV32 || RISCV64 <------------------This setup (after patch 3 is added) triggered a test failure in 'check- qtest', when polling all available boards in qemu-system-riscv32, because it didn't find a default 32 bit CPU for the cva6 board:
# starting QEMU: exec ./qemu-system-riscv32 -qtest unix:/tmp/ qtest-1683816.sock -qtest-log /dev/null -chardev socket,path=/tmp/ qtest-1683816.qmp,id=char0 -mon chardev=char0,mode=control -display none -audio none -machine cva6 -accel qtest ----------------------------------- stderr ----------------------------------- qemu-system-riscv32: ../hw/core/machine.c:1574: is_cpu_type_supported: Assertion `cc != NULL' failed. Broken pipe ../tests/qtest/libqtest.c:208: kill_qemu() detected QEMU death from signal 6 (Aborted) (core dumped)We have 2 options here:
- if the CVA6 board is supposed to run in RISCV32 and RISCV64, then its default
CPU must be 32 bit compliant too. The CPU declaration in this patch must be moved outside the "#ifdefined(TARGET_RISCV64)" block (e.g right afterTYPE_RISCV_CPU_SIFIVE_U);
Quoted 4 lines
- if the board is 64 bit only then the CPU declaration is fine, and we need to
change the board hw/riscv/Kconfig entry to "depends on RISCV64".
As long as it is just the #ifdef block I will move it.
Should I just re-send this change?
Quoted 10 lines
Thanks,
Daniel
Quoted 3 lines
target/riscv/cpu.c +0
-0DEFINE_RISCV_CPU(TYPE_RISCV_CPU_SIFIVE_E51, TYPE_RISCV_CPU_SIFIVE_E,.misa_mxl_max =
MXL_RV64
),
Signature · 4 lines
Ben Dooks http://www.codethink.co.uk/ Senior Engineer Codethink - Providing Genius https://www.codethink.co.uk/privacy.html
Re: [PATCH v2 2/3] target/riscv: add cva6 core type
Quoted 77 lines · Ben Dooks
Quoted 37 lines · Daniel Henrique Barboza
Quoted 34 lines · Ben Dooks
Add
TYPE_RISCV_CPU_CVA6for the CVA6 coreSigned-off-by Ben Dooks <[email protected]>---
target/riscv/cpu-qom.h| 1 +
target/riscv/cpu.c | 11 +++++++++++2 files changed, 12 insertions(+)target/riscv/cpu-qom.h +1
-0@@ -34,6 +34,7 @@ #define TYPE_RISCV_CPU_BASE32 RISCV_CPU_TYPE_NAME("rv32") #define TYPE_RISCV_CPU_BASE64 RISCV_CPU_TYPE_NAME("rv64") #define TYPE_RISCV_CPU_BASE128 RISCV_CPU_TYPE_NAME("x-rv128") +#define TYPE_RISCV_CPU_CVA6 RISCV_CPU_TYPE_NAME("cva6") #define TYPE_RISCV_CPU_RV32I RISCV_CPU_TYPE_NAME("rv32i") #define TYPE_RISCV_CPU_RV32E RISCV_CPU_TYPE_NAME("rv32e") #define TYPE_RISCV_CPU_RV64I RISCV_CPU_TYPE_NAME("rv64i")target/riscv/cpu.c +7
-0@@ -3009,6 +3009,17 @@ static const TypeInfo riscv_cpu_type_infos[] = { .misa_mxl_max = MXL_RV64, ), + DEFINE_RISCV_CPU(TYPE_RISCV_CPU_CVA6, TYPE_RISCV_VENDOR_CPU, + .misa_ext = RVI | RVM | RVA | RVF | RVD | RVC | RVB | RVS | RVU, + .misa_mxl_max = MXL_RV64, + .cfg.max_satp_mode = VM_1_10_SV39, + .priv_spec = PRIV_VERSION_1_12_0, + .cfg.pmp = true, + .cfg.mmu = true,Quoted 8 lines
target/riscv/cpu.c static const TypeInfo riscv_cpu_type_infos[] = { · line 3022
Quoted 4 lines
target/riscv/cpu.c +4
-0+ .cfg.ext_zifencei = true, + .cfg.ext_zicsr = true, + ), +The CPU is being added inside a "#if
defined(TARGET_RISCV64)" block, meaning that it's a 64-bit CPU only. But the CVA6 board added in patch 1 is being added for both 32 and 64 bit emulations in hw/riscv/Kconfig:Ah yes, it is possible to make a cva6 32bit, is it ok just to ove this into a different place or is there anything else needed to allow 32 or 64bit?
I've only been building a 64bit userland to test so didn't notice the lack of 32bit was an issue.
Quoted 24 lines
config CVA6
bool
default y
depends on RISCV32 || RISCV64 <------------------This setup (after patch 3 is added) triggered a test failure in 'check- qtest', when polling all available boards in qemu-system-riscv32, because it didn't find a default 32 bit CPU for the cva6 board:
# starting QEMU: exec ./qemu-system-riscv32 -qtest unix:/tmp/ qtest-1683816.sock -qtest-log /dev/null -chardev socket,path=/tmp/ qtest-1683816.qmp,id=char0 -mon chardev=char0,mode=control -display none -audio none -machine cva6 -accel qtest ----------------------------------- stderr ----------------------------------- qemu-system-riscv32: ../hw/core/machine.c:1574: is_cpu_type_supported: Assertion `cc != NULL' failed. Broken pipe ../tests/qtest/libqtest.c:208: kill_qemu() detected QEMU death from signal 6 (Aborted) (core dumped)We have 2 options here:
- if the CVA6 board is supposed to run in RISCV32 and RISCV64, then its default CPU must be 32 bit compliant too. The CPU declaration in this patch must be moved outside the "#if
defined(TARGET_RISCV64)" block (e.g right afterTYPE_RISCV_CPU_SIFIVE_U);
Quoted 5 lines
Quoted 3 lines
- if the board is 64 bit only then the CPU declaration is fine, and we need to change the board hw/riscv/Kconfig entry to "depends on RISCV64".
As long as it is just the #ifdef block I will move it.
I just read the CV6 documentation at:
https://github.com/openhwgroup/cva6/
The README states right at the start:
"CVA6 is a 6-stage, single-issue, in-order CPU which implements the 64-bit RISC-V instruction set."
So this means that CVA6 is a 64-bit CPU only. This means that we want the second
option: the CPU declaration is fine, but the CVA6 board must be built only for 64 bits. In patch 1, this line:
Quoted 4 lines
Quoted 4 lines
config CVA6
bool default y depends on RISCV32 || RISCV64 <------------------
Should be "depends on RISCV64".
Thanks,
Daniel
Quoted 15 lines
Should I just re-send this change?
Quoted 10 lines
Thanks,
Daniel
Quoted 3 lines
target/riscv/cpu.c +0
-0DEFINE_RISCV_CPU(TYPE_RISCV_CPU_SIFIVE_E51, TYPE_RISCV_CPU_SIFIVE_E,.misa_mxl_max =
MXL_RV64
),
Re: [PATCH v2 2/3] target/riscv: add cva6 core type
Quoted 98 lines · Daniel Henrique Barboza
Quoted 80 lines · Ben Dooks
Quoted 38 lines · Daniel Henrique Barboza
Quoted 35 lines · Ben Dooks
Add
TYPE_RISCV_CPU_CVA6for the CVA6 coreSigned-off-by Ben Dooks <[email protected]>---
target/riscv/cpu-qom.h| 1 +
target/riscv/cpu.c | 11 +++++++++++2 files changed, 12 insertions(+)target/riscv/cpu-qom.h +1
-0@@ -34,6 +34,7 @@ #define TYPE_RISCV_CPU_BASE32 RISCV_CPU_TYPE_NAME("rv32") #define TYPE_RISCV_CPU_BASE64 RISCV_CPU_TYPE_NAME("rv64") #define TYPE_RISCV_CPU_BASE128 RISCV_CPU_TYPE_NAME("x- rv128") +#define TYPE_RISCV_CPU_CVA6 RISCV_CPU_TYPE_NAME("cva6") #define TYPE_RISCV_CPU_RV32I RISCV_CPU_TYPE_NAME("rv32i") #define TYPE_RISCV_CPU_RV32E RISCV_CPU_TYPE_NAME("rv32e") #define TYPE_RISCV_CPU_RV64I RISCV_CPU_TYPE_NAME("rv64i")target/riscv/cpu.c +7
-0@@ -3009,6 +3009,17 @@ static const TypeInfo riscv_cpu_type_infos[] = { .misa_mxl_max = MXL_RV64, ), + DEFINE_RISCV_CPU(TYPE_RISCV_CPU_CVA6, TYPE_RISCV_VENDOR_CPU, + .misa_ext = RVI | RVM | RVA | RVF | RVD | RVC | RVB | RVS | RVU, + .misa_mxl_max = MXL_RV64, + .cfg.max_satp_mode = VM_1_10_SV39, + .priv_spec = PRIV_VERSION_1_12_0, + .cfg.pmp = true, + .cfg.mmu = true,Quoted 8 lines
target/riscv/cpu.c static const TypeInfo riscv_cpu_type_infos[] = { · line 3022
Quoted 4 lines
target/riscv/cpu.c +4
-0+ .cfg.ext_zifencei = true, + .cfg.ext_zicsr = true, + ), +The CPU is being added inside a "#if
defined(TARGET_RISCV64)" block, meaning that it's a 64-bit CPU only. But the CVA6 board added in patch 1 is being added for both 32 and 64 bit emulations in hw/riscv/Kconfig:Ah yes, it is possible to make a cva6 32bit, is it ok just to ove this into a different place or is there anything else needed to allow 32 or 64bit?
I've only been building a 64bit userland to test so didn't notice the lack of 32bit was an issue.
Quoted 26 lines
config CVA6
bool
default y
depends on RISCV32 || RISCV64 <------------------This setup (after patch 3 is added) triggered a test failure in 'check- qtest', when polling all available boards in qemu-system-riscv32, because it didn't find a default 32 bit CPU for the cva6 board:
# starting QEMU: exec ./qemu-system-riscv32 -qtest unix:/tmp/ qtest-1683816.sock -qtest-log /dev/null -chardev socket,path=/tmp/ qtest-1683816.qmp,id=char0 -mon chardev=char0,mode=control -display none -audio none -machine cva6 -accel qtest ----------------------------------- stderr ----------------------------------- qemu-system-riscv32: ../hw/core/machine.c:1574: is_cpu_type_supported: Assertion `cc != NULL' failed. Broken pipe ../tests/qtest/libqtest.c:208: kill_qemu() detected QEMU death from signal 6 (Aborted) (core dumped)We have 2 options here:
- if the CVA6 board is supposed to run in RISCV32 and RISCV64, then its default
CPU must be 32 bit compliant too. The CPU declaration in this patch must be moved outside the "#ifdefined(TARGET_RISCV64)" block (e.g right afterTYPE_RISCV_CPU_SIFIVE_U);Quoted 6 lines
Quoted 4 lines
- if the board is 64 bit only then the CPU declaration is fine, and we need to
change the board hw/riscv/Kconfig entry to "depends on RISCV64".As long as it is just the #ifdef block I will move it.
I just read the CV6 documentation at:
https://github.com/openhwgroup/cva6/
The README states right at the start:
Quoted 6 lines
"CVA6 is a 6-stage, single-issue, in-order CPU which implements the 64- bit RISC-V instruction set."
So this means that CVA6 is a 64-bit CPU only. This means that we want the second
option: the CPU declaration is fine, but the CVA6 board must be built only for 64 bits. In patch 1, this line:
There do seem to be some build variants for cva32a6 deep in the docs and the cva6-sdk has builds for both xlen==32 and xlen==64 so I am a bit confused here.
Signature · 4 lines
Ben Dooks http://www.codethink.co.uk/ Senior Engineer Codethink - Providing Genius https://www.codethink.co.uk/privacy.html
Re: [PATCH v2 2/3] target/riscv: add cva6 core type
Quoted 98 lines · Ben Dooks
Quoted 97 lines · Daniel Henrique Barboza
Quoted 77 lines · Ben Dooks
Quoted 37 lines · Daniel Henrique Barboza
Quoted 34 lines · Ben Dooks
Add
TYPE_RISCV_CPU_CVA6for the CVA6 coreSigned-off-by Ben Dooks <[email protected]>---
target/riscv/cpu-qom.h| 1 +
target/riscv/cpu.c | 11 +++++++++++2 files changed, 12 insertions(+)target/riscv/cpu-qom.h +1
-0@@ -34,6 +34,7 @@ #define TYPE_RISCV_CPU_BASE32 RISCV_CPU_TYPE_NAME("rv32") #define TYPE_RISCV_CPU_BASE64 RISCV_CPU_TYPE_NAME("rv64") #define TYPE_RISCV_CPU_BASE128 RISCV_CPU_TYPE_NAME("x- rv128") +#define TYPE_RISCV_CPU_CVA6 RISCV_CPU_TYPE_NAME("cva6") #define TYPE_RISCV_CPU_RV32I RISCV_CPU_TYPE_NAME("rv32i") #define TYPE_RISCV_CPU_RV32E RISCV_CPU_TYPE_NAME("rv32e") #define TYPE_RISCV_CPU_RV64I RISCV_CPU_TYPE_NAME("rv64i")target/riscv/cpu.c +7
-0@@ -3009,6 +3009,17 @@ static const TypeInfo riscv_cpu_type_infos[] = { .misa_mxl_max = MXL_RV64, ), + DEFINE_RISCV_CPU(TYPE_RISCV_CPU_CVA6, TYPE_RISCV_VENDOR_CPU, + .misa_ext = RVI | RVM | RVA | RVF | RVD | RVC | RVB | RVS | RVU, + .misa_mxl_max = MXL_RV64, + .cfg.max_satp_mode = VM_1_10_SV39, + .priv_spec = PRIV_VERSION_1_12_0, + .cfg.pmp = true, + .cfg.mmu = true,Quoted 8 lines
target/riscv/cpu.c static const TypeInfo riscv_cpu_type_infos[] = { · line 3022
Quoted 4 lines
target/riscv/cpu.c +4
-0+ .cfg.ext_zifencei = true, + .cfg.ext_zicsr = true, + ), +The CPU is being added inside a "#if
defined(TARGET_RISCV64)" block, meaning that it's a 64-bit CPU only. But the CVA6 board added in patch 1 is being added for both 32 and 64 bit emulations in hw/riscv/Kconfig:Ah yes, it is possible to make a cva6 32bit, is it ok just to ove this into a different place or is there anything else needed to allow 32 or 64bit?
I've only been building a 64bit userland to test so didn't notice the lack of 32bit was an issue.
Quoted 24 lines
config CVA6
bool
default y
depends on RISCV32 || RISCV64 <------------------This setup (after patch 3 is added) triggered a test failure in 'check- qtest', when polling all available boards in qemu-system-riscv32, because it didn't find a default 32 bit CPU for the cva6 board:
# starting QEMU: exec ./qemu-system-riscv32 -qtest unix:/tmp/ qtest-1683816.sock -qtest-log /dev/null -chardev socket,path=/tmp/ qtest-1683816.qmp,id=char0 -mon chardev=char0,mode=control -display none -audio none -machine cva6 -accel qtest ----------------------------------- stderr ----------------------------------- qemu-system-riscv32: ../hw/core/machine.c:1574: is_cpu_type_supported: Assertion `cc != NULL' failed. Broken pipe ../tests/qtest/libqtest.c:208: kill_qemu() detected QEMU death from signal 6 (Aborted) (core dumped)We have 2 options here:
- if the CVA6 board is supposed to run in RISCV32 and RISCV64, then its default CPU must be 32 bit compliant too. The CPU declaration in this patch must be moved outside the "#if
defined(TARGET_RISCV64)" block (e.g right afterTYPE_RISCV_CPU_SIFIVE_U);Quoted 5 lines
Quoted 3 lines
- if the board is 64 bit only then the CPU declaration is fine, and we need to change the board hw/riscv/Kconfig entry to "depends on RISCV64".
As long as it is just the #ifdef block I will move it.
I just read the CV6 documentation at:
https://github.com/openhwgroup/cva6/
The README states right at the start:
"CVA6 is a 6-stage, single-issue, in-order CPU which implements the 64- bit RISC-V instruction set."
Quoted 8 lines
Quoted 3 lines
So this means that CVA6 is a 64-bit CPU only. This means that we want the second
option: the CPU declaration is fine, but the CVA6 board must be built only for 64 bits. In patch 1, this line:There do seem to be some build variants for cva32a6 deep in the docs and the cva6-sdk has builds for both xlen==32 and xlen==64 so I am a bit confused here.
It looks like that the 32 bit version (which I assume to be this cva32a65x target) is not the same CPU as you're adding here. At least in a quick read at the docs.
Even if we move the CPU declaration as I've suggested, making this cva6 work 32 bit compliant too, that doesn't mean that it'll have the intended purpose as per its own spec.
My suggestion is to get a clarification with the cva6 folks (or any other interested party) about whether this is supposed to be a 64 bit only board/cpu or not. If unsure, I suggest to contribute this as a 64 bit only CPU/board for now and then revisit this later in case there's a 32 bit variant too.
Thanks,
Daniel
Quoted 2 lines
Re: [PATCH v2 2/3] target/riscv: add cva6 core type
In reply to Daniel Henrique BarbozaQuoted 23 lines · Daniel Henrique Barboza
Quoted 8 lines · Ben Dooks
Quoted 7 lines · Daniel Henrique Barboza
Quoted 4 lines · Ben Dooks
Add
TYPE_RISCV_CPU_CVA6for the CVA6 coreSigned-off-by Ben Dooks <[email protected]>---
The README states right at the start:
"CVA6 is a 6-stage, single-issue, in-order CPU which implements the 64- bit RISC-V instruction set."
So this means that CVA6 is a 64-bit CPU only. This means that we want the second
option: the CPU declaration is fine, but the CVA6 board must be built only for 64 bits. In patch 1, this line:
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
config CVA6
bool
default y
depends on RISCV32 || RISCV64 <------------------Should be "depends on RISCV64".
I think given the confusion, let's go with the RISCV64 for now and if it turns out there is an 32-bit build option we can always add it in later and change anything else around.
Signature · 4 lines
Ben Dooks http://www.codethink.co.uk/ Senior Engineer Codethink - Providing Genius https://www.codethink.co.uk/privacy.html
Re: [PATCH v2 2/3] target/riscv: add cva6 core type
Quoted 30 lines · Ben Dooks
Quoted 29 lines · Daniel Henrique Barboza
Quoted 8 lines · Ben Dooks
Quoted 7 lines · Daniel Henrique Barboza
Quoted 4 lines · Ben Dooks
Add
TYPE_RISCV_CPU_CVA6for the CVA6 coreSigned-off-by Ben Dooks <[email protected]>---
The README states right at the start:
"CVA6 is a 6-stage, single-issue, in-order CPU which implements the 64- bit RISC-V instruction set."
So this means that CVA6 is a 64-bit CPU only. This means that we want the second
option: the CPU declaration is fine, but the CVA6 board must be built only for 64 bits. In patch 1, this line:Quoted 4 lines
Quoted 4 lines
config CVA6
bool
default y
depends on RISCV32 || RISCV64 <------------------
Quoted 6 lines
Quoted 1 line
Should be "depends on RISCV64".
I think given the confusion, let's go with the RISCV64 for now and if it turns out there is an 32-bit build option we can always add it in later and change anything else around.
Just sent a reply making this same suggestion. I agree.
Daniel
Quoted 2 lines
PATCH v2 3/3 hw/riscv: set cva6 to use TYPE_RISCV_CPU_CVA6
In reply to Ben DooksChange to using TYPE_RISCV_CPU_CVA6 once this is merged.
--- hw/riscv/cva6.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
hw/riscv/cva6.c +1 -2
@@ -83,8 +83,7 @@ static void cva6_machine_class_init(ObjectClass *oc, const void *data) mc->init = cva6_machine_init; mc->max_cpus =1 ; mc->default_ram_id ="cva6.ram" ; -/* start with "max" cpu type until we sort out CVA6 type */ - mc->default_cpu_type =TYPE_RISCV_CPU_MAX ; + mc->default_cpu_type =TYPE_RISCV_CPU_CVA6 ; mc->default_ram_size = cva6_memmap[CVA6_DRAM ].size; };
Signature · 1 line
2.37.2.352.g3c44437643
Hi,
(added Alistair in CC)
I suggest adding the RISC-V maintainer, Alistair, in the CC for the next posting. It helps in the series visibility.
It would also be nice to add a RISC-V reference in the subject, e.g. "RISCV: Add initial CVA6 implementation", to help ppl from the common qemu-devel ML to quickly identify what the series is about.
Thanks,
Daniel
Quoted 6 lines · Ben Dooks
This implements the CVA6 (the
corev_apufrom the fpga) model.v2:
- fixed whitespace and rebased patches