Module Name: src
Committed By: skrll
Date: Sat Nov 4 17:09:55 UTC 2017
Modified Files:
src/sys/arch/arm/cortex: a9_mpsubr.S
Log Message:
Ensure CNTVOFF is 0 before dropping out of Hyp mode
CVS ----------------------------------------------------------------------
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/arm/cortex/a9_mpsubr.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/cortex/a9_mpsubr.S
diff -u src/sys/arch/arm/cortex/a9_mpsubr.S:1.51 src/sys/arch/arm/cortex/a9_mpsubr.S:1.52
--- src/sys/arch/arm/cortex/a9_mpsubr.S:1.51 Fri Sep 22 06:31:02 2017
+++ src/sys/arch/arm/cortex/a9_mpsubr.S Sat Nov 4 17:09:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: a9_mpsubr.S,v 1.51 2017/09/22 06:31:02 skrll Exp $ */
+/* $NetBSD: a9_mpsubr.S,v 1.52 2017/11/04 17:09:55 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -357,6 +357,10 @@ cortex_init:
teq r0, #(PSR_HYP32_MODE) /* Hyp Mode? */
bne 1f
+ /* Set CNTVOFF to 0 */
+ mov r0, #0
+ mcrr p15, 4, r0, r0, c14
+
/* Ensure that IRQ, and FIQ will be disabled after eret */
mrs r0, cpsr
bic r0, r0, #(PSR_MODE)
