diff options
| author | fsmp <fsmp@FreeBSD.org> | 1997-08-21 05:08:25 +0000 |
|---|---|---|
| committer | fsmp <fsmp@FreeBSD.org> | 1997-08-21 05:08:25 +0000 |
| commit | 50236db5333cdc58157e0ad9c48b24efe702d9d3 (patch) | |
| tree | c85a743ad15448292b7f250fbc5f3e4352835dd7 /sys/i386/isa/apic_ipl.s | |
| parent | 5d3c68aeda6b25c847b3ad8a14bb11a9d77328aa (diff) | |
| download | FreeBSD-src-50236db5333cdc58157e0ad9c48b24efe702d9d3.zip FreeBSD-src-50236db5333cdc58157e0ad9c48b24efe702d9d3.tar.gz | |
Made PEND_INTS default.
Made NEW_STRATEGY default.
Removed misc. old cruft.
Centralized simple locks into mp_machdep.c
Centralized simple lock macros into param.h
More cleanup in the direction of making splxx()/cpl MP-safe.
Diffstat (limited to 'sys/i386/isa/apic_ipl.s')
| -rw-r--r-- | sys/i386/isa/apic_ipl.s | 67 |
1 files changed, 3 insertions, 64 deletions
diff --git a/sys/i386/isa/apic_ipl.s b/sys/i386/isa/apic_ipl.s index 1412367..a36c4de 100644 --- a/sys/i386/isa/apic_ipl.s +++ b/sys/i386/isa/apic_ipl.s @@ -22,17 +22,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: apic_ipl.s,v 1.11 1997/07/31 17:28:56 fsmp Exp $ + * $Id: apic_ipl.s,v 1.23 1997/08/21 04:52:30 smp Exp smp $ */ -#include <machine/smptests.h> /** NEW_STRATEGY, APIC_PIN0_TIMER */ - .data ALIGN_DATA -#ifdef NEW_STRATEGY - /* this allows us to change the 8254 APIC pin# assignment */ .globl _Xintr8254 _Xintr8254: @@ -43,22 +39,6 @@ _Xintr8254: _mask8254: .long 0 -#else /** NEW_STRATEGY */ - -#ifndef APIC_PIN0_TIMER -/* this allows us to change the 8254 APIC pin# assignment */ - .globl _Xintr8254 -_Xintr8254: - .long _Xintr7 - -/* used by this file, microtime.s and clock.c */ - .globl _mask8254 -_mask8254: - .long 0 -#endif /* APIC_PIN0_TIMER */ - -#endif /** NEW_STRATEGY */ - /* */ .globl _vec _vec: @@ -69,6 +49,7 @@ _vec: /* various simple locks */ .align 2 /* MUST be 32bit aligned */ +#if 0 /* critical region around IO APIC */ .globl _imen_lock _imen_lock: @@ -88,6 +69,7 @@ _fast_intr_lock: .globl _intr_lock _intr_lock: .long 0 +#endif /* * Note: @@ -122,7 +104,6 @@ _apic_imen: * generic vector function for 8254 clock */ ALIGN_TEXT -#ifdef NEW_STRATEGY .globl _vec8254 _vec8254: @@ -139,38 +120,6 @@ _vec8254: movl _Xintr8254, %eax jmp %eax /* XXX might need _Xfastintr# */ -#else /** NEW_STRATEGY */ - -#ifdef APIC_PIN0_TIMER -vec0: - popl %eax /* return address */ - pushfl - pushl $KCSEL - pushl %eax - cli - lock /* MP-safe */ - andl $~IRQ_BIT(0), iactive /* lazy masking */ - MEXITCOUNT - jmp _Xintr0 /* XXX might need _Xfastintr0 */ -#else - .globl _vec8254 -_vec8254: - popl %eax /* return address */ - pushfl - pushl $KCSEL - pushl %eax - movl _mask8254, %eax /* lazy masking */ - notl %eax - cli - lock /* MP-safe */ - andl %eax, iactive - MEXITCOUNT - movl _Xintr8254, %eax - jmp %eax /* XXX might need _Xfastintr# */ -#endif /* APIC_PIN0_TIMER */ - -#endif /** NEW_STRATEGY */ - /* * generic vector function for RTC clock @@ -205,17 +154,7 @@ __CONCAT(vec,irq_num): ; \ jmp __CONCAT(_Xintr,irq_num) -#ifdef NEW_STRATEGY - BUILD_VEC(0) - -#else /** NEW_STRATEGY */ - -#ifndef APIC_PIN0_TIMER - BUILD_VEC(0) -#endif /* APIC_PIN0_TIMER */ - -#endif /** NEW_STRATEGY */ BUILD_VEC(1) BUILD_VEC(2) BUILD_VEC(3) |
