|
@@ -541,6 +541,9 @@ static Property arm_cpu_has_el2_property =
|
|
static Property arm_cpu_has_el3_property =
|
|
static Property arm_cpu_has_el3_property =
|
|
DEFINE_PROP_BOOL("has_el3", ARMCPU, has_el3, true);
|
|
DEFINE_PROP_BOOL("has_el3", ARMCPU, has_el3, true);
|
|
|
|
|
|
|
|
+static Property arm_cpu_cfgend_property =
|
|
|
|
+ DEFINE_PROP_BOOL("cfgend", ARMCPU, cfgend, false);
|
|
|
|
+
|
|
/* use property name "pmu" to match other archs and virt tools */
|
|
/* use property name "pmu" to match other archs and virt tools */
|
|
static Property arm_cpu_has_pmu_property =
|
|
static Property arm_cpu_has_pmu_property =
|
|
DEFINE_PROP_BOOL("pmu", ARMCPU, has_pmu, true);
|
|
DEFINE_PROP_BOOL("pmu", ARMCPU, has_pmu, true);
|
|
@@ -608,6 +611,8 @@ static void arm_cpu_post_init(Object *obj)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ qdev_property_add_static(DEVICE(obj), &arm_cpu_cfgend_property,
|
|
|
|
+ &error_abort);
|
|
}
|
|
}
|
|
|
|
|
|
static void arm_cpu_finalizefn(Object *obj)
|
|
static void arm_cpu_finalizefn(Object *obj)
|
|
@@ -728,6 +733,14 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
|
|
cpu->reset_sctlr |= (1 << 13);
|
|
cpu->reset_sctlr |= (1 << 13);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if (cpu->cfgend) {
|
|
|
|
+ if (arm_feature(&cpu->env, ARM_FEATURE_V7)) {
|
|
|
|
+ cpu->reset_sctlr |= SCTLR_EE;
|
|
|
|
+ } else {
|
|
|
|
+ cpu->reset_sctlr |= SCTLR_B;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
if (!cpu->has_el3) {
|
|
if (!cpu->has_el3) {
|
|
/* If the has_el3 CPU property is disabled then we need to disable the
|
|
/* If the has_el3 CPU property is disabled then we need to disable the
|
|
* feature.
|
|
* feature.
|