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

If a valid ELCR was found, consult it for the trigger mode of ISA

Browse Source 
interrupts that have a trigger mode of conforming.  This fixes problems on
some older machines that still route PCI devices via ISA interrupts when
using an I/O APIC.

Tested by:	Peter Trifonov pvtrifonov at mail dot ru
MFC after:	1 month
This commit is contained in:
John Baldwin 2005-01-18 20:27:24 +00:00
parent 42f0ddd465
commit d81080b30a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/i386/i386/io_apic.c
View File

@ -423,7 +423,7 @@ ioapic_config_intr(struct intsrc *isrc, enum intr_trigger trig,
* them to be set to active low.
*
* XXX: Should we write to the ELCR if the trigger mode changes for
* an EISA IRQ?
* an EISA IRQ or an ISA IRQ with the ELCR present?
*/
if (intpin->io_bus == APIC_BUS_EISA)
pol = INTR_POLARITY_HIGH;

8
sys/i386/i386/mptable.c
View File

@ -580,12 +580,18 @@ conforming_trigger(u_char src_bus, u_char src_bus_irq)
KASSERT(src_bus <= mptable_maxbusid, ("bus id %d too large", src_bus));
switch (busses[src_bus].bus_type) {
case ISA:
return (INTR_TRIGGER_EDGE);
#ifndef PC98
if (elcr_found)
return (elcr_read_trigger(src_bus_irq));
else
#endif
return (INTR_TRIGGER_EDGE);
case PCI:
return (INTR_TRIGGER_LEVEL);
#ifndef PC98
case EISA:
KASSERT(src_bus_irq < 16, ("Invalid EISA IRQ %d", src_bus_irq));
KASSERT(elcr_found, ("Missing ELCR"));
return (elcr_read_trigger(src_bus_irq));
#endif
default: