[src/trunk]: src/sys/arch/arm/cortex Ensure CNTVOFF is 0 before dropping out ...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/57a8926f603b
branches:  trunk
changeset: 357302:57a8926f603b
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Nov 04 17:09:55 2017 +0000

description:
Ensure CNTVOFF is 0 before dropping out of Hyp mode
CVS ----------------------------------------------------------------------

diffstat:

 sys/arch/arm/cortex/a9_mpsubr.S |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r db64ecad76e0 -r 57a8926f603b sys/arch/arm/cortex/a9_mpsubr.S
--- a/sys/arch/arm/cortex/a9_mpsubr.S   Sat Nov 04 16:21:49 2017 +0000
+++ b/sys/arch/arm/cortex/a9_mpsubr.S   Sat Nov 04 17:09:55 2017 +0000
@@ -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 @@
        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)