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

Always install IDT entries for ATPIC interrupt sources. The APIC no

Browse Source 
longer uses these interrupt vectors for its ISA interrupt pins, so these
entries will not be overwritten.  If we get a spurious interrupt from the
ATPIC when using the APIC, it will be treated as a stray interrupt instead
of causing a panic.
This commit is contained in:
John Baldwin 2003-11-14 21:02:49 +00:00
parent 9188b4a169
commit 64bb257f0b
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/amd64/isa/atpic.c
View File

@ -215,16 +215,6 @@ atpic_eoi_slave(struct intsrc *isrc)
static void
atpic_enable_intr(struct intsrc *isrc)
{
struct atpic_intsrc *ai = (struct atpic_intsrc *)isrc;
struct atpic *ap = (struct atpic *)isrc->is_pic;
register_t eflags;
mtx_lock_spin(&icu_lock);
eflags = intr_disable();
setidt(ap->at_intbase + ai->at_irq, ai->at_intr, SDT_SYS386IGT,
SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));
intr_restore(eflags);
mtx_unlock_spin(&icu_lock);
}
static int
@ -326,6 +316,9 @@ atpic_init(void *dummy __unused)
if (i == ICU_SLAVEID)
continue;
ai = &atintrs[i];
setidt(((struct atpic *)ai->at_intsrc.is_pic)->at_intbase +
ai->at_irq, ai->at_intr, SDT_SYS386IGT, SEL_KPL,
GSEL(GCODE_SEL, SEL_KPL));
intr_register_source(&ai->at_intsrc);
}
}

13
sys/i386/isa/atpic.c
View File

@ -215,16 +215,6 @@ atpic_eoi_slave(struct intsrc *isrc)
static void
atpic_enable_intr(struct intsrc *isrc)
{
struct atpic_intsrc *ai = (struct atpic_intsrc *)isrc;
struct atpic *ap = (struct atpic *)isrc->is_pic;
register_t eflags;
mtx_lock_spin(&icu_lock);
eflags = intr_disable();
setidt(ap->at_intbase + ai->at_irq, ai->at_intr, SDT_SYS386IGT,
SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));
intr_restore(eflags);
mtx_unlock_spin(&icu_lock);
}
static int
@ -326,6 +316,9 @@ atpic_init(void *dummy __unused)
if (i == ICU_SLAVEID)
continue;
ai = &atintrs[i];
setidt(((struct atpic *)ai->at_intsrc.is_pic)->at_intbase +
ai->at_irq, ai->at_intr, SDT_SYS386IGT, SEL_KPL,
GSEL(GCODE_SEL, SEL_KPL));
intr_register_source(&ai->at_intsrc);
}
}