From 900747236f373528733e07d2d4f451912b5ebff7 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 16 Nov 2018 21:59:52 -0500 Subject: [PATCH] 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. Backports commit 436c0cbbeb38dd97c02fe921a7cb253a18afdd86 from qemu --- qemu/target/arm/cpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qemu/target/arm/cpu.c b/qemu/target/arm/cpu.c index a851e932..480dfd6b 100644 --- a/qemu/target/arm/cpu.c +++ b/qemu/target/arm/cpu.c @@ -1374,6 +1374,7 @@ static void cortex_a7_initfn(struct uc_struct *uc, Object *obj, void *opaque) 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; @@ -1420,6 +1421,7 @@ static void cortex_a15_initfn(struct uc_struct *uc, Object *obj, void *opaque) 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;