[src/netbsd-7]: src/sys/arch/arm/cortex Pull up following revision(s) (reques...

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

details:   https://anonhg.NetBSD.org/src/rev/f6dae1fe14f2
branches:  netbsd-7
changeset: 800366:f6dae1fe14f2
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Dec 03 10:29:12 2017 +0000

description:
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

diffstat:

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

diffs (20 lines):

diff -r ce04c3aeece6 -r f6dae1fe14f2 sys/arch/arm/cortex/a9_mpsubr.S
--- a/sys/arch/arm/cortex/a9_mpsubr.S   Sun Dec 03 10:25:02 2017 +0000
+++ b/sys/arch/arm/cortex/a9_mpsubr.S   Sun Dec 03 10:29:12 2017 +0000
@@ -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 @@
        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)