diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/arm64/arm_tf.c | 1 | ||||
| -rw-r--r-- | src/arch/arm64/boot.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/arch/arm64/arm_tf.c b/src/arch/arm64/arm_tf.c index 1cb35ba3b5..9735e1b599 100644 --- a/src/arch/arm64/arm_tf.c +++ b/src/arch/arm64/arm_tf.c @@ -84,6 +84,7 @@ void arm_tf_run_bl31(u64 payload_entry, u64 payload_arg0, u64 payload_spsr) dcache_clean_by_mva(&bl31_params, sizeof(bl31_params)); dcache_clean_by_mva(&bl33_ep_info, sizeof(bl33_ep_info)); + raw_write_daif(SPSR_EXCEPTION_MASK); mmu_disable(); bl31_entry(&bl31_params, bl31_plat_params); die("BL31 returned!"); diff --git a/src/arch/arm64/boot.c b/src/arch/arm64/boot.c index eea758c8e1..fa83c3f657 100644 --- a/src/arch/arm64/boot.c +++ b/src/arch/arm64/boot.c @@ -31,7 +31,7 @@ static void run_payload(struct prog *prog) doit = prog_entry(prog); arg = prog_entry_arg(prog); - u64 payload_spsr = SPSR_EXCEPTION_MASK | get_eret_el(EL2, SPSR_USE_L); + u64 payload_spsr = get_eret_el(EL2, SPSR_USE_L); if (IS_ENABLED(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE)) arm_tf_run_bl31((u64)doit, (u64)arg, payload_spsr); |