[src/trunk]: src/sys/arch Add hook so E500 watchdog can use a separate stack ...

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

details:   https://anonhg.NetBSD.org/src/rev/f3b7931071fb
branches:  trunk
changeset: 780049:f3b7931071fb
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jul 09 17:36:55 2012 +0000

description:
Add hook so E500 watchdog can use a separate stack but leave it disabled by
default.

diffstat:

 sys/arch/evbppc/conf/files.mpc85xx |   4 ++--
 sys/arch/powerpc/booke/trap_subr.S |  13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diffs (57 lines):

diff -r 18de7aef28c6 -r f3b7931071fb sys/arch/evbppc/conf/files.mpc85xx
--- a/sys/arch/evbppc/conf/files.mpc85xx        Mon Jul 09 11:40:19 2012 +0000
+++ b/sys/arch/evbppc/conf/files.mpc85xx        Mon Jul 09 17:36:55 2012 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: files.mpc85xx,v 1.7 2011/08/19 02:18:26 matt Exp $
+#      $NetBSD: files.mpc85xx,v 1.8 2012/07/09 17:36:55 matt Exp $
 #
 # mpc85xx-specific configuration info
 
 defflag        opt_mpc85xx.h   MPC8536 MPC8544 MPC8548 MPC8555 MPC8568 MPC8572
-                       P2020 CADMUS PIXIS
+                       P2020 CADMUS PIXIS E500_WDOG_STACK
 defparam opt_mpc85xx.h SYS_CLK MEMSIZE
 
 file   arch/evbppc/mpc85xx/autoconf.c
diff -r 18de7aef28c6 -r f3b7931071fb sys/arch/powerpc/booke/trap_subr.S
--- a/sys/arch/powerpc/booke/trap_subr.S        Mon Jul 09 11:40:19 2012 +0000
+++ b/sys/arch/powerpc/booke/trap_subr.S        Mon Jul 09 17:36:55 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap_subr.S,v 1.6 2011/06/21 05:33:04 matt Exp $       */
+/*     $NetBSD: trap_subr.S,v 1.7 2012/07/09 17:36:55 matt Exp $       */
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-RCSID("$NetBSD: trap_subr.S,v 1.6 2011/06/21 05:33:04 matt Exp $")
+RCSID("$NetBSD: trap_subr.S,v 1.7 2012/07/09 17:36:55 matt Exp $")
 
        .globl  _C_LABEL(sctrapexit), _C_LABEL(trapexit), _C_LABEL(intrcall)
 
@@ -503,18 +503,19 @@
        bl      _C_LABEL(intr_fitintr)
        b       intrexit
 
+#ifdef E500_WDOG_STACK
        .data
        .lcomm wdogstk,4096
+#endif
        .text
        .p2align 4
 _C_LABEL(watchdog_timer_vector):
        /* MSR[CE], MSR[ME], MSR[DE] are unchanged, all others cleared */
        FRAME_CRIT_PROLOGUE                     /* save SP r25-31 CR LR XER */
+#ifdef E500_WDOG_STACK
        FRAME_WDOG_ENTER(EXC_WDOG, wdogstk+4096-CALLFRAMELEN)
-#if 0
-       lis     %r11,0xe0004641@ha
-       addi    %r11,%r11,0xe0004641@l
-       stb     %r11,-65(%r11)
+#else
+       FRAME_CRIT_ENTER(EXC_WDOG);
 #endif
 
        bl      _C_LABEL(intr_wdogintr)