mirror of https://github.com/xemu-project/xemu.git
target/riscv: move 'cbom_blocksize' to riscv_cpu_properties[]
After 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(). Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Tested-by: Vladimir Isaev <vladimir.isaev@syntacore.com> tested-by tags added, rebased with Alistair's riscv-to-apply.next. Message-ID: <20240112140201.127083-3-dbarboza@ventanamicro.com> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
parent
bbef914044
commit
b84efa39a0
|
@ -1326,6 +1326,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;
|
||||
}
|
||||
|
||||
|
@ -1877,8 +1878,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),
|
||||
|
||||
|
@ -1967,6 +2002,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
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue