Module Name: src
Committed By: matt
Date: Mon Jul 9 17:36:55 UTC 2012
Modified Files:
src/sys/arch/evbppc/conf: files.mpc85xx
src/sys/arch/powerpc/booke: trap_subr.S
Log Message:
Add hook so E500 watchdog can use a separate stack but leave it disabled by
default.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/conf/files.mpc85xx
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/booke/trap_subr.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/evbppc/conf/files.mpc85xx
diff -u src/sys/arch/evbppc/conf/files.mpc85xx:1.7 src/sys/arch/evbppc/conf/files.mpc85xx:1.8
--- src/sys/arch/evbppc/conf/files.mpc85xx:1.7 Fri Aug 19 02:18:26 2011
+++ src/sys/arch/evbppc/conf/files.mpc85xx Mon Jul 9 17:36:55 2012
@@ -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
Index: src/sys/arch/powerpc/booke/trap_subr.S
diff -u src/sys/arch/powerpc/booke/trap_subr.S:1.6 src/sys/arch/powerpc/booke/trap_subr.S:1.7
--- src/sys/arch/powerpc/booke/trap_subr.S:1.6 Tue Jun 21 05:33:04 2011
+++ src/sys/arch/powerpc/booke/trap_subr.S Mon Jul 9 17:36:55 2012
@@ -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 @@ _C_LABEL(fixed_interval_timer_vector):
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)
