Fewer hardcoded values and simpler code in ip30 interrupt handling.

3 files changed, 65 insertions, 26 deletions

diff --git a/sys/arch/sgi/sgi/ip30_machdep.c b/sys/arch/sgi/sgi/ip30_machdep.c
index 102cf5ed658..2d021396b44 100644
--- a/sys/arch/sgi/sgi/ip30_machdep.c
+++ b/sys/arch/sgi/sgi/ip30_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip30_machdep.c,v 1.5 2009/04/15 18:42:23 miod Exp $	*/
+/*	$OpenBSD: ip30_machdep.c,v 1.6 2009/04/18 14:48:08 miod Exp $	*/
 
 /*
  * Copyright (c) 2008 Miodrag Vallat.
@@ -166,9 +166,10 @@ ip30_widget_id(int16_t nasid, u_int widget, uint32_t *wid)
 void
 hw_setintrmask(intrmask_t m)
 {
-	extern intrmask_t heart_intem;
+	extern uint64_t heart_intem;
 
 	paddr_t heart;
 	heart = PHYS_TO_XKPHYS(HEART_PIU_BASE, CCA_NC);
-	*(volatile uint64_t *)(heart + HEART_IMR(0)) = heart_intem & ~m;
+	*(volatile uint64_t *)(heart + HEART_IMR(0)) =
+	    heart_intem & ~((uint64_t)m);
 }
diff --git a/sys/arch/sgi/xbow/xheart.c b/sys/arch/sgi/xbow/xheart.c
index c01385ed474..1b283f20bad 100644
--- a/sys/arch/sgi/xbow/xheart.c
+++ b/sys/arch/sgi/xbow/xheart.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xheart.c,v 1.5 2009/04/15 18:45:41 miod Exp $	*/
+/*	$OpenBSD: xheart.c,v 1.6 2009/04/18 14:48:09 miod Exp $	*/
 
 /*
  * Copyright (c) 2008 Miodrag Vallat.
@@ -243,14 +243,12 @@ xheart_intr_register(int widget, int level, int *intrbit)
 	/*
 	 * All interrupts will be serviced at hardware level 0,
 	 * so the `level' argument can be ignored.
-	 * On HEART, the low 16 bits of the interrupt register
-	 * are level 0 sources.
 	 */
-	for (bit = 15; bit >= 0; bit--)
+	for (bit = HEART_INTR_WIDGET_MAX; bit >= HEART_INTR_WIDGET_MIN; bit--)
 		if ((sc->sc_intrmask & (1 << bit)) == 0)
 			break;
 
-	if (bit < 0)
+	if (bit < HEART_INTR_WIDGET_MIN)
 		return EINVAL;
 
 	*intrbit = bit;
@@ -269,7 +267,7 @@ xheart_intr_establish(int (*func)(void *), void *arg, int intrbit,
 	paddr_t heart;
 
 #ifdef DIAGNOSTIC
-	if (intrbit < 0 || intrbit >= 16)
+	if (intrbit < HEART_INTR_MIN || intrbit > HEART_INTR_MAX)
 		return EINVAL;
 #endif
 
@@ -311,7 +309,7 @@ xheart_intr_disestablish(int intrbit)
 	int s;
 
 #ifdef DIAGNOSTIC
-	if (intrbit < 0 || intrbit >= 16)
+	if (intrbit < HEART_INTR_MIN || intrbit > HEART_INTR_MAX)
 		return;
 #endif
 
@@ -340,7 +338,7 @@ xheart_intr_disestablish(int intrbit)
  * Xheart interrupt handler driver.
  */
 
-intrmask_t heart_intem = 0;
+uint64_t heart_intem = 0;
 
 /*
  * Recompute interrupt masks.
@@ -389,8 +387,7 @@ xheart_intr_makemasks(struct xheart_softc *sc)
 	imask[IPL_NONE] = 0;
 	imask[IPL_HIGH] = -1;
 
-	/* Lastly, determine which IRQs are actually in use. */
-	heart_intem = sc->sc_intrmask & 0x00000000ffffffffL;
+	heart_intem = sc->sc_intrmask;
 	hw_setintrmask(0);
 }
 
@@ -412,9 +409,11 @@ xheart_intr_handler(intrmask_t hwpend, struct trap_frame *frame)
 {
 	paddr_t heart;
 	uint64_t imr, isr;
+	int icpl;
 	int bit;
 	intrmask_t mask;
 	struct intrhand *ih;
+	int rc;
 
 	heart = PHYS_TO_XKPHYS(HEART_PIU_BASE, CCA_NC);
 	isr = *(volatile uint64_t *)(heart + HEART_ISR);
@@ -425,28 +424,55 @@ xheart_intr_handler(intrmask_t hwpend, struct trap_frame *frame)
 		return 0;	/* not for us */
 
 	/*
-	 * If interrupts are spl-masked, mark them as pending and mask
-	 * them in hardware.
+	 * Mask all pending interrupts.
+	 */
+	*(volatile uint64_t *)(heart + HEART_IMR(0)) &= ~isr;
+
+	/*
+	 * If interrupts are spl-masked, mark them as pending only.
 	 */
 	if ((mask = isr & frame->cpl) != 0) {
 		atomic_setbits_int(&ipending, mask);
-		*(volatile uint64_t *)(heart + HEART_IMR(0)) &= ~mask;
 		isr &= ~mask;
 	}
 
 	/*
 	 * Now process unmasked interrupts.
 	 */
-	mask = isr & ~frame->cpl;
-	atomic_clearbits_int(&ipending, mask);
-	for (bit = 15, mask = 1 << 15; bit >= 0; bit--, mask >>= 1) {
-		if ((isr & mask) == 0)
-			continue;
-
-		for (ih = intrhand[bit]; ih != NULL; ih = ih->ih_next) {
-			if ((*ih->ih_fun)(ih->ih_arg) != 0)
-				ih->ih_count.ec_count++;
+	if (isr != 0) {
+		atomic_clearbits_int(&ipending, isr);
+
+		__asm__ (" .set noreorder\n");
+		icpl = cpl;
+		__asm__ (" sync\n .set reorder\n");
+
+		/* XXX Rework this to dispatch in decreasing levels */
+		for (bit = HEART_INTR_MAX, mask = 1 << bit;
+		    bit >= HEART_INTR_MIN; bit--, mask >>= 1) {
+			if ((isr & mask) == 0)
+				continue;
+
+			rc = 0;
+			for (ih = intrhand[bit]; ih != NULL; ih = ih->ih_next) {
+				splraise(imask[ih->ih_level]);
+				ih->frame = frame;
+				if ((*ih->ih_fun)(ih->ih_arg) != 0) {
+					rc = 1;
+					ih->ih_count.ec_count++;
+				}
+			}
+			if (rc == 0)
+				printf("spurious interrupt, source %d\n", bit);
 		}
+
+		/*
+		 * Reenable interrupts which have been serviced.
+		 */
+		*(volatile uint64_t *)(heart + HEART_IMR(0)) |= isr;
+
+		__asm__ (" .set noreorder\n");
+		cpl = icpl;
+		__asm__ (" sync\n .set reorder\n");
 	}
 
 	return CR_INT_0;
diff --git a/sys/arch/sgi/xbow/xheartreg.h b/sys/arch/sgi/xbow/xheartreg.h
index d5c5b48da9d..51110690bb5 100644
--- a/sys/arch/sgi/xbow/xheartreg.h
+++ b/sys/arch/sgi/xbow/xheartreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xheartreg.h,v 1.1 2008/04/07 22:47:40 miod Exp $	*/
+/*	$OpenBSD: xheartreg.h,v 1.2 2009/04/18 14:48:09 miod Exp $	*/
 
 /*
  * Copyright (c) 2008 Miodrag Vallat.
@@ -44,3 +44,15 @@
 #define	HEART_ISR_SET		0x00010020
 #define	HEART_ISR_CLR		0x00010028
 #define	HEART_ISR		0x00010030
+
+/*
+ * ISR bit assignments (partial).
+ */
+
+#define	HEART_INTR_ACFAIL	15
+#define	HEART_INTR_POWER	14
+#define	HEART_INTR_WIDGET_MAX	13
+#define	HEART_INTR_WIDGET_MIN	0
+
+#define	HEART_INTR_MAX		15
+#define	HEART_INTR_MIN		0