d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure that interrupt sense settings set after interrupts are enabled

Browse Source 
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
This commit is contained in:
Nathan Whitehorn 2010-06-05 16:21:55 +00:00
parent 04c49e68de
commit 36d0d27786
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=208835
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/powerpc/powerpc/intr_machdep.c
View File

@ -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);