From: Peter Maydell Date: Tue, 13 Nov 2018 10:47:59 +0000 (+0000) Subject: target/arm/cpu: Give Cortex-A15 and -A7 the EL2 feature X-Git-Tag: qemu-xen-4.13.0-rc1~551^2 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=436c0cbbeb38dd97c02fe921a7cb253a18afdd86;p=qemu-xen.git target/arm/cpu: Give Cortex-A15 and -A7 the EL2 feature The Cortex-A15 and Cortex-A7 both have EL2; now we've implemented it properly we can enable the feature bit. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Edgar E. Iglesias Message-id: 20181109173553.22341-3-peter.maydell@linaro.org --- diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 858a70872a..60411f6bfe 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1650,6 +1650,7 @@ static void cortex_a7_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER); set_feature(&cpu->env, ARM_FEATURE_DUMMY_C15_REGS); set_feature(&cpu->env, ARM_FEATURE_CBAR_RO); + set_feature(&cpu->env, ARM_FEATURE_EL2); set_feature(&cpu->env, ARM_FEATURE_EL3); cpu->kvm_target = QEMU_KVM_ARM_TARGET_CORTEX_A7; cpu->midr = 0x410fc075; @@ -1696,6 +1697,7 @@ static void cortex_a15_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER); set_feature(&cpu->env, ARM_FEATURE_DUMMY_C15_REGS); set_feature(&cpu->env, ARM_FEATURE_CBAR_RO); + set_feature(&cpu->env, ARM_FEATURE_EL2); set_feature(&cpu->env, ARM_FEATURE_EL3); cpu->kvm_target = QEMU_KVM_ARM_TARGET_CORTEX_A15; cpu->midr = 0x412fc0f1;