diff options
| -rw-r--r-- | sys/arch/mips64/mips64/clock.c | 16 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/interrupt.c | 13 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/softintr.c | 8 | ||||
| -rw-r--r-- | sys/arch/sgi/include/intr.h | 5 | ||||
| -rw-r--r-- | sys/arch/sgi/xbow/xheart.c | 6 |
5 files changed, 28 insertions, 20 deletions
diff --git a/sys/arch/mips64/mips64/clock.c b/sys/arch/mips64/mips64/clock.c index 91c405be630..0cd58d1559c 100644 --- a/sys/arch/mips64/mips64/clock.c +++ b/sys/arch/mips64/mips64/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.29 2009/11/22 22:15:25 syuu Exp $ */ +/* $OpenBSD: clock.c,v 1.30 2009/11/26 23:32:46 syuu Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -117,9 +117,13 @@ clockattach(struct device *parent, struct device *self, void *aux) uint32_t clock_int5(uint32_t mask, struct trap_frame *tf) { - u_int32_t clkdiff; + u_int32_t clkdiff, sr; struct cpu_info *ci = curcpu(); + /* Enable interrupts at this (hardware) level again */ + sr = getsr(); + updateimask(mask); + /* * If we got an interrupt before we got ready to process it, * retrigger it as far as possible. cpu_initclocks() will @@ -127,6 +131,7 @@ clock_int5(uint32_t mask, struct trap_frame *tf) */ if (ci->ci_clock_started == 0) { cp0_set_compare(cp0_get_count() - 1); + setsr(sr); return CR_INT_5; } @@ -158,12 +163,19 @@ clock_int5(uint32_t mask, struct trap_frame *tf) * Process clock interrupt unless it is currently masked. */ if (tf->ipl < IPL_CLOCK) { +#ifdef MULTIPROCESSOR + __mp_lock(&kernel_lock); +#endif while (ci->ci_pendingticks) { clk_count.ec_count++; hardclock(tf); ci->ci_pendingticks--; } +#ifdef MULTIPROCESSOR + __mp_unlock(&kernel_lock); +#endif } + setsr(sr); return CR_INT_5; /* Clock is always on 5 */ } diff --git a/sys/arch/mips64/mips64/interrupt.c b/sys/arch/mips64/mips64/interrupt.c index 5f6717b34e1..5bd47a08a4c 100644 --- a/sys/arch/mips64/mips64/interrupt.c +++ b/sys/arch/mips64/mips64/interrupt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interrupt.c,v 1.53 2009/11/22 00:31:03 syuu Exp $ */ +/* $OpenBSD: interrupt.c,v 1.54 2009/11/26 23:32:46 syuu Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -114,12 +114,6 @@ interrupt(struct trap_frame *trapframe) #ifdef DEBUG_INTERRUPT trapdebug_enter(trapframe, 0); #endif - -#ifdef MULTIPROCESSOR - if (ci->ci_ipl < IPL_SCHED) - __mp_lock(&kernel_lock); -#endif - uvmexp.intrs++; /* Mask out interrupts from cause that are unmasked */ @@ -152,11 +146,6 @@ interrupt(struct trap_frame *trapframe) ci->ci_ipl = s; /* no-overhead splx */ __asm__ ("sync\n\t.set reorder\n"); } - -#ifdef MULTIPROCESSOR - if (ci->ci_ipl < IPL_SCHED) - __mp_unlock(&kernel_lock); -#endif } diff --git a/sys/arch/mips64/mips64/softintr.c b/sys/arch/mips64/mips64/softintr.c index c9244cf76e8..354480fe936 100644 --- a/sys/arch/mips64/mips64/softintr.c +++ b/sys/arch/mips64/mips64/softintr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softintr.c,v 1.7 2009/11/22 22:15:25 syuu Exp $ */ +/* $OpenBSD: softintr.c,v 1.8 2009/11/26 23:32:46 syuu Exp $ */ /* $NetBSD: softintr.c,v 1.2 2003/07/15 00:24:39 lukem Exp $ */ /* @@ -205,6 +205,9 @@ dosoftint() struct cpu_info *ci = curcpu(); int sir, q, mask; + if (ci->ci_ipl < IPL_SCHED) + __mp_lock(&kernel_lock); + while ((sir = ci->ci_softpending) != 0) { atomic_clearbits_int(&ci->ci_softpending, sir); @@ -214,4 +217,7 @@ dosoftint() softintr_dispatch(q); } } + + if (ci->ci_ipl < IPL_SCHED) + __mp_unlock(&kernel_lock); } diff --git a/sys/arch/sgi/include/intr.h b/sys/arch/sgi/include/intr.h index 62cc4e7b4d7..07af62d0ad2 100644 --- a/sys/arch/sgi/include/intr.h +++ b/sys/arch/sgi/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.37 2009/11/25 17:39:51 syuu Exp $ */ +/* $OpenBSD: intr.h,v 1.38 2009/11/26 23:32:46 syuu Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -172,7 +172,8 @@ struct intrhand { */ /* Schedule priorities for base interrupts (CPU) */ -#define INTPRI_CLOCK 0 +#define INTPRI_IPI 0 +#define INTPRI_CLOCK 1 /* other values are system-specific */ #define NLOWINT 16 /* Number of low level registrations possible */ diff --git a/sys/arch/sgi/xbow/xheart.c b/sys/arch/sgi/xbow/xheart.c index eb2075d4866..88b0f640cb7 100644 --- a/sys/arch/sgi/xbow/xheart.c +++ b/sys/arch/sgi/xbow/xheart.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xheart.c,v 1.18 2009/11/25 17:39:51 syuu Exp $ */ +/* $OpenBSD: xheart.c,v 1.19 2009/11/26 23:32:46 syuu Exp $ */ /* * Copyright (c) 2008 Miodrag Vallat. @@ -89,8 +89,8 @@ struct intrhand *xheart_intrhand[HEART_NINTS]; #define INTPRI_HEART_1 (INTPRI_HEART_2 + 1) #define INTPRI_HEART_0 (INTPRI_HEART_1 + 1) #else -#define INTPRI_HEART_2 (INTPRI_CLOCK + 1) -#define INTPRI_HEART_0 (INTPRI_HEART_2 + 1) +#define INTPRI_HEART_2 (INTPRI_IPI) +#define INTPRI_HEART_0 (INTPRI_CLOCK + 1) #endif #define INTPRI_HEART_LEDS (INTPRI_HEART_0 + 1) |