aboutsummaryrefslogtreecommitdiff
path: root/bl31
diff options
context:
space:
mode:
authorAndrew Thoelke <andrew.thoelke@arm.com>2014-10-10 12:13:48 +0100
committerAndrew Thoelke <andrew.thoelke@arm.com>2014-10-10 12:13:48 +0100
commitd07baec4b5bf141acc2c36aaf68ea977a7a916fb (patch)
treee5435de9af8551738a16125050f1919ccbd59127 /bl31
parent7e998c42ce1ffa16101cc712a3b914c311e29788 (diff)
parent14c0526b737592776360fec99b452e740879d532 (diff)
downloadtrusted-firmware-a-d07baec4b5bf141acc2c36aaf68ea977a7a916fb.tar.gz
Merge pull request #206 from soby-mathew/sm/reset_cntvoff
Reset CNTVOFF_EL2 register before exit into EL1 on warm boot
Diffstat (limited to 'bl31')
-rw-r--r--bl31/context_mgmt.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/bl31/context_mgmt.c b/bl31/context_mgmt.c
index 4dd297eff8..6f27176c1d 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());