diff options
| author | fsmp <fsmp@FreeBSD.org> | 1997-07-19 03:59:28 +0000 |
|---|---|---|
| committer | fsmp <fsmp@FreeBSD.org> | 1997-07-19 03:59:28 +0000 |
| commit | 74e82794985a5fd827fa091239a2d850f73ce3c2 (patch) | |
| tree | 5cf32793a6de5b2072645b3afb13115a90d44ba9 /sys/i386/isa/apic_ipl.s | |
| parent | 87c3825771104583798fc3b243f9d8d9c98984a5 (diff) | |
| download | FreeBSD-src-74e82794985a5fd827fa091239a2d850f73ce3c2.zip FreeBSD-src-74e82794985a5fd827fa091239a2d850f73ce3c2.tar.gz | |
Added #code to support define APIC_PIN0_TIMER.
This code ALWAYS runs the 8254 timer thru the 8259 ICU.
It depricates the usage of "options SMP_TIMER_NC" in the config file.
Diffstat (limited to 'sys/i386/isa/apic_ipl.s')
| -rw-r--r-- | sys/i386/isa/apic_ipl.s | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/sys/i386/isa/apic_ipl.s b/sys/i386/isa/apic_ipl.s index c7612c8..bb88ceb 100644 --- a/sys/i386/isa/apic_ipl.s +++ b/sys/i386/isa/apic_ipl.s @@ -22,12 +22,17 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: apic_ipl.s,v 1.1 1997/07/18 22:54:17 smp Exp smp $ + * $Id: apic_ipl.s,v 1.2 1997/07/19 02:28:29 fsmp Exp $ */ +#ifdef APIC_IO +#include <machine/smptests.h> /** APIC_PIN0_TIMER */ +#endif /* APIC_IO */ + .data ALIGN_DATA +#ifndef APIC_PIN0_TIMER /* this allows us to change the 8254 APIC pin# assignment */ .globl _Xintr8254 _Xintr8254: @@ -37,6 +42,7 @@ _Xintr8254: .globl _mask8254 _mask8254: .long 0 +#endif /* APIC_PIN0_TIMER */ #ifdef DO_RTC_VEC /** XXX FIXME: remove me after several weeks of no problems */ @@ -76,6 +82,17 @@ _vec: * generic vector function for 8254 clock */ ALIGN_TEXT +#ifdef APIC_PIN0_TIMER +vec0: + popl %eax /* return address */ + pushfl + pushl $KCSEL + pushl %eax + cli + andl $~IRQ_BIT(0), iactive ; /* lazy masking */ + MEXITCOUNT + jmp _Xintr0 /* XXX might need _Xfastintr0 */ +#else .globl _vec8254 _vec8254: popl %eax /* return address */ @@ -83,12 +100,14 @@ _vec8254: pushl $KCSEL pushl %eax cli - movl _mask8254,%eax /* lazy masking */ + movl _mask8254, %eax /* lazy masking */ notl %eax - andl %eax,iactive + andl %eax, iactive MEXITCOUNT movl _Xintr8254, %eax jmp %eax /* XXX might need _Xfastintr# */ +#endif /* APIC_PIN0_TIMER */ + /* * generic vector function for RTC clock @@ -142,7 +161,9 @@ __CONCAT(vec,irq_num): ; \ jmp __CONCAT(_Xintr,irq_num) - BUILD_VEC(0) /* NOT specific in IO APIC hardware */ +#ifndef APIC_PIN0_TIMER + BUILD_VEC(0) +#endif /* APIC_PIN0_TIMER */ BUILD_VEC(1) BUILD_VEC(2) BUILD_VEC(3) |
