Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the 'FIFO Full' hack for interrupt vector 0. 

It is unclear that this interrupt fails to latch as int2_wait_fifo()
depends on it doing so and appears to work. Furthermore, we were previously
unconditionally unmasking the interrupt 0 vector, which led to more
'unexpected interrupt' messages on the console, rather than avoiding them.

Approved by sekiya@.
This commit is contained in:
rumble 2006-09-01 03:33:41 +00:00
parent 49b2425f19
commit 67e8288ba5
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/arch/sgimips/dev/int.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: int.c,v 1.11 2005/12/11 12:18:52 christos Exp $ */
/* $NetBSD: int.c,v 1.12 2006/09/01 03:33:41 rumble Exp $ */
/*
* Copyright (c) 2004 Christopher SEKIYA
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: int.c,v 1.11 2005/12/11 12:18:52 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: int.c,v 1.12 2006/09/01 03:33:41 rumble Exp $");
#include "opt_cputype.h"
@ -226,17 +226,10 @@ int_local0_intr(u_int32_t status, u_int32_t cause, u_int32_t pc,
l0stat = bus_space_read_4(iot, ioh, INT2_LOCAL0_STATUS);
l0mask = bus_space_read_4(iot, ioh, INT2_LOCAL0_MASK);
/* The "FIFO full" bit is apparently not latched in the ISR, which
means that it won't be present in l0stat unless we're very lucky.
If no interrupts are pending, assume that it was caused by a full
FIFO and dispatch.
*/
bus_space_write_4(iot, ioh, INT2_LOCAL0_MASK, l0mask & (0xfe));
if ( (l0mask & 0x01) && ((l0stat & l0mask) == 0) )
l0stat = 0x01;
l0stat &= l0mask;
for (i = 0; i < 8; i++) {
if ( (l0stat & l0mask) & (1 << i)) {
if (l0stat & (1 << i)) {
for (ih = &intrtab[i]; ih != NULL; ih = ih->ih_next) {
if (ih->ih_fun != NULL)
(ih->ih_fun)(ih->ih_arg);
@ -246,9 +239,6 @@ int_local0_intr(u_int32_t status, u_int32_t cause, u_int32_t pc,
}
}
}
/* Unmask FIFO */
bus_space_write_4(iot, ioh, INT2_LOCAL0_MASK, l0mask | 0x01);
}
void