diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-08-25 17:25:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-25 17:25:39 +0100 |
| commit | 01ebe3d2c6cd8d2cc2b6074fc68d268f00b0f373 (patch) | |
| tree | a0cc37fe07dcd7e2373dd21a304d5f37f635c31d /lib | |
| parent | f91e8d1af6bbe64747de138f5afdabbd901e17d5 (diff) | |
| parent | 2e09d4f804f9a4005c6e297e7d775829344e5b22 (diff) | |
| download | arm-trusted-firmware-01ebe3d2c6cd8d2cc2b6074fc68d268f00b0f373.tar.gz | |
Merge pull request #1059 from kenkuang/intergration
fix a typo abort sctlr_el2
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/el3_runtime/aarch64/context_mgmt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/el3_runtime/aarch64/context_mgmt.c b/lib/el3_runtime/aarch64/context_mgmt.c index 5257bf1c..3d26056a 100644 --- a/lib/el3_runtime/aarch64/context_mgmt.c +++ b/lib/el3_runtime/aarch64/context_mgmt.c @@ -229,7 +229,7 @@ void cm_prepare_el3_exit(uint32_t security_state) /* Use SCTLR_EL1.EE value to initialise sctlr_el2 */ sctlr_elx = read_ctx_reg(get_sysregs_ctx(ctx), CTX_SCTLR_EL1); - sctlr_elx &= ~SCTLR_EE_BIT; + sctlr_elx &= SCTLR_EE_BIT; sctlr_elx |= SCTLR_EL2_RES1; write_sctlr_el2(sctlr_elx); } else if (EL_IMPLEMENTED(2)) { |