Convert the MIDR register to a property. This allows boards to later set a custom MIDR value. This has been done in such a way to maintain compatibility with all existing CPUs and boards
Signed-off-by: Alistair Francis <alistair.fran...@xilinx.com> --- I originally added the properties to the cpu->midr variable in a similar method to how Peter Crosthwaite did in his 'Fix Support for ARM CBAR and reset-hivecs' series. V2: Use dc->props to avoid using qdev_* target-arm/cpu.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 408d207..52f7f06 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -253,6 +253,7 @@ static void arm_cpu_post_init(Object *obj) { ARMCPU *cpu = ARM_CPU(obj); Error *err = NULL; + uint32_t temp = cpu->midr; if (arm_feature(&cpu->env, ARM_FEATURE_CBAR)) { qdev_property_add_static(DEVICE(obj), &arm_cpu_reset_cbar_property, @@ -265,6 +266,17 @@ static void arm_cpu_post_init(Object *obj) &err); assert_no_error(err); } + + /* + * Initialise the midr property and set it to the original CPU MIDR + * This is used to maintain compatibility with boards that don't set + * a custom MIDR + */ + object_property_set_int(OBJECT(cpu), temp, "midr", &err); + if (err) { + error_report("%s", error_get_pretty(err)); + exit(1); + } } static void arm_cpu_finalizefn(Object *obj) @@ -984,6 +996,7 @@ static const ARMCPUInfo arm_cpus[] = { static Property arm_cpu_properties[] = { DEFINE_PROP_BOOL("start-powered-off", ARMCPU, start_powered_off, false), + DEFINE_PROP_UINT32("midr", ARMCPU, midr, 0), DEFINE_PROP_END_OF_LIST() }; -- 1.7.1