[src/trunk]: src/sys/arch/sparc/sparc - move nmi_sun4m intr counting into nmi...

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

details:   https://anonhg.NetBSD.org/src/rev/8c13510fb029
branches:  trunk
changeset: 762084:8c13510fb029
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Feb 15 10:59:25 2011 +0000

description:
- move nmi_sun4m intr counting into nmi_soft/nmi_hard.
- request the appropriate stack space for nmi_sun4m, in particular,
  make sure we have space for %g2...%g5.  now entering ddb via eg,
  serial break no longer causes cpu1 to fault.

diffstat:

 sys/arch/sparc/sparc/intr.c   |  6 ++++--
 sys/arch/sparc/sparc/locore.s |  6 ++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 3df660b8bf7d -r 8c13510fb029 sys/arch/sparc/sparc/intr.c
--- a/sys/arch/sparc/sparc/intr.c       Tue Feb 15 10:37:07 2011 +0000
+++ b/sys/arch/sparc/sparc/intr.c       Tue Feb 15 10:59:25 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.c,v 1.113 2011/02/15 09:56:32 mrg Exp $ */
+/*     $NetBSD: intr.c,v 1.114 2011/02/15 10:59:25 mrg Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.113 2011/02/15 09:56:32 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.114 2011/02/15 10:59:25 mrg Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_sparc_arch.h"
@@ -205,6 +205,7 @@
 
        /* Tally */
        cpuinfo.ci_intrcnt[15].ev_count++;
+       cpuinfo.ci_data.cpu_nintr++;
 
        afsr = afva = 0;
        if ((*cpuinfo.get_asyncflt)(&afsr, &afva) == 0) {
@@ -296,6 +297,7 @@
 
        /* Tally */
        cpuinfo.ci_sintrcnt[15].ev_count++;
+       cpuinfo.ci_data.cpu_nintr++;
 
        if (cpuinfo.mailbox) {
                /* Check PROM messages */
diff -r 3df660b8bf7d -r 8c13510fb029 sys/arch/sparc/sparc/locore.s
--- a/sys/arch/sparc/sparc/locore.s     Tue Feb 15 10:37:07 2011 +0000
+++ b/sys/arch/sparc/sparc/locore.s     Tue Feb 15 10:59:25 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.260 2011/01/27 06:24:59 mrg Exp $ */
+/*     $NetBSD: locore.s,v 1.261 2011/02/15 10:59:25 mrg Exp $ */
 
 /*
  * Copyright (c) 1996 Paul Kranenburg
@@ -3062,9 +3062,7 @@
 
 #if defined(SUN4M)
 _ENTRY(_C_LABEL(nmi_sun4m))
-       INTR_SETUP(-CCFSZ-80)
-       ! tally intr (curcpu()->cpu_data.cpu_nintr++) (clobbers %o0,%o1,%o2)
-       INCR64(CPUINFO_VA + CPUINFO_NINTR)
+       INTR_SETUP(-CCFSZ-80-8-8)       ! normal frame, plus g2..g5
 
 #if !defined(MSIIEP) /* normal sun4m */