Module Name: src
Committed By: snj
Date: Sun Dec 3 10:29:12 UTC 2017
Modified Files:
src/sys/arch/arm/cortex [netbsd-7]: a9_mpsubr.S
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1524):
sys/arch/arm/cortex/a9_mpsubr.S: revision 1.52
Ensure CNTVOFF is 0 before dropping out of Hyp mode
To generate a diff of this commit:
cvs rdiff -u -r1.18.2.5 -r1.18.2.6 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.18.2.5 src/sys/arch/arm/cortex/a9_mpsubr.S:1.18.2.6
--- src/sys/arch/arm/cortex/a9_mpsubr.S:1.18.2.5 Sat Jul 8 17:01:52 2017
+++ src/sys/arch/arm/cortex/a9_mpsubr.S Sun Dec 3 10:29:12 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: a9_mpsubr.S,v 1.18.2.5 2017/07/08 17:01:52 snj Exp $ */
+/* $NetBSD: a9_mpsubr.S,v 1.18.2.6 2017/12/03 10:29:12 snj Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -338,6 +338,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)
