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

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

details:   https://anonhg.NetBSD.org/src/rev/254fa2724103
branches:  netbsd-8
changeset: 434387:254fa2724103
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Nov 17 15:07:16 2017 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #351):
        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 36bc9615dbc8 -r 254fa2724103 sys/arch/arm/cortex/a9_mpsubr.S
--- a/sys/arch/arm/cortex/a9_mpsubr.S   Fri Nov 17 14:56:52 2017 +0000
+++ b/sys/arch/arm/cortex/a9_mpsubr.S   Fri Nov 17 15:07:16 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: a9_mpsubr.S,v 1.47.8.1 2017/07/06 05:28:43 martin Exp $        */
+/*     $NetBSD: a9_mpsubr.S,v 1.47.8.2 2017/11/17 15:07:16 martin Exp $        */
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -354,6 +354,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)