/*
- * Copyright (c) 2003-2009 Apple Inc. All rights reserved.
+ * Copyright (c) 2003-2012 Apple Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
* the rights to redistribute these changes.
*/
-#include <platforms.h>
#include <mach/i386/vm_param.h>
#include <kern/xpr.h>
#include <kern/cpu_data.h>
#include <kern/processor.h>
+#include <sys/kdebug.h>
#include <console/serial_protos.h>
#include <vm/vm_page.h>
#include <vm/pmap.h>
#include <i386/pmCPU.h>
#include <i386/tsc.h>
#include <i386/locks.h> /* LcksOpts */
-#ifdef __i386__
-#include <i386/cpu_capabilities.h>
-#endif
#if DEBUG
#include <machine/pal_routines.h>
#endif
-
#if DEBUG
#define DBG(x...) kprintf(x)
#else
pd_entry_t *KPTphys;
pd_entry_t *IdlePTD;
-#ifdef __i386__
-pd_entry_t *IdlePDPT64;
-#else
pdpt_entry_t *IdlePDPT;
pml4_entry_t *IdlePML4;
-#endif
char *physfree;
uintptr_t tmp = (uintptr_t)physfree;
bzero(physfree, npages * PAGE_SIZE);
physfree += npages * PAGE_SIZE;
-#ifdef __x86_64__
tmp += VM_MIN_KERNEL_ADDRESS & ~LOW_4GB_MASK;
-#endif
return (void *)tmp;
}
extern pmap_paddr_t first_avail;
-#ifdef __x86_64__
int break_kprintf = 0;
uint64_t
set_cr3_raw((uint32_t) new_cr3);
}
-#endif
-#ifdef __i386__
-#define ID_MAP_VTOP(x) x
-#endif
-#ifdef __x86_64__
// Set up the physical mapping - NPHYSMAP GB of memory mapped at a high address
// NPHYSMAP is determined by the maximum supported RAM size plus 4GB to account
// the PCI hole (which is less 4GB but not more).
} * physmapL2 = ALLOCPAGES(NPHYSMAP);
uint64_t i;
- uint8_t phys_random_L3 = ml_early_random() & 0xFF;
+ uint8_t phys_random_L3 = early_random() & 0xFF;
/* We assume NX support. Mark all levels of the PHYSMAP NX
* to avoid granting executability via a single bit flip.
*/
- assert(cpuid_extfeatures() & CPUID_EXTFEATURE_XD);
+#if DEVELOPMENT || DEBUG
+ uint32_t reg[4];
+ do_cpuid(0x80000000, reg);
+ if (reg[eax] >= 0x80000001) {
+ do_cpuid(0x80000001, reg);
+ assert(reg[edx] & CPUID_EXTFEATURE_XD);
+ }
+#endif /* DEVELOPMENT || DEBUG */
for(i = 0; i < NPHYSMAP; i++) {
physmapL3[i + phys_random_L3] =
((i * PTE_PER_PAGE + j) << PDSHIFT)
| INTEL_PTE_PS
| INTEL_PTE_VALID
- | INTEL_PTE_NX
+ | INTEL_PTE_NX
| INTEL_PTE_WRITE;
}
}
}
-#else /* __x86_64__ */
-
-static void
-Idle_PTs_init(void)
-{
- /* Allocate the "idle" kernel page tables: */
- KPTphys = ALLOCPAGES(NKPT); /* level 1 */
- IdlePTD = ALLOCPAGES(NPGPTD); /* level 2 */
-
- IdlePDPT64 = ALLOCPAGES(1);
-
- // Recursive mapping of PTEs
- fillkpt(IdlePTD, INTEL_PTE_WRITE, (uintptr_t)IdlePTD, PTDPTDI, NPGPTD);
- // commpage
- fillkpt(IdlePTD, INTEL_PTE_WRITE|INTEL_PTE_USER, (uintptr_t)ALLOCPAGES(1), _COMM_PAGE32_BASE_ADDRESS >> PDESHIFT,1);
-
- // Fill the lowest level with everything up to physfree
- fillkpt(KPTphys,
- INTEL_PTE_WRITE, 0, 0, (int)(((uintptr_t)physfree) >> PAGE_SHIFT));
-
- // Rewrite the 2nd-lowest level to point to pages of KPTphys.
- // This was previously filled statically by idle_pt.c, and thus
- // must be done after the KPTphys fill since IdlePTD is in use
- fillkpt(IdlePTD,
- INTEL_PTE_WRITE, (uintptr_t)ID_MAP_VTOP(KPTphys), 0, NKPT);
-
- // IdlePDPT entries
- fillkpt(IdlePDPT, 0, (uintptr_t)IdlePTD, 0, NPGPTD);
-
- postcode(VSTART_SET_CR3);
-
- // Flush the TLB now we're done rewriting the page tables..
- set_cr3_raw(get_cr3_raw());
-}
-#endif
/*
* vstart() is called in the natural mode (64bit for K64, 32 for K32)
kernelBootArgs = (boot_args *)boot_args_start;
lphysfree = kernelBootArgs->kaddr + kernelBootArgs->ksize;
physfree = (void *)(uintptr_t)((lphysfree + PAGE_SIZE - 1) &~ (PAGE_SIZE - 1));
-#if DEBUG
+
+#if DEVELOPMENT || DEBUG
pal_serial_init();
#endif
DBG("revision 0x%x\n", kernelBootArgs->Revision);
kernelBootArgs,
&kernelBootArgs->ksize,
&kernelBootArgs->kaddr);
+ DBG("SMBIOS mem sz 0x%llx\n", kernelBootArgs->PhysicalMemorySize);
- postcode(VSTART_IDLE_PTS_INIT);
-
- Idle_PTs_init();
-
- first_avail = (vm_offset_t)ID_MAP_VTOP(physfree);
-
- cpu = 0;
- cpu_data_alloc(TRUE);
-
-
/*
* Setup boot args given the physical start address.
+ * Note: PE_init_platform needs to be called before Idle_PTs_init
+ * because access to the DeviceTree is required to read the
+ * random seed before generating a random physical map slide.
*/
kernelBootArgs = (boot_args *)
ml_static_ptovirt(boot_args_start);
DBG("i386_init(0x%lx) kernelBootArgs=%p\n",
(unsigned long)boot_args_start, kernelBootArgs);
-
PE_init_platform(FALSE, kernelBootArgs);
postcode(PE_INIT_PLATFORM_D);
+
+ Idle_PTs_init();
+ postcode(VSTART_IDLE_PTS_INIT);
+
+ first_avail = (vm_offset_t)ID_MAP_VTOP(physfree);
+
+ cpu = 0;
+ cpu_data_alloc(TRUE);
} else {
-#ifdef __x86_64__
/* Switch to kernel's page tables (from the Boot PTs) */
set_cr3_raw((uintptr_t)ID_MAP_VTOP(IdlePML4));
-#endif
/* Find our logical cpu number */
cpu = lapic_to_cpu[(LAPIC_READ(ID)>>LAPIC_ID_SHIFT) & LAPIC_ID_MASK];
DBG("CPU: %d, GSBASE initial value: 0x%llx\n", cpu, rdmsr64(MSR_IA32_GS_BASE));
}
postcode(VSTART_CPU_DESC_INIT);
-#ifdef __x86_64__
if(is_boot_cpu)
cpu_desc_init64(cpu_datap(cpu));
cpu_desc_load64(cpu_datap(cpu));
-#else
- if(is_boot_cpu)
- cpu_desc_init(cpu_datap(cpu));
- cpu_desc_load(cpu_datap(cpu));
-#endif
postcode(VSTART_CPU_MODE_INIT);
if (is_boot_cpu)
cpu_mode_init(current_cpu_datap()); /* cpu_mode_init() will be
* via i386_init_slave()
*/
postcode(VSTART_EXIT);
-#ifdef __i386__
- if (cpuid_extfeatures() & CPUID_EXTFEATURE_XD) {
- wrmsr64(MSR_IA32_EFER, rdmsr64(MSR_IA32_EFER) | MSR_IA32_EFER_NXE);
- DBG("vstart() NX/XD enabled, i386\n");
- }
-
- if (is_boot_cpu)
- i386_init();
- else
- i386_init_slave();
- /*NOTREACHED*/
-#else
x86_init_wrapper(is_boot_cpu ? (uintptr_t) i386_init
: (uintptr_t) i386_init_slave,
cpu_datap(cpu)->cpu_int_stack_top);
-#endif
+}
+
+void
+pstate_trace(void)
+{
}
/*
postcode(I386_INIT_ENTRY);
pal_i386_init();
+ tsc_init();
+ rtclock_early_init(); /* mach_absolute_time() now functionsl */
+
+ kernel_debug_string_simple("i386_init");
+ pstate_trace();
#if CONFIG_MCA
/* Initialize machine-check handling */
mca_cpu_init();
#endif
-
- kernel_early_bootstrap();
-
master_cpu = 0;
cpu_init();
panic_init(); /* Init this in case we need debugger */
/* setup debugging output if one has been chosen */
+ kernel_debug_string_simple("PE_init_kprintf");
PE_init_kprintf(FALSE);
+ kernel_debug_string_simple("kernel_early_bootstrap");
+ kernel_early_bootstrap();
+
if (!PE_parse_boot_argn("diag", &dgWork.dgFlags, sizeof (dgWork.dgFlags)))
dgWork.dgFlags = 0;
}
/* setup console output */
+ kernel_debug_string_simple("PE_init_printf");
PE_init_printf(FALSE);
kprintf("version_variant = %s\n", version_variant);
/*
* debug support for > 4G systems
*/
- if (!PE_parse_boot_argn("himemory_mode", &vm_himemory_mode, sizeof (vm_himemory_mode)))
- vm_himemory_mode = 0;
+ PE_parse_boot_argn("himemory_mode", &vm_himemory_mode, sizeof (vm_himemory_mode));
+ if (vm_himemory_mode != 0)
+ kprintf("himemory_mode: %d\n", vm_himemory_mode);
if (!PE_parse_boot_argn("immediate_NMI", &fidn, sizeof (fidn)))
force_immediate_debugger_NMI = FALSE;
&urgency_notification_assert_abstime_threshold,
sizeof(urgency_notification_assert_abstime_threshold));
-#if CONFIG_YONAH
- /*
- * At this point we check whether we are a 64-bit processor
- * and that we're not restricted to legacy mode, 32-bit operation.
- */
- if (cpuid_extfeatures() & CPUID_EXTFEATURE_EM64T) {
- boolean_t legacy_mode;
- kprintf("EM64T supported");
- if (PE_parse_boot_argn("-legacy", &legacy_mode, sizeof (legacy_mode))) {
- kprintf(" but legacy mode forced\n");
- IA32e = FALSE;
- } else {
- kprintf(" and will be enabled\n");
- }
- } else
- IA32e = FALSE;
-#endif
-
if (!(cpuid_extfeatures() & CPUID_EXTFEATURE_XD))
nx_enabled = 0;
/*
* VM initialization, after this we're using page tables...
- * The maximum number of cpus must be set beforehand.
+ * Thn maximum number of cpus must be set beforehand.
*/
+ kernel_debug_string_simple("i386_vm_init");
i386_vm_init(maxmemtouse, IA32e, kernelBootArgs);
/* create the console for verbose or pretty mode */
PE_init_platform(TRUE, kernelBootArgs);
PE_create_console();
- tsc_init();
+ kernel_debug_string_simple("power_management_init");
power_management_init();
processor_bootstrap();
thread_bootstrap();
+ pstate_trace();
+ kernel_debug_string_simple("machine_startup");
machine_startup();
+ pstate_trace();
}
static void
#if CONFIG_VMX
/* resume VT operation */
- vmx_resume();
+ vmx_resume(FALSE);
#endif
#if CONFIG_MTRR
cpu_thread_init(); /* not strictly necessary */
- cpu_init(); /* Sets cpu_running which starter cpu waits for */
-
+ cpu_init(); /* Sets cpu_running which starter cpu waits for */
slave_main(init_param);
panic("do_init_slave() returned from slave_main()");
projects / apple / xnu.git / blobdiff