openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

target/arm: Register second AddressSpace for secure v8M CPUs 

If a v8M CPU supports the security extension then we need to
give it two AddressSpaces, the same way we do already for
an A profile core with EL3.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 1503414539-28762-5-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2017-09-07 13:54:52 +01:00
parent 1e577cc7cf
commit 1d2091bc75
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target/arm/cpu.c
View File

@ -843,22 +843,21 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
init_cpreg_list(cpu); init_cpreg_list(cpu);
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
if (cpu->has_el3) { if (cpu->has_el3 || arm_feature(env, ARM_FEATURE_M_SECURITY)) {
cs->num_ases = 2;
} else {
cs->num_ases = 1;
}
if (cpu->has_el3) {
AddressSpace *as; AddressSpace *as;
cs->num_ases = 2;
if (!cpu->secure_memory) { if (!cpu->secure_memory) {
cpu->secure_memory = cs->memory; cpu->secure_memory = cs->memory;
} }
as = address_space_init_shareable(cpu->secure_memory, as = address_space_init_shareable(cpu->secure_memory,
"cpu-secure-memory"); "cpu-secure-memory");
cpu_address_space_init(cs, as, ARMASIdx_S); cpu_address_space_init(cs, as, ARMASIdx_S);
} else {
cs->num_ases = 1;
} }
cpu_address_space_init(cs, cpu_address_space_init(cs,
address_space_init_shareable(cs->memory, address_space_init_shareable(cs->memory,
"cpu-memory"), "cpu-memory"),