diff options
| -rw-r--r-- | bl31/context_mgmt.c | 3 | ||||
| -rw-r--r-- | include/lib/aarch64/arch_helpers.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/bl31/context_mgmt.c b/bl31/context_mgmt.c index 4dd297ef..6f27176c 100644 --- a/bl31/context_mgmt.c +++ b/bl31/context_mgmt.c @@ -250,6 +250,9 @@ void cm_prepare_el3_exit(uint32_t security_state) /* Enable EL1 access to timer */ write_cnthctl_el2(EL1PCEN_BIT | EL1PCTEN_BIT); + /* Reset CNTVOFF_EL2 */ + write_cntvoff_el2(0); + /* Set VPIDR, VMPIDR to match MIDR, MPIDR */ write_vpidr_el2(read_midr_el1()); write_vmpidr_el2(read_mpidr_el1()); diff --git a/include/lib/aarch64/arch_helpers.h b/include/lib/aarch64/arch_helpers.h index 09365fb9..d431baaf 100644 --- a/include/lib/aarch64/arch_helpers.h +++ b/include/lib/aarch64/arch_helpers.h @@ -262,6 +262,8 @@ DEFINE_SYSREG_RW_FUNCS(cnthctl_el2) DEFINE_SYSREG_RW_FUNCS(tpidr_el3) +DEFINE_SYSREG_RW_FUNCS(cntvoff_el2) + DEFINE_SYSREG_RW_FUNCS(vpidr_el2) DEFINE_SYSREG_RW_FUNCS(vmpidr_el2) |