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

* Pass the IRQ number to stray_irqhandler() and display it in 

the panic message.
* Mask off undefined bits from the XINT3 and XINT0 registers in the CPLD.
This commit is contained in:
thorpej 2001-11-07 02:06:37 +00:00
parent 272e588400
commit 4a2c5fd66d
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/arch/evbarm/iq80310/iq80310_intr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iq80310_intr.c,v 1.1 2001/11/07 00:33:23 thorpej Exp $ */
/* $NetBSD: iq80310_intr.c,v 1.2 2001/11/07 02:06:37 thorpej Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@ -69,7 +69,7 @@ extern void set_spl_masks(void);
/* Called only from assembler code. */
uint32_t iq80310_intstat_read(void);
void stray_irqhandler(void);
void stray_irqhandler(int);
/*
* We have 8 interrupt source bits -- 5 in the XINT3 register, and 3
@ -115,10 +115,11 @@ iq80310_intstat_read(void)
{
uint32_t intstat;
intstat = bus_space_read_1(&obio_bs_tag, IQ80310_XINT3_STATUS, 0);
intstat = bus_space_read_1(&obio_bs_tag, IQ80310_XINT3_STATUS,
0) & 0x1f;
if (1/*rev F or later board*/)
intstat |= bus_space_read_1(&obio_bs_tag,
IQ80310_XINT0_STATUS, 0) << 5;
intstat |= (bus_space_read_1(&obio_bs_tag,
IQ80310_XINT0_STATUS, 0) & 0x7) << 5;
return (intstat);
}
@ -172,10 +173,10 @@ disable_irq(int irq)
}
void
stray_irqhandler(void)
stray_irqhandler(int irq)
{
panic("stray IRQ\n");
panic("no handlers for IRQ %d\n", irq);
}
void *

4
sys/arch/evbarm/iq80310/iq80310_irq.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: iq80310_irq.S,v 1.1 2001/11/07 00:33:23 thorpej Exp $ */
/* $NetBSD: iq80310_irq.S,v 1.2 2001/11/07 02:06:38 thorpej Exp $ */
/*
* Copyright (c) 1998 Mark Brinicombe.
@ -248,7 +248,7 @@ irqloop:
ldr r1, [r4, #(V_INTR)] /* stat info B */
teq r6, #0x00000000 /* Do we have a handler? */
moveq r0, r8 /* IRQ requests ars arg 0. */
moveq r0, r9 /* IRQ # as arg 0. */
addeq lr, pc, #nextirq - . - 8 /* return address */
bic r11, r11, r10 /* clear the IRQ bit */
beq _C_LABEL(stray_irqhandler) /* call special handler */