diff options
| author | neel <neel@FreeBSD.org> | 2012-12-16 00:57:14 +0000 |
|---|---|---|
| committer | neel <neel@FreeBSD.org> | 2012-12-16 00:57:14 +0000 |
| commit | 7d7f92fbade54e46285282d2c5f456298084d794 (patch) | |
| tree | a500b7d2860e6f8efd38cae2d48084aa02dbb0fa /sys/amd64 | |
| parent | 70b50f16469543eddc3a9958b4a973bec1e41f52 (diff) | |
| download | FreeBSD-src-7d7f92fbade54e46285282d2c5f456298084d794.zip FreeBSD-src-7d7f92fbade54e46285282d2c5f456298084d794.tar.gz | |
Prefer x2apic mode when running inside a virtual machine.
Provide a tunable 'machdep.x2apic_desired' to let the administrator override
the default behavior.
Provide a read-only sysctl 'machdep.x2apic' to let the administrator know
whether the kernel is using x2apic or legacy mmio to access local apic.
Tested with Parallels Desktop 8 and bhyve hypervisors.
Also tested running on bare metal Intel Xeon E5-2658.
Obtained from: NetApp
Discussed with: jhb, attilio, avg, grehan
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/mp_machdep.c | 2 | ||||
| -rw-r--r-- | sys/amd64/include/apicvar.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index b4a0be4..f7423be 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -708,6 +708,8 @@ init_secondary(void) wrmsr(MSR_STAR, msr); wrmsr(MSR_SF_MASK, PSL_NT|PSL_T|PSL_I|PSL_C|PSL_D); + lapic_init_ap(); + /* Disable local APIC just to be sure. */ lapic_disable(); diff --git a/sys/amd64/include/apicvar.h b/sys/amd64/include/apicvar.h index ae2f5b9..dee5900 100644 --- a/sys/amd64/include/apicvar.h +++ b/sys/amd64/include/apicvar.h @@ -209,6 +209,7 @@ int lapic_enable_pmc(void); void lapic_eoi(void); int lapic_id(void); void lapic_init(vm_paddr_t addr); +void lapic_init_ap(void); int lapic_intr_pending(u_int vector); void lapic_ipi_raw(register_t icrlo, u_int dest); void lapic_ipi_vectored(u_int vector, int dest); |
