Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-23 21:44:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #206 from soby-mathew/sm/reset_cntvoff

Browse source 
Reset CNTVOFF_EL2 register before exit into EL1 on warm boot
This commit is contained in:
Andrew Thoelke 2014-10-10 12:13:48 +01:00
commit d07baec4b5
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bl31/context_mgmt.c
View file

@ -250,6 +250,9 @@ void cm_prepare_el3_exit(uint32_t security_state)
/* Enable EL1 access to timer */ /* Enable EL1 access to timer */
write_cnthctl_el2(EL1PCEN_BIT | EL1PCTEN_BIT); write_cnthctl_el2(EL1PCEN_BIT | EL1PCTEN_BIT);
/* Reset CNTVOFF_EL2 */
write_cntvoff_el2(0);
/* Set VPIDR, VMPIDR to match MIDR, MPIDR */ /* Set VPIDR, VMPIDR to match MIDR, MPIDR */
write_vpidr_el2(read_midr_el1()); write_vpidr_el2(read_midr_el1());
write_vmpidr_el2(read_mpidr_el1()); write_vmpidr_el2(read_mpidr_el1());

2
include/lib/aarch64/arch_helpers.h
View file

@ -262,6 +262,8 @@ DEFINE_SYSREG_RW_FUNCS(cnthctl_el2)
DEFINE_SYSREG_RW_FUNCS(tpidr_el3) DEFINE_SYSREG_RW_FUNCS(tpidr_el3)
DEFINE_SYSREG_RW_FUNCS(cntvoff_el2)
DEFINE_SYSREG_RW_FUNCS(vpidr_el2) DEFINE_SYSREG_RW_FUNCS(vpidr_el2)
DEFINE_SYSREG_RW_FUNCS(vmpidr_el2) DEFINE_SYSREG_RW_FUNCS(vmpidr_el2)