7aa75d514a
- The MP code no longer knows anything specific about an MP Table. Instead, the local APIC code adds CPUs via the cpu_add() function when a local APIC is enumerated by an APIC enumerator. - Don't divide the argument to mp_bootaddress() by 1024 just so that we can turn around and mulitply it by 1024 again. - We no longer panic if SMP is enabled but we are booted on a UP machine. - init_secondary(), the asm code between init_secondary() and ap_init() in mpboot.s and ap_init() have all been merged together in C into init_secondary(). - We now use the cpuid feature bits to determine if we should enable PSE, PGE, or VME on each AP. - Due to the change in the implementation of critical sections, acquire the SMP TLB mutex around a slightly larger chunk of code for TLB shootdowns. - Remove some of the debug code from the original SMP implementation that is no longer used or no longer applies to the new APIC code. - Use a temporary hack to disable the ACPI module until the SMP code has been further reorganized to allow ACPI to work as a module again. - Add a DDB command to dump the interesting contents of the IDT.
91 lines
2.7 KiB
C
91 lines
2.7 KiB
C
/*
|
|
* ----------------------------------------------------------------------------
|
|
* "THE BEER-WARE LICENSE" (Revision 42):
|
|
* <phk@FreeBSD.org> wrote this file. As long as you retain this notice you
|
|
* can do whatever you want with this stuff. If we meet some day, and you think
|
|
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
|
|
* ----------------------------------------------------------------------------
|
|
*
|
|
* $FreeBSD$
|
|
*
|
|
*/
|
|
|
|
#ifndef _MACHINE_SMP_H_
|
|
#define _MACHINE_SMP_H_
|
|
|
|
#ifdef _KERNEL
|
|
|
|
#ifdef SMP
|
|
|
|
#ifndef LOCORE
|
|
|
|
/*
|
|
* For sending values to POST displays.
|
|
* XXX FIXME: where does this really belong, isa.h/isa.c perhaps?
|
|
*/
|
|
extern int current_postcode; /** XXX currently in mp_machdep.c */
|
|
#define POSTCODE(X) current_postcode = (X), \
|
|
outb(0x80, current_postcode)
|
|
#define POSTCODE_LO(X) current_postcode &= 0xf0, \
|
|
current_postcode |= ((X) & 0x0f), \
|
|
outb(0x80, current_postcode)
|
|
#define POSTCODE_HI(X) current_postcode &= 0x0f, \
|
|
current_postcode |= (((X) << 4) & 0xf0), \
|
|
outb(0x80, current_postcode)
|
|
|
|
#include <sys/bus.h>
|
|
#include <machine/frame.h>
|
|
#include <machine/intr_machdep.h>
|
|
#include <machine/apicvar.h>
|
|
|
|
/* global data in mpboot.s */
|
|
extern int bootMP_size;
|
|
|
|
/* functions in mpboot.s */
|
|
void bootMP(void);
|
|
|
|
/* global data in mp_machdep.c */
|
|
extern int mp_naps;
|
|
extern int boot_cpu_id;
|
|
extern struct pcb stoppcbs[];
|
|
extern struct mtx smp_tlb_mtx;
|
|
|
|
/* IPI handlers */
|
|
inthand_t
|
|
IDTVEC(invltlb), /* TLB shootdowns - global */
|
|
IDTVEC(invlpg), /* TLB shootdowns - 1 page */
|
|
IDTVEC(invlrng), /* TLB shootdowns - page range */
|
|
IDTVEC(hardclock), /* Forward hardclock() */
|
|
IDTVEC(statclock), /* Forward statclock() */
|
|
IDTVEC(cpuast), /* Additional software trap on other cpu */
|
|
IDTVEC(cpustop), /* CPU stops & waits to be restarted */
|
|
IDTVEC(rendezvous), /* handle CPU rendezvous */
|
|
IDTVEC(lazypmap); /* handle lazy pmap release */
|
|
|
|
/* functions in mp_machdep.c */
|
|
void cpu_add(u_int apic_id, char boot_cpu);
|
|
void init_secondary(void);
|
|
void ipi_selected(u_int cpus, u_int ipi);
|
|
void ipi_all(u_int ipi);
|
|
void ipi_all_but_self(u_int ipi);
|
|
void ipi_self(u_int ipi);
|
|
void forward_statclock(void);
|
|
void forwarded_statclock(struct clockframe frame);
|
|
void forward_hardclock(void);
|
|
void forwarded_hardclock(struct clockframe frame);
|
|
u_int mp_bootaddress(u_int);
|
|
int mp_grab_cpu_hlt(void);
|
|
void smp_invlpg(vm_offset_t addr);
|
|
void smp_masked_invlpg(u_int mask, vm_offset_t addr);
|
|
void smp_invlpg_range(vm_offset_t startva, vm_offset_t endva);
|
|
void smp_masked_invlpg_range(u_int mask, vm_offset_t startva,
|
|
vm_offset_t endva);
|
|
void smp_invltlb(void);
|
|
void smp_masked_invltlb(u_int mask);
|
|
|
|
#endif /* !LOCORE */
|
|
#endif /* SMP */
|
|
|
|
#endif /* _KERNEL */
|
|
#endif /* _MACHINE_SMP_H_ */
|