Commit 436c0cbb authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 20181109173553.22341-3-peter.maydell@linaro.org
parent 593cfa2b

target/arm/cpu.c

+2 −0
Original line number Diff line number Diff line
@@ -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;