On Thu, Jan 4, 2024 at 3:44 AM Daniel Henrique Barboza
<dbarb...@ventanamicro.com> wrote:
>
> 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 <dbarb...@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.fran...@wdc.com>
Alistair
> ---
> target/riscv/cpu.c | 39 +++++++++++++++++++++++++++++++++++++-
> target/riscv/kvm/kvm-cpu.c | 4 ----
> 2 files changed, 38 insertions(+), 5 deletions(-)
>
> diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
> index 92b4881e9c..b510cb94fc 100644
> --- a/target/riscv/cpu.c
> +++ b/target/riscv/cpu.c
> @@ -1276,6 +1276,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;
> }
>
> @@ -1822,8 +1823,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("cboz_blocksize", RISCVCPU, cfg.cboz_blocksize, 64),
>
> DEFINE_PROP_END_OF_LIST(),
> @@ -1844,6 +1879,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
> diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c
> index 70fb075846..1866b56913 100644
> --- a/target/riscv/kvm/kvm-cpu.c
> +++ b/target/riscv/kvm/kvm-cpu.c
> @@ -484,10 +484,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);
> --
> 2.43.0
>
>
