diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-05-11 16:04:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-11 16:04:52 +0100 |
| commit | d6104f5ab4e68f92cf97f6a3e55395c71ed137ac (patch) | |
| tree | 4c9488add4622ce77fc328e34efe6f4bb7289873 /bl1 | |
| parent | 78b7134927422425bcad3413cf78783e3eaf633c (diff) | |
| parent | b10d44995eb652675863c2cc6a7726683613da0d (diff) | |
Merge pull request #927 from jeenu-arm/state-switch
Execution state switch
Diffstat (limited to 'bl1')
| -rw-r--r-- | bl1/aarch64/bl1_context_mgmt.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/bl1/aarch64/bl1_context_mgmt.c b/bl1/aarch64/bl1_context_mgmt.c index 7069ed64..2c7fe070 100644 --- a/bl1/aarch64/bl1_context_mgmt.c +++ b/bl1/aarch64/bl1_context_mgmt.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -48,8 +48,7 @@ void bl1_prepare_next_image(unsigned int image_id) * Ensure that the build flag to save AArch32 system registers in CPU * context is not set for AArch64-only platforms. */ - if (((read_id_aa64pfr0_el1() >> ID_AA64PFR0_EL1_SHIFT) - & ID_AA64PFR0_ELX_MASK) == 0x1) { + if (EL_IMPLEMENTED(1) == EL_IMPL_A64ONLY) { ERROR("EL1 supports AArch64-only. Please set build flag " "CTX_INCLUDE_AARCH32_REGS = 0"); panic(); @@ -75,9 +74,8 @@ void bl1_prepare_next_image(unsigned int image_id) next_bl_ep->spsr = SPSR_64(MODE_EL1, MODE_SP_ELX, DISABLE_ALL_EXCEPTIONS); } else { - /* Use EL2 if supported else use EL1. */ - if (read_id_aa64pfr0_el1() & - (ID_AA64PFR0_ELX_MASK << ID_AA64PFR0_EL2_SHIFT)) { + /* Use EL2 if supported; else use EL1. */ + if (EL_IMPLEMENTED(2)) { next_bl_ep->spsr = SPSR_64(MODE_EL2, MODE_SP_ELX, DISABLE_ALL_EXCEPTIONS); } else { |