diff options
author | jhb <jhb@FreeBSD.org> | 2008-04-05 19:58:30 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2008-04-05 19:58:30 +0000 |
commit | 79918c45a6cb0f1be2a1f4a98b4db650b3e3ec66 (patch) | |
tree | 3473dbfbaef8cf04d0d7e8cc250d98a1d866650b /sys/sparc64 | |
parent | bcf7984652af778a74311520173661bcd19d3326 (diff) | |
download | FreeBSD-src-79918c45a6cb0f1be2a1f4a98b4db650b3e3ec66.zip FreeBSD-src-79918c45a6cb0f1be2a1f4a98b4db650b3e3ec66.tar.gz |
Add a MI intr_event_handle() routine for the non-INTR_FILTER case. This
allows all the INTR_FILTER #ifdef's to be removed from the MD interrupt
code.
- Rename the intr_event 'eoi', 'disable', and 'enable' hooks to
'post_filter', 'pre_ithread', and 'post_ithread' to be less x86-centric.
Also, add a comment describe what the MI code expects them to do.
- On amd64, i386, and powerpc this is effectively a NOP.
- On arm, don't bother masking the interrupt unless the ithread is
scheduled in the non-INTR_FILTER case to match what INTR_FILTER did.
Also, don't bother unmasking the interrupt in the post_filter case if
we never masked it. The INTR_FILTER case had been doing this by having
arm_unmask_irq for the post_filter (formerly 'eoi') hook.
- On ia64, stray interrupts are now masked for the non-INTR_FILTER case.
They were already masked in the INTR_FILTER case.
- On sparc64, use the a NULL pre_ithread hook and use intr_enable_eoi() for
both the 'post_filter' and 'post_ithread' hooks to match what the
non-INTR_FILTER code did.
- On sun4v, retire the ithread wrapper hack by using an appropriate
'post_ithread' hook instead (it's what 'post_ithread'/'enable' was
designed to do even in 5.x).
Glanced at by: piso
Reviewed by: marius
Requested by: marius [1], [5]
Tested on: amd64, i386, arm, sparc64
Diffstat (limited to 'sys/sparc64')
-rw-r--r-- | sys/sparc64/sparc64/intr_machdep.c | 54 |
1 files changed, 3 insertions, 51 deletions
diff --git a/sys/sparc64/sparc64/intr_machdep.c b/sys/sparc64/sparc64/intr_machdep.c index 115d486..d5e3e04 100644 --- a/sys/sparc64/sparc64/intr_machdep.c +++ b/sys/sparc64/sparc64/intr_machdep.c @@ -248,57 +248,9 @@ static void intr_execute_handlers(void *cookie) { struct intr_vector *iv; -#ifndef INTR_FILTER - struct intr_event *ie; - struct intr_handler *ih; - int error, thread, ret; -#endif iv = cookie; -#ifndef INTR_FILTER - ie = iv->iv_event; - if (iv->iv_ic == NULL || ie == NULL) { - intr_stray_vector(iv); - return; - } - - /* Execute fast interrupt handlers directly. */ - ret = 0; - thread = 0; - critical_enter(); - TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) { - if (ih->ih_filter == NULL) { - thread = 1; - continue; - } - MPASS(ih->ih_filter != NULL && ih->ih_argument != NULL); - CTR3(KTR_INTR, "%s: executing handler %p(%p)", __func__, - ih->ih_filter, ih->ih_argument); - ret = ih->ih_filter(ih->ih_argument); - /* - * Wrapper handler special case: see - * i386/intr_machdep.c::intr_execute_handlers() - */ - if (!thread) { - if (ret == FILTER_SCHEDULE_THREAD) - thread = 1; - } - } - if (!thread) - intr_enable_eoi(iv); - - /* Schedule a heavyweight interrupt process. */ - if (thread) - error = intr_event_schedule_thread(ie); - else if (TAILQ_EMPTY(&ie->ie_handlers)) - error = EINVAL; - else - error = 0; - critical_exit(); - if (error == EINVAL) -#else - if (intr_event_handle(iv->iv_event, NULL) != 0) -#endif + if (iv->iv_ic == NULL || intr_event_handle(iv->iv_event, NULL) != 0) intr_stray_vector(iv); } @@ -329,8 +281,8 @@ intr_controller_register(int vec, const struct intr_controller *ic, * CPU as long as the source of a level sensitive interrupt is * not cleared. */ - error = intr_event_create(&ie, iv, 0, ic->ic_disable, intr_enable_eoi, - ic->ic_eoi, NULL, "vec%d:", vec); + error = intr_event_create(&ie, iv, 0, NULL, intr_enable_eoi, + intr_enable_eoi, NULL, "vec%d:", vec); if (error != 0) return (error); mtx_lock_spin(&intr_table_lock); |