diff options
author | dg <dg@FreeBSD.org> | 1995-12-23 16:53:57 +0000 |
---|---|---|
committer | dg <dg@FreeBSD.org> | 1995-12-23 16:53:57 +0000 |
commit | 3236ea0039afc46c52d782caea030ce448725698 (patch) | |
tree | a40689044f4c9eeced4f46947d59405a75aa93e7 /sys/amd64/isa/vector.s | |
parent | 9fc588db482144830720564dce9cf642a938739a (diff) | |
download | FreeBSD-src-3236ea0039afc46c52d782caea030ce448725698.zip FreeBSD-src-3236ea0039afc46c52d782caea030ce448725698.tar.gz |
Made "AUTO_EOI_1" standard. auto-EOI on the master ICU is a documented
feature of the ICU. auto-EOI on the slave is not safe, however, so it
remains an option. Killed religious FASTER_NOP when writing the ICU.
Reviewed by: bde
Diffstat (limited to 'sys/amd64/isa/vector.s')
-rw-r--r-- | sys/amd64/isa/vector.s | 90 |
1 files changed, 37 insertions, 53 deletions
diff --git a/sys/amd64/isa/vector.s b/sys/amd64/isa/vector.s index 388c0e2..3b40769 100644 --- a/sys/amd64/isa/vector.s +++ b/sys/amd64/isa/vector.s @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: vector.s,v 1.13 1995/10/28 16:58:05 markm Exp $ + * $Id: vector.s,v 1.14 1995/11/04 16:00:56 markm Exp $ */ #include <i386/isa/icu.h> @@ -11,29 +11,15 @@ #define IRQ_BIT(irq_num) (1 << ((irq_num) % 8)) #define IRQ_BYTE(irq_num) ((irq_num) / 8) -#ifdef AUTO_EOI_1 -#define ENABLE_ICU1 /* use auto-EOI to reduce i/o */ -#define OUTB_ICU1 -#else -#define ENABLE_ICU1 \ - movb $ICU_EOI,%al ; /* as soon as possible send EOI ... */ \ - OUTB_ICU1 /* ... to clear in service bit */ -#define OUTB_ICU1 \ - FASTER_NOP ; \ - outb %al,$IO_ICU1 -#endif - #ifdef AUTO_EOI_2 /* * The data sheet says no auto-EOI on slave, but it sometimes works. */ -#define ENABLE_ICU1_AND_2 ENABLE_ICU1 +#define ENABLE_ICU2 #else -#define ENABLE_ICU1_AND_2 \ - movb $ICU_EOI,%al ; /* as above */ \ - FASTER_NOP ; \ - outb %al,$IO_ICU2 ; /* but do second icu first ... */ \ - OUTB_ICU1 /* ... then first icu (if !AUTO_EOI_1) */ +#define ENABLE_ICU2 \ + movb $ICU_EOI,%al ; \ + outb %al,$IO_ICU2 ; #endif #ifdef FAST_INTR_HANDLER_USES_ES @@ -174,7 +160,6 @@ IDTVEC(intr/**/irq_num) ; \ movb _imen + IRQ_BYTE(irq_num),%al ; \ orb $IRQ_BIT(irq_num),%al ; \ movb %al,_imen + IRQ_BYTE(irq_num) ; \ - FASTER_NOP ; \ outb %al,$icu+1 ; \ enable_icus ; \ incl _cnt+V_INTR ; /* tally interrupts */ \ @@ -197,7 +182,6 @@ Xresume/**/irq_num: ; \ movb _imen + IRQ_BYTE(irq_num),%al ; \ andb $~IRQ_BIT(irq_num),%al ; \ movb %al,_imen + IRQ_BYTE(irq_num) ; \ - FASTER_NOP ; \ outb %al,$icu+1 ; \ sti ; /* XXX _doreti repeats the cli/sti */ \ /* Add this interrupt to the pool of entropy */ \ @@ -218,38 +202,38 @@ Xresume/**/irq_num: ; \ iret MCOUNT_LABEL(bintr) - FAST_INTR(0, ENABLE_ICU1) - FAST_INTR(1, ENABLE_ICU1) - FAST_INTR(2, ENABLE_ICU1) - FAST_INTR(3, ENABLE_ICU1) - FAST_INTR(4, ENABLE_ICU1) - FAST_INTR(5, ENABLE_ICU1) - FAST_INTR(6, ENABLE_ICU1) - FAST_INTR(7, ENABLE_ICU1) - FAST_INTR(8, ENABLE_ICU1_AND_2) - FAST_INTR(9, ENABLE_ICU1_AND_2) - FAST_INTR(10, ENABLE_ICU1_AND_2) - FAST_INTR(11, ENABLE_ICU1_AND_2) - FAST_INTR(12, ENABLE_ICU1_AND_2) - FAST_INTR(13, ENABLE_ICU1_AND_2) - FAST_INTR(14, ENABLE_ICU1_AND_2) - FAST_INTR(15, ENABLE_ICU1_AND_2) - INTR(0, IO_ICU1, ENABLE_ICU1, al) - INTR(1, IO_ICU1, ENABLE_ICU1, al) - INTR(2, IO_ICU1, ENABLE_ICU1, al) - INTR(3, IO_ICU1, ENABLE_ICU1, al) - INTR(4, IO_ICU1, ENABLE_ICU1, al) - INTR(5, IO_ICU1, ENABLE_ICU1, al) - INTR(6, IO_ICU1, ENABLE_ICU1, al) - INTR(7, IO_ICU1, ENABLE_ICU1, al) - INTR(8, IO_ICU2, ENABLE_ICU1_AND_2, ah) - INTR(9, IO_ICU2, ENABLE_ICU1_AND_2, ah) - INTR(10, IO_ICU2, ENABLE_ICU1_AND_2, ah) - INTR(11, IO_ICU2, ENABLE_ICU1_AND_2, ah) - INTR(12, IO_ICU2, ENABLE_ICU1_AND_2, ah) - INTR(13, IO_ICU2, ENABLE_ICU1_AND_2, ah) - INTR(14, IO_ICU2, ENABLE_ICU1_AND_2, ah) - INTR(15, IO_ICU2, ENABLE_ICU1_AND_2, ah) + FAST_INTR(0,) + FAST_INTR(1,) + FAST_INTR(2,) + FAST_INTR(3,) + FAST_INTR(4,) + FAST_INTR(5,) + FAST_INTR(6,) + FAST_INTR(7,) + FAST_INTR(8, ENABLE_ICU2) + FAST_INTR(9, ENABLE_ICU2) + FAST_INTR(10, ENABLE_ICU2) + FAST_INTR(11, ENABLE_ICU2) + FAST_INTR(12, ENABLE_ICU2) + FAST_INTR(13, ENABLE_ICU2) + FAST_INTR(14, ENABLE_ICU2) + FAST_INTR(15, ENABLE_ICU2) + INTR(0, IO_ICU1,, al) + INTR(1, IO_ICU1,, al) + INTR(2, IO_ICU1,, al) + INTR(3, IO_ICU1,, al) + INTR(4, IO_ICU1,, al) + INTR(5, IO_ICU1,, al) + INTR(6, IO_ICU1,, al) + INTR(7, IO_ICU1,, al) + INTR(8, IO_ICU2, ENABLE_ICU2, ah) + INTR(9, IO_ICU2, ENABLE_ICU2, ah) + INTR(10, IO_ICU2, ENABLE_ICU2, ah) + INTR(11, IO_ICU2, ENABLE_ICU2, ah) + INTR(12, IO_ICU2, ENABLE_ICU2, ah) + INTR(13, IO_ICU2, ENABLE_ICU2, ah) + INTR(14, IO_ICU2, ENABLE_ICU2, ah) + INTR(15, IO_ICU2, ENABLE_ICU2, ah) MCOUNT_LABEL(eintr) .data |