diff options
| author | Greg Bellows <greg.bellows@linaro.org> | 2014-12-11 15:21:14 -0600 |
|---|---|---|
| committer | Greg Bellows <greg.bellows@linaro.org> | 2014-12-12 14:08:25 -0600 |
| commit | ca17286cdd9b647c45a6eeadfdfaf2ed20d450f6 (patch) | |
| tree | 3a187796fe1a8751fce192ceb10d09eade55b4ea | |
| parent | 4c5313e70b90a47ac15ba7807b5a10686491afb7 (diff) | |
target-arm: Add arm_boot_info secure_boot control
Adds the secure_boot boolean field to the arm_boot_info descriptor. This
fields is used to indicate whether Linux should boot into secure or non-secure
state if the ARM EL3 feature is enabled. The default is to leave the CPU in an
unaltered reset state. On EL3 enabled systems, the reset state is secure and
can be overridden by setting the added field to false.
Signed-off-by: Greg Bellows <greg.bellows@linaro.org>
| -rw-r--r-- | hw/arm/boot.c | 10 | ||||
| -rw-r--r-- | include/hw/arm/arm.h | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/hw/arm/boot.c b/hw/arm/boot.c index e6a3c5bcf..7ec33f3d7 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -457,6 +457,16 @@ static void do_cpu_reset(void *opaque) env->thumb = info->entry & 1; } } else { + /* If we are booting Linux then we need to check whether we are + * booting into secure or non-secure state and adjust the state + * accordingly. Out of reset, ARM is defined to be in secure state + * (SCR.NS = 0), we change that here is non-secure boot has been + * requested. + */ + if (arm_feature(env, ARM_FEATURE_EL3) && !info->secure_boot) { + env->cp15.scr_el3 |= SCR_NS; + } + if (CPU(cpu) == first_cpu) { if (env->aarch64) { env->pc = info->loader_start; diff --git a/include/hw/arm/arm.h b/include/hw/arm/arm.h index cefc9e698..665956222 100644 --- a/include/hw/arm/arm.h +++ b/include/hw/arm/arm.h @@ -37,6 +37,10 @@ struct arm_boot_info { hwaddr gic_cpu_if_addr; int nb_cpus; int board_id; + /* ARM machines that support security extensions use this field to control + * whether Linux is booted as securei(true) or non-secure(false). + */ + bool secure_boot; int (*atag_board)(const struct arm_boot_info *info, void *p); /* multicore boards that use the default secondary core boot functions * can ignore these two function calls. If the default functions won't |