Merge pull request #927 from jeenu-arm/state-switch

[project/bcm63xx/atf.git] / lib / el3_runtime / aarch64 / context_mgmt.c

diff --git a/lib/el3_runtime/aarch64/context_mgmt.c b/lib/el3_runtime/aarch64/context_mgmt.c
index d376fdac5f009fe18b9a2c842a638864e7615e74..0104c4ed0881240d49afa139c11d7b1d5a0820fb 100644 (file)
--- a/lib/el3_runtime/aarch64/context_mgmt.c
+++ b/lib/el3_runtime/aarch64/context_mgmt.c
@@ -205,8 +205,7 @@ void cm_prepare_el3_exit(uint32_t security_state)
                        sctlr_elx &= ~SCTLR_EE_BIT;
                        sctlr_elx |= SCTLR_EL2_RES1;
                        write_sctlr_el2(sctlr_elx);
-               } else if (read_id_aa64pfr0_el1() &
-                          (ID_AA64PFR0_ELX_MASK << ID_AA64PFR0_EL2_SHIFT)) {
+               } else if (EL_IMPLEMENTED(2)) {
                        /* EL2 present but unused, need to disable safely */
 
                        /* HCR_EL2 = 0, except RW bit set to match SCR_EL3 */