Module Name: src
Committed By: macallan
Date: Fri Mar 1 02:33:55 UTC 2019
Modified Files:
src/sys/arch/sparc/sparc: intr.c
Log Message:
since SX can trigger NMIs dump the status and error registers along with
the rest if sx is present.
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/sparc/sparc/intr.c
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/sparc/sparc/intr.c
diff -u src/sys/arch/sparc/sparc/intr.c:1.120 src/sys/arch/sparc/sparc/intr.c:1.121
--- src/sys/arch/sparc/sparc/intr.c:1.120 Mon Feb 4 09:57:39 2019
+++ src/sys/arch/sparc/sparc/intr.c Fri Mar 1 02:33:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.120 2019/02/04 09:57:39 mrg Exp $ */
+/* $NetBSD: intr.c,v 1.121 2019/03/01 02:33:55 macallan Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,10 +41,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.120 2019/02/04 09:57:39 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.121 2019/03/01 02:33:55 macallan Exp $");
#include "opt_multiprocessor.h"
#include "opt_sparc_arch.h"
+#include "sx.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -70,6 +71,11 @@ __KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.1
#include <machine/db_machdep.h>
#endif
+#if NSX > 0
+#include <sys/bus.h>
+#include <sparc/dev/sxvar.h>
+#endif
+
#if defined(MULTIPROCESSOR)
static int intr_biglock_wrapper(void *);
@@ -255,7 +261,10 @@ nmi_hard(void)
si = *((uint32_t *)ICR_SI_PEND);
snprintb(bits, sizeof(bits), SINTR_BITS, si);
printf("cpu%d: NMI: system interrupts: %s\n", cpu_number(), bits);
-
+
+#if NSX > 0
+ sx_dump();
+#endif
if ((si & SINTR_M) != 0) {
/* ECC memory error */
