RISC-V: Add properties to the CPUs
cover RISC-V: Add properties to the CPUs
This series is based on the previous "RISC-V: Allow specifying CPU ISA via command line" series. This series does not allow custom ISA extensions instead it just allows other property setting.
This series allows users to specify spec versions, MMU support and PMP support from the command line.
This series depreates some existing CPUs and machines as they are no longer required.
Alistair Francis (6):
linux-user/riscv: Add the CPU type as a comment
riscv: virt: Allow specifying a CPU via commandline target/riscv: Create settable CPU properties target/riscv: Add a base 32 and 64 bit CPU target/riscv: Deprecate the generic no MMU CPUs
riscv: spike: Add a generic spike machine
hw/riscv/spike.c | 106 +++++++++++++++++++++++++++++++++- hw/riscv/virt.c | 3 +- include/hw/riscv/virt.h | 4 +- linux-user/riscv/target_elf.h | 1 + qemu-deprecated.texi | 21 +++++++ target/riscv/cpu.c | 63 ++++++++++++++++++++ target/riscv/cpu.h | 10 ++++ 7 files changed, 204 insertions(+), 4 deletions(-)
Signature · 1 line
2.21.0
PATCH 1/6 linux-user/riscv: Add the CPU type as a comment
--- linux-user/riscv/target_elf.h | 1 + 1 file changed, 1 insertion(+)
linux-user/riscv/target_elf.h +1 -0
@@ -9,6 +9,7 @@#define RISCV_TARGET_ELF_H static inline const char *cpu_get_model (uint32_t eflags) { +/* TYPE_RISCV_CPU_ANY */ return "any" ; }#endif
Signature · 1 line
2.21.0
PATCH 2/6 riscv: virt: Allow specifying a CPU via commandline
In reply to Alistair Francis--- hw/riscv/virt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
hw/riscv/virt.c +2 -1
@@ -400,7 +400,7 @@ static void riscv_virt_board_init(MachineState *machine)/* Initialize SOC */ object_initialize_child (OBJECT (machine),"soc" , &s->soc,sizeof (s->soc),TYPE_RISCV_HART_ARRAY , &error_abort,NULL ); -object_property_set_str (OBJECT (&s->soc),VIRT_CPU ,"cpu-type" , +object_property_set_str (OBJECT (&s->soc), machine->cpu_type,"cpu-type" , &error_abort);object_property_set_int (OBJECT (&s->soc), smp_cpus,"num-harts" , &error_abort);
@@ -526,6 +526,7 @@ static void riscv_virt_board_machine_init(MachineClass *mc) mc->desc ="RISC-V VirtIO Board (Privileged ISA v1.10)" ; mc->init = riscv_virt_board_init; mc->max_cpus =8 ;/* hardcoded limit in BBL */ + mc->default_cpu_type =VIRT_CPU ; }DEFINE_MACHINE ("virt" , riscv_virt_board_machine_init)
Signature · 1 line
2.21.0
PATCH 3/6 target/riscv: Create settable CPU properties
In reply to Alistair Francis--- target/riscv/cpu.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ target/riscv/cpu.h | 8 ++++++++ 2 files changed, 57 insertions(+)
target/riscv/cpu.c +49 -0
@@ -22,6 +22,7 @@#include "cpu.h" #include "exec/exec-all.h" #include "qapi/error.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" /* RISC-V CPU definitions */
@@ -296,7 +297,11 @@ static void riscv_cpu_disas_set_info(CPUState *s, disassemble_info *info)static void riscv_cpu_realize (DeviceState *dev,Error **errp) {CPUState *cs =CPU (dev); +RISCVCPU *cpu =RISCV_CPU (dev); +CPURISCVState *env = &cpu->env;RISCVCPUClass *mcc =RISCV_CPU_GET_CLASS (dev); +int priv_version =PRIV_VERSION_1_10_0 ; +int user_version =USER_VERSION_2_02_0 ;Error *local_err =NULL ;cpu_exec_realizefn (cs, &local_err);
@@ -305,6 +310,41 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)return ; } +if (cpu->cfg.priv_spec) { +if (!g_strcmp0 (cpu->cfg.priv_spec,"v1.10.0" )) { + priv_version =PRIV_VERSION_1_10_0 ; + }else if (!g_strcmp0 (cpu->cfg.priv_spec,"v1.9.1" )) { + priv_version =PRIV_VERSION_1_09_1 ; + }else { +error_setg (errp, +"Unsupported privilege spec version '%s'" , + cpu->cfg.priv_spec); +return ; + } + } + +if (cpu->cfg.user_spec) { +if (!g_strcmp0 (cpu->cfg.user_spec,"v2.02.0" )) { + user_version =USER_VERSION_2_02_0 ; + }else { +error_setg (errp, +"Unsupported user spec version '%s'" , + cpu->cfg.user_spec); +return ; + } + } + +set_versions (env, user_version, priv_version); +set_resetvec (env,DEFAULT_RSTVEC ); + +if (cpu->cfg.mmu) { +set_feature (env,RISCV_FEATURE_MMU ); + } + +if (cpu->cfg.pmp) { +set_feature (env,RISCV_FEATURE_PMP ); + } +riscv_cpu_register_gdb_regs_for_features (cs);qemu_init_vcpu (cs);
@@ -326,6 +366,14 @@ static const VMStateDescription vmstate_riscv_cpu = { .unmigratable = 1, }; +static Property riscv_cpu_properties[] = { +DEFINE_PROP_STRING ("priv_spec" ,RISCVCPU , cfg.priv_spec), +DEFINE_PROP_STRING ("user_spec" ,RISCVCPU , cfg.user_spec), +DEFINE_PROP_BOOL ("mmu" ,RISCVCPU , cfg.mmu, true), +DEFINE_PROP_BOOL ("pmp" ,RISCVCPU , cfg.pmp, true), +DEFINE_PROP_END_OF_LIST (), +}; +static void riscv_cpu_class_init (ObjectClass *c,void *data) {RISCVCPUClass *mcc =RISCV_CPU_CLASS (c);
@@ -366,6 +414,7 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data)#endif /* For now, mark unmigratable: */ cc->vmsd = &vmstate_riscv_cpu; + dc->props = riscv_cpu_properties; }char *riscv_isa_string (RISCVCPU *cpu)
target/riscv/cpu.h +8 -0
@@ -224,6 +224,14 @@ typedef struct RISCVCPU {CPUState parent_obj;/*< public >*/ CPURISCVState env; + +/* Configuration Settings */ +struct { +char *priv_spec; +char *user_spec; +bool mmu; +bool pmp; + } cfg; }RISCVCPU ;static inline RISCVCPU *riscv_env_get_cpu (CPURISCVState *env)
Signature · 1 line
2.21.0
PATCH 4/6 target/riscv: Add a base 32 and 64 bit CPU
In reply to Alistair FrancisAt the same time deprecate the ISA string CPUs.
It is dobtful anyone specifies the CPUs, but we are keeping them for the Spike machine (which is about to be depreated) so we may as well just mark them as deprecated.
--- include/hw/riscv/virt.h | 4 ++-- qemu-deprecated.texi | 9 +++++++++ target/riscv/cpu.c | 14 ++++++++++++++ target/riscv/cpu.h | 2 ++ 4 files changed, 27 insertions(+), 2 deletions(-)
include/hw/riscv/virt.h +2 -2
@@ -74,9 +74,9 @@ enum { FDT_PLIC_ADDR_CELLS + FDT_PLIC_INT_CELLS)#if defined(TARGET_RISCV32 ) -#define VIRT_CPU TYPE_RISCV_CPU_RV32GCSU_V1_10_0 +#define VIRT_CPU TYPE_RISCV_CPU_BASE32#elif defined(TARGET_RISCV64 ) -#define VIRT_CPU TYPE_RISCV_CPU_RV64GCSU_V1_10_0 +#define VIRT_CPU TYPE_RISCV_CPU_BASE64#endif #endif
qemu-deprecated.texi +9 -0
@@ -128,6 +128,15 @@ The ``acl_show'', ``acl_reset'', ``acl_policy'', ``acl_add'', and ``acl_remove'' commands are deprecated with no replacement. Authorization for VNC should be performed using the pluggable QAuthZ objects. +@section System emulator CPUS + +@subsection RISC-V ISA CPUs (since 4.1) + +The RISC-V cpus with the ISA version in the CPU name have been depcreated. The +four CPUs are: ``rv32gcsu-v1.9.1``, ``rv32gcsu-v1.10.0``, ``rv64gcsu-v1.9.1`` and +``rv64gcsu-v1.10.0``. Instead the version can be specified via the CPU ``priv_spec`` +option when using the ``rv32`` or ``rv64`` CPUs. + @section System emulator devices @subsection bluetooth (since 3.1)
target/riscv/cpu.c +14 -0
@@ -114,6 +114,12 @@ static void riscv_any_cpu_init(Object *obj)#if defined(TARGET_RISCV32 ) +static void riscv_base32_cpu_init (Object *obj) +{ +CPURISCVState *env = &RISCV_CPU (obj)->env; +set_misa (env,RV32 |RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU ); +} +static void rv32gcsu_priv1_09_1_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;
@@ -145,6 +151,12 @@ static void rv32imacu_nommu_cpu_init(Object *obj)#elif defined(TARGET_RISCV64 ) +static void riscv_base64_cpu_init (Object *obj) +{ +CPURISCVState *env = &RISCV_CPU (obj)->env; +set_misa (env,RV64 |RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU ); +} +static void rv64gcsu_priv1_09_1_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;
@@ -490,12 +502,14 @@ static const TypeInfo riscv_cpu_type_infos[] = { }, DEFINE_CPU(TYPE_RISCV_CPU_ANY, riscv_any_cpu_init),#if defined(TARGET_RISCV32 ) +DEFINE_CPU (TYPE_RISCV_CPU_BASE32 , riscv_base32_cpu_init),DEFINE_CPU (TYPE_RISCV_CPU_RV32GCSU_V1_09_1 , rv32gcsu_priv1_09_1_cpu_init),DEFINE_CPU (TYPE_RISCV_CPU_RV32GCSU_V1_10_0 , rv32gcsu_priv1_10_0_cpu_init),DEFINE_CPU (TYPE_RISCV_CPU_RV32IMACU_NOMMU , rv32imacu_nommu_cpu_init),DEFINE_CPU (TYPE_RISCV_CPU_SIFIVE_E31 , rv32imacu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rv32gcsu_priv1_10_0_cpu_init)#elif defined(TARGET_RISCV64 ) +DEFINE_CPU (TYPE_RISCV_CPU_BASE64 , riscv_base64_cpu_init),DEFINE_CPU (TYPE_RISCV_CPU_RV64GCSU_V1_09_1 , rv64gcsu_priv1_09_1_cpu_init),DEFINE_CPU (TYPE_RISCV_CPU_RV64GCSU_V1_10_0 , rv64gcsu_priv1_10_0_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_RV64IMACU_NOMMU, rv64imacu_nommu_cpu_init),
target/riscv/cpu.h +2 -0
@@ -48,6 +48,8 @@#define CPU_RESOLVING_TYPE TYPE_RISCV_CPU#define TYPE_RISCV_CPU_ANY RISCV_CPU_TYPE_NAME("any") +#define TYPE_RISCV_CPU_BASE32 RISCV_CPU_TYPE_NAME("rv32") +#define TYPE_RISCV_CPU_BASE64 RISCV_CPU_TYPE_NAME("rv64")#define TYPE_RISCV_CPU_RV32GCSU_V1_09_1 RISCV_CPU_TYPE_NAME("rv32gcsu-v1.9.1")#define TYPE_RISCV_CPU_RV32GCSU_V1_10_0 RISCV_CPU_TYPE_NAME("rv32gcsu-v1.10.0")#define TYPE_RISCV_CPU_RV32IMACU_NOMMU RISCV_CPU_TYPE_NAME("rv32imacu-nommu")
Signature · 1 line
2.21.0
PATCH 5/6 target/riscv: Deprecate the generic no MMU CPUs
In reply to Alistair FrancisThese can now be specified via the command line so we no longer need these.
--- qemu-deprecated.texi | 6 ++++++ 1 file changed, 6 insertions(+)
qemu-deprecated.texi +6 -0
@@ -137,6 +137,12 @@ four CPUs are: ``rv32gcsu-v1.9.1``, ``rv32gcsu-v1.10.0``, ``rv64gcsu-v1.9.1`` an ``rv64gcsu-v1.10.0``. Instead the version can be specified via the CPU ``priv_spec`` option when using the ``rv32`` or ``rv64`` CPUs. +@subsection RISC-V ISA CPUs (since 4.1) + +The RISC-V no MMU cpus have been depcreated. The two CPUs: ``rv32imacu-nommu`` and +``rv64imacu-nommu`` should no longer be used. Instead the MMU status can be specified +via the CPU ``mmu`` option when using the ``rv32`` or ``rv64`` CPUs. + @section System emulator devices @subsection bluetooth (since 3.1)
Signature · 1 line
2.21.0
PATCH 6/6 riscv: spike: Add a generic spike machine
In reply to Alistair FrancisAdd a generic spike machine (not tied to a version) and deprecate the spike mahines that are tied to a specific version. As we can now specify the CPU via the command line we no londer need specific versions of the spike machines.
--- hw/riscv/spike.c | 106 ++++++++++++++++++++++++++++++++++++++++++- qemu-deprecated.texi | 6 +++ 2 files changed, 111 insertions(+), 1 deletion(-)
hw/riscv/spike.c +105 -1
@@ -39,6 +39,7 @@#include "chardev/char.h" #include "sysemu/arch_init.h" #include "sysemu/device_tree.h" +#include "sysemu/qtest.h" #include "exec/address-spaces.h" #include "elf.h"
@@ -160,7 +161,89 @@ static void create_fdt(SpikeState *s, const struct MemmapEntry *memmap,qemu_fdt_add_subnode (fdt,"/chosen" );qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , cmdline); } - } +} + +static void spike_board_init (MachineState *machine) +{ +const struct MemmapEntry *memmap = spike_memmap; + +SpikeState *s =g_new0 (SpikeState,1 ); +MemoryRegion *system_memory =get_system_memory (); +MemoryRegion *main_mem =g_new (MemoryRegion,1 ); +MemoryRegion *mask_rom =g_new (MemoryRegion,1 ); +int i; + +/* Initialize SOC */ +object_initialize_child (OBJECT (machine),"soc" , &s->soc,sizeof (s->soc), +TYPE_RISCV_HART_ARRAY , &error_abort,NULL ); +object_property_set_str (OBJECT (&s->soc), machine->cpu_type,"cpu-type" , + &error_abort); +object_property_set_int (OBJECT (&s->soc), smp_cpus,"num-harts" , + &error_abort); +object_property_set_bool (OBJECT (&s->soc), true,"realized" , + &error_abort); + +/* register system main memory (actual RAM) */ +memory_region_init_ram (main_mem,NULL ,"riscv.spike.ram" , + machine->ram_size, &error_fatal); +memory_region_add_subregion (system_memory, memmap[SPIKE_DRAM ].base, + main_mem); + +/* create device tree */ +create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline); + +/* boot rom */ +memory_region_init_rom (mask_rom,NULL ,"riscv.spike.mrom" , + memmap[SPIKE_MROM ].size, &error_fatal); +memory_region_add_subregion (system_memory, memmap[SPIKE_MROM ].base, + mask_rom); + +if (machine->kernel_filename) { +load_kernel (machine->kernel_filename); + } + +/* reset vector */ +uint32_t reset_vec[8 ] = { +0x00000297 ,/* 1: auipc t0, %pcrel_hi(dtb) */ +0x02028593 ,/* addi a1, t0, %pcrel_lo(1b) */ +0xf1402573 ,/* csrr a0, mhartid */ +#if defined(TARGET_RISCV32) +0x0182a283 ,/* lw t0, 24(t0) */ +#elif defined(TARGET_RISCV64) +0x0182b283 ,/* ld t0, 24(t0) */ +#endif +0x00028067 ,/* jr t0 */ +0x00000000 , + memmap[SPIKE_DRAM ].base,/* start: .dword DRAM_BASE */ +0x00000000 , +/* dtb: */ + }; + +/* copy in the reset vector in little_endian byte order */ +for (i =0 ; i <sizeof (reset_vec) >>2 ; i++) { + reset_vec[i] =cpu_to_le32 (reset_vec[i]); + } +rom_add_blob_fixed_as ("mrom.reset" , reset_vec,sizeof (reset_vec), + memmap[SPIKE_MROM ].base, &address_space_memory); + +/* copy in the device tree */ +if (fdt_pack (s->fdt) ||fdt_totalsize (s->fdt) > + memmap[SPIKE_MROM ].size -sizeof (reset_vec)) { +error_report ("not enough space to store device-tree" ); +exit (1 ); + } +qemu_fdt_dumpdtb (s->fdt,fdt_totalsize (s->fdt)); +rom_add_blob_fixed_as ("mrom.fdt" , s->fdt,fdt_totalsize (s->fdt), + memmap[SPIKE_MROM ].base +sizeof (reset_vec), + &address_space_memory); + +/* initialize HTIF using symbols found in load_kernel */ +htif_mm_init (system_memory, mask_rom, &s->soc.harts[0 ].env,serial_hd (0 )); + +/* Core Local Interruptor (timer and IPI) */ +sifive_clint_create (memmap[SPIKE_CLINT ].base, memmap[SPIKE_CLINT ].size, + smp_cpus,SIFIVE_SIP_BASE ,SIFIVE_TIMECMP_BASE ,SIFIVE_TIME_BASE ); +}static void spike_v1_10_0_board_init (MachineState *machine) {
@@ -172,6 +255,12 @@ static void spike_v1_10_0_board_init(MachineState *machine)MemoryRegion *mask_rom =g_new (MemoryRegion,1 );int i; +if (!qtest_enabled ()) { +info_report ("The Spike v1.10.0 machine has been deprecated. " +"Please use the generic spike machine and specify the ISA " +"versions using -cpu." ); + } +/* Initialize SOC */ object_initialize_child (OBJECT (machine),"soc" , &s->soc,sizeof (s->soc),TYPE_RISCV_HART_ARRAY , &error_abort,NULL );
@@ -254,6 +343,12 @@ static void spike_v1_09_1_board_init(MachineState *machine)MemoryRegion *mask_rom =g_new (MemoryRegion,1 );int i; +if (!qtest_enabled ()) { +info_report ("The Spike v1.09.1 machine has been deprecated. " +"Please use the generic spike machine and specify the ISA " +"versions using -cpu." ); + } +/* Initialize SOC */ object_initialize_child (OBJECT (machine),"soc" , &s->soc,sizeof (s->soc),TYPE_RISCV_HART_ARRAY , &error_abort,NULL );
@@ -359,8 +454,17 @@ static void spike_v1_10_0_machine_init(MachineClass *mc) mc->desc ="RISC-V Spike Board (Privileged ISA v1.10)" ; mc->init = spike_v1_10_0_board_init; mc->max_cpus =1 ; +} + +static void spike_machine_init (MachineClass *mc) +{ + mc->desc ="RISC-V Spike Board" ; + mc->init = spike_board_init; + mc->max_cpus =1 ; mc->is_default =1 ; + mc->default_cpu_type =SPIKE_V1_10_0_CPU ; } DEFINE_MACHINE("spike_v1.9.1", spike_v1_09_1_machine_init) DEFINE_MACHINE("spike_v1.10", spike_v1_10_0_machine_init) +DEFINE_MACHINE ("spike" , spike_machine_init)
qemu-deprecated.texi +6 -0
@@ -165,6 +165,12 @@ This machine type uses an unmaintained firmware, broken in lots of ways, and unable to start post-2004 operating systems. 40p machine type should be used instead. +@subsection spike_v1.9.1 and spike_v1.10 (since 4.1) + +The version specific Spike machines have been deprecated in favour of the +generic ``spike`` machine. If you need to specify an older version of the RISC-V +spec you can use the ``-cpu rv64gcsu,priv_spec=v1.9.1`` command line argument. + @section Device options @subsection Block device options
Signature · 1 line
2.21.0