Share cpu.h between the x86 ports.
This commit is contained in:
parent
c5fb1571ad
commit
f674d9678b
@ -1,4 +1,4 @@
|
||||
# $NetBSD: md.amd64,v 1.32 2008/02/26 10:55:49 drochner Exp $
|
||||
# $NetBSD: md.amd64,v 1.33 2008/05/11 15:32:20 ad Exp $
|
||||
./usr/include/amd64 comp-c-include
|
||||
./usr/include/amd64/ansi.h comp-c-include
|
||||
./usr/include/amd64/aout_machdep.h comp-c-include
|
||||
@ -136,6 +136,7 @@
|
||||
./usr/include/x86/bootinfo.h comp-c-include
|
||||
./usr/include/x86/bus.h comp-c-include
|
||||
./usr/include/x86/cacheinfo.h comp-c-include
|
||||
./usr/include/x86/cpu.h comp-c-include
|
||||
./usr/include/x86/cputypes.h comp-c-include
|
||||
./usr/include/x86/cpuvar.h comp-c-include
|
||||
./usr/include/x86/float.h comp-c-include
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: md.i386,v 1.105 2008/02/26 10:55:50 drochner Exp $
|
||||
# $NetBSD: md.i386,v 1.106 2008/05/11 15:32:20 ad Exp $
|
||||
./usr/include/emmintrin.h comp-c-include gcccmds
|
||||
./usr/include/i386 comp-c-include
|
||||
./usr/include/i386/_G_config.h comp-obsolete obsolete
|
||||
@ -88,6 +88,7 @@
|
||||
./usr/include/x86/bootinfo.h comp-c-include
|
||||
./usr/include/x86/bus.h comp-c-include
|
||||
./usr/include/x86/cacheinfo.h comp-c-include
|
||||
./usr/include/x86/cpu.h comp-c-include
|
||||
./usr/include/x86/cputypes.h comp-c-include
|
||||
./usr/include/x86/cpuvar.h comp-c-include
|
||||
./usr/include/x86/float.h comp-c-include
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: acpi_wakecode.S,v 1.4 2008/04/28 20:23:12 martin Exp $ */
|
||||
/* $NetBSD: acpi_wakecode.S,v 1.5 2008/05/11 15:32:20 ad Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2007 Joerg Sonnenberger <joerg@netbsd.org>
|
||||
@ -168,7 +168,7 @@ wakeup_32:
|
||||
/* Enable SYSCALL extension and Long Mode */
|
||||
movl $MSR_EFER,%ecx
|
||||
rdmsr
|
||||
movl WAKEUP_msr_efer + ACPI_WAKEUP_ADDR,%eax
|
||||
movl WAKEUP_efer + ACPI_WAKEUP_ADDR,%eax
|
||||
wrmsr
|
||||
|
||||
/* Load temporary PML4, code will switch to full PML4 later */
|
||||
@ -241,5 +241,5 @@ WAKEUP_beep_on_reset: .byte 0
|
||||
|
||||
.global WAKEUP_curcpu
|
||||
WAKEUP_curcpu: .quad 0
|
||||
.global WAKEUP_msr_efer
|
||||
WAKEUP_msr_efer: .long 0
|
||||
.global WAKEUP_efer
|
||||
WAKEUP_efer: .long 0
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: acpi_wakeup_low.S,v 1.3 2007/12/18 07:17:09 joerg Exp $ */
|
||||
/* $NetBSD: acpi_wakeup_low.S,v 1.4 2008/05/11 15:32:20 ad Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2007 Joerg Sonnenberger <joerg@netbsd.org>
|
||||
@ -51,22 +51,22 @@ acpi_md_sleep_exit:
|
||||
movw %ax,%gs
|
||||
|
||||
movl $MSR_EFER,%ecx
|
||||
movl ACPI_SUSPEND_MSR_EFER(%r8),%eax
|
||||
movl ACPI_SUSPEND_EFER(%r8),%eax
|
||||
wrmsr
|
||||
|
||||
movl $MSR_FSBASE,%ecx
|
||||
movl ACPI_SUSPEND_FS_BASE_L(%r8),%eax
|
||||
movl ACPI_SUSPEND_FS_BASE_H(%r8),%edx
|
||||
movl ACPI_SUSPEND_FS(%r8),%eax
|
||||
movl ACPI_SUSPEND_FS+4(%r8),%edx
|
||||
wrmsr
|
||||
|
||||
movl $MSR_GSBASE,%ecx
|
||||
movl ACPI_SUSPEND_GS_BASE_L(%r8),%eax
|
||||
movl ACPI_SUSPEND_GS_BASE_H(%r8),%edx
|
||||
movl ACPI_SUSPEND_GS(%r8),%eax
|
||||
movl ACPI_SUSPEND_GS+4(%r8),%edx
|
||||
wrmsr
|
||||
|
||||
movl $MSR_KERNELGSBASE,%ecx
|
||||
movl ACPI_SUSPEND_GS_KERNELBASE_L(%r8),%eax
|
||||
movl ACPI_SUSPEND_GS_KERNELBASE_H(%r8),%edx
|
||||
movl ACPI_SUSPEND_KGS(%r8),%eax
|
||||
movl ACPI_SUSPEND_KGS+4(%r8),%edx
|
||||
wrmsr
|
||||
|
||||
movq ACPI_SUSPEND_CR8(%r8),%rax
|
||||
@ -91,18 +91,17 @@ acpi_md_sleep_exit:
|
||||
lldt ACPI_SUSPEND_LDT(%r8)
|
||||
lidt ACPI_SUSPEND_IDT(%r8)
|
||||
|
||||
movq ACPI_SUSPEND_RSP(%r8),%rsp
|
||||
|
||||
movq ACPI_SUSPEND_RBX(%r8),%rbx
|
||||
movq ACPI_SUSPEND_RBP(%r8),%rbp
|
||||
movq ACPI_SUSPEND_R12(%r8),%r12
|
||||
movq ACPI_SUSPEND_R13(%r8),%r13
|
||||
movq ACPI_SUSPEND_R14(%r8),%r14
|
||||
movq ACPI_SUSPEND_R15(%r8),%r15
|
||||
movq ACPI_SUSPEND_REG+(0*8)(%r8),%rsp
|
||||
movq ACPI_SUSPEND_REG+(1*8)(%r8),%rbx
|
||||
movq ACPI_SUSPEND_REG+(2*8)(%r8),%rbp
|
||||
movq ACPI_SUSPEND_REG+(3*8)(%r8),%r12
|
||||
movq ACPI_SUSPEND_REG+(4*8)(%r8),%r13
|
||||
movq ACPI_SUSPEND_REG+(5*8)(%r8),%r14
|
||||
movq ACPI_SUSPEND_REG+(6*8)(%r8),%r15
|
||||
|
||||
xorq %rax,%rax
|
||||
|
||||
pushq ACPI_SUSPEND_RFL(%r8)
|
||||
pushq ACPI_SUSPEND_REG+(7*8)(%r8)
|
||||
popfq
|
||||
ret
|
||||
|
||||
@ -111,12 +110,12 @@ acpi_md_sleep_exit:
|
||||
.globl acpi_md_sleep_prepare
|
||||
acpi_md_sleep_prepare:
|
||||
movq CPUVAR(SELF),%r8
|
||||
movq %rbx,ACPI_SUSPEND_RBX(%r8)
|
||||
movq %rbp,ACPI_SUSPEND_RBP(%r8)
|
||||
movq %r12,ACPI_SUSPEND_R12(%r8)
|
||||
movq %r13,ACPI_SUSPEND_R13(%r8)
|
||||
movq %r14,ACPI_SUSPEND_R14(%r8)
|
||||
movq %r15,ACPI_SUSPEND_R15(%r8)
|
||||
movq %rbx,ACPI_SUSPEND_REG+(1*8)(%r8)
|
||||
movq %rbp,ACPI_SUSPEND_REG+(2*8)(%r8)
|
||||
movq %r12,ACPI_SUSPEND_REG+(3*8)(%r8)
|
||||
movq %r13,ACPI_SUSPEND_REG+(4*8)(%r8)
|
||||
movq %r14,ACPI_SUSPEND_REG+(5*8)(%r8)
|
||||
movq %r15,ACPI_SUSPEND_REG+(6*8)(%r8)
|
||||
|
||||
movq %cr0,%rax
|
||||
movq %rax,ACPI_SUSPEND_CR0(%r8)
|
||||
@ -130,28 +129,28 @@ acpi_md_sleep_prepare:
|
||||
movq %rax,ACPI_SUSPEND_CR8(%r8)
|
||||
|
||||
pushfq
|
||||
popq ACPI_SUSPEND_RFL(%r8)
|
||||
popq ACPI_SUSPEND_REG+(7*8)(%r8)
|
||||
|
||||
movq %rsp,ACPI_SUSPEND_RSP(%r8)
|
||||
movq %rsp,ACPI_SUSPEND_REG+(0*8)(%r8)
|
||||
|
||||
movl $MSR_FSBASE,%ecx
|
||||
rdmsr
|
||||
movl %eax,ACPI_SUSPEND_FS_BASE_L(%r8)
|
||||
movl %edx,ACPI_SUSPEND_FS_BASE_H(%r8)
|
||||
movl %eax,ACPI_SUSPEND_FS(%r8)
|
||||
movl %edx,ACPI_SUSPEND_FS+4(%r8)
|
||||
|
||||
movl $MSR_GSBASE,%ecx
|
||||
rdmsr
|
||||
movl %eax,ACPI_SUSPEND_GS_BASE_L(%r8)
|
||||
movl %edx,ACPI_SUSPEND_GS_BASE_H(%r8)
|
||||
movl %eax,ACPI_SUSPEND_GS(%r8)
|
||||
movl %edx,ACPI_SUSPEND_GS+4(%r8)
|
||||
|
||||
movl $MSR_KERNELGSBASE,%ecx
|
||||
rdmsr
|
||||
movl %eax,ACPI_SUSPEND_GS_KERNELBASE_L(%r8)
|
||||
movl %edx,ACPI_SUSPEND_GS_KERNELBASE_H(%r8)
|
||||
movl %eax,ACPI_SUSPEND_KGS(%r8)
|
||||
movl %edx,ACPI_SUSPEND_KGS+4(%r8)
|
||||
|
||||
movl $MSR_EFER,%ecx
|
||||
rdmsr
|
||||
movl %eax,ACPI_SUSPEND_MSR_EFER(%r8)
|
||||
movl %eax,ACPI_SUSPEND_EFER(%r8)
|
||||
|
||||
sgdt ACPI_SUSPEND_GDT(%r8)
|
||||
sidt ACPI_SUSPEND_IDT(%r8)
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: autoconf.c,v 1.20 2008/05/10 16:12:32 ad Exp $ */
|
||||
/* $NetBSD: autoconf.c,v 1.21 2008/05/11 15:32:20 ad Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1990 The Regents of the University of California.
|
||||
@ -46,16 +46,17 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.20 2008/05/10 16:12:32 ad Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.21 2008/05/11 15:32:20 ad Exp $");
|
||||
|
||||
#include "opt_multiprocessor.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/buf.h>
|
||||
#include <sys/cpu.h>
|
||||
|
||||
#include <machine/pte.h>
|
||||
#include <machine/cpu.h>
|
||||
#include <machine/cpufunc.h>
|
||||
|
||||
#include "ioapic.h"
|
||||
#include "lapic.h"
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: gdt.c,v 1.18 2008/04/28 20:23:12 martin Exp $ */
|
||||
/* $NetBSD: gdt.c,v 1.19 2008/05/11 15:32:20 ad Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.18 2008/04/28 20:23:12 martin Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.19 2008/05/11 15:32:20 ad Exp $");
|
||||
|
||||
#include "opt_multiprocessor.h"
|
||||
#include "opt_xen.h"
|
||||
@ -172,7 +172,7 @@ gdt_init(void)
|
||||
}
|
||||
pmap_update(pmap_kernel());
|
||||
memcpy(gdtstore, old_gdt, DYNSEL_START);
|
||||
ci->ci_gdt = gdtstore;
|
||||
ci->ci_gdt = (void *)gdtstore;
|
||||
#ifndef XEN
|
||||
set_sys_segment(GDT_ADDR_SYS(gdtstore, GLDT_SEL), ldtstore,
|
||||
LDT_SIZE - 1, SDT_SYSLDT, SEL_KPL, 0);
|
||||
@ -187,14 +187,14 @@ void
|
||||
gdt_alloc_cpu(struct cpu_info *ci)
|
||||
{
|
||||
#if 0
|
||||
ci->ci_gdt = (char *)uvm_km_valloc(kernel_map, MAXGDTSIZ);
|
||||
ci->ci_gdt = (void *)uvm_km_valloc(kernel_map, MAXGDTSIZ);
|
||||
uvm_map_pageable(kernel_map, (vaddr_t)ci->ci_gdt,
|
||||
(vaddr_t)ci->ci_gdt + MINGDTSIZ, false, false);
|
||||
memset(ci->ci_gdt, 0, MINGDTSIZ);
|
||||
memcpy(ci->ci_gdt, gdtstore,
|
||||
DYNSEL_START + gdt_dyncount * sizeof(struct sys_segment_descriptor));
|
||||
#else
|
||||
ci->ci_gdt = gdtstore;
|
||||
ci->ci_gdt = (void *)gdtstore;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: genassym.cf,v 1.31 2008/05/10 16:12:32 ad Exp $
|
||||
# $NetBSD: genassym.cf,v 1.32 2008/05/11 15:32:20 ad Exp $
|
||||
|
||||
#
|
||||
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
|
||||
@ -262,30 +262,20 @@ define CPU_INFO_CPUID offsetof(struct cpu_info, ci_cpuid)
|
||||
define CPU_INFO_ISTATE offsetof(struct cpu_info, ci_istate)
|
||||
define CPU_INFO_CC_SKEW offsetof(struct cpu_info, ci_data.cpu_cc_skew)
|
||||
|
||||
define ACPI_SUSPEND_GDT offsetof(struct cpu_info, ci_suspend_gdt)
|
||||
define ACPI_SUSPEND_IDT offsetof(struct cpu_info, ci_suspend_idt)
|
||||
define ACPI_SUSPEND_TR offsetof(struct cpu_info, ci_suspend_tr)
|
||||
define ACPI_SUSPEND_LDT offsetof(struct cpu_info, ci_suspend_ldt)
|
||||
define ACPI_SUSPEND_FS_BASE_L offsetof(struct cpu_info, ci_suspend_fs_base_l)
|
||||
define ACPI_SUSPEND_FS_BASE_H offsetof(struct cpu_info, ci_suspend_fs_base_h)
|
||||
define ACPI_SUSPEND_GS_BASE_L offsetof(struct cpu_info, ci_suspend_gs_base_l)
|
||||
define ACPI_SUSPEND_GS_BASE_H offsetof(struct cpu_info, ci_suspend_gs_base_h)
|
||||
define ACPI_SUSPEND_GS_KERNELBASE_L offsetof(struct cpu_info, ci_suspend_gs_kernelbase_l)
|
||||
define ACPI_SUSPEND_GS_KERNELBASE_H offsetof(struct cpu_info, ci_suspend_gs_kernelbase_h)
|
||||
define ACPI_SUSPEND_MSR_EFER offsetof(struct cpu_info, ci_suspend_msr_efer)
|
||||
define ACPI_SUSPEND_RBX offsetof(struct cpu_info, ci_suspend_rbx)
|
||||
define ACPI_SUSPEND_RBP offsetof(struct cpu_info, ci_suspend_rbp)
|
||||
define ACPI_SUSPEND_RSP offsetof(struct cpu_info, ci_suspend_rsp)
|
||||
define ACPI_SUSPEND_R12 offsetof(struct cpu_info, ci_suspend_r12)
|
||||
define ACPI_SUSPEND_R13 offsetof(struct cpu_info, ci_suspend_r13)
|
||||
define ACPI_SUSPEND_R14 offsetof(struct cpu_info, ci_suspend_r14)
|
||||
define ACPI_SUSPEND_R15 offsetof(struct cpu_info, ci_suspend_r15)
|
||||
define ACPI_SUSPEND_RFL offsetof(struct cpu_info, ci_suspend_rfl)
|
||||
define ACPI_SUSPEND_CR0 offsetof(struct cpu_info, ci_suspend_cr0)
|
||||
define ACPI_SUSPEND_CR2 offsetof(struct cpu_info, ci_suspend_cr2)
|
||||
define ACPI_SUSPEND_CR3 offsetof(struct cpu_info, ci_suspend_cr3)
|
||||
define ACPI_SUSPEND_CR4 offsetof(struct cpu_info, ci_suspend_cr4)
|
||||
define ACPI_SUSPEND_CR8 offsetof(struct cpu_info, ci_suspend_cr8)
|
||||
define ACPI_SUSPEND_GDT offsetof(struct cpu_info, ci_suspend_gdt)
|
||||
define ACPI_SUSPEND_IDT offsetof(struct cpu_info, ci_suspend_idt)
|
||||
define ACPI_SUSPEND_TR offsetof(struct cpu_info, ci_suspend_tr)
|
||||
define ACPI_SUSPEND_LDT offsetof(struct cpu_info, ci_suspend_ldt)
|
||||
define ACPI_SUSPEND_FS offsetof(struct cpu_info, ci_suspend_fs)
|
||||
define ACPI_SUSPEND_GS offsetof(struct cpu_info, ci_suspend_gs)
|
||||
define ACPI_SUSPEND_KGS offsetof(struct cpu_info, ci_suspend_kgs)
|
||||
define ACPI_SUSPEND_EFER offsetof(struct cpu_info, ci_suspend_efer)
|
||||
define ACPI_SUSPEND_REG offsetof(struct cpu_info, ci_suspend_reg)
|
||||
define ACPI_SUSPEND_CR0 offsetof(struct cpu_info, ci_suspend_cr0)
|
||||
define ACPI_SUSPEND_CR2 offsetof(struct cpu_info, ci_suspend_cr2)
|
||||
define ACPI_SUSPEND_CR3 offsetof(struct cpu_info, ci_suspend_cr3)
|
||||
define ACPI_SUSPEND_CR4 offsetof(struct cpu_info, ci_suspend_cr4)
|
||||
define ACPI_SUSPEND_CR8 offsetof(struct cpu_info, ci_suspend_cr8)
|
||||
|
||||
if NIOAPIC > 0
|
||||
define IOAPIC_SC_REG offsetof(struct ioapic_softc, sc_reg)
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: procfs_machdep.c,v 1.8 2008/05/10 16:12:32 ad Exp $ */
|
||||
/* $NetBSD: procfs_machdep.c,v 1.9 2008/05/11 15:32:20 ad Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2001 Wasabi Systems, Inc.
|
||||
@ -42,7 +42,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.8 2008/05/10 16:12:32 ad Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.9 2008/05/11 15:32:20 ad Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
@ -172,7 +172,7 @@ procfs_getonecpu(int xcpu, struct cpu_info *ci, char *bf, int *len)
|
||||
"model name\t: %s\n"
|
||||
"stepping\t: ",
|
||||
xcpu,
|
||||
cpu_vendorname,
|
||||
cpu_brand_string,
|
||||
cpuid_level >= 0 ?
|
||||
((ci->ci_signature >> 8) & 15) : cpu_class + 3,
|
||||
cpuid_level >= 0 ?
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cpu.h,v 1.54 2008/05/11 14:44:53 ad Exp $ */
|
||||
/* $NetBSD: cpu.h,v 1.55 2008/05/11 15:32:20 ad Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1990 The Regents of the University of California.
|
||||
@ -37,176 +37,7 @@
|
||||
#ifndef _AMD64_CPU_H_
|
||||
#define _AMD64_CPU_H_
|
||||
|
||||
#if defined(_KERNEL)
|
||||
#if defined(_KERNEL_OPT)
|
||||
#include "opt_multiprocessor.h"
|
||||
#include "opt_lockdebug.h"
|
||||
#include "opt_xen.h"
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Definitions unique to x86-64 cpu support.
|
||||
*/
|
||||
#include <machine/frame.h>
|
||||
#include <machine/segments.h>
|
||||
#include <machine/tss.h>
|
||||
#include <machine/intrdefs.h>
|
||||
#include <x86/cacheinfo.h>
|
||||
|
||||
#include <sys/device.h>
|
||||
#include <sys/simplelock.h>
|
||||
#include <sys/cpu_data.h>
|
||||
#include <sys/systm.h>
|
||||
|
||||
struct pmap;
|
||||
|
||||
struct cpu_info {
|
||||
struct device *ci_dev;
|
||||
struct cpu_info *ci_self;
|
||||
|
||||
#ifdef XEN
|
||||
volatile struct vcpu_info *ci_vcpu;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Will be accessed by other CPUs.
|
||||
*/
|
||||
struct cpu_info *ci_next;
|
||||
struct lwp *ci_curlwp;
|
||||
struct pmap_cpu *ci_pmap_cpu;
|
||||
struct lwp *ci_fpcurlwp;
|
||||
int ci_fpsaving;
|
||||
u_int ci_cpuid;
|
||||
int ci_cpumask; /* (1 << CPU ID) */
|
||||
u_int ci_apicid;
|
||||
uint8_t ci_initapicid; /* our intitial APIC ID */
|
||||
uint8_t ci_packageid;
|
||||
uint8_t ci_coreid;
|
||||
uint8_t ci_smtid;
|
||||
struct cpu_data ci_data; /* MI per-cpu data */
|
||||
|
||||
/*
|
||||
* Private members.
|
||||
*/
|
||||
struct evcnt ci_tlb_evcnt; /* tlb shootdown counter */
|
||||
struct pmap *ci_pmap; /* current pmap */
|
||||
int ci_need_tlbwait; /* need to wait for TLB invalidations */
|
||||
int ci_want_pmapload; /* pmap_load() is needed */
|
||||
volatile int ci_tlbstate; /* one of TLBSTATE_ states. see below */
|
||||
#define TLBSTATE_VALID 0 /* all user tlbs are valid */
|
||||
#define TLBSTATE_LAZY 1 /* tlbs are valid but won't be kept uptodate */
|
||||
#define TLBSTATE_STALE 2 /* we might have stale user tlbs */
|
||||
uint64_t ci_scratch;
|
||||
#ifdef XEN
|
||||
struct iplsource *ci_isources[NIPL];
|
||||
#else
|
||||
struct intrsource *ci_isources[MAX_INTR_SOURCES];
|
||||
#endif
|
||||
volatile int ci_mtx_count; /* Negative count of spin mutexes */
|
||||
volatile int ci_mtx_oldspl; /* Old SPL at this ci_idepth */
|
||||
|
||||
/* The following must be aligned for cmpxchg8b. */
|
||||
struct {
|
||||
uint32_t ipending;
|
||||
int ilevel;
|
||||
} ci_istate __aligned(8);
|
||||
#define ci_ipending ci_istate.ipending
|
||||
#define ci_ilevel ci_istate.ilevel
|
||||
|
||||
int ci_idepth;
|
||||
void * ci_intrstack;
|
||||
uint32_t ci_imask[NIPL];
|
||||
uint32_t ci_iunmask[NIPL];
|
||||
|
||||
u_int ci_flags;
|
||||
uint32_t ci_ipis;
|
||||
|
||||
int32_t ci_cpuid_level;
|
||||
uint32_t ci_signature;
|
||||
uint32_t ci_feature_flags;
|
||||
uint32_t ci_feature2_flags;
|
||||
uint32_t ci_feature3_flags;
|
||||
uint32_t ci_padlock_flags;
|
||||
uint32_t ci_cflush_lsize;
|
||||
uint32_t ci_vendor[4]; /* vendor string */
|
||||
volatile uint32_t ci_lapic_counter;
|
||||
|
||||
const struct cpu_functions *ci_func;
|
||||
void (*cpu_setup)(struct cpu_info *);
|
||||
void (*ci_info)(struct cpu_info *);
|
||||
|
||||
struct trapframe *ci_ddb_regs;
|
||||
|
||||
struct x86_cache_info ci_cinfo[CAI_COUNT];
|
||||
|
||||
char *ci_gdt;
|
||||
|
||||
struct evcnt ci_ipi_events[X86_NIPI];
|
||||
|
||||
struct x86_64_tss ci_tss; /* Per-cpu TSS; shared among LWPs */
|
||||
int ci_tss_sel; /* TSS selector of this cpu */
|
||||
|
||||
/*
|
||||
* The following two are actually region_descriptors,
|
||||
* but that would pollute the namespace.
|
||||
*/
|
||||
uint64_t ci_suspend_gdt;
|
||||
uint16_t ci_suspend_gdt_padding;
|
||||
uint64_t ci_suspend_idt;
|
||||
uint16_t ci_suspend_idt_padding;
|
||||
|
||||
uint16_t ci_suspend_tr;
|
||||
uint16_t ci_suspend_ldt;
|
||||
uint32_t ci_suspend_fs_base_l;
|
||||
uint32_t ci_suspend_fs_base_h;
|
||||
uint32_t ci_suspend_gs_base_l;
|
||||
uint32_t ci_suspend_gs_base_h;
|
||||
uint32_t ci_suspend_gs_kernelbase_l;
|
||||
uint32_t ci_suspend_gs_kernelbase_h;
|
||||
uint32_t ci_suspend_msr_efer;
|
||||
uint64_t ci_suspend_rbx;
|
||||
uint64_t ci_suspend_rbp;
|
||||
uint64_t ci_suspend_rsp;
|
||||
uint64_t ci_suspend_r12;
|
||||
uint64_t ci_suspend_r13;
|
||||
uint64_t ci_suspend_r14;
|
||||
uint64_t ci_suspend_r15;
|
||||
uint64_t ci_suspend_rfl;
|
||||
uint64_t ci_suspend_cr0;
|
||||
uint64_t ci_suspend_cr2;
|
||||
uint64_t ci_suspend_cr3;
|
||||
uint64_t ci_suspend_cr4;
|
||||
uint64_t ci_suspend_cr8;
|
||||
|
||||
/* The following must be in a single cache line. */
|
||||
int ci_want_resched __aligned(64);
|
||||
int ci_padout __aligned(64);
|
||||
};
|
||||
|
||||
#define CPUF_BSP 0x0001 /* CPU is the original BSP */
|
||||
#define CPUF_AP 0x0002 /* CPU is an AP */
|
||||
#define CPUF_SP 0x0004 /* CPU is only processor */
|
||||
#define CPUF_PRIMARY 0x0008 /* CPU is active primary processor */
|
||||
|
||||
#define CPUF_SYNCTSC 0x0800 /* Synchronize TSC */
|
||||
#define CPUF_PRESENT 0x1000 /* CPU is present */
|
||||
#define CPUF_RUNNING 0x2000 /* CPU is running */
|
||||
#define CPUF_PAUSE 0x4000 /* CPU is paused in DDB */
|
||||
#define CPUF_GO 0x8000 /* CPU should start running */
|
||||
|
||||
|
||||
extern struct cpu_info cpu_info_primary;
|
||||
extern struct cpu_info *cpu_info_list;
|
||||
|
||||
#define CPU_INFO_ITERATOR int
|
||||
#define CPU_INFO_FOREACH(cii, ci) cii = 0, ci = cpu_info_list; \
|
||||
ci != NULL; ci = ci->ci_next
|
||||
|
||||
#define X86_MAXPROCS 32 /* bitmask; can be bumped to 64 */
|
||||
|
||||
#define CPU_STARTUP(_ci, _target) ((_ci)->ci_func->start(_ci, _target))
|
||||
#define CPU_STOP(_ci) ((_ci)->ci_func->stop(_ci))
|
||||
#define CPU_START_CLEANUP(_ci) ((_ci)->ci_func->cleanup(_ci))
|
||||
#include <x86/cpu.h>
|
||||
|
||||
#if defined(__GNUC__) && !defined(_LKM)
|
||||
static struct cpu_info *x86_curcpu(void);
|
||||
@ -246,187 +77,12 @@ cpu_set_curpri(int pri)
|
||||
"r" (pri)
|
||||
);
|
||||
}
|
||||
#else /* __GNUC__ && !_LKM */
|
||||
/* For non-GCC and LKMs */
|
||||
struct cpu_info *x86_curcpu(void);
|
||||
lwp_t *x86_curlwp(void);
|
||||
void cpu_set_curpri(int);
|
||||
#endif /* __GNUC__ && !_LKM */
|
||||
|
||||
#define cpu_number() (curcpu()->ci_cpuid)
|
||||
|
||||
#define CPU_IS_PRIMARY(ci) ((ci)->ci_flags & CPUF_PRIMARY)
|
||||
|
||||
extern struct cpu_info *cpu_info[X86_MAXPROCS];
|
||||
|
||||
void cpu_boot_secondary_processors(void);
|
||||
void cpu_init_idle_lwps(void);
|
||||
|
||||
#define X86_AST_GENERIC 0x01
|
||||
#define X86_AST_PREEMPT 0x02
|
||||
|
||||
#define aston(l, why) ((l)->l_md.md_astpending |= (why))
|
||||
#define cpu_did_resched(l) ((l)->l_md.md_astpending &= ~X86_AST_PREEMPT)
|
||||
|
||||
extern uint32_t cpus_attached;
|
||||
|
||||
#define curcpu() x86_curcpu()
|
||||
#define curlwp x86_curlwp()
|
||||
#define curpcb (&curlwp->l_addr->u_pcb)
|
||||
|
||||
/*
|
||||
* Arguments to hardclock, softclock and statclock
|
||||
* encapsulate the previous machine state in an opaque
|
||||
* clockframe; for now, use generic intrframe.
|
||||
*/
|
||||
struct clockframe {
|
||||
struct intrframe cf_if;
|
||||
};
|
||||
|
||||
#define CLKF_USERMODE(frame) USERMODE((frame)->cf_if.if_tf.tf_cs, \
|
||||
(frame)->cf_if.if_tf.tf_rflags)
|
||||
#define CLKF_PC(frame) ((frame)->cf_if.if_tf.tf_rip)
|
||||
#define CLKF_INTR(frame) (curcpu()->ci_idepth > 0)
|
||||
|
||||
/*
|
||||
* This is used during profiling to integrate system time. It can safely
|
||||
* assume that the process is resident.
|
||||
*/
|
||||
#define LWP_PC(l) ((l)->l_md.md_regs->tf_rip)
|
||||
|
||||
/*
|
||||
* Give a profiling tick to the current process when the user profiling
|
||||
* buffer pages are invalid. On the i386, request an ast to send us
|
||||
* through trap(), marking the proc as needing a profiling tick.
|
||||
*/
|
||||
extern void cpu_need_proftick(struct lwp *);
|
||||
|
||||
/*
|
||||
* Notify an LWP that it has a signal pending, process as soon as possible.
|
||||
*/
|
||||
extern void cpu_signotify(struct lwp *);
|
||||
|
||||
/*
|
||||
* We need a machine-independent name for this.
|
||||
*/
|
||||
extern void (*delay_func)(unsigned int);
|
||||
|
||||
#define DELAY(x) (*delay_func)(x)
|
||||
#define delay(x) (*delay_func)(x)
|
||||
|
||||
|
||||
/*
|
||||
* pull in #defines for kinds of processors
|
||||
*/
|
||||
|
||||
extern int biosbasemem;
|
||||
extern int biosextmem;
|
||||
extern int cpu;
|
||||
extern int cpu_feature;
|
||||
extern int cpu_feature2;
|
||||
extern int cpu_id;
|
||||
extern int cpuid_level;
|
||||
extern int cpu_class;
|
||||
extern char cpu_brand_string[];
|
||||
extern char cpu_vendorname[];
|
||||
|
||||
extern void (*x86_cpu_idle)(void);
|
||||
#define cpu_idle() (*x86_cpu_idle)()
|
||||
|
||||
/* identcpu.c */
|
||||
|
||||
void cpu_probe(struct cpu_info *);
|
||||
void cpu_identify(struct cpu_info *);
|
||||
|
||||
/* machdep.c */
|
||||
void dumpconf(void);
|
||||
void cpu_reset(void);
|
||||
void x86_64_proc0_tss_ldt_init(void);
|
||||
void x86_64_init_pcb_tss_ldt(struct cpu_info *);
|
||||
void cpu_proc_fork(struct proc *, struct proc *);
|
||||
|
||||
struct region_descriptor;
|
||||
void lgdt(struct region_descriptor *);
|
||||
#ifdef XEN
|
||||
void lgdt_finish(void);
|
||||
#endif
|
||||
void fillw(short, void *, size_t);
|
||||
|
||||
struct pcb;
|
||||
void savectx(struct pcb *);
|
||||
void lwp_trampoline(void);
|
||||
void child_trampoline(void);
|
||||
|
||||
#ifdef XEN
|
||||
void startrtclock(void);
|
||||
void xen_delay(unsigned int);
|
||||
void xen_initclocks(void);
|
||||
#else
|
||||
/* clock.c */
|
||||
void initrtclock(u_long);
|
||||
void startrtclock(void);
|
||||
void i8254_delay(unsigned int);
|
||||
void i8254_initclocks(void);
|
||||
#endif
|
||||
|
||||
void cpu_init_msrs(struct cpu_info *, bool);
|
||||
|
||||
|
||||
/* vm_machdep.c */
|
||||
int kvtop(void *);
|
||||
|
||||
/* trap.c */
|
||||
void child_return(void *);
|
||||
|
||||
/* consinit.c */
|
||||
void kgdb_port_init(void);
|
||||
|
||||
/* bus_machdep.c */
|
||||
void x86_bus_space_init(void);
|
||||
void x86_bus_space_mallocok(void);
|
||||
|
||||
#endif /* _KERNEL */
|
||||
|
||||
#include <machine/psl.h>
|
||||
|
||||
/*
|
||||
* CTL_MACHDEP definitions.
|
||||
*/
|
||||
#define CPU_CONSDEV 1 /* dev_t: console terminal device */
|
||||
#define CPU_BIOSBASEMEM 2 /* int: bios-reported base mem (K) */
|
||||
#define CPU_BIOSEXTMEM 3 /* int: bios-reported ext. mem (K) */
|
||||
#define CPU_NKPDE 4 /* int: number of kernel PDEs */
|
||||
#define CPU_BOOTED_KERNEL 5 /* string: booted kernel name */
|
||||
#define CPU_DISKINFO 6 /* disk geometry information */
|
||||
#define CPU_FPU_PRESENT 7 /* FPU is present */
|
||||
#define CPU_MAXID 8 /* number of valid machdep ids */
|
||||
|
||||
|
||||
/*
|
||||
* Structure for CPU_DISKINFO sysctl call.
|
||||
* XXX this should be somewhere else.
|
||||
*/
|
||||
#define MAX_BIOSDISKS 16
|
||||
|
||||
struct disklist {
|
||||
int dl_nbiosdisks; /* number of bios disks */
|
||||
struct biosdisk_info {
|
||||
int bi_dev; /* BIOS device # (0x80 ..) */
|
||||
int bi_cyl; /* cylinders on disk */
|
||||
int bi_head; /* heads per track */
|
||||
int bi_sec; /* sectors per track */
|
||||
uint64_t bi_lbasecs; /* total sec. (iff ext13) */
|
||||
#define BIFLAG_INVALID 0x01
|
||||
#define BIFLAG_EXTINT13 0x02
|
||||
int bi_flags;
|
||||
} dl_biosdisks[MAX_BIOSDISKS];
|
||||
|
||||
int dl_nnativedisks; /* number of native disks */
|
||||
struct nativedisk_info {
|
||||
char ni_devname[16]; /* native device name */
|
||||
int ni_nmatches; /* # of matches w/ BIOS */
|
||||
int ni_biosmatches[MAX_BIOSDISKS]; /* indices in dl_biosdisks */
|
||||
} dl_nativedisks[1]; /* actually longer */
|
||||
};
|
||||
|
||||
#endif /* !_AMD64_CPU_H_ */
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: acpi_wakeup_low.S,v 1.4 2007/12/18 07:17:13 joerg Exp $ */
|
||||
/* $NetBSD: acpi_wakeup_low.S,v 1.5 2008/05/11 15:32:20 ad Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2007 Joerg Sonnenberger <joerg@netbsd.org>
|
||||
@ -29,7 +29,7 @@
|
||||
*/
|
||||
|
||||
#include <machine/asm.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup_low.S,v 1.4 2007/12/18 07:17:13 joerg Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup_low.S,v 1.5 2008/05/11 15:32:20 ad Exp $");
|
||||
|
||||
#include "assym.h"
|
||||
#include <machine/segments.h>
|
||||
@ -70,13 +70,13 @@ acpi_md_sleep_exit:
|
||||
andl $~0x0200,4(%eax,%ecx, 1)
|
||||
ltr %cx
|
||||
|
||||
movl ACPI_SUSPEND_EBX(%edx),%ebx
|
||||
movl ACPI_SUSPEND_ESI(%edx),%esi
|
||||
movl ACPI_SUSPEND_EDI(%edx),%edi
|
||||
movl ACPI_SUSPEND_EBP(%edx),%ebp
|
||||
movl ACPI_SUSPEND_ESP(%edx),%esp
|
||||
movl ACPI_SUSPEND_REG+(0*4)(%edx),%ebx
|
||||
movl ACPI_SUSPEND_REG+(1*4)(%edx),%esi
|
||||
movl ACPI_SUSPEND_REG+(2*4)(%edx),%edi
|
||||
movl ACPI_SUSPEND_REG+(3*4)(%edx),%ebp
|
||||
movl ACPI_SUSPEND_REG+(4*4)(%edx),%esp
|
||||
|
||||
pushl ACPI_SUSPEND_EFL(%edx)
|
||||
pushl ACPI_SUSPEND_REG+(5*4)(%edx)
|
||||
popfl
|
||||
|
||||
xorl %eax,%eax
|
||||
@ -91,11 +91,11 @@ acpi_md_sleep_prepare:
|
||||
movw %fs,ACPI_SUSPEND_FS(%edx)
|
||||
movw %gs,ACPI_SUSPEND_GS(%edx)
|
||||
|
||||
movl %ebx,ACPI_SUSPEND_EBX(%edx)
|
||||
movl %esi,ACPI_SUSPEND_ESI(%edx)
|
||||
movl %edi,ACPI_SUSPEND_EDI(%edx)
|
||||
movl %ebp,ACPI_SUSPEND_EBP(%edx)
|
||||
movl %esp,ACPI_SUSPEND_ESP(%edx)
|
||||
movl %ebx,ACPI_SUSPEND_REG+(0*4)(%edx)
|
||||
movl %esi,ACPI_SUSPEND_REG+(1*4)(%edx)
|
||||
movl %edi,ACPI_SUSPEND_REG+(2*4)(%edx)
|
||||
movl %ebp,ACPI_SUSPEND_REG+(3*4)(%edx)
|
||||
movl %esp,ACPI_SUSPEND_REG+(4*4)(%edx)
|
||||
|
||||
movl %cr0,%eax
|
||||
movl %eax,ACPI_SUSPEND_CR0(%edx)
|
||||
@ -107,7 +107,7 @@ acpi_md_sleep_prepare:
|
||||
movl %eax,ACPI_SUSPEND_CR4(%edx)
|
||||
|
||||
pushfl
|
||||
popl ACPI_SUSPEND_EFL(%edx)
|
||||
popl ACPI_SUSPEND_REG+(5*4)(%edx)
|
||||
|
||||
sgdt ACPI_SUSPEND_GDT(%edx)
|
||||
sidt ACPI_SUSPEND_IDT(%edx)
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: genassym.cf,v 1.70 2008/05/11 14:44:54 ad Exp $
|
||||
# $NetBSD: genassym.cf,v 1.71 2008/05/11 15:32:20 ad Exp $
|
||||
|
||||
#
|
||||
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
|
||||
@ -339,23 +339,20 @@ define CPU_INFO_MTX_OLDSPL offsetof(struct cpu_info, ci_mtx_oldspl)
|
||||
define CPU_INFO_INTRSTACK offsetof(struct cpu_info, ci_intrstack)
|
||||
define CPU_INFO_ISTATE offsetof(struct cpu_info, ci_istate)
|
||||
|
||||
define ACPI_SUSPEND_GDT offsetof(struct cpu_info, ci_suspend_gdt)
|
||||
define ACPI_SUSPEND_IDT offsetof(struct cpu_info, ci_suspend_idt)
|
||||
define ACPI_SUSPEND_TR offsetof(struct cpu_info, ci_suspend_tr)
|
||||
define ACPI_SUSPEND_LDT offsetof(struct cpu_info, ci_suspend_ldt)
|
||||
define ACPI_SUSPEND_FS offsetof(struct cpu_info, ci_suspend_fs)
|
||||
define ACPI_SUSPEND_GS offsetof(struct cpu_info, ci_suspend_gs)
|
||||
|
||||
define ACPI_SUSPEND_EBX offsetof(struct cpu_info, ci_suspend_ebx)
|
||||
define ACPI_SUSPEND_ESI offsetof(struct cpu_info, ci_suspend_esi)
|
||||
define ACPI_SUSPEND_EDI offsetof(struct cpu_info, ci_suspend_edi)
|
||||
define ACPI_SUSPEND_EBP offsetof(struct cpu_info, ci_suspend_ebp)
|
||||
define ACPI_SUSPEND_ESP offsetof(struct cpu_info, ci_suspend_esp)
|
||||
define ACPI_SUSPEND_EFL offsetof(struct cpu_info, ci_suspend_efl)
|
||||
define ACPI_SUSPEND_CR0 offsetof(struct cpu_info, ci_suspend_cr0)
|
||||
define ACPI_SUSPEND_CR2 offsetof(struct cpu_info, ci_suspend_cr2)
|
||||
define ACPI_SUSPEND_CR3 offsetof(struct cpu_info, ci_suspend_cr3)
|
||||
define ACPI_SUSPEND_CR4 offsetof(struct cpu_info, ci_suspend_cr4)
|
||||
define ACPI_SUSPEND_GDT offsetof(struct cpu_info, ci_suspend_gdt)
|
||||
define ACPI_SUSPEND_IDT offsetof(struct cpu_info, ci_suspend_idt)
|
||||
define ACPI_SUSPEND_TR offsetof(struct cpu_info, ci_suspend_tr)
|
||||
define ACPI_SUSPEND_LDT offsetof(struct cpu_info, ci_suspend_ldt)
|
||||
define ACPI_SUSPEND_FS offsetof(struct cpu_info, ci_suspend_fs)
|
||||
define ACPI_SUSPEND_GS offsetof(struct cpu_info, ci_suspend_gs)
|
||||
define ACPI_SUSPEND_KGS offsetof(struct cpu_info, ci_suspend_kgs)
|
||||
define ACPI_SUSPEND_EFER offsetof(struct cpu_info, ci_suspend_efer)
|
||||
define ACPI_SUSPEND_REG offsetof(struct cpu_info, ci_suspend_reg)
|
||||
define ACPI_SUSPEND_CR0 offsetof(struct cpu_info, ci_suspend_cr0)
|
||||
define ACPI_SUSPEND_CR2 offsetof(struct cpu_info, ci_suspend_cr2)
|
||||
define ACPI_SUSPEND_CR3 offsetof(struct cpu_info, ci_suspend_cr3)
|
||||
define ACPI_SUSPEND_CR4 offsetof(struct cpu_info, ci_suspend_cr4)
|
||||
define ACPI_SUSPEND_CR8 offsetof(struct cpu_info, ci_suspend_cr8)
|
||||
|
||||
if NIOAPIC > 0
|
||||
define IOAPIC_SC_REG offsetof(struct ioapic_softc, sc_reg)
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cpu.h,v 1.172 2008/05/11 14:44:54 ad Exp $ */
|
||||
/* $NetBSD: cpu.h,v 1.173 2008/05/11 15:32:20 ad Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1990 The Regents of the University of California.
|
||||
@ -37,207 +37,7 @@
|
||||
#ifndef _I386_CPU_H_
|
||||
#define _I386_CPU_H_
|
||||
|
||||
#ifdef _KERNEL
|
||||
#if defined(_KERNEL_OPT)
|
||||
#include "opt_multiprocessor.h"
|
||||
#include "opt_user_ldt.h"
|
||||
#include "opt_vm86.h"
|
||||
#include "opt_xen.h"
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Definitions unique to i386 cpu support.
|
||||
*/
|
||||
#include <machine/frame.h>
|
||||
#include <machine/segments.h>
|
||||
#include <machine/tss.h>
|
||||
#include <machine/intrdefs.h>
|
||||
#include <x86/cacheinfo.h>
|
||||
#include <x86/via_padlock.h>
|
||||
|
||||
#include <sys/device.h>
|
||||
#include <sys/cpu_data.h>
|
||||
|
||||
#include <lib/libkern/libkern.h> /* offsetof */
|
||||
|
||||
struct intrsource;
|
||||
struct pmap;
|
||||
|
||||
#define NIOPORTS 1024 /* # of ports we allow to be mapped */
|
||||
#define IOMAPSIZE (NIOPORTS / 8) /* I/O bitmap size in bytes */
|
||||
|
||||
/*
|
||||
* a bunch of this belongs in cpuvar.h; move it later..
|
||||
*/
|
||||
|
||||
struct cpu_info {
|
||||
struct device *ci_dev; /* pointer to our device */
|
||||
struct cpu_info *ci_self; /* self-pointer */
|
||||
|
||||
#ifdef XEN
|
||||
volatile struct vcpu_info *ci_vcpu;
|
||||
#endif
|
||||
|
||||
void *ci_tlog_base; /* Trap log base */
|
||||
int32_t ci_tlog_offset; /* Trap log current offset */
|
||||
|
||||
/*
|
||||
* Will be accessed by other CPUs.
|
||||
*/
|
||||
struct cpu_info *ci_next; /* next cpu */
|
||||
struct lwp *ci_curlwp; /* current owner of the processor */
|
||||
int ci_fpused; /* XEN: FPU was used by curlwp */
|
||||
struct pmap_cpu *ci_pmap_cpu; /* per-CPU pmap data */
|
||||
struct lwp *ci_fpcurlwp; /* current owner of the FPU */
|
||||
int ci_fpsaving; /* save in progress */
|
||||
cpuid_t ci_cpuid; /* our CPU ID */
|
||||
int ci_cpumask; /* (1 << CPU ID) */
|
||||
u_int ci_apicid; /* our APIC ID */
|
||||
uint8_t ci_initapicid; /* our intitial APIC ID */
|
||||
uint8_t ci_packageid;
|
||||
uint8_t ci_coreid;
|
||||
uint8_t ci_smtid;
|
||||
struct cpu_data ci_data; /* MI per-cpu data */
|
||||
|
||||
/*
|
||||
* Private members.
|
||||
*/
|
||||
struct evcnt ci_tlb_evcnt; /* tlb shootdown counter */
|
||||
struct pmap *ci_pmap; /* current pmap */
|
||||
int ci_need_tlbwait; /* need to wait for TLB invalidations */
|
||||
int ci_want_pmapload; /* pmap_load() is needed */
|
||||
volatile int ci_tlbstate; /* one of TLBSTATE_ states. see below */
|
||||
#define TLBSTATE_VALID 0 /* all user tlbs are valid */
|
||||
#define TLBSTATE_LAZY 1 /* tlbs are valid but won't be kept uptodate */
|
||||
#define TLBSTATE_STALE 2 /* we might have stale user tlbs */
|
||||
|
||||
#ifdef XEN
|
||||
struct iplsource *ci_isources[NIPL];
|
||||
#else
|
||||
struct intrsource *ci_isources[MAX_INTR_SOURCES];
|
||||
#endif
|
||||
volatile int ci_mtx_count; /* Negative count of spin mutexes */
|
||||
volatile int ci_mtx_oldspl; /* Old SPL at this ci_idepth */
|
||||
|
||||
/* The following must be aligned for cmpxchg8b. */
|
||||
struct {
|
||||
uint32_t ipending;
|
||||
int ilevel;
|
||||
} ci_istate __aligned(8);
|
||||
#define ci_ipending ci_istate.ipending
|
||||
#define ci_ilevel ci_istate.ilevel
|
||||
|
||||
int ci_idepth;
|
||||
void * ci_intrstack;
|
||||
uint32_t ci_imask[NIPL];
|
||||
uint32_t ci_iunmask[NIPL];
|
||||
|
||||
uint32_t ci_flags; /* flags; see below */
|
||||
uint32_t ci_ipis; /* interprocessor interrupts pending */
|
||||
int sc_apic_version; /* local APIC version */
|
||||
|
||||
uint32_t ci_signature; /* X86 cpuid type */
|
||||
uint32_t ci_feature_flags;/* X86 %edx CPUID feature bits */
|
||||
uint32_t ci_feature2_flags;/* X86 %ecx CPUID feature bits */
|
||||
uint32_t ci_feature3_flags;/* X86 extended feature bits */
|
||||
uint32_t ci_padlock_flags;/* VIA PadLock feature bits */
|
||||
uint32_t ci_vendor[4]; /* vendor string */
|
||||
uint32_t ci_cpu_serial[3]; /* PIII serial number */
|
||||
volatile uint32_t ci_lapic_counter;
|
||||
|
||||
const struct cpu_functions *ci_func; /* start/stop functions */
|
||||
void (*cpu_setup)(struct cpu_info *);
|
||||
/* proc-dependant init */
|
||||
void (*ci_info)(struct cpu_info *);
|
||||
|
||||
struct trapframe *ci_ddb_regs;
|
||||
|
||||
u_int ci_cflush_lsize; /* CFLUSH insn line size */
|
||||
struct x86_cache_info ci_cinfo[CAI_COUNT];
|
||||
|
||||
union descriptor *ci_gdt;
|
||||
|
||||
struct i386tss ci_doubleflt_tss;
|
||||
struct i386tss ci_ddbipi_tss;
|
||||
|
||||
char *ci_doubleflt_stack;
|
||||
char *ci_ddbipi_stack;
|
||||
|
||||
struct evcnt ci_ipi_events[X86_NIPI];
|
||||
|
||||
struct via_padlock ci_vp; /* VIA PadLock private storage */
|
||||
|
||||
struct i386tss ci_tss; /* Per-cpu TSS; shared among LWPs */
|
||||
char ci_iomap[IOMAPSIZE]; /* I/O Bitmap */
|
||||
int ci_tss_sel; /* TSS selector of this cpu */
|
||||
|
||||
/*
|
||||
* The following two are actually region_descriptors,
|
||||
* but that would pollute the namespace.
|
||||
*/
|
||||
uint32_t ci_suspend_gdt;
|
||||
uint16_t ci_suspend_gdt_padding;
|
||||
uint32_t ci_suspend_idt;
|
||||
uint16_t ci_suspend_idt_padding;
|
||||
|
||||
uint16_t ci_suspend_tr;
|
||||
uint16_t ci_suspend_ldt;
|
||||
uint16_t ci_suspend_fs;
|
||||
uint16_t ci_suspend_gs;
|
||||
uint32_t ci_suspend_ebx;
|
||||
uint32_t ci_suspend_esi;
|
||||
uint32_t ci_suspend_edi;
|
||||
uint32_t ci_suspend_ebp;
|
||||
uint32_t ci_suspend_esp;
|
||||
uint32_t ci_suspend_efl;
|
||||
uint32_t ci_suspend_cr0;
|
||||
uint32_t ci_suspend_cr2;
|
||||
uint32_t ci_suspend_cr3;
|
||||
uint32_t ci_suspend_cr4;
|
||||
|
||||
/* The following must be in a single cache line. */
|
||||
int ci_want_resched __aligned(64);
|
||||
int ci_padout __aligned(64);
|
||||
};
|
||||
|
||||
/*
|
||||
* Processor flag notes: The "primary" CPU has certain MI-defined
|
||||
* roles (mostly relating to hardclock handling); we distinguish
|
||||
* betwen the processor which booted us, and the processor currently
|
||||
* holding the "primary" role just to give us the flexibility later to
|
||||
* change primaries should we be sufficiently twisted.
|
||||
*/
|
||||
|
||||
#define CPUF_BSP 0x0001 /* CPU is the original BSP */
|
||||
#define CPUF_AP 0x0002 /* CPU is an AP */
|
||||
#define CPUF_SP 0x0004 /* CPU is only processor */
|
||||
#define CPUF_PRIMARY 0x0008 /* CPU is active primary processor */
|
||||
|
||||
#define CPUF_APIC_CD 0x0010 /* CPU has apic configured */
|
||||
|
||||
#define CPUF_SYNCTSC 0x0800 /* Synchronize TSC */
|
||||
#define CPUF_PRESENT 0x1000 /* CPU is present */
|
||||
#define CPUF_RUNNING 0x2000 /* CPU is running */
|
||||
#define CPUF_PAUSE 0x4000 /* CPU is paused in DDB */
|
||||
#define CPUF_GO 0x8000 /* CPU should start running */
|
||||
|
||||
/*
|
||||
* We statically allocate the CPU info for the primary CPU (or,
|
||||
* the only CPU on uniprocessors), and the primary CPU is the
|
||||
* first CPU on the CPU info list.
|
||||
*/
|
||||
extern struct cpu_info cpu_info_primary;
|
||||
extern struct cpu_info *cpu_info_list;
|
||||
|
||||
#define CPU_INFO_ITERATOR int
|
||||
#define CPU_INFO_FOREACH(cii, ci) cii = 0, ci = cpu_info_list; \
|
||||
ci != NULL; ci = ci->ci_next
|
||||
|
||||
#define X86_MAXPROCS 32 /* because we use a bitmask */
|
||||
|
||||
#define CPU_STARTUP(_ci, _target) ((_ci)->ci_func->start(_ci, _target))
|
||||
#define CPU_STOP(_ci) ((_ci)->ci_func->stop(_ci))
|
||||
#define CPU_START_CLEANUP(_ci) ((_ci)->ci_func->cleanup(_ci))
|
||||
#include <x86/cpu.h>
|
||||
|
||||
#if defined(__GNUC__) && !defined(_LKM)
|
||||
static struct cpu_info *x86_curcpu(void);
|
||||
@ -276,225 +76,11 @@ cpu_set_curpri(int pri)
|
||||
"r" (pri)
|
||||
);
|
||||
}
|
||||
#else /* __GNUC__ && !_LKM */
|
||||
/* For non-GCC and LKMs */
|
||||
struct cpu_info *x86_curcpu(void);
|
||||
lwp_t *x86_curlwp(void);
|
||||
void cpu_set_curpri(int);
|
||||
#endif /* __GNUC__ && !_LKM */
|
||||
|
||||
#define cpu_number() (curcpu()->ci_cpuid)
|
||||
|
||||
#define CPU_IS_PRIMARY(ci) ((ci)->ci_flags & CPUF_PRIMARY)
|
||||
|
||||
#define X86_AST_GENERIC 0x01
|
||||
#define X86_AST_PREEMPT 0x02
|
||||
|
||||
#define aston(l, why) ((l)->l_md.md_astpending |= (why))
|
||||
#define cpu_did_resched(l) ((l)->l_md.md_astpending &= ~X86_AST_PREEMPT)
|
||||
|
||||
extern struct cpu_info *cpu_info[X86_MAXPROCS];
|
||||
|
||||
void cpu_boot_secondary_processors(void);
|
||||
void cpu_init_idle_lwps(void);
|
||||
|
||||
extern uint32_t cpus_attached;
|
||||
#ifndef XEN
|
||||
#define curcpu() x86_curcpu()
|
||||
#define curlwp x86_curlwp()
|
||||
#else
|
||||
/* XXX initgdt() calls pmap_kenter_pa() which calls splvm() before %fs is set */
|
||||
#define curcpu() (&cpu_info_primary)
|
||||
#define curlwp curcpu()->ci_curlwp
|
||||
#endif
|
||||
#define curpcb (&curlwp->l_addr->u_pcb)
|
||||
|
||||
/*
|
||||
* Arguments to hardclock, softclock and statclock
|
||||
* encapsulate the previous machine state in an opaque
|
||||
* clockframe; for now, use generic intrframe.
|
||||
*/
|
||||
struct clockframe {
|
||||
struct intrframe cf_if;
|
||||
};
|
||||
|
||||
#define CLKF_USERMODE(frame) USERMODE((frame)->cf_if.if_cs, (frame)->cf_if.if_eflags)
|
||||
#define CLKF_PC(frame) ((frame)->cf_if.if_eip)
|
||||
#define CLKF_INTR(frame) (curcpu()->ci_idepth > 0)
|
||||
|
||||
/*
|
||||
* This is used during profiling to integrate system time. It can safely
|
||||
* assume that the process is resident.
|
||||
*/
|
||||
#define LWP_PC(l) ((l)->l_md.md_regs->tf_eip)
|
||||
|
||||
/*
|
||||
* Give a profiling tick to the current process when the user profiling
|
||||
* buffer pages are invalid. On the i386, request an ast to send us
|
||||
* through trap(), marking the proc as needing a profiling tick.
|
||||
*/
|
||||
extern void cpu_need_proftick(struct lwp *l);
|
||||
|
||||
/*
|
||||
* Notify the LWP l that it has a signal pending, process as soon as
|
||||
* possible.
|
||||
*/
|
||||
extern void cpu_signotify(struct lwp *);
|
||||
|
||||
/*
|
||||
* We need a machine-independent name for this.
|
||||
*/
|
||||
extern void (*delay_func)(unsigned int);
|
||||
struct timeval;
|
||||
|
||||
#define DELAY(x) (*delay_func)(x)
|
||||
#define delay(x) (*delay_func)(x)
|
||||
|
||||
extern int biosbasemem;
|
||||
extern int biosextmem;
|
||||
extern unsigned int cpu_feature;
|
||||
extern unsigned int cpu_feature2;
|
||||
extern unsigned int cpu_feature_padlock;
|
||||
extern int cpu;
|
||||
extern int cpuid_level;
|
||||
extern int cpu_class;
|
||||
extern char cpu_brand_string[];
|
||||
|
||||
extern int i386_use_fxsave;
|
||||
extern int i386_has_sse;
|
||||
extern int i386_has_sse2;
|
||||
|
||||
extern void (*x86_cpu_idle)(void);
|
||||
#define cpu_idle() (*x86_cpu_idle)()
|
||||
|
||||
/* machdep.c */
|
||||
void dumpconf(void);
|
||||
void cpu_reset(void);
|
||||
void i386_proc0_tss_ldt_init(void);
|
||||
|
||||
/* longrun.c */
|
||||
u_int tmx86_get_longrun_mode(void);
|
||||
void tmx86_get_longrun_status(u_int *, u_int *, u_int *);
|
||||
void tmx86_init_longrun(void);
|
||||
|
||||
/* identcpu.c */
|
||||
void cpu_probe(struct cpu_info *);
|
||||
void cpu_identify(struct cpu_info *);
|
||||
|
||||
/* vm_machdep.c */
|
||||
void cpu_proc_fork(struct proc *, struct proc *);
|
||||
|
||||
/* locore.s */
|
||||
struct region_descriptor;
|
||||
void lgdt(struct region_descriptor *);
|
||||
#ifdef XEN
|
||||
void lgdt_finish(void);
|
||||
void i386_switch_context(lwp_t *);
|
||||
#endif
|
||||
void fillw(short, void *, size_t);
|
||||
|
||||
struct pcb;
|
||||
void savectx(struct pcb *);
|
||||
void lwp_trampoline(void);
|
||||
#ifdef XEN
|
||||
void startrtclock(void);
|
||||
void xen_delay(unsigned int);
|
||||
void xen_initclocks(void);
|
||||
#else
|
||||
/* clock.c */
|
||||
void initrtclock(u_long);
|
||||
void startrtclock(void);
|
||||
void i8254_delay(unsigned int);
|
||||
void i8254_microtime(struct timeval *);
|
||||
void i8254_initclocks(void);
|
||||
#endif
|
||||
|
||||
/* cpu.c */
|
||||
|
||||
void cpu_probe_features(struct cpu_info *);
|
||||
|
||||
/* npx.c */
|
||||
void npxsave_lwp(struct lwp *, bool);
|
||||
void npxsave_cpu(bool);
|
||||
|
||||
/* vm_machdep.c */
|
||||
int kvtop(void *);
|
||||
|
||||
#ifdef USER_LDT
|
||||
/* sys_machdep.h */
|
||||
int x86_get_ldt(struct lwp *, void *, register_t *);
|
||||
int x86_set_ldt(struct lwp *, void *, register_t *);
|
||||
#endif
|
||||
|
||||
/* isa_machdep.c */
|
||||
void isa_defaultirq(void);
|
||||
int isa_nmi(void);
|
||||
|
||||
#ifdef VM86
|
||||
/* vm86.c */
|
||||
void vm86_gpfault(struct lwp *, int);
|
||||
#endif /* VM86 */
|
||||
|
||||
/* consinit.c */
|
||||
void kgdb_port_init(void);
|
||||
|
||||
/* bus_machdep.c */
|
||||
void x86_bus_space_init(void);
|
||||
void x86_bus_space_mallocok(void);
|
||||
|
||||
#include <machine/psl.h> /* Must be after struct cpu_info declaration */
|
||||
|
||||
#endif /* _KERNEL */
|
||||
|
||||
/*
|
||||
* CTL_MACHDEP definitions.
|
||||
*/
|
||||
#define CPU_CONSDEV 1 /* dev_t: console terminal device */
|
||||
#define CPU_BIOSBASEMEM 2 /* int: bios-reported base mem (K) */
|
||||
#define CPU_BIOSEXTMEM 3 /* int: bios-reported ext. mem (K) */
|
||||
/* CPU_NKPDE 4 obsolete: int: number of kernel PDEs */
|
||||
#define CPU_BOOTED_KERNEL 5 /* string: booted kernel name */
|
||||
#define CPU_DISKINFO 6 /* struct disklist *:
|
||||
* disk geometry information */
|
||||
#define CPU_FPU_PRESENT 7 /* int: FPU is present */
|
||||
#define CPU_OSFXSR 8 /* int: OS uses FXSAVE/FXRSTOR */
|
||||
#define CPU_SSE 9 /* int: OS/CPU supports SSE */
|
||||
#define CPU_SSE2 10 /* int: OS/CPU supports SSE2 */
|
||||
#define CPU_TMLR_MODE 11 /* int: longrun mode
|
||||
* 0: minimum frequency
|
||||
* 1: economy
|
||||
* 2: performance
|
||||
* 3: maximum frequency
|
||||
*/
|
||||
#define CPU_TMLR_FREQUENCY 12 /* int: current frequency */
|
||||
#define CPU_TMLR_VOLTAGE 13 /* int: curret voltage */
|
||||
#define CPU_TMLR_PERCENTAGE 14 /* int: current clock percentage */
|
||||
#define CPU_MAXID 15 /* number of valid machdep ids */
|
||||
|
||||
/*
|
||||
* Structure for CPU_DISKINFO sysctl call.
|
||||
* XXX this should be somewhere else.
|
||||
*/
|
||||
#define MAX_BIOSDISKS 16
|
||||
|
||||
struct disklist {
|
||||
int dl_nbiosdisks; /* number of bios disks */
|
||||
struct biosdisk_info {
|
||||
int bi_dev; /* BIOS device # (0x80 ..) */
|
||||
int bi_cyl; /* cylinders on disk */
|
||||
int bi_head; /* heads per track */
|
||||
int bi_sec; /* sectors per track */
|
||||
uint64_t bi_lbasecs; /* total sec. (iff ext13) */
|
||||
#define BIFLAG_INVALID 0x01
|
||||
#define BIFLAG_EXTINT13 0x02
|
||||
int bi_flags;
|
||||
} dl_biosdisks[MAX_BIOSDISKS];
|
||||
|
||||
int dl_nnativedisks; /* number of native disks */
|
||||
struct nativedisk_info {
|
||||
char ni_devname[16]; /* native device name */
|
||||
int ni_nmatches; /* # of matches w/ BIOS */
|
||||
int ni_biosmatches[MAX_BIOSDISKS]; /* indices in dl_biosdisks */
|
||||
} dl_nativedisks[1]; /* actually longer */
|
||||
};
|
||||
#endif /* !_I386_CPU_H_ */
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: acpi_wakeup.c,v 1.5 2008/04/28 20:23:40 martin Exp $ */
|
||||
/* $NetBSD: acpi_wakeup.c,v 1.6 2008/05/11 15:32:20 ad Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2002 The NetBSD Foundation, Inc.
|
||||
@ -30,7 +30,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.5 2008/04/28 20:23:40 martin Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.6 2008/05/11 15:32:20 ad Exp $");
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org>
|
||||
@ -159,7 +159,7 @@ acpi_md_sleep_patch(struct cpu_info *ci)
|
||||
#ifdef __i386__
|
||||
WAKECODE_FIXUP(WAKEUP_r_cr4, uint32_t, ci->ci_suspend_cr4);
|
||||
#else
|
||||
WAKECODE_FIXUP(WAKEUP_msr_efer, uint32_t, ci->ci_suspend_msr_efer);
|
||||
WAKECODE_FIXUP(WAKEUP_efer, uint32_t, ci->ci_suspend_efer);
|
||||
#endif
|
||||
|
||||
WAKECODE_FIXUP(WAKEUP_curcpu, void *, ci);
|
||||
|
@ -1,10 +1,11 @@
|
||||
# $NetBSD: Makefile,v 1.12 2008/01/20 13:43:37 yamt Exp $
|
||||
# $NetBSD: Makefile,v 1.13 2008/05/11 15:32:20 ad Exp $
|
||||
|
||||
INCSDIR=/usr/include/x86
|
||||
|
||||
INCS= aout_machdep.h \
|
||||
bootinfo.h bus.h \
|
||||
cacheinfo.h \
|
||||
cpu.h \
|
||||
cputypes.h \
|
||||
cpuvar.h \
|
||||
float.h \
|
||||
|
455
sys/arch/x86/include/cpu.h
Normal file
455
sys/arch/x86/include/cpu.h
Normal file
@ -0,0 +1,455 @@
|
||||
/* $NetBSD: cpu.h,v 1.1 2008/05/11 15:32:20 ad Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1990 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This code is derived from software contributed to Berkeley by
|
||||
* William Jolitz.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)cpu.h 5.4 (Berkeley) 5/9/91
|
||||
*/
|
||||
|
||||
#ifndef _X86_CPU_H_
|
||||
#define _X86_CPU_H_
|
||||
|
||||
#ifdef _KERNEL
|
||||
#if defined(_KERNEL_OPT)
|
||||
#include "opt_xen.h"
|
||||
#ifdef i386
|
||||
#include "opt_user_ldt.h"
|
||||
#include "opt_vm86.h"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Definitions unique to x86 cpu support.
|
||||
*/
|
||||
#include <machine/frame.h>
|
||||
#include <machine/segments.h>
|
||||
#include <machine/tss.h>
|
||||
#include <machine/intrdefs.h>
|
||||
|
||||
#include <x86/cacheinfo.h>
|
||||
#include <x86/via_padlock.h>
|
||||
|
||||
#include <sys/cpu_data.h>
|
||||
|
||||
#include <lib/libkern/libkern.h> /* offsetof */
|
||||
|
||||
struct intrsource;
|
||||
struct pmap;
|
||||
struct device;
|
||||
|
||||
#ifdef __x86_64__
|
||||
#define i386tss x86_64_tss
|
||||
#endif
|
||||
|
||||
#define NIOPORTS 1024 /* # of ports we allow to be mapped */
|
||||
#define IOMAPSIZE (NIOPORTS / 8) /* I/O bitmap size in bytes */
|
||||
|
||||
/*
|
||||
* a bunch of this belongs in cpuvar.h; move it later..
|
||||
*/
|
||||
|
||||
struct cpu_info {
|
||||
struct device *ci_dev; /* pointer to our device */
|
||||
struct cpu_info *ci_self; /* self-pointer */
|
||||
volatile struct vcpu_info *ci_vcpu; /* for XEN */
|
||||
void *ci_tlog_base; /* Trap log base */
|
||||
int32_t ci_tlog_offset; /* Trap log current offset */
|
||||
|
||||
/*
|
||||
* Will be accessed by other CPUs.
|
||||
*/
|
||||
struct cpu_info *ci_next; /* next cpu */
|
||||
struct lwp *ci_curlwp; /* current owner of the processor */
|
||||
struct pmap_cpu *ci_pmap_cpu; /* per-CPU pmap data */
|
||||
struct lwp *ci_fpcurlwp; /* current owner of the FPU */
|
||||
int ci_fpsaving; /* save in progress */
|
||||
int ci_fpused; /* XEN: FPU was used by curlwp */
|
||||
cpuid_t ci_cpuid; /* our CPU ID */
|
||||
int ci_cpumask; /* (1 << CPU ID) */
|
||||
u_int ci_apicid; /* our APIC ID */
|
||||
uint8_t ci_initapicid; /* our intitial APIC ID */
|
||||
uint8_t ci_packageid;
|
||||
uint8_t ci_coreid;
|
||||
uint8_t ci_smtid;
|
||||
struct cpu_data ci_data; /* MI per-cpu data */
|
||||
|
||||
/*
|
||||
* Private members.
|
||||
*/
|
||||
struct evcnt ci_tlb_evcnt; /* tlb shootdown counter */
|
||||
struct pmap *ci_pmap; /* current pmap */
|
||||
int ci_need_tlbwait; /* need to wait for TLB invalidations */
|
||||
int ci_want_pmapload; /* pmap_load() is needed */
|
||||
volatile int ci_tlbstate; /* one of TLBSTATE_ states. see below */
|
||||
#define TLBSTATE_VALID 0 /* all user tlbs are valid */
|
||||
#define TLBSTATE_LAZY 1 /* tlbs are valid but won't be kept uptodate */
|
||||
#define TLBSTATE_STALE 2 /* we might have stale user tlbs */
|
||||
uint64_t ci_scratch;
|
||||
|
||||
#ifdef XEN
|
||||
struct iplsource *ci_isources[NIPL];
|
||||
#else
|
||||
struct intrsource *ci_isources[MAX_INTR_SOURCES];
|
||||
#endif
|
||||
volatile int ci_mtx_count; /* Negative count of spin mutexes */
|
||||
volatile int ci_mtx_oldspl; /* Old SPL at this ci_idepth */
|
||||
|
||||
/* The following must be aligned for cmpxchg8b. */
|
||||
struct {
|
||||
uint32_t ipending;
|
||||
int ilevel;
|
||||
} ci_istate __aligned(8);
|
||||
#define ci_ipending ci_istate.ipending
|
||||
#define ci_ilevel ci_istate.ilevel
|
||||
|
||||
int ci_idepth;
|
||||
void * ci_intrstack;
|
||||
uint32_t ci_imask[NIPL];
|
||||
uint32_t ci_iunmask[NIPL];
|
||||
|
||||
uint32_t ci_flags; /* flags; see below */
|
||||
uint32_t ci_ipis; /* interprocessor interrupts pending */
|
||||
int sc_apic_version; /* local APIC version */
|
||||
|
||||
uint32_t ci_signature; /* X86 cpuid type */
|
||||
uint32_t ci_feature_flags;/* X86 %edx CPUID feature bits */
|
||||
uint32_t ci_feature2_flags;/* X86 %ecx CPUID feature bits */
|
||||
uint32_t ci_feature3_flags;/* X86 extended feature bits */
|
||||
uint32_t ci_padlock_flags;/* VIA PadLock feature bits */
|
||||
uint32_t ci_vendor[4]; /* vendor string */
|
||||
uint32_t ci_cpu_serial[3]; /* PIII serial number */
|
||||
volatile uint32_t ci_lapic_counter;
|
||||
|
||||
const struct cpu_functions *ci_func; /* start/stop functions */
|
||||
struct trapframe *ci_ddb_regs;
|
||||
|
||||
u_int ci_cflush_lsize; /* CFLUSH insn line size */
|
||||
struct x86_cache_info ci_cinfo[CAI_COUNT];
|
||||
|
||||
union descriptor *ci_gdt;
|
||||
|
||||
#ifdef i386
|
||||
struct i386tss ci_doubleflt_tss;
|
||||
struct i386tss ci_ddbipi_tss;
|
||||
#endif
|
||||
char *ci_doubleflt_stack;
|
||||
char *ci_ddbipi_stack;
|
||||
|
||||
struct evcnt ci_ipi_events[X86_NIPI];
|
||||
|
||||
struct via_padlock ci_vp; /* VIA PadLock private storage */
|
||||
|
||||
struct i386tss ci_tss; /* Per-cpu TSS; shared among LWPs */
|
||||
char ci_iomap[IOMAPSIZE]; /* I/O Bitmap */
|
||||
int ci_tss_sel; /* TSS selector of this cpu */
|
||||
|
||||
/*
|
||||
* The following two are actually region_descriptors,
|
||||
* but that would pollute the namespace.
|
||||
*/
|
||||
uintptr_t ci_suspend_gdt;
|
||||
uint16_t ci_suspend_gdt_padding;
|
||||
uintptr_t ci_suspend_idt;
|
||||
uint16_t ci_suspend_idt_padding;
|
||||
|
||||
uint16_t ci_suspend_tr;
|
||||
uint16_t ci_suspend_ldt;
|
||||
uintptr_t ci_suspend_fs;
|
||||
uintptr_t ci_suspend_gs;
|
||||
uintptr_t ci_suspend_kgs;
|
||||
uintptr_t ci_suspend_efer;
|
||||
uintptr_t ci_suspend_reg[12];
|
||||
uintptr_t ci_suspend_cr0;
|
||||
uintptr_t ci_suspend_cr2;
|
||||
uintptr_t ci_suspend_cr3;
|
||||
uintptr_t ci_suspend_cr4;
|
||||
uintptr_t ci_suspend_cr8;
|
||||
|
||||
/* The following must be in a single cache line. */
|
||||
int ci_want_resched __aligned(64);
|
||||
int ci_padout __aligned(64);
|
||||
};
|
||||
|
||||
/*
|
||||
* Processor flag notes: The "primary" CPU has certain MI-defined
|
||||
* roles (mostly relating to hardclock handling); we distinguish
|
||||
* betwen the processor which booted us, and the processor currently
|
||||
* holding the "primary" role just to give us the flexibility later to
|
||||
* change primaries should we be sufficiently twisted.
|
||||
*/
|
||||
|
||||
#define CPUF_BSP 0x0001 /* CPU is the original BSP */
|
||||
#define CPUF_AP 0x0002 /* CPU is an AP */
|
||||
#define CPUF_SP 0x0004 /* CPU is only processor */
|
||||
#define CPUF_PRIMARY 0x0008 /* CPU is active primary processor */
|
||||
|
||||
#define CPUF_SYNCTSC 0x0800 /* Synchronize TSC */
|
||||
#define CPUF_PRESENT 0x1000 /* CPU is present */
|
||||
#define CPUF_RUNNING 0x2000 /* CPU is running */
|
||||
#define CPUF_PAUSE 0x4000 /* CPU is paused in DDB */
|
||||
#define CPUF_GO 0x8000 /* CPU should start running */
|
||||
|
||||
/*
|
||||
* We statically allocate the CPU info for the primary CPU (or,
|
||||
* the only CPU on uniprocessors), and the primary CPU is the
|
||||
* first CPU on the CPU info list.
|
||||
*/
|
||||
extern struct cpu_info cpu_info_primary;
|
||||
extern struct cpu_info *cpu_info_list;
|
||||
|
||||
#define CPU_INFO_ITERATOR int
|
||||
#define CPU_INFO_FOREACH(cii, ci) cii = 0, ci = cpu_info_list; \
|
||||
ci != NULL; ci = ci->ci_next
|
||||
|
||||
#define X86_MAXPROCS 32 /* because we use a bitmask */
|
||||
|
||||
#define CPU_STARTUP(_ci, _target) ((_ci)->ci_func->start(_ci, _target))
|
||||
#define CPU_STOP(_ci) ((_ci)->ci_func->stop(_ci))
|
||||
#define CPU_START_CLEANUP(_ci) ((_ci)->ci_func->cleanup(_ci))
|
||||
|
||||
#if !defined(__GNUC__) || defined(_LKM)
|
||||
/* For non-GCC and modules */
|
||||
struct cpu_info *x86_curcpu(void);
|
||||
lwp_t *x86_curlwp(void);
|
||||
void cpu_set_curpri(int);
|
||||
#endif
|
||||
|
||||
#define cpu_number() (curcpu()->ci_cpuid)
|
||||
|
||||
#define CPU_IS_PRIMARY(ci) ((ci)->ci_flags & CPUF_PRIMARY)
|
||||
|
||||
#define X86_AST_GENERIC 0x01
|
||||
#define X86_AST_PREEMPT 0x02
|
||||
|
||||
#define aston(l, why) ((l)->l_md.md_astpending |= (why))
|
||||
#define cpu_did_resched(l) ((l)->l_md.md_astpending &= ~X86_AST_PREEMPT)
|
||||
|
||||
extern struct cpu_info *cpu_info[X86_MAXPROCS];
|
||||
|
||||
void cpu_boot_secondary_processors(void);
|
||||
void cpu_init_idle_lwps(void);
|
||||
void cpu_init_msrs(struct cpu_info *, bool);
|
||||
|
||||
extern uint32_t cpus_attached;
|
||||
#ifndef XEN
|
||||
#define curcpu() x86_curcpu()
|
||||
#define curlwp x86_curlwp()
|
||||
#else
|
||||
/* XXX initgdt() calls pmap_kenter_pa() which calls splvm() before %fs is set */
|
||||
#define curcpu() (&cpu_info_primary)
|
||||
#define curlwp curcpu()->ci_curlwp
|
||||
#endif
|
||||
#define curpcb (&curlwp->l_addr->u_pcb)
|
||||
|
||||
/*
|
||||
* Arguments to hardclock, softclock and statclock
|
||||
* encapsulate the previous machine state in an opaque
|
||||
* clockframe; for now, use generic intrframe.
|
||||
*/
|
||||
struct clockframe {
|
||||
struct intrframe cf_if;
|
||||
};
|
||||
|
||||
/*
|
||||
* Give a profiling tick to the current process when the user profiling
|
||||
* buffer pages are invalid. On the i386, request an ast to send us
|
||||
* through trap(), marking the proc as needing a profiling tick.
|
||||
*/
|
||||
extern void cpu_need_proftick(struct lwp *l);
|
||||
|
||||
/*
|
||||
* Notify the LWP l that it has a signal pending, process as soon as
|
||||
* possible.
|
||||
*/
|
||||
extern void cpu_signotify(struct lwp *);
|
||||
|
||||
/*
|
||||
* We need a machine-independent name for this.
|
||||
*/
|
||||
extern void (*delay_func)(unsigned int);
|
||||
struct timeval;
|
||||
|
||||
#define DELAY(x) (*delay_func)(x)
|
||||
#define delay(x) (*delay_func)(x)
|
||||
|
||||
extern int biosbasemem;
|
||||
extern int biosextmem;
|
||||
extern unsigned int cpu_feature;
|
||||
extern unsigned int cpu_feature2;
|
||||
extern unsigned int cpu_feature_padlock;
|
||||
extern int cpu;
|
||||
extern int cpuid_level;
|
||||
extern int cpu_class;
|
||||
extern char cpu_brand_string[];
|
||||
|
||||
extern int i386_use_fxsave;
|
||||
extern int i386_has_sse;
|
||||
extern int i386_has_sse2;
|
||||
|
||||
extern void (*x86_cpu_idle)(void);
|
||||
#define cpu_idle() (*x86_cpu_idle)()
|
||||
|
||||
/* machdep.c */
|
||||
void dumpconf(void);
|
||||
void cpu_reset(void);
|
||||
void i386_proc0_tss_ldt_init(void);
|
||||
void dumpconf(void);
|
||||
void cpu_reset(void);
|
||||
void x86_64_proc0_tss_ldt_init(void);
|
||||
void x86_64_init_pcb_tss_ldt(struct cpu_info *);
|
||||
|
||||
/* longrun.c */
|
||||
u_int tmx86_get_longrun_mode(void);
|
||||
void tmx86_get_longrun_status(u_int *, u_int *, u_int *);
|
||||
void tmx86_init_longrun(void);
|
||||
|
||||
/* identcpu.c */
|
||||
void cpu_probe(struct cpu_info *);
|
||||
void cpu_identify(struct cpu_info *);
|
||||
|
||||
/* vm_machdep.c */
|
||||
void cpu_proc_fork(struct proc *, struct proc *);
|
||||
|
||||
/* locore.s */
|
||||
struct region_descriptor;
|
||||
void lgdt(struct region_descriptor *);
|
||||
#ifdef XEN
|
||||
void lgdt_finish(void);
|
||||
void i386_switch_context(lwp_t *);
|
||||
#endif
|
||||
void fillw(short, void *, size_t);
|
||||
|
||||
struct pcb;
|
||||
void savectx(struct pcb *);
|
||||
void lwp_trampoline(void);
|
||||
void child_trampoline(void);
|
||||
#ifdef XEN
|
||||
void startrtclock(void);
|
||||
void xen_delay(unsigned int);
|
||||
void xen_initclocks(void);
|
||||
#else
|
||||
/* clock.c */
|
||||
void initrtclock(u_long);
|
||||
void startrtclock(void);
|
||||
void i8254_delay(unsigned int);
|
||||
void i8254_microtime(struct timeval *);
|
||||
void i8254_initclocks(void);
|
||||
#endif
|
||||
|
||||
/* cpu.c */
|
||||
|
||||
void cpu_probe_features(struct cpu_info *);
|
||||
|
||||
/* npx.c */
|
||||
void npxsave_lwp(struct lwp *, bool);
|
||||
void npxsave_cpu(bool);
|
||||
|
||||
/* vm_machdep.c */
|
||||
int kvtop(void *);
|
||||
|
||||
#ifdef USER_LDT
|
||||
/* sys_machdep.h */
|
||||
int x86_get_ldt(struct lwp *, void *, register_t *);
|
||||
int x86_set_ldt(struct lwp *, void *, register_t *);
|
||||
#endif
|
||||
|
||||
/* isa_machdep.c */
|
||||
void isa_defaultirq(void);
|
||||
int isa_nmi(void);
|
||||
|
||||
#ifdef VM86
|
||||
/* vm86.c */
|
||||
void vm86_gpfault(struct lwp *, int);
|
||||
#endif /* VM86 */
|
||||
|
||||
/* consinit.c */
|
||||
void kgdb_port_init(void);
|
||||
|
||||
/* bus_machdep.c */
|
||||
void x86_bus_space_init(void);
|
||||
void x86_bus_space_mallocok(void);
|
||||
|
||||
#include <machine/psl.h> /* Must be after struct cpu_info declaration */
|
||||
|
||||
#endif /* _KERNEL */
|
||||
|
||||
/*
|
||||
* CTL_MACHDEP definitions.
|
||||
*/
|
||||
#define CPU_CONSDEV 1 /* dev_t: console terminal device */
|
||||
#define CPU_BIOSBASEMEM 2 /* int: bios-reported base mem (K) */
|
||||
#define CPU_BIOSEXTMEM 3 /* int: bios-reported ext. mem (K) */
|
||||
/* CPU_NKPDE 4 obsolete: int: number of kernel PDEs */
|
||||
#define CPU_BOOTED_KERNEL 5 /* string: booted kernel name */
|
||||
#define CPU_DISKINFO 6 /* struct disklist *:
|
||||
* disk geometry information */
|
||||
#define CPU_FPU_PRESENT 7 /* int: FPU is present */
|
||||
#define CPU_OSFXSR 8 /* int: OS uses FXSAVE/FXRSTOR */
|
||||
#define CPU_SSE 9 /* int: OS/CPU supports SSE */
|
||||
#define CPU_SSE2 10 /* int: OS/CPU supports SSE2 */
|
||||
#define CPU_TMLR_MODE 11 /* int: longrun mode
|
||||
* 0: minimum frequency
|
||||
* 1: economy
|
||||
* 2: performance
|
||||
* 3: maximum frequency
|
||||
*/
|
||||
#define CPU_TMLR_FREQUENCY 12 /* int: current frequency */
|
||||
#define CPU_TMLR_VOLTAGE 13 /* int: curret voltage */
|
||||
#define CPU_TMLR_PERCENTAGE 14 /* int: current clock percentage */
|
||||
#define CPU_MAXID 15 /* number of valid machdep ids */
|
||||
|
||||
/*
|
||||
* Structure for CPU_DISKINFO sysctl call.
|
||||
* XXX this should be somewhere else.
|
||||
*/
|
||||
#define MAX_BIOSDISKS 16
|
||||
|
||||
struct disklist {
|
||||
int dl_nbiosdisks; /* number of bios disks */
|
||||
struct biosdisk_info {
|
||||
int bi_dev; /* BIOS device # (0x80 ..) */
|
||||
int bi_cyl; /* cylinders on disk */
|
||||
int bi_head; /* heads per track */
|
||||
int bi_sec; /* sectors per track */
|
||||
uint64_t bi_lbasecs; /* total sec. (iff ext13) */
|
||||
#define BIFLAG_INVALID 0x01
|
||||
#define BIFLAG_EXTINT13 0x02
|
||||
int bi_flags;
|
||||
} dl_biosdisks[MAX_BIOSDISKS];
|
||||
|
||||
int dl_nnativedisks; /* number of native disks */
|
||||
struct nativedisk_info {
|
||||
char ni_devname[16]; /* native device name */
|
||||
int ni_nmatches; /* # of matches w/ BIOS */
|
||||
int ni_biosmatches[MAX_BIOSDISKS]; /* indices in dl_biosdisks */
|
||||
} dl_nativedisks[1]; /* actually longer */
|
||||
};
|
||||
#endif /* !_X86_CPU_H_ */
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cpu.c,v 1.40 2008/05/11 14:44:54 ad Exp $ */
|
||||
/* $NetBSD: cpu.c,v 1.41 2008/05/11 15:32:20 ad Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2000, 2006, 2007, 2008 The NetBSD Foundation, Inc.
|
||||
@ -62,7 +62,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.40 2008/05/11 14:44:54 ad Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.41 2008/05/11 15:32:20 ad Exp $");
|
||||
|
||||
#include "opt_ddb.h"
|
||||
#include "opt_multiprocessor.h"
|
||||
@ -461,9 +461,6 @@ cpu_attach(device_t parent, device_t self, void *aux)
|
||||
void
|
||||
cpu_init(struct cpu_info *ci)
|
||||
{
|
||||
/* configure the CPU if needed */
|
||||
if (ci->cpu_setup != NULL)
|
||||
(*ci->cpu_setup)(ci);
|
||||
|
||||
lcr0(rcr0() | CR0_WP);
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cpu.c,v 1.21 2008/05/11 15:02:34 ad Exp $ */
|
||||
/* $NetBSD: cpu.c,v 1.22 2008/05/11 15:32:20 ad Exp $ */
|
||||
/* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp */
|
||||
|
||||
/*-
|
||||
@ -66,7 +66,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.21 2008/05/11 15:02:34 ad Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.22 2008/05/11 15:32:20 ad Exp $");
|
||||
|
||||
#include "opt_ddb.h"
|
||||
#include "opt_multiprocessor.h"
|
||||
@ -520,9 +520,6 @@ cpu_attach_common(device_t parent, device_t self, void *aux)
|
||||
void
|
||||
cpu_init(struct cpu_info *ci)
|
||||
{
|
||||
/* configure the CPU if needed */
|
||||
if (ci->cpu_setup != NULL)
|
||||
(*ci->cpu_setup)(ci);
|
||||
|
||||
/*
|
||||
* On a P6 or above, enable global TLB caching if the
|
||||
|
Loading…
Reference in New Issue
Block a user