[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 13/17] target/riscv: move 'cboz_blocksize' to riscv_cpu_proper
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH v4 13/17] target/riscv: move 'cboz_blocksize' to riscv_cpu_properties[] |
Date: |
Fri, 5 Jan 2024 20:05:42 -0300 |
And remove the now unused kvm_cpu_set_cbomz_blksize() setter.
Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
target/riscv/cpu.c | 38 +++++++++++++++++++++++++++++++++++++-
target/riscv/kvm/kvm-cpu.c | 28 ----------------------------
2 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index e3cbe9b1b6..f84c3fc4a2 100644
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -1318,6 +1318,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;
}
@@ -1938,8 +1939,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(),
};
@@ -2028,6 +2063,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),
diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c
index 9a6a007931..c9b4a6a7e8 100644
--- a/target/riscv/kvm/kvm-cpu.c
+++ b/target/riscv/kvm/kvm-cpu.c
@@ -343,30 +343,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;
@@ -484,10 +460,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);
--
2.43.0
- [PATCH v4 03/17] target/riscv: move 'pmu-mask' and 'pmu-num' to riscv_cpu_properties[], (continued)
- [PATCH v4 03/17] target/riscv: move 'pmu-mask' and 'pmu-num' to riscv_cpu_properties[], Daniel Henrique Barboza, 2024/01/05
- [PATCH v4 05/17] target/riscv: move 'pmp' to riscv_cpu_properties[], Daniel Henrique Barboza, 2024/01/05
- [PATCH v4 04/17] target/riscv: move 'mmu' to riscv_cpu_properties[], Daniel Henrique Barboza, 2024/01/05
- [PATCH v4 06/17] target/riscv: rework 'priv_spec', Daniel Henrique Barboza, 2024/01/05
- [PATCH v4 07/17] target/riscv: rework 'vext_spec', Daniel Henrique Barboza, 2024/01/05
- [PATCH v4 08/17] target/riscv: move 'vlen' to riscv_cpu_properties[], Daniel Henrique Barboza, 2024/01/05
- [PATCH v4 09/17] target/riscv: move 'elen' to riscv_cpu_properties[], Daniel Henrique Barboza, 2024/01/05
- [PATCH v4 10/17] target/riscv: create finalize_features() for KVM, Daniel Henrique Barboza, 2024/01/05
- [PATCH v4 11/17] target/riscv: move 'cbom_blocksize' to riscv_cpu_properties[], Daniel Henrique Barboza, 2024/01/05
- [PATCH v4 13/17] target/riscv: move 'cboz_blocksize' to riscv_cpu_properties[],
Daniel Henrique Barboza <=
- [PATCH v4 12/17] target/riscv: move 'cbop_blocksize' to riscv_cpu_properties[], Daniel Henrique Barboza, 2024/01/05
- [PATCH v4 14/17] target/riscv: remove riscv_cpu_options[], Daniel Henrique Barboza, 2024/01/05
- [PATCH v4 15/17] target/riscv/cpu.c: move 'mvendorid' to riscv_cpu_properties[], Daniel Henrique Barboza, 2024/01/05
- [PATCH v4 16/17] target/riscv/cpu.c: move 'mimpid' to riscv_cpu_properties[], Daniel Henrique Barboza, 2024/01/05
- [PATCH v4 17/17] target/riscv/cpu.c: move 'marchid' to riscv_cpu_properties[], Daniel Henrique Barboza, 2024/01/05
- Re: [PATCH v4 00/17] target/riscv: deprecate riscv_cpu_options[], Vladimir Isaev, 2024/01/09