target/riscv: deprecate riscv_cpu_options[]
v5 cover target/riscv: deprecate riscv_cpu_options[]
Hi,
This version is a resend of patches 10 to 17 from v4, reviewed-by and tested-by tags added, rebased with Alistair's riscv-to-apply.next. Patches 01 to 09 of v4 are already queued.
All patches acked.
Changes from v4:
- patches 1 to 9: already queued
- patches 10 to 17: reviewed-by and tested-by tags added (tested-by
not added in KVM specific patches)
- v4 link: https://lore.kernel.org/qemu-riscv/[email protected]/
Daniel Henrique Barboza (8):
target/riscv: create finalize_features() for KVM target/riscv: move 'cbom_blocksize' to riscv_cpu_properties[] target/riscv: move 'cbop_blocksize' to riscv_cpu_properties[] target/riscv: move 'cboz_blocksize' to riscv_cpu_properties[] target/riscv: remove riscv_cpu_options[] target/riscv/cpu.c: move 'mvendorid' to riscv_cpu_properties[] target/riscv/cpu.c: move 'mimpid' to riscv_cpu_properties[] target/riscv/cpu.c: move 'marchid' to riscv_cpu_properties[]
target/riscv/cpu.c | 377 +++++++++++++++++++++++------------ target/riscv/cpu.h | 2 +- target/riscv/kvm/kvm-cpu.c | 100 ++++++---- target/riscv/kvm/kvm_riscv.h | 1 + target/riscv/tcg/tcg-cpu.c | 4 - 5 files changed, 311 insertions(+), 173 deletions(-)
Signature · 1 line
2.43.0
PATCH v5 1/8 target/riscv: create finalize_features() for KVM
To turn cbom_blocksize and cboz_blocksize into class properties we need KVM specific changes.
KVM is creating its own version of these options with a customized setter() that prevents users from picking an invalid value during init() time. This comes at the cost of duplicating each option that KVM supports. This will keep happening for each new shared option KVM implements in the future.
We can avoid that by using the same property TCG uses and adding specific KVM handling during finalize() time, like TCG already does with riscv_tcg_cpu_finalize_features(). To do that, the common CPU property offers a way of knowing if an option was user set or not, sparing us from doing unneeded syscalls.
riscv_kvm_cpu_finalize_features() is then created using the same KVMScratch CPU we already use during init() time, since finalize() time is still too early to use the official KVM CPU for it. cbom_blocksize and cboz_blocksize are then handled during finalize() in the same way they're handled by their KVM specific setter.
With this change we can proceed with the blocksize changes in the common code without breaking the KVM driver.
--- target/riscv/cpu.c | 16 +++++++--- target/riscv/cpu.h | 1 + target/riscv/kvm/kvm-cpu.c | 59 ++++++++++++++++++++++++++++++++++++ target/riscv/kvm/kvm_riscv.h | 1 + 4 files changed, 72 insertions(+), 5 deletions(-)
target/riscv/cpu.c +11 -5
@@ -68,6 +68,11 @@ static void cpu_option_add_user_setting(const char *optname, uint32_t value) GUINT_TO_POINTER(value)); } +bool riscv_cpu_option_set (const char *optname) +{ +return g_hash_table_contains (general_user_opts, optname); +} +#define ISA_EXT_DATA_ENTRY (_name, _min_ver, _prop) \ {#_name, _min_ver, CPU_CFG_OFFSET(_prop)}
@@ -1109,17 +1114,18 @@ void riscv_cpu_finalize_features(RISCVCPU *cpu, Error **errp) }#endif -/* -* KVM accel does not have a specialized finalize() -* callback because its extensions are validated -* in the get()/set() callbacks of each property. -*/ if (tcg_enabled ()) {riscv_tcg_cpu_finalize_features (cpu, &local_err);if (local_err !=NULL ) {error_propagate (errp, local_err);return ; } + }else if (kvm_enabled ()) { +riscv_kvm_cpu_finalize_features (cpu, &local_err); +if (local_err !=NULL ) { +error_propagate (errp, local_err); +return ; + } } }
target/riscv/cpu.h +1 -0
@@ -510,6 +510,7 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr);char *riscv_isa_string (RISCVCPU *cpu); +bool riscv_cpu_option_set (const char *optname);#define cpu_mmu_index riscv_cpu_mmu_index
target/riscv/kvm/kvm-cpu.c +59 -0
65 lines not on this page · raw message
target/riscv/kvm/kvm_riscv.h +1 -0
@@ -27,5 +27,6 @@ void kvm_riscv_aia_create(MachineState *machine, uint64_t group_shift, uint64_t guest_num);void riscv_kvm_aplic_request (void *opaque,int irq,int level);int kvm_riscv_sync_mpstate_to_kvm (RISCVCPU *cpu,int state); +void riscv_kvm_cpu_finalize_features (RISCVCPU *cpu,Error **errp);#endif
Signature · 1 line
2.43.0
PATCH v5 2/8 target/riscv: move 'cbom_blocksize' to riscv_cpu_properties[]
In reply to Daniel Henrique BarbozaAfter adding a KVM finalize() implementation, turn cbom_blocksize into a class property. Follow the same design we used with 'vlen' and 'elen'.
The duplicated 'cbom_blocksize' KVM property can be removed from kvm_riscv_add_cpu_user_properties().
--- target/riscv/cpu.c | 39 +++++++++++++++++++++++++++++++++++++- target/riscv/kvm/kvm-cpu.c | 4 ---- 2 files changed, 38 insertions(+), 5 deletions(-)
target/riscv/cpu.c +38 -1
@@ -1321,6 +1321,7 @@ static void riscv_cpu_init(Object *obj) cpu->cfg.pmu_mask =MAKE_64BIT_MASK (3 ,16 ); cpu->cfg.vlen =128 ; cpu->cfg.elen =64 ; + cpu->cfg.cbom_blocksize =64 ; cpu->env.vext_ver =VEXT_VERSION_1_00_0 ; }
@@ -1872,8 +1873,42 @@ static const PropertyInfo prop_elen = { .set = prop_elen_set, }; +static void prop_cbom_blksize_set (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +RISCVCPU *cpu =RISCV_CPU (obj); +uint16_t value; + +if (!visit_type_uint16 (v, name, &value, errp)) { +return ; + } + +if (value != cpu->cfg.cbom_blocksize &&riscv_cpu_is_vendor (obj)) { +cpu_set_prop_err (cpu, name, errp); +error_append_hint (errp,"Current '%s' val: %u\n" , + name, cpu->cfg.cbom_blocksize); +return ; + } + +cpu_option_add_user_setting (name, value); + cpu->cfg.cbom_blocksize = value; +} + +static void prop_cbom_blksize_get (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +uint16_t value =RISCV_CPU (obj)->cfg.cbom_blocksize; + +visit_type_uint16 (v, name, &value, errp); +} + +static const PropertyInfo prop_cbom_blksize = { + .name ="cbom_blocksize" , + .get = prop_cbom_blksize_get, + .set = prop_cbom_blksize_set, +}; +Property riscv_cpu_options[] = { -DEFINE_PROP_UINT16 ("cbom_blocksize" ,RISCVCPU , cfg.cbom_blocksize,64 ),DEFINE_PROP_UINT16 ("cbop_blocksize" ,RISCVCPU , cfg.cbop_blocksize,64 ),DEFINE_PROP_UINT16 ("cboz_blocksize" ,RISCVCPU , cfg.cboz_blocksize,64 ),
@@ -1962,6 +1997,8 @@ static Property riscv_cpu_properties[] = { {.name = "vlen", .info = &prop_vlen}, {.name = "elen", .info = &prop_elen}, + {.name = "cbom_blocksize", .info = &prop_cbom_blksize}, +#ifndef CONFIG_USER_ONLY DEFINE_PROP_UINT64("resetvec", RISCVCPU, env.resetvec, DEFAULT_RSTVEC),#endif
target/riscv/kvm/kvm-cpu.c +0 -4
@@ -493,10 +493,6 @@ static void kvm_riscv_add_cpu_user_properties(Object *cpu_obj) NULL, multi_cfg); } -object_property_add (cpu_obj,"cbom_blocksize" ,"uint16" , -NULL , kvm_cpu_set_cbomz_blksize, -NULL , &kvm_cbom_blocksize); -object_property_add (cpu_obj,"cboz_blocksize" ,"uint16" ,NULL , kvm_cpu_set_cbomz_blksize,NULL , &kvm_cboz_blocksize);
Signature · 1 line
2.43.0
PATCH v5 3/8 target/riscv: move 'cbop_blocksize' to riscv_cpu_properties[]
In reply to Daniel Henrique BarbozaDo the same we did with 'cbom_blocksize' in the previous patch.
--- target/riscv/cpu.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-)
target/riscv/cpu.c +37 -1
@@ -1322,6 +1322,7 @@ static void riscv_cpu_init(Object *obj) cpu->cfg.vlen =128 ; cpu->cfg.elen =64 ; cpu->cfg.cbom_blocksize =64 ; + cpu->cfg.cbop_blocksize =64 ; cpu->env.vext_ver =VEXT_VERSION_1_00_0 ; }
@@ -1908,8 +1909,42 @@ static const PropertyInfo prop_cbom_blksize = { .set = prop_cbom_blksize_set, }; +static void prop_cbop_blksize_set (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +RISCVCPU *cpu =RISCV_CPU (obj); +uint16_t value; + +if (!visit_type_uint16 (v, name, &value, errp)) { +return ; + } + +if (value != cpu->cfg.cbop_blocksize &&riscv_cpu_is_vendor (obj)) { +cpu_set_prop_err (cpu, name, errp); +error_append_hint (errp,"Current '%s' val: %u\n" , + name, cpu->cfg.cbop_blocksize); +return ; + } + +cpu_option_add_user_setting (name, value); + cpu->cfg.cbop_blocksize = value; +} + +static void prop_cbop_blksize_get (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +uint16_t value =RISCV_CPU (obj)->cfg.cbop_blocksize; + +visit_type_uint16 (v, name, &value, errp); +} + +static const PropertyInfo prop_cbop_blksize = { + .name ="cbop_blocksize" , + .get = prop_cbop_blksize_get, + .set = prop_cbop_blksize_set, +}; +Property riscv_cpu_options[] = { -DEFINE_PROP_UINT16 ("cbop_blocksize" ,RISCVCPU , cfg.cbop_blocksize,64 ),DEFINE_PROP_UINT16 ("cboz_blocksize" ,RISCVCPU , cfg.cboz_blocksize,64 ),DEFINE_PROP_END_OF_LIST (),
@@ -1998,6 +2033,7 @@ static Property riscv_cpu_properties[] = { {.name = "elen", .info = &prop_elen}, {.name = "cbom_blocksize", .info = &prop_cbom_blksize}, + {.name = "cbop_blocksize", .info = &prop_cbop_blksize},#ifndef CONFIG_USER_ONLY DEFINE_PROP_UINT64("resetvec", RISCVCPU, env.resetvec, DEFAULT_RSTVEC),
Signature · 1 line
2.43.0
PATCH v5 4/8 target/riscv: move 'cboz_blocksize' to riscv_cpu_properties[]
In reply to Daniel Henrique BarbozaAnd remove the now unused kvm_cpu_set_cbomz_blksize() setter.
--- target/riscv/cpu.c | 38 +++++++++++++++++++++++++++++++++++++- target/riscv/kvm/kvm-cpu.c | 28 ---------------------------- 2 files changed, 37 insertions(+), 29 deletions(-)
target/riscv/cpu.c +37 -1
@@ -1323,6 +1323,7 @@ static void riscv_cpu_init(Object *obj) cpu->cfg.elen =64 ; cpu->cfg.cbom_blocksize =64 ; cpu->cfg.cbop_blocksize =64 ; + cpu->cfg.cboz_blocksize =64 ; cpu->env.vext_ver =VEXT_VERSION_1_00_0 ; }
@@ -1944,8 +1945,42 @@ static const PropertyInfo prop_cbop_blksize = { .set = prop_cbop_blksize_set, }; +static void prop_cboz_blksize_set (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +RISCVCPU *cpu =RISCV_CPU (obj); +uint16_t value; + +if (!visit_type_uint16 (v, name, &value, errp)) { +return ; + } + +if (value != cpu->cfg.cboz_blocksize &&riscv_cpu_is_vendor (obj)) { +cpu_set_prop_err (cpu, name, errp); +error_append_hint (errp,"Current '%s' val: %u\n" , + name, cpu->cfg.cboz_blocksize); +return ; + } + +cpu_option_add_user_setting (name, value); + cpu->cfg.cboz_blocksize = value; +} + +static void prop_cboz_blksize_get (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +uint16_t value =RISCV_CPU (obj)->cfg.cboz_blocksize; + +visit_type_uint16 (v, name, &value, errp); +} + +static const PropertyInfo prop_cboz_blksize = { + .name ="cboz_blocksize" , + .get = prop_cboz_blksize_get, + .set = prop_cboz_blksize_set, +}; +Property riscv_cpu_options[] = { -DEFINE_PROP_UINT16 ("cboz_blocksize" ,RISCVCPU , cfg.cboz_blocksize,64 ),DEFINE_PROP_END_OF_LIST (), };
@@ -2034,6 +2069,7 @@ static Property riscv_cpu_properties[] = { {.name = "cbom_blocksize", .info = &prop_cbom_blksize}, {.name = "cbop_blocksize", .info = &prop_cbop_blksize}, + {.name = "cboz_blocksize", .info = &prop_cboz_blksize},#ifndef CONFIG_USER_ONLY DEFINE_PROP_UINT64("resetvec", RISCVCPU, env.resetvec, DEFAULT_RSTVEC),
target/riscv/kvm/kvm-cpu.c +0 -28
@@ -352,30 +352,6 @@ static KVMCPUConfig kvm_cboz_blocksize = { .kvm_reg_id = KVM_REG_RISCV_CONFIG_REG(zicboz_block_size) }; -static void kvm_cpu_set_cbomz_blksize (Object *obj,Visitor *v, -const char *name, -void *opaque,Error **errp) -{ -KVMCPUConfig *cbomz_cfg = opaque; -RISCVCPU *cpu =RISCV_CPU (obj); -uint16_t value, *host_val; - -if (!visit_type_uint16 (v, name, &value, errp)) { -return ; - } - - host_val =kvmconfig_get_cfg_addr (cpu, cbomz_cfg); - -if (value != *host_val) { -error_report ("Unable to set %s to a different value than " -"the host (%u)" , - cbomz_cfg->name, *host_val); -exit (EXIT_FAILURE ); - } - - cbomz_cfg->user_set = true; -} -static void kvm_riscv_update_cpu_cfg_isa_ext (RISCVCPU *cpu,CPUState *cs) {CPURISCVState *env = &cpu->env;
@@ -493,10 +469,6 @@ static void kvm_riscv_add_cpu_user_properties(Object *cpu_obj) NULL, multi_cfg); } -object_property_add (cpu_obj,"cboz_blocksize" ,"uint16" , -NULL , kvm_cpu_set_cbomz_blksize, -NULL , &kvm_cboz_blocksize); -riscv_cpu_add_kvm_unavail_prop_array (cpu_obj, riscv_cpu_extensions);riscv_cpu_add_kvm_unavail_prop_array (cpu_obj, riscv_cpu_vendor_exts);riscv_cpu_add_kvm_unavail_prop_array (cpu_obj, riscv_cpu_experimental_exts);
Signature · 1 line
2.43.0
PATCH v5 5/8 target/riscv: remove riscv_cpu_options[]
In reply to Daniel Henrique BarbozaThe array is empty and can be removed.
--- target/riscv/cpu.c | 5 ----- target/riscv/cpu.h | 1 - target/riscv/kvm/kvm-cpu.c | 9 --------- target/riscv/tcg/tcg-cpu.c | 4 ---- 4 files changed, 19 deletions(-)
target/riscv/cpu.c +0 -5
@@ -1980,11 +1980,6 @@ static const PropertyInfo prop_cboz_blksize = { .set = prop_cboz_blksize_set, }; -Property riscv_cpu_options[] = { - -DEFINE_PROP_END_OF_LIST (), -}; -/* * RVA22U64 defines some 'named features' or 'synthetic extensions' * that are cache related: Za64rs, Zic64b, Ziccif, Ziccrse, Ziccamoa
target/riscv/cpu.h +0 -1
@@ -790,7 +790,6 @@ extern const RISCVCPUMultiExtConfig riscv_cpu_vendor_exts[];extern const RISCVCPUMultiExtConfig riscv_cpu_experimental_exts[];extern const RISCVCPUMultiExtConfig riscv_cpu_named_features[];extern const RISCVCPUMultiExtConfig riscv_cpu_deprecated_exts[]; -extern Property riscv_cpu_options[]; typedef struct isa_ext_data { const char *name;
target/riscv/kvm/kvm-cpu.c +0 -9
@@ -1527,19 +1527,10 @@ void kvm_riscv_aia_create(MachineState *machine, uint64_t group_shift,static void kvm_cpu_instance_init (CPUState *cs) {Object *obj =OBJECT (RISCV_CPU (cs)); -DeviceState *dev =DEVICE (obj);riscv_init_kvm_registers (obj);kvm_riscv_add_cpu_user_properties (obj); - -for (Property *prop = riscv_cpu_options; prop && prop->name; prop++) { -/* Check if we have a specific KVM handler for the option */ -if (object_property_find (obj, prop->name)) { -continue ; - } -qdev_property_add_static (dev, prop); - } }/*
target/riscv/tcg/tcg-cpu.c +0 -4
@@ -1301,10 +1301,6 @@ static void riscv_cpu_add_user_properties(Object *obj)riscv_cpu_add_multiext_prop_array (obj, riscv_cpu_deprecated_exts);riscv_cpu_add_profiles (obj); - -for (Property *prop = riscv_cpu_options; prop && prop->name; prop++) { -qdev_property_add_static (DEVICE (obj), prop); - } }/*
Signature · 1 line
2.43.0
PATCH v5 6/8 target/riscv/cpu.c: move 'mvendorid' to riscv_cpu_properties[]
In reply to Daniel Henrique BarbozaKeep all class properties in riscv_cpu_properties[].
--- target/riscv/cpu.c | 69 +++++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 32 deletions(-)
target/riscv/cpu.c +37 -32
@@ -1980,6 +1980,41 @@ static const PropertyInfo prop_cboz_blksize = { .set = prop_cboz_blksize_set, }; +static void prop_mvendorid_set (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +bool dynamic_cpu =riscv_cpu_is_dynamic (obj); +RISCVCPU *cpu =RISCV_CPU (obj); +uint32_t prev_val = cpu->cfg.mvendorid; +uint32_t value; + +if (!visit_type_uint32 (v, name, &value, errp)) { +return ; + } + +if (!dynamic_cpu && prev_val != value) { +error_setg (errp,"Unable to change %s mvendorid (0x%x)" , +object_get_typename (obj), prev_val); +return ; + } + + cpu->cfg.mvendorid = value; +} + +static void prop_mvendorid_get (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +uint32_t value =RISCV_CPU (obj)->cfg.mvendorid; + +visit_type_uint32 (v, name, &value, errp); +} + +static const PropertyInfo prop_mvendorid = { + .name ="mvendorid" , + .get = prop_mvendorid_get, + .set = prop_mvendorid_set, +}; +/* * RVA22U64 defines some 'named features' or 'synthetic extensions' * that are cache related: Za64rs, Zic64b, Ziccif, Ziccrse, Ziccamoa
@@ -2066,6 +2101,8 @@ static Property riscv_cpu_properties[] = { {.name = "cbop_blocksize", .info = &prop_cbop_blksize}, {.name = "cboz_blocksize", .info = &prop_cboz_blksize}, + {.name = "mvendorid", .info = &prop_mvendorid}, +#ifndef CONFIG_USER_ONLY DEFINE_PROP_UINT64("resetvec", RISCVCPU, env.resetvec, DEFAULT_RSTVEC),#endif
@@ -2146,35 +2183,6 @@ static const struct SysemuCPUOps riscv_sysemu_ops = { };#endif -static void cpu_set_mvendorid (Object *obj,Visitor *v,const char *name, -void *opaque,Error **errp) -{ -bool dynamic_cpu =riscv_cpu_is_dynamic (obj); -RISCVCPU *cpu =RISCV_CPU (obj); -uint32_t prev_val = cpu->cfg.mvendorid; -uint32_t value; - -if (!visit_type_uint32 (v, name, &value, errp)) { -return ; - } - -if (!dynamic_cpu && prev_val != value) { -error_setg (errp,"Unable to change %s mvendorid (0x%x)" , -object_get_typename (obj), prev_val); -return ; - } - - cpu->cfg.mvendorid = value; -} - -static void cpu_get_mvendorid (Object *obj,Visitor *v,const char *name, -void *opaque,Error **errp) -{ -uint32_t value =RISCV_CPU (obj)->cfg.mvendorid; - -visit_type_uint32 (v, name, &value, errp); -} -static void cpu_set_mimpid (Object *obj,Visitor *v,const char *name,void *opaque,Error **errp) {
@@ -2284,9 +2292,6 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data) cc->gdb_arch_name = riscv_gdb_arch_name; cc->gdb_get_dynamic_xml = riscv_gdb_get_dynamic_xml; -object_class_property_add (c,"mvendorid" ,"uint32" , cpu_get_mvendorid, - cpu_set_mvendorid,NULL ,NULL ); -object_class_property_add (c,"mimpid" ,"uint64" , cpu_get_mimpid, cpu_set_mimpid,NULL ,NULL );
Signature · 1 line
2.43.0
PATCH v5 7/8 target/riscv/cpu.c: move 'mimpid' to riscv_cpu_properties[]
In reply to Daniel Henrique BarbozaKeep all class properties in riscv_cpu_properties[].
--- target/riscv/cpu.c | 68 ++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 32 deletions(-)
target/riscv/cpu.c +36 -32
@@ -2015,6 +2015,41 @@ static const PropertyInfo prop_mvendorid = { .set = prop_mvendorid_set, }; +static void prop_mimpid_set (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +bool dynamic_cpu =riscv_cpu_is_dynamic (obj); +RISCVCPU *cpu =RISCV_CPU (obj); +uint64_t prev_val = cpu->cfg.mimpid; +uint64_t value; + +if (!visit_type_uint64 (v, name, &value, errp)) { +return ; + } + +if (!dynamic_cpu && prev_val != value) { +error_setg (errp,"Unable to change %s mimpid (0x%" PRIu64")" , +object_get_typename (obj), prev_val); +return ; + } + + cpu->cfg.mimpid = value; +} + +static void prop_mimpid_get (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +uint64_t value =RISCV_CPU (obj)->cfg.mimpid; + +visit_type_uint64 (v, name, &value, errp); +} + +static const PropertyInfo prop_mimpid = { + .name ="mimpid" , + .get = prop_mimpid_get, + .set = prop_mimpid_set, +}; +/* * RVA22U64 defines some 'named features' or 'synthetic extensions' * that are cache related: Za64rs, Zic64b, Ziccif, Ziccrse, Ziccamoa
@@ -2102,6 +2137,7 @@ static Property riscv_cpu_properties[] = { {.name = "cboz_blocksize", .info = &prop_cboz_blksize}, {.name = "mvendorid", .info = &prop_mvendorid}, + {.name = "mimpid", .info = &prop_mimpid},#ifndef CONFIG_USER_ONLY DEFINE_PROP_UINT64("resetvec", RISCVCPU, env.resetvec, DEFAULT_RSTVEC),
@@ -2183,35 +2219,6 @@ static const struct SysemuCPUOps riscv_sysemu_ops = { };#endif -static void cpu_set_mimpid (Object *obj,Visitor *v,const char *name, -void *opaque,Error **errp) -{ -bool dynamic_cpu =riscv_cpu_is_dynamic (obj); -RISCVCPU *cpu =RISCV_CPU (obj); -uint64_t prev_val = cpu->cfg.mimpid; -uint64_t value; - -if (!visit_type_uint64 (v, name, &value, errp)) { -return ; - } - -if (!dynamic_cpu && prev_val != value) { -error_setg (errp,"Unable to change %s mimpid (0x%" PRIu64")" , -object_get_typename (obj), prev_val); -return ; - } - - cpu->cfg.mimpid = value; -} - -static void cpu_get_mimpid (Object *obj,Visitor *v,const char *name, -void *opaque,Error **errp) -{ -uint64_t value =RISCV_CPU (obj)->cfg.mimpid; - -visit_type_uint64 (v, name, &value, errp); -} -static void cpu_set_marchid (Object *obj,Visitor *v,const char *name,void *opaque,Error **errp) {
@@ -2292,9 +2299,6 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data) cc->gdb_arch_name = riscv_gdb_arch_name; cc->gdb_get_dynamic_xml = riscv_gdb_get_dynamic_xml; -object_class_property_add (c,"mimpid" ,"uint64" , cpu_get_mimpid, - cpu_set_mimpid,NULL ,NULL ); -object_class_property_add (c,"marchid" ,"uint64" , cpu_get_marchid, cpu_set_marchid,NULL ,NULL );
Signature · 1 line
2.43.0
PATCH v5 8/8 target/riscv/cpu.c: move 'marchid' to riscv_cpu_properties[]
In reply to Daniel Henrique BarbozaKeep all class properties in riscv_cpu_properties[].
--- target/riscv/cpu.c | 110 +++++++++++++++++++++++---------------------- 1 file changed, 57 insertions(+), 53 deletions(-)
target/riscv/cpu.c +57 -53
@@ -2050,6 +2050,62 @@ static const PropertyInfo prop_mimpid = { .set = prop_mimpid_set, }; +static void prop_marchid_set (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +bool dynamic_cpu =riscv_cpu_is_dynamic (obj); +RISCVCPU *cpu =RISCV_CPU (obj); +uint64_t prev_val = cpu->cfg.marchid; +uint64_t value, invalid_val; +uint32_t mxlen =0 ; + +if (!visit_type_uint64 (v, name, &value, errp)) { +return ; + } + +if (!dynamic_cpu && prev_val != value) { +error_setg (errp,"Unable to change %s marchid (0x%" PRIu64")" , +object_get_typename (obj), prev_val); +return ; + } + +switch (riscv_cpu_mxl (&cpu->env)) { +case MXL_RV32 : + mxlen =32 ; +break ; +case MXL_RV64 : +case MXL_RV128 : + mxlen =64 ; +break ; +default : +g_assert_not_reached (); + } + + invalid_val =1LL << (mxlen -1 ); + +if (value == invalid_val) { +error_setg (errp,"Unable to set marchid with MSB (%u) bit set " +"and the remaining bits zero" , mxlen); +return ; + } + + cpu->cfg.marchid = value; +} + +static void prop_marchid_get (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +uint64_t value =RISCV_CPU (obj)->cfg.marchid; + +visit_type_uint64 (v, name, &value, errp); +} + +static const PropertyInfo prop_marchid = { + .name ="marchid" , + .get = prop_marchid_get, + .set = prop_marchid_set, +}; +/* * RVA22U64 defines some 'named features' or 'synthetic extensions' * that are cache related: Za64rs, Zic64b, Ziccif, Ziccrse, Ziccamoa
@@ -2138,6 +2194,7 @@ static Property riscv_cpu_properties[] = { {.name = "mvendorid", .info = &prop_mvendorid}, {.name = "mimpid", .info = &prop_mimpid}, + {.name = "marchid", .info = &prop_marchid},#ifndef CONFIG_USER_ONLY DEFINE_PROP_UINT64("resetvec", RISCVCPU, env.resetvec, DEFAULT_RSTVEC),
@@ -2219,56 +2276,6 @@ static const struct SysemuCPUOps riscv_sysemu_ops = { };#endif -static void cpu_set_marchid (Object *obj,Visitor *v,const char *name, -void *opaque,Error **errp) -{ -bool dynamic_cpu =riscv_cpu_is_dynamic (obj); -RISCVCPU *cpu =RISCV_CPU (obj); -uint64_t prev_val = cpu->cfg.marchid; -uint64_t value, invalid_val; -uint32_t mxlen =0 ; - -if (!visit_type_uint64 (v, name, &value, errp)) { -return ; - } - -if (!dynamic_cpu && prev_val != value) { -error_setg (errp,"Unable to change %s marchid (0x%" PRIu64")" , -object_get_typename (obj), prev_val); -return ; - } - -switch (riscv_cpu_mxl (&cpu->env)) { -case MXL_RV32 : - mxlen =32 ; -break ; -case MXL_RV64 : -case MXL_RV128 : - mxlen =64 ; -break ; -default : -g_assert_not_reached (); - } - - invalid_val =1LL << (mxlen -1 ); - -if (value == invalid_val) { -error_setg (errp,"Unable to set marchid with MSB (%u) bit set " -"and the remaining bits zero" , mxlen); -return ; - } - - cpu->cfg.marchid = value; -} - -static void cpu_get_marchid (Object *obj,Visitor *v,const char *name, -void *opaque,Error **errp) -{ -uint64_t value =RISCV_CPU (obj)->cfg.marchid; - -visit_type_uint64 (v, name, &value, errp); -} -static void riscv_cpu_class_init (ObjectClass *c,void *data) {RISCVCPUClass *mcc =RISCV_CPU_CLASS (c);
@@ -2299,9 +2306,6 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data) cc->gdb_arch_name = riscv_gdb_arch_name; cc->gdb_get_dynamic_xml = riscv_gdb_get_dynamic_xml; -object_class_property_add (c,"marchid" ,"uint64" , cpu_get_marchid, - cpu_set_marchid,NULL ,NULL ); -device_class_set_props (dc, riscv_cpu_properties); }
Signature · 1 line
2.43.0
Alistair Francis
AppliedQuoted 15 lines · Daniel Henrique Barboza
Hi,
This version is a resend of patches 10 to 17 from v4, reviewed-by and tested-by tags added, rebased with Alistair's riscv-to-apply.next. Patches 01 to 09 of v4 are already queued.
All patches acked.
Changes from v4:
- patches 1 to 9: already queued
- patches 10 to 17: reviewed-by and tested-by tags added (tested-by
not added in KVM specific patches)
- v4 link: https://lore.kernel.org/qemu-riscv/[email protected]/
Quoted 9 lines
Daniel Henrique Barboza (8):
target/riscv: createfinalize_features()for KVM target/riscv: move 'cbom_blocksize' to riscv_cpu_properties[] target/riscv: move 'cbop_blocksize' to riscv_cpu_properties[] target/riscv: move 'cboz_blocksize' to riscv_cpu_properties[] target/riscv: remove riscv_cpu_options[]target/riscv/cpu.c: move 'mvendorid' to riscv_cpu_properties[]target/riscv/cpu.c: move 'mimpid' to riscv_cpu_properties[]target/riscv/cpu.c: move 'marchid' to riscv_cpu_properties[]
Thanks!
Applied to riscv-to-apply.next
Alistair
Quoted 12 lines
target/riscv/cpu.c | 377 +++++++++++++++++++++++------------ target/riscv/cpu.h | 2 +- target/riscv/kvm/kvm-cpu.c | 100 ++++++---- target/riscv/kvm/kvm_riscv.h | 1 + target/riscv/tcg/tcg-cpu.c | 4 - 5 files changed, 311 insertions(+), 173 deletions(-)--
2.43.0