diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2010-06-05 16:21:55 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2010-06-05 16:21:55 +0000 |
| commit | 000bf61c7ba7fc8f3fc8c7899c5133555a482a94 (patch) | |
| tree | 63825c19f4c780499ae19acb71368d5ae7b45c54 /sys/powerpc | |
| parent | 6a41cd83d70cdd49e05e3507e1bff813ffbcdced (diff) | |
| download | FreeBSD-src-000bf61c7ba7fc8f3fc8c7899c5133555a482a94.zip FreeBSD-src-000bf61c7ba7fc8f3fc8c7899c5133555a482a94.tar.gz | |
Make sure that interrupt sense settings set after interrupts are enabled
are respected. This fixes loading the Apple onboard audio driver
(snd_ai2s) as a module after boot, which would previously cause a panic.
PR: powerpc/146888
MFC after: 5 days
Diffstat (limited to 'sys/powerpc')
| -rw-r--r-- | sys/powerpc/powerpc/intr_machdep.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/powerpc/powerpc/intr_machdep.c b/sys/powerpc/powerpc/intr_machdep.c index 026cc02..0f8520d 100644 --- a/sys/powerpc/powerpc/intr_machdep.c +++ b/sys/powerpc/powerpc/intr_machdep.c @@ -164,6 +164,7 @@ intr_lookup(u_int irq) i->trig = INTR_TRIGGER_CONFORM; i->pol = INTR_POLARITY_CONFORM; i->irq = irq; + i->pic = NULL; i->vector = -1; mtx_lock(&intr_table_lock); @@ -325,6 +326,11 @@ powerpc_setup_intr(const char *name, u_int irq, driver_filter_t filter, if (!cold) { error = powerpc_map_irq(i); + + if (!error && (i->trig != INTR_TRIGGER_CONFORM || + i->pol != INTR_POLARITY_CONFORM)) + PIC_CONFIG(i->pic, i->intline, i->trig, i->pol); + if (!error && enable) PIC_ENABLE(i->pic, i->intline, i->vector); } @@ -350,7 +356,7 @@ powerpc_config_intr(int irq, enum intr_trigger trig, enum intr_polarity pol) i->trig = trig; i->pol = pol; - if (!cold) + if (!cold && i->pic != NULL) PIC_CONFIG(i->pic, i->intline, trig, pol); return (0); |
