*
* @APPLE_LICENSE_HEADER_START@
*
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License"). You may not use this file except in compliance with the
- * License. Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
*
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
*
* @APPLE_LICENSE_HEADER_END@
*/
#include <i386/cpuid.h>
#include <i386/fpu.h>
#include <kern/processor.h>
+#include <kern/machine.h>
#include <kern/cpu_data.h>
-#include <kern/thread_act.h>
+#include <kern/cpu_number.h>
+#include <kern/thread.h>
+#include <i386/cpu_data.h>
#include <i386/machine_cpu.h>
#include <i386/mp.h>
#include <i386/mp_events.h>
+#include <i386/cpu_threads.h>
+#include <i386/pmap.h>
+#include <i386/misc_protos.h>
+#include <mach/vm_param.h>
+
+#define MIN(a,b) ((a)<(b)? (a) : (b))
+
+extern void initialize_screen(Boot_Video *, unsigned int);
+extern void wakeup(void *);
static int max_cpus_initialized = 0;
/* boot memory allocation */
vm_offset_t ml_static_malloc(
- vm_size_t size)
+ __unused vm_size_t size)
{
return((vm_offset_t)NULL);
}
ml_static_ptovirt(
vm_offset_t paddr)
{
- return phystokv(paddr);
+ return (vm_offset_t)((unsigned) paddr | LINEAR_KERNEL_ADDRESS);
}
+
+/*
+ * Routine: ml_static_mfree
+ * Function:
+ */
void
ml_static_mfree(
- vm_offset_t vaddr,
- vm_size_t size)
+ vm_offset_t vaddr,
+ vm_size_t size)
{
- return;
+ vm_offset_t vaddr_cur;
+ ppnum_t ppn;
+
+ if (vaddr < VM_MIN_KERNEL_ADDRESS) return;
+
+ assert((vaddr & (PAGE_SIZE-1)) == 0); /* must be page aligned */
+
+ for (vaddr_cur = vaddr;
+ vaddr_cur < round_page_32(vaddr+size);
+ vaddr_cur += PAGE_SIZE) {
+ ppn = pmap_find_phys(kernel_pmap, (addr64_t)vaddr_cur);
+ if (ppn != (vm_offset_t)NULL) {
+ pmap_remove(kernel_pmap, (addr64_t)vaddr_cur, (addr64_t)(vaddr_cur+PAGE_SIZE));
+ vm_page_create(ppn,(ppn+1));
+ vm_page_wire_count--;
+ }
+ }
}
/* virtual to physical on wired pages */
initialize_screen(0, kPEAcquireScreen);
}
+static void
+cpu_idle(void)
+{
+ __asm__ volatile("sti; hlt": : :"memory");
+}
+void (*cpu_idle_handler)(void) = cpu_idle;
+
void
machine_idle(void)
{
- DBGLOG(cpu_handle, cpu_number(), MP_IDLE);
- __asm__ volatile("sti; hlt": : :"memory");
- __asm__ volatile("cli");
- DBGLOG(cpu_handle, cpu_number(), MP_UNIDLE);
+ cpu_core_t *my_core = cpu_core();
+ int others_active;
+
+ /*
+ * We halt this cpu thread
+ * unless kernel param idlehalt is false and no other thread
+ * in the same core is active - if so, don't halt so that this
+ * core doesn't go into a low-power mode.
+ */
+ others_active = !atomic_decl_and_test(
+ (long *) &my_core->active_threads, 1);
+ if (idlehalt || others_active) {
+ DBGLOG(cpu_handle, cpu_number(), MP_IDLE);
+ cpu_idle_handler();
+ DBGLOG(cpu_handle, cpu_number(), MP_UNIDLE);
+ } else {
+ __asm__ volatile("sti");
+ }
+ atomic_incl((long *) &my_core->active_threads, 1);
}
void
machine_signal_idle(
processor_t processor)
{
- cpu_interrupt(processor->slot_num);
+ cpu_interrupt(PROCESSOR_DATA(processor, slot_num));
}
kern_return_t
ml_processor_register(
cpu_id_t cpu_id,
uint32_t lapic_id,
- processor_t *processor,
+ processor_t *processor_out,
ipi_handler_t *ipi_handler,
boolean_t boot_cpu)
{
- kern_return_t ret;
int target_cpu;
+ cpu_data_t *this_cpu_datap;
- if (cpu_register(&target_cpu) != KERN_SUCCESS)
+ this_cpu_datap = cpu_data_alloc(boot_cpu);
+ if (this_cpu_datap == NULL) {
return KERN_FAILURE;
-
+ }
+ target_cpu = this_cpu_datap->cpu_number;
assert((boot_cpu && (target_cpu == 0)) ||
(!boot_cpu && (target_cpu != 0)));
lapic_cpu_map(lapic_id, target_cpu);
- cpu_data[target_cpu].cpu_id = cpu_id;
- cpu_data[target_cpu].cpu_phys_number = lapic_id;
- *processor = cpu_to_processor(target_cpu);
+
+ this_cpu_datap->cpu_id = cpu_id;
+ this_cpu_datap->cpu_phys_number = lapic_id;
+
+ this_cpu_datap->cpu_console_buf = console_cpu_alloc(boot_cpu);
+ if (this_cpu_datap->cpu_console_buf == NULL)
+ goto failed;
+
+ if (!boot_cpu) {
+ this_cpu_datap->cpu_pmap = pmap_cpu_alloc(boot_cpu);
+ if (this_cpu_datap->cpu_pmap == NULL)
+ goto failed;
+
+ this_cpu_datap->cpu_processor = cpu_processor_alloc(boot_cpu);
+ if (this_cpu_datap->cpu_processor == NULL)
+ goto failed;
+ processor_init(this_cpu_datap->cpu_processor, target_cpu);
+ }
+
+ *processor_out = this_cpu_datap->cpu_processor;
*ipi_handler = NULL;
return KERN_SUCCESS;
+
+failed:
+ cpu_processor_free(this_cpu_datap->cpu_processor);
+ pmap_cpu_free(this_cpu_datap->cpu_pmap);
+ console_cpu_free(this_cpu_datap->cpu_console_buf);
+ return KERN_FAILURE;
}
void
-ml_cpu_get_info(ml_cpu_info_t *cpu_info)
+ml_cpu_get_info(ml_cpu_info_t *cpu_infop)
{
boolean_t os_supports_sse;
i386_cpu_info_t *cpuid_infop;
- if (cpu_info == NULL)
+ if (cpu_infop == NULL)
return;
/*
*/
os_supports_sse = get_cr4() & CR4_XMM;
if ((cpuid_features() & CPUID_FEATURE_SSE2) && os_supports_sse)
- cpu_info->vector_unit = 4;
+ cpu_infop->vector_unit = 4;
else if ((cpuid_features() & CPUID_FEATURE_SSE) && os_supports_sse)
- cpu_info->vector_unit = 3;
+ cpu_infop->vector_unit = 3;
else if (cpuid_features() & CPUID_FEATURE_MMX)
- cpu_info->vector_unit = 2;
+ cpu_infop->vector_unit = 2;
else
- cpu_info->vector_unit = 0;
+ cpu_infop->vector_unit = 0;
cpuid_infop = cpuid_info();
- cpu_info->cache_line_size = cpuid_infop->cache_linesize;
+ cpu_infop->cache_line_size = cpuid_infop->cache_linesize;
- cpu_info->l1_icache_size = cpuid_infop->cache_size[L1I];
- cpu_info->l1_dcache_size = cpuid_infop->cache_size[L1D];
+ cpu_infop->l1_icache_size = cpuid_infop->cache_size[L1I];
+ cpu_infop->l1_dcache_size = cpuid_infop->cache_size[L1D];
- cpu_info->l2_settings = 1;
- cpu_info->l2_cache_size = cpuid_infop->cache_size[L2U];
+ if (cpuid_infop->cache_size[L2U] > 0) {
+ cpu_infop->l2_settings = 1;
+ cpu_infop->l2_cache_size = cpuid_infop->cache_size[L2U];
+ } else {
+ cpu_infop->l2_settings = 0;
+ cpu_infop->l2_cache_size = 0xFFFFFFFF;
+ }
- /* XXX No L3 */
- cpu_info->l3_settings = 0;
- cpu_info->l3_cache_size = 0xFFFFFFFF;
+ if (cpuid_infop->cache_size[L3U] > 0) {
+ cpu_infop->l2_settings = 1;
+ cpu_infop->l2_cache_size = cpuid_infop->cache_size[L3U];
+ } else {
+ cpu_infop->l3_settings = 0;
+ cpu_infop->l3_cache_size = 0xFFFFFFFF;
+ }
}
void
current_state = ml_set_interrupts_enabled(FALSE);
if (max_cpus_initialized != MAX_CPUS_SET) {
- if (max_cpus > 0 && max_cpus < NCPUS)
- machine_info.max_cpus = max_cpus;
+ if (max_cpus > 0 && max_cpus <= MAX_CPUS) {
+ /*
+ * Note: max_cpus is the number of enable processors
+ * that ACPI found; max_ncpus is the maximum number
+ * that the kernel supports or that the "cpus="
+ * boot-arg has set. Here we take int minimum.
+ */
+ machine_info.max_cpus = MIN(max_cpus, max_ncpus);
+ }
if (max_cpus_initialized == MAX_CPUS_WAIT)
wakeup((event_t)&max_cpus_initialized);
max_cpus_initialized = MAX_CPUS_SET;
return(machine_info.max_cpus);
}
+/*
+ * This is called from the machine-independent routine cpu_up()
+ * to perform machine-dependent info updates. Defer to cpu_thread_init().
+ */
+void
+ml_cpu_up(void)
+{
+ return;
+}
+
+/*
+ * This is called from the machine-independent routine cpu_down()
+ * to perform machine-dependent info updates.
+ */
+void
+ml_cpu_down(void)
+{
+ return;
+}
+
/* Stubs for pc tracing mechanism */
int *pc_trace_buf;
int pc_trace_cnt = 0;
int
-set_be_bit()
+set_be_bit(void)
{
return(0);
}
int
-clr_be_bit()
+clr_be_bit(void)
{
return(0);
}
int
-be_tracing()
+be_tracing(void)
{
return(0);
}
-#undef current_act
-thread_act_t
+/*
+ * The following are required for parts of the kernel
+ * that cannot resolve these functions as inlines:
+ */
+extern thread_t current_act(void);
+thread_t
current_act(void)
-{
- return(current_act_fast());
-}
+{
+ return(current_thread_fast());
+}
#undef current_thread
+extern thread_t current_thread(void);
thread_t
current_thread(void)
{
- return(current_act_fast());
+ return(current_thread_fast());
}
projects / apple / xnu.git / blobdiff