diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-07-22 20:08:24 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-07-22 20:08:24 +0000 |
| commit | 93669765697793fabc9566c12a0da41d396eb7ac (patch) | |
| tree | 155ef5d7ceaf46b66e1b5a9467b37d234423c61e | |
| parent | f864987e35027547b594c3eb7d67643f6aa126c0 (diff) | |
Make sure the irq numbers for the O2 event counters match the interrupt lines
reported in dmesg.
While there, silence the spurious interrupt warning logic if, at the time
it is triggered, there are really no hardware interrupts pending; this can
happen if serial interrupts gets processed e.g. at splx() before the
hardware interrupt routine has a change to run.
| -rw-r--r-- | sys/arch/sgi/localbus/macebus.c | 41 |
1 files changed, 28 insertions, 13 deletions
diff --git a/sys/arch/sgi/localbus/macebus.c b/sys/arch/sgi/localbus/macebus.c index 64e069dc9e2..46959880542 100644 --- a/sys/arch/sgi/localbus/macebus.c +++ b/sys/arch/sgi/localbus/macebus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macebus.c,v 1.39 2009/07/17 18:06:51 miod Exp $ */ +/* $OpenBSD: macebus.c,v 1.40 2009/07/22 20:08:23 miod Exp $ */ /* * Copyright (c) 2000-2004 Opsycon AB (www.opsycon.se) @@ -538,7 +538,7 @@ macebus_intr_establish(void *icp, u_long irq, int type, int level, initialized = 1; } - if (irq > 62 || irq < 1) { + if (irq > SPL_CLOCK || irq < 1) { panic("intr_establish: illegal irq %d", irq); } irq -= 1; /* Adjust for 1 being first (0 is no int) */ @@ -592,7 +592,7 @@ macebus_intr_establish(void *icp, u_long irq, int type, int level, ih->ih_arg = ih_arg; ih->ih_next = NULL; ih->ih_level = level; - ih->ih_irq = irq; + ih->ih_irq = irq + 1; ih->ih_what = ih_what; evcount_attach(&ih->ih_count, ih_what, (void *)&ih->ih_irq, &evcount_intr); @@ -742,16 +742,31 @@ macebus_iointr(intrmask_t hwpend, struct trap_frame *cf) #ifdef DIAGNOSTIC if (pending != 0) { - printf("stray interrupt, mace mask %lx stat %lx\n" - "crime mask %lx stat %lx hard %lx (pending %lx caught %lx)\n", - bus_space_read_8(&macebus_tag, mace_h, MACE_ISA_INT_MASK), - bus_space_read_8(&macebus_tag, mace_h, MACE_ISA_INT_STAT), - bus_space_read_8(&crimebus_tag, crime_h, CRIME_INT_MASK), - bus_space_read_8(&crimebus_tag, crime_h, CRIME_INT_STAT), - bus_space_read_8(&crimebus_tag, crime_h, CRIME_INT_HARD), - pending, caught); - if (++spurious >= 10) - panic("too many stray interrupts"); + intstat = bus_space_read_8(&crimebus_tag, crime_h, + CRIME_INT_STAT) & + bus_space_read_8(&crimebus_tag, crime_h, CRIME_INT_MASK); + isastat = bus_space_read_8(&macebus_tag, mace_h, + MACE_ISA_INT_STAT) & + bus_space_read_8(&macebus_tag, mace_h, MACE_ISA_INT_MASK); + + if (intstat != 0 || isastat != 0) { + printf("stray interrupt, mace mask %lx stat %lx\n" + "crime mask %lx stat %lx hard %lx " + "(pending %lx caught %lx)\n", + bus_space_read_8(&macebus_tag, mace_h, + MACE_ISA_INT_MASK), + bus_space_read_8(&macebus_tag, mace_h, + MACE_ISA_INT_STAT), + bus_space_read_8(&crimebus_tag, crime_h, + CRIME_INT_MASK), + bus_space_read_8(&crimebus_tag, crime_h, + CRIME_INT_STAT), + bus_space_read_8(&crimebus_tag, crime_h, + CRIME_INT_HARD), + pending, caught); + if (++spurious >= 10) + panic("too many stray interrupts"); + } } #endif |