X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8ad349bb6ed4a0be06e34c92be0d98b92e078db4..e2fac8b15b12a7979f72090454d850e612fc5b13:/osfmk/ppc/ppc_init.c diff --git a/osfmk/ppc/ppc_init.c b/osfmk/ppc/ppc_init.c index 9478b8a7e..ccdbb8bb9 100644 --- a/osfmk/ppc/ppc_init.c +++ b/osfmk/ppc/ppc_init.c @@ -1,31 +1,29 @@ /* - * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2000-2008 Apple Inc. All rights reserved. * - * @APPLE_LICENSE_OSREFERENCE_HEADER_START@ + * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * - * 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. The rights granted to you under the - * License may not be used to create, or enable the creation or - * redistribution of, unlawful or unlicensed copies of an Apple operating - * system, or to circumvent, violate, or enable the circumvention or - * violation of, any terms of an Apple operating system software license - * agreement. - * - * Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. - * - * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. - * Please see the License for the specific language governing rights and + * 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. The rights granted to you under the License + * may not be used to create, or enable the creation or redistribution of, + * unlawful or unlicensed copies of an Apple operating system, or to + * circumvent, violate, or enable the circumvention or violation of, any + * terms of an Apple operating system software license agreement. + * + * Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this file. + * + * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and * limitations under the License. - * - * @APPLE_LICENSE_OSREFERENCE_HEADER_END@ + * + * @APPLE_OSREFERENCE_LICENSE_HEADER_END@ */ /* * @OSF_COPYRIGHT@ @@ -56,7 +54,7 @@ #include #include #include -#include +#include #include #include @@ -65,9 +63,6 @@ extern unsigned int mckFlags; extern vm_offset_t intstack; extern vm_offset_t debstack; -int pc_trace_buf[1024] = {0}; -int pc_trace_cnt = 1024; - extern unsigned int extPatchMCK; extern unsigned int extPatch32; extern unsigned int hwulckPatch_isync; @@ -84,8 +79,6 @@ extern unsigned int rwlesPatch_isync; extern unsigned int rwlesPatch_eieio; extern unsigned int rwldPatch_isync; extern unsigned int rwldPatch_eieio; -extern unsigned int retfsectPatch_eieio; -extern unsigned int retfsectPatch_isync; extern unsigned int bcopy_nop_if_32bit; extern unsigned int bcopy_nc_nop_if_32bit; extern unsigned int memcpy_nop_if_32bit; @@ -97,6 +90,8 @@ extern unsigned int uft_cuttrace; int forcenap = 0; int wcte = 0; /* Non-cache gather timer disabled */ +int debug_task; + patch_entry_t patch_table[] = { {&extPatch32, 0x60000000, PATCH_FEATURE, PatchExt32}, {&extPatchMCK, 0x60000000, PATCH_PROCESSOR, CPU_SUBTYPE_POWERPC_970}, @@ -117,10 +112,6 @@ patch_entry_t patch_table[] = { {&bcopy_nop_if_32bit, 0x60000000, PATCH_FEATURE, PatchExt32}, {&bcopy_nc_nop_if_32bit,0x60000000, PATCH_FEATURE, PatchExt32}, {&memcpy_nop_if_32bit, 0x60000000, PATCH_FEATURE, PatchExt32}, -#if !MACH_LDEBUG - {&retfsectPatch_isync, 0x60000000, PATCH_FEATURE, PatchLwsync}, - {&retfsectPatch_eieio, 0x7c2004ac, PATCH_FEATURE, PatchLwsync}, -#endif {&xsum_nop_if_32bit, 0x60000000, PATCH_FEATURE, PatchExt32}, {&uft_nop_if_32bit, 0x60000000, PATCH_FEATURE, PatchExt32}, {&uft_uaw_nop_if_32bit, 0x60000000, PATCH_FEATURE, PatchExt32}, @@ -138,6 +129,7 @@ void ppc_init( void ppc_init_cpu( struct per_proc_info *proc_info); + /* * Routine: ppc_init * Function: @@ -157,7 +149,6 @@ ppc_init( uint64_t scdata; - /* * Setup per_proc info for first cpu. */ @@ -170,11 +161,13 @@ ppc_init( BootProcInfo.debstackptr = BootProcInfo.debstack_top_ss; BootProcInfo.interrupts_enabled = 0; BootProcInfo.pending_ast = AST_NONE; - BootProcInfo.FPU_owner = 0; - BootProcInfo.VMX_owner = 0; + BootProcInfo.FPU_owner = NULL; + BootProcInfo.VMX_owner = NULL; BootProcInfo.pp_cbfr = console_per_proc_alloc(TRUE); BootProcInfo.rtcPop = EndOfAllTime; - BootProcInfo.pp2ndPage = (addr64_t)&BootProcInfo; /* Initial physical address of the second page */ + queue_init(&BootProcInfo.rtclock_timer.queue); + BootProcInfo.rtclock_timer.deadline = EndOfAllTime; + BootProcInfo.pp2ndPage = (addr64_t)(uintptr_t)&BootProcInfo; /* Initial physical address of the second page */ BootProcInfo.pms.pmsStamp = 0; /* Dummy transition time */ BootProcInfo.pms.pmsPop = EndOfAllTime; /* Set the pop way into the future */ @@ -202,34 +195,36 @@ ppc_init( master_cpu = 0; processor_bootstrap(); - timer_switch((uint32_t)mach_absolute_time(), &thread->system_timer); + timer_start(&thread->system_timer, mach_absolute_time()); + PROCESSOR_DATA(master_processor, kernel_timer) = + PROCESSOR_DATA(master_processor, thread_timer) = &thread->system_timer; static_memory_end = round_page(args->topOfKernelData);; PE_init_platform(FALSE, args); /* Get platform expert set up */ - if (!PE_parse_boot_arg("novmx", &novmx)) novmx=0; /* Special run without VMX? */ + if (!PE_parse_boot_argn("novmx", &novmx, sizeof (novmx))) novmx=0; /* Special run without VMX? */ if(novmx) { /* Yeah, turn it off */ BootProcInfo.pf.Available &= ~pfAltivec; /* Turn off Altivec available */ __asm__ volatile("mtsprg 2,%0" : : "r" (BootProcInfo.pf.Available)); /* Set live value */ } - if (!PE_parse_boot_arg("fn", &forcenap)) forcenap = 0; /* If force nap not set, make 0 */ + if (!PE_parse_boot_argn("fn", &forcenap, sizeof (forcenap))) forcenap = 0; /* If force nap not set, make 0 */ else { if(forcenap < 2) forcenap = forcenap + 1; /* Else set 1 for off, 2 for on */ else forcenap = 0; /* Clear for error case */ } - if (!PE_parse_boot_arg("pmsx", &pmsExperimental)) pmsExperimental = 0; /* Check if we should start in experimental power management stepper mode */ - if (!PE_parse_boot_arg("lcks", &LcksOpts)) LcksOpts = 0; /* Set lcks options */ - if (!PE_parse_boot_arg("diag", &dgWork.dgFlags)) dgWork.dgFlags = 0; /* Set diagnostic flags */ + if (!PE_parse_boot_argn("pmsx", &pmsExperimental, sizeof (pmsExperimental))) pmsExperimental = 0; /* Check if we should start in experimental power management stepper mode */ + if (!PE_parse_boot_argn("lcks", &LcksOpts, sizeof (LcksOpts))) LcksOpts = 0; /* Set lcks options */ + if (!PE_parse_boot_argn("diag", &dgWork.dgFlags, sizeof (dgWork.dgFlags))) dgWork.dgFlags = 0; /* Set diagnostic flags */ if(dgWork.dgFlags & enaExpTrace) trcWork.traceMask = 0xFFFFFFFF; /* If tracing requested, enable it */ - if(PE_parse_boot_arg("ctrc", &cputrace)) { /* See if tracing is limited to a specific cpu */ + if(PE_parse_boot_argn("ctrc", &cputrace, sizeof (cputrace))) { /* See if tracing is limited to a specific cpu */ trcWork.traceMask = (trcWork.traceMask & 0xFFFFFFF0) | (cputrace & 0xF); /* Limit to 4 */ } - if(!PE_parse_boot_arg("tb", &trcWork.traceSize)) { /* See if non-default trace buffer size */ + if(!PE_parse_boot_argn("tb", &trcWork.traceSize, sizeof (trcWork.traceSize))) { /* See if non-default trace buffer size */ #if DEBUG trcWork.traceSize = 32; /* Default 32 page trace table for DEBUG */ #else @@ -241,18 +236,18 @@ ppc_init( if(trcWork.traceSize > 256) trcWork.traceSize = 256; /* Maximum size of 256 pages */ trcWork.traceSize = trcWork.traceSize * 4096; /* Change page count to size */ - if (!PE_parse_boot_arg("maxmem", &maxmem)) + if (!PE_parse_boot_argn("maxmem", &maxmem, sizeof (maxmem))) xmaxmem=0; else xmaxmem = (uint64_t)maxmem * (1024 * 1024); - if (!PE_parse_boot_arg("wcte", &wcte)) wcte = 0; /* If write combine timer enable not supplied, make 1 */ + if (!PE_parse_boot_argn("wcte", &wcte, sizeof (wcte))) wcte = 0; /* If write combine timer enable not supplied, make 1 */ else wcte = (wcte != 0); /* Force to 0 or 1 */ - if (!PE_parse_boot_arg("mcklog", &mckFlags)) mckFlags = 0; /* If machine check flags not specified, clear */ + if (!PE_parse_boot_argn("mcklog", &mckFlags, sizeof (mckFlags))) mckFlags = 0; /* If machine check flags not specified, clear */ else if(mckFlags > 1) mckFlags = 0; /* If bogus, clear */ - if (!PE_parse_boot_arg("ht_shift", &hash_table_shift)) /* should we use a non-default hash table size? */ + if (!PE_parse_boot_argn("ht_shift", &hash_table_shift, sizeof (hash_table_shift))) /* should we use a non-default hash table size? */ hash_table_shift = 0; /* no, use default size */ /* @@ -269,7 +264,7 @@ ppc_init( (void)ml_scom_write(GUSModeReg << 8, scdata); /* Get GUS mode register */ } - if(PE_parse_boot_arg("mcksoft", &mcksoft)) { /* Have they supplied "machine check software recovery? */ + if(PE_parse_boot_argn("mcksoft", &mcksoft, sizeof (mcksoft))) { /* Have they supplied "machine check software recovery? */ newhid = BootProcInfo.pf.pfHID5; /* Get the old HID5 */ if(mcksoft < 2) { newhid &= 0xFFFFFFFFFFFFDFFFULL; /* Clear the old one */ @@ -280,7 +275,7 @@ ppc_init( } } - machine_startup(args); + machine_startup(); } /* @@ -303,5 +298,5 @@ ppc_init_cpu( cpu_init(); - slave_main(); + slave_main(NULL); }