With the movement of the property, we can remove the field from the cpu entirely, using only the class.
Signed-off-by: Richard Henderson <richard.hender...@linaro.org> --- target/arm/cpu-qom.h | 3 +++ target/arm/cpu.h | 3 --- hw/arm/aspeed_ast2600.c | 6 +++-- target/arm/cpu.c | 50 +++++++++++++++++++++++------------------ target/arm/helper.c | 3 ++- 5 files changed, 37 insertions(+), 28 deletions(-) diff --git a/target/arm/cpu-qom.h b/target/arm/cpu-qom.h index 6b113d7fe6..2d6fa38a30 100644 --- a/target/arm/cpu-qom.h +++ b/target/arm/cpu-qom.h @@ -154,6 +154,9 @@ struct ARMCPUClass { */ uint64_t ccsidr[16]; + /* Generic timer counter frequency, in Hz */ + uint64_t gt_cntfrq_hz; + uint32_t revidr; uint32_t id_afr0; uint32_t reset_fpsid; diff --git a/target/arm/cpu.h b/target/arm/cpu.h index f2dceae0e7..e425846007 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1019,9 +1019,6 @@ struct ArchCPU { ARMVQMap sve_vq; ARMVQMap sme_vq; - - /* Generic timer counter frequency, in Hz */ - uint64_t gt_cntfrq_hz; }; unsigned int gt_cntfrq_period_ns(ARMCPU *cpu); diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c index cd75465c2b..bb8579546e 100644 --- a/hw/arm/aspeed_ast2600.c +++ b/hw/arm/aspeed_ast2600.c @@ -145,6 +145,7 @@ static void aspeed_soc_ast2600_init(Object *obj) { AspeedSoCState *s = ASPEED_SOC(obj); AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); + ObjectClass *cpu_class; int i; char socname[8]; char typename[64]; @@ -153,6 +154,9 @@ static void aspeed_soc_ast2600_init(Object *obj) g_assert_not_reached(); } + cpu_class = object_class_by_name(sc->cpu_type); + class_property_set_uint(cpu_class, "cntfrq", 1125000000, &error_abort); + for (i = 0; i < sc->num_cpus; i++) { object_initialize_child(obj, "cpu[*]", &s->cpu[i], sc->cpu_type); } @@ -305,8 +309,6 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp) object_property_set_int(OBJECT(&s->cpu[i]), "mp-affinity", aspeed_calc_affinity(i), &error_abort); - object_property_set_int(OBJECT(&s->cpu[i]), "cntfrq", 1125000000, - &error_abort); object_property_set_bool(OBJECT(&s->cpu[i]), "neon", false, &error_abort); object_property_set_link(OBJECT(&s->cpu[i]), "memory", diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 7d68c50d7c..bc4a052e4c 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1277,10 +1277,6 @@ static void arm_cpu_initfn(Object *obj) } } -static Property arm_cpu_gt_cntfrq_property = - DEFINE_PROP_UINT64("cntfrq", ARMCPU, gt_cntfrq_hz, - NANOSECONDS_PER_SECOND / GTIMER_SCALE); - static Property arm_cpu_reset_cbar_property = DEFINE_PROP_UINT64("reset-cbar", ARMCPU, reset_cbar, 0); @@ -1342,6 +1338,12 @@ static void arm_set_pmu(Object *obj, bool value, Error **errp) unsigned int gt_cntfrq_period_ns(ARMCPU *cpu) { + ARMCPUClass *acc = ARM_CPU_GET_CLASS(cpu); + + if (!arm_class_feature(acc, ARM_FEATURE_GENERIC_TIMER)) { + return GTIMER_SCALE; + } + /* * The exact approach to calculating guest ticks is: * @@ -1360,8 +1362,8 @@ unsigned int gt_cntfrq_period_ns(ARMCPU *cpu) * Finally, CNTFRQ is effectively capped at 1GHz to ensure our scale factor * cannot become zero. */ - return NANOSECONDS_PER_SECOND > cpu->gt_cntfrq_hz ? - NANOSECONDS_PER_SECOND / cpu->gt_cntfrq_hz : 1; + return (NANOSECONDS_PER_SECOND > acc->gt_cntfrq_hz ? + NANOSECONDS_PER_SECOND / acc->gt_cntfrq_hz : 1); } static void arm_cpu_post_init(Object *obj) @@ -1466,10 +1468,6 @@ static void arm_cpu_post_init(Object *obj) qdev_property_add_static(DEVICE(obj), &arm_cpu_cfgend_property); - if (arm_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER)) { - qdev_property_add_static(DEVICE(cpu), &arm_cpu_gt_cntfrq_property); - } - if (kvm_enabled()) { kvm_arm_add_vcpu_properties(obj); } @@ -1614,18 +1612,7 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) } { - uint64_t scale; - - if (arm_feature(env, ARM_FEATURE_GENERIC_TIMER)) { - if (!cpu->gt_cntfrq_hz) { - error_setg(errp, "Invalid CNTFRQ: %"PRId64"Hz", - cpu->gt_cntfrq_hz); - return; - } - scale = gt_cntfrq_period_ns(cpu); - } else { - scale = GTIMER_SCALE; - } + uint64_t scale = gt_cntfrq_period_ns(cpu); cpu->gt_timer[GTIMER_PHYS] = timer_new(QEMU_CLOCK_VIRTUAL, scale, arm_gt_ptimer_cb, cpu); @@ -2242,6 +2229,7 @@ static void arm_cpu_leaf_class_init(ObjectClass *oc, void *data) acc->cp_regs = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, g_free); + acc->gt_cntfrq_hz = NANOSECONDS_PER_SECOND / GTIMER_SCALE; acc->info = data; if (acc->info->class_init) { @@ -2308,6 +2296,16 @@ static void arm_cpu_leaf_class_init(ObjectClass *oc, void *data) if (arm_class_feature(acc, ARM_FEATURE_M)) { set_class_feature(acc, ARM_FEATURE_PMSA); } + +#ifndef CONFIG_USER_ONLY + if (arm_class_feature(acc, ARM_FEATURE_GENERIC_TIMER)) { + class_property_add(oc, "cntfrq", "uint64", NULL, + arm_class_prop_uint64_ofs, + arm_class_prop_uint64_ofs, + (void *)(uintptr_t) + offsetof(ARMCPUClass, gt_cntfrq_hz)); + } +#endif /* CONFIG_USER_ONLY */ } static bool arm_cpu_class_late_init(ObjectClass *oc, Error **errp) @@ -2320,6 +2318,14 @@ static bool arm_cpu_class_late_init(ObjectClass *oc, Error **errp) } } +#ifndef CONFIG_USER_ONLY + /* TODO: Perhaps better to put this check in a property set hook. */ + if (!acc->gt_cntfrq_hz) { + error_setg(errp, "Invalid CNTFRQ: %"PRId64"Hz", acc->gt_cntfrq_hz); + return false; + } +#endif /* CONFIG_USER_ONLY */ + /* Run some consistency checks for TCG. */ if (tcg_enabled()) { bool no_aa32 = arm_class_feature(acc, ARM_FEATURE_AARCH64) && diff --git a/target/arm/helper.c b/target/arm/helper.c index d18200ed16..67d32c2e59 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2977,8 +2977,9 @@ void arm_gt_hvtimer_cb(void *opaque) static void arm_gt_cntfrq_reset(CPUARMState *env, const ARMCPRegInfo *opaque) { ARMCPU *cpu = env_archcpu(env); + ARMCPUClass *acc = ARM_CPU_GET_CLASS(cpu); - cpu->env.cp15.c14_cntfrq = cpu->gt_cntfrq_hz; + cpu->env.cp15.c14_cntfrq = acc->gt_cntfrq_hz; } static const ARMCPRegInfo generic_timer_cp_reginfo[] = { -- 2.34.1