diff options
| author | Steve Passe <fsmp@FreeBSD.org> | 1997-05-29 05:58:41 +0000 |
|---|---|---|
| committer | Steve Passe <fsmp@FreeBSD.org> | 1997-05-29 05:58:41 +0000 |
| commit | a8baaafda0714b303359ba38828bef0abcaa5820 (patch) | |
| tree | a67dcd96fc6cfb49180c8ddef74d39ecde244a39 /sys/kern/subr_smp.c | |
| parent | 08942d46056ad4038f22c271c33bce8fb6dfb65d (diff) | |
| download | src-a8baaafda0714b303359ba38828bef0abcaa5820.tar.gz src-a8baaafda0714b303359ba38828bef0abcaa5820.zip | |
Code such as apic_base[APIC_ID] converted to lapic__id
Changes to pmap.c for lapic_t lapic && ioapic_t ioapic pointers,
currently equal to apic_base && io_apic_base, will stand alone with the
private page mapping.
Notes
Notes:
svn path=/head/; revision=26270
Diffstat (limited to 'sys/kern/subr_smp.c')
| -rw-r--r-- | sys/kern/subr_smp.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index c5aa2f2c3e46..46e38e12ca84 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -375,9 +375,9 @@ configure_local_apic(void) outb(0x23, byte); /* disconnect 8259s/NMI */ } /* mask the LVT1 */ - temp = apic_base[APIC_LVT1]; + temp = lapic__lvt_lint0; temp |= APIC_LVT_M; - apic_base[APIC_LVT1] = temp; + lapic__lvt_lint0 = temp; } #endif /* APIC_IO */ @@ -1258,7 +1258,7 @@ default_mp_table(int type) } #endif /* 0 */ - boot_cpu_id = (apic_base[APIC_ID] & APIC_ID_MASK) >> 24; + boot_cpu_id = (lapic__id & APIC_ID_MASK) >> 24; ap_cpu_id = (boot_cpu_id == 0) ? 1 : 0; /* BSP */ @@ -1362,7 +1362,7 @@ start_all_aps(u_int boot_addr) * * get the initial mp_lock with a count of 1 for the BSP */ - mp_lock = (apic_base[APIC_ID] & APIC_ID_MASK) + 1; + mp_lock = (lapic__id & APIC_ID_MASK) + 1; /* initialize BSP's local APIC */ apic_initialize(1); @@ -1401,7 +1401,7 @@ start_all_aps(u_int boot_addr) } /* fill in our (BSP) APIC version */ - cpu_apic_versions[0] = apic_base[APIC_VER]; + cpu_apic_versions[0] = lapic__version; /* restore the warmstart vector */ *(u_long *) WARMBOOT_OFF = mpbioswarmvec; @@ -1503,24 +1503,24 @@ start_ap(int logical_cpu, u_int boot_addr) */ /* setup the address for the target AP */ - icr_hi = apic_base[APIC_ICR_HI] & ~APIC_ID_MASK; + icr_hi = lapic__icr_hi & ~APIC_ID_MASK; icr_hi |= (physical_cpu << 24); - apic_base[APIC_ICR_HI] = icr_hi; + lapic__icr_hi = icr_hi; /* do an INIT IPI: assert RESET */ - icr_lo = apic_base[APIC_ICR_LOW] & 0xfff00000; - apic_base[APIC_ICR_LOW] = icr_lo | 0x0000c500; + icr_lo = lapic__icr_lo & 0xfff00000; + lapic__icr_lo = icr_lo | 0x0000c500; /* wait for pending status end */ - while (apic_base[APIC_ICR_LOW] & APIC_DELSTAT_MASK) + while (lapic__icr_lo & APIC_DELSTAT_MASK) /* spin */ ; /* do an INIT IPI: deassert RESET */ - apic_base[APIC_ICR_LOW] = icr_lo | 0x00008500; + lapic__icr_lo = icr_lo | 0x00008500; /* wait for pending status end */ u_sleep(10000); /* wait ~10mS */ - while (apic_base[APIC_ICR_LOW] & APIC_DELSTAT_MASK) + while (lapic__icr_lo & APIC_DELSTAT_MASK) /* spin */ ; /* @@ -1533,8 +1533,8 @@ start_ap(int logical_cpu, u_int boot_addr) */ /* do a STARTUP IPI */ - apic_base[APIC_ICR_LOW] = icr_lo | 0x00000600 | vector; - while (apic_base[APIC_ICR_LOW] & APIC_DELSTAT_MASK) + lapic__icr_lo = icr_lo | 0x00000600 | vector; + while (lapic__icr_lo & APIC_DELSTAT_MASK) /* spin */ ; u_sleep(200); /* wait ~200uS */ @@ -1545,8 +1545,8 @@ start_ap(int logical_cpu, u_int boot_addr) * recognized after hardware RESET or INIT IPI. */ - apic_base[APIC_ICR_LOW] = icr_lo | 0x00000600 | vector; - while (apic_base[APIC_ICR_LOW] & APIC_DELSTAT_MASK) + lapic__icr_lo = icr_lo | 0x00000600 | vector; + while (lapic__icr_lo & APIC_DELSTAT_MASK) /* spin */ ; u_sleep(200); /* wait ~200uS */ |