| Message ID | 20220127154639.2090164-2-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | arm: Fix handling of unrecognized functions in PSCI emulation | expand |
On 1/28/22 02:46, Peter Maydell wrote: > We want to allow the psci-conduit property to be set after realize, > because the parts of the code which are best placed to decide if it's > OK to enable QEMU's builtin PSCI emulation (the board code and the > arm_load_kernel() function are distant from the code which creates > and realizes CPUs (typically inside an SoC object's init and realize > method) and run afterwards. > > Since the DEFINE_PROP_* macros don't have support for creating > properties which can be changed after realize, change the property to > be created with object_property_add_uint32_ptr(), which is what we > already use in this function for creating settable-after-realize > properties like init-svtor and init-nsvtor. > > Note that it doesn't conceptually make sense to change the setting of > the property after the machine has been completely initialized, > beacuse this would mean that the behaviour of the machine when first > started would differ from its behaviour when the system is > subsequently reset. (It would also require the underlying state to > be migrated, which we don't do.) > > Signed-off-by: Peter Maydell<peter.maydell@linaro.org> > --- > target/arm/cpu.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/target/arm/cpu.c b/target/arm/cpu.c index cdbc4cdd012..5a9c02a2561 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1317,6 +1317,11 @@ void arm_cpu_post_init(Object *obj) OBJ_PROP_FLAG_READWRITE); } + /* Not DEFINE_PROP_UINT32: we want this to be settable after realize */ + object_property_add_uint32_ptr(obj, "psci-conduit", + &cpu->psci_conduit, + OBJ_PROP_FLAG_READWRITE); + qdev_property_add_static(DEVICE(obj), &arm_cpu_cfgend_property); if (arm_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER)) { @@ -1987,7 +1992,6 @@ static ObjectClass *arm_cpu_class_by_name(const char *cpu_model) } static Property arm_cpu_properties[] = { - DEFINE_PROP_UINT32("psci-conduit", ARMCPU, psci_conduit, 0), DEFINE_PROP_UINT64("midr", ARMCPU, midr, 0), DEFINE_PROP_UINT64("mp-affinity", ARMCPU, mp_affinity, ARM64_AFFINITY_INVALID),
We want to allow the psci-conduit property to be set after realize, because the parts of the code which are best placed to decide if it's OK to enable QEMU's builtin PSCI emulation (the board code and the arm_load_kernel() function are distant from the code which creates and realizes CPUs (typically inside an SoC object's init and realize method) and run afterwards. Since the DEFINE_PROP_* macros don't have support for creating properties which can be changed after realize, change the property to be created with object_property_add_uint32_ptr(), which is what we already use in this function for creating settable-after-realize properties like init-svtor and init-nsvtor. Note that it doesn't conceptually make sense to change the setting of the property after the machine has been completely initialized, beacuse this would mean that the behaviour of the machine when first started would differ from its behaviour when the system is subsequently reset. (It would also require the underlying state to be migrated, which we don't do.) Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- target/arm/cpu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)