Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 18 Jun 2011 11:27:45 +0000 (UTC)
From:      Marius Strobl <marius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r223235 - head/sys/sparc64/sparc64
Message-ID:  <201106181127.p5IBRjhJ038277@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: marius
Date: Sat Jun 18 11:27:44 2011
New Revision: 223235
URL: http://svn.freebsd.org/changeset/base/223235

Log:
  - As with stray vector interrupts limit the reporting of stray level
    interrupts. Bringup on additional machine models repeatedly reveals
    firmware that enables interrupts behind our back, causing the console
    to be flooded otherwise.
  - As with the regular interrupt counters using uint16_t instead of
    u_long for counting the stray vector interrupts should be more than
    sufficient.
  - Cache the interrupt vector in intr_stray_vector().

Modified:
  head/sys/sparc64/sparc64/intr_machdep.c

Modified: head/sys/sparc64/sparc64/intr_machdep.c
==============================================================================
--- head/sys/sparc64/sparc64/intr_machdep.c	Sat Jun 18 11:27:28 2011	(r223234)
+++ head/sys/sparc64/sparc64/intr_machdep.c	Sat Jun 18 11:27:44 2011	(r223235)
@@ -83,10 +83,11 @@ CTASSERT((1 << IV_SHIFT) == sizeof(struc
 
 ih_func_t *intr_handlers[PIL_MAX];
 uint16_t pil_countp[PIL_MAX];
+static uint16_t pil_stray_count[PIL_MAX];
 
 struct intr_vector intr_vectors[IV_MAX];
 uint16_t intr_countp[IV_MAX];
-static u_long intr_stray_count[IV_MAX];
+static uint16_t intr_stray_count[IV_MAX];
 
 static const char *const pil_names[] = {
 	"stray",
@@ -199,22 +200,32 @@ intr_setup(int pri, ih_func_t *ihf, int 
 static void
 intr_stray_level(struct trapframe *tf)
 {
+	uint64_t level;
 
-	printf("stray level interrupt %ld\n", tf->tf_level);
+	level = tf->tf_level;
+	if (pil_stray_count[level] < MAX_STRAY_LOG) {
+		printf("stray level interrupt %ld\n", level);
+		pil_stray_count[level]++;
+		if (pil_stray_count[level] >= MAX_STRAY_LOG)
+			printf("got %d stray level interrupt %ld's: not "
+			    "logging anymore\n", MAX_STRAY_LOG, level);
+	}
 }
 
 static void
 intr_stray_vector(void *cookie)
 {
 	struct intr_vector *iv;
+	u_int vec;
 
 	iv = cookie;
-	if (intr_stray_count[iv->iv_vec] < MAX_STRAY_LOG) {
-		printf("stray vector interrupt %d\n", iv->iv_vec);
-		intr_stray_count[iv->iv_vec]++;
-		if (intr_stray_count[iv->iv_vec] >= MAX_STRAY_LOG)
-			printf("got %d stray interrupt %d's: not logging "
-			    "anymore\n", MAX_STRAY_LOG, iv->iv_vec);
+	vec = iv->iv_vec;
+	if (intr_stray_count[vec] < MAX_STRAY_LOG) {
+		printf("stray vector interrupt %d\n", vec);
+		intr_stray_count[vec]++;
+		if (intr_stray_count[vec] >= MAX_STRAY_LOG)
+			printf("got %d stray vector interrupt %d's: not "
+			    "logging anymore\n", MAX_STRAY_LOG, vec);
 	}
 }

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106181127.p5IBRjhJ038277>