xnu-1228.15.4.tar.gz

[apple/xnu.git] / osfmk / ppc / ppc_init.c

diff --git a/osfmk/ppc/ppc_init.c b/osfmk/ppc/ppc_init.c
index b371e79e1ac7687f4736c0eabad50d2beaace8af..ccdbb8bb93ef2709adc0e03c24157e69b8f6dc46 100644 (file)
--- a/osfmk/ppc/ppc_init.c
+++ b/osfmk/ppc/ppc_init.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2008 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -54,7 +54,7 @@
 #include <ppc/mem.h>
 #include <ppc/mappings.h>
 #include <ppc/locks.h>
 #include <ppc/mem.h>
 #include <ppc/mappings.h>
 #include <ppc/locks.h>

-#include <ppc/pms.h>
+#include <kern/pms.h>

 #include <ppc/rtclock.h>
 
 #include <pexpert/pexpert.h>
 #include <ppc/rtclock.h>
 
 #include <pexpert/pexpert.h>


@@ -63,9 +63,6 @@ extern unsigned int mckFlags;
 extern vm_offset_t     intstack;
 extern vm_offset_t     debstack;  
 
 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;
 extern unsigned int extPatchMCK;
 extern unsigned int extPatch32;
 extern unsigned int hwulckPatch_isync;


@@ -82,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 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;
 extern unsigned int bcopy_nop_if_32bit;
 extern unsigned int bcopy_nc_nop_if_32bit;
 extern unsigned int memcpy_nop_if_32bit;


@@ -95,6 +90,8 @@ extern unsigned int uft_cuttrace;
 int forcenap = 0;
 int wcte = 0;                          /* Non-cache gather timer disabled */
 
 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},
 patch_entry_t patch_table[] = {
        {&extPatch32,                   0x60000000, PATCH_FEATURE,              PatchExt32},
        {&extPatchMCK,                  0x60000000, PATCH_PROCESSOR,    CPU_SUBTYPE_POWERPC_970},


@@ -115,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},
        {&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},
        {&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},


@@ -136,6 +129,7 @@ void        ppc_init(
 void   ppc_init_cpu(
                        struct per_proc_info *proc_info);
 
 void   ppc_init_cpu(
                        struct per_proc_info *proc_info);
 

+       

 /*
  *             Routine:                ppc_init
  *             Function:
 /*
  *             Routine:                ppc_init
  *             Function:


@@ -155,7 +149,6 @@ ppc_init(
        uint64_t                        scdata;
 
 
        uint64_t                        scdata;
 
 

-

        /*
         * Setup per_proc info for first cpu.
         */
        /*
         * Setup per_proc info for first cpu.
         */


@@ -168,11 +161,13 @@ ppc_init(
        BootProcInfo.debstackptr = BootProcInfo.debstack_top_ss;
        BootProcInfo.interrupts_enabled = 0;
        BootProcInfo.pending_ast = AST_NONE;
        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.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 */
 
        BootProcInfo.pms.pmsStamp = 0;                                          /* Dummy transition time */
        BootProcInfo.pms.pmsPop = EndOfAllTime;                         /* Set the pop way into the future */


@@ -200,34 +195,36 @@ ppc_init(
        master_cpu = 0;
        processor_bootstrap();
 
        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 */
 
 
        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(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 */
        }
        
        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(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 */
        }
 
                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
 #if DEBUG
                trcWork.traceSize = 32;                                                 /* Default 32 page trace table for DEBUG */
 #else


@@ -239,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(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);
 
                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 */
 
        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 */
     
        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 */
 
        /*   
         hash_table_shift = 0;                           /* no, use default size */
 
        /*   


@@ -267,7 +264,7 @@ ppc_init(
                        (void)ml_scom_write(GUSModeReg << 8, scdata);   /* Get GUS mode register */
                }
                
                        (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 */
                        newhid = BootProcInfo.pf.pfHID5;                        /* Get the old HID5 */
                        if(mcksoft < 2) {
                                newhid &= 0xFFFFFFFFFFFFDFFFULL;                /* Clear the old one */


@@ -278,7 +275,7 @@ ppc_init(
                }
        }
                
                }
        }
                

-       machine_startup(args);
+       machine_startup();

 }
 
 /*
 }
 
 /*


@@ -301,5 +298,5 @@ ppc_init_cpu(
 
        cpu_init();
        
 
        cpu_init();
        

-       slave_main();
+       slave_main(NULL);

 }
 }