xnu-344.23.tar.gz

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

diff --git a/osfmk/ppc/Diagnostics.c b/osfmk/ppc/Diagnostics.c
index a24486c8d62610b1cdc0e67fec97452af1784f1e..ffa7e0f6481c252667d0034d63b8ebbc22c370dc 100644 (file)
--- a/osfmk/ppc/Diagnostics.c
+++ b/osfmk/ppc/Diagnostics.c
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This 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,
  * 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.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


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

+#include <ppc/pmap_internals.h>

 #include <ppc/savearea.h>
 #include <ppc/Diagnostics.h>
 #include <ppc/machine_cpu.h>
 #include <ppc/savearea.h>
 #include <ppc/Diagnostics.h>
 #include <ppc/machine_cpu.h>


@@ -77,11 +75,8 @@ int diagCall(struct savearea *save) {
        } ttt, adj;
        natural_t tbu, tbu2, tbl;
        struct per_proc_info *per_proc;                                 /* Area for my per_proc address */
        } ttt, adj;
        natural_t tbu, tbu2, tbl;
        struct per_proc_info *per_proc;                                 /* Area for my per_proc address */

-       int cpu, ret;
+       int cpu;

        unsigned int tstrt, tend, temp, temp2;
        unsigned int tstrt, tend, temp, temp2;

-       addr64_t src, snk;
-       uint64_t scom, hid1, hid4, srrwrk, stat;
-       scomcomm sarea;

 
        if(!(dgWork.dgFlags & enaDiagSCs)) return 0;    /* If not enabled, cause an exception */
 
 
        if(!(dgWork.dgFlags & enaDiagSCs)) return 0;    /* If not enabled, cause an exception */
 


@@ -121,7 +116,7 @@ int diagCall(struct savearea *save) {
  */
                case dgLRA:
                
  */
                case dgLRA:
                

-                       save->save_r3 = pmap_find_phys(current_act()->map->pmap, save->save_r4);        /* Get read address */
+                       save->save_r3 = pmap_extract(current_act()->map->pmap, save->save_r4);  /* Get read address */

                        
                        return -1;                                                              /* Return no AST checking... */
                        
                        
                        return -1;                                                              /* Return no AST checking... */
                        


@@ -130,58 +125,11 @@ int diagCall(struct savearea *save) {
  */
                case dgpcpy:
                
  */
                case dgpcpy:
                

-               
-#if 1
-                       src = (save->save_r4 << 32) | (0x00000000FFFFFFFFULL & save->save_r5);  /* Merge into 64-bit */
-                       snk = (save->save_r6 << 32) | (0x00000000FFFFFFFFULL & save->save_r7);  /* Merge into 64-bit */
-                       save->save_r3 = copypv(src, snk, save->save_r8, save->save_r9); /* Copy the physical page */
+#if 0
+                       save->save_r3 = copyp2v(save->save_r4, save->save_r5, save->save_r6);   /* Copy the physical page */

 #endif                 
                        return 1;                                                               /* Return and check for ASTs... */
                        
 #endif                 
                        return 1;                                                               /* Return and check for ASTs... */
                        

-/*
- *             Read/Write physical memory
- */
-               case dgprw:
-               
-                       src = (save->save_r5 << 32) | (0x00000000FFFFFFFFULL & save->save_r6);  /* Merge into 64-bit */
-                       
-                       switch(save->save_r4) {                                 /* Select the actual function */
-
-                               case 0:
-                                       save->save_r3 = (uint64_t)ml_phys_read_byte((unsigned int)src);
-                                       break;
-                       
-                               case 1:
-                                       save->save_r3 = (uint64_t)ml_phys_read_byte_64(src);
-                                       break;
-                               
-                               case 2:
-                                       save->save_r3 = (uint64_t)ml_phys_read((unsigned int)src);
-                                       break;
-                               
-                               case 3:
-                                       save->save_r3 = (uint64_t)ml_phys_read_64(src);
-                                       break;
-
-                               case 4:
-                                       ml_phys_write_byte((unsigned int)src, (unsigned int)save->save_r7);
-                                       break;
-                       
-                               case 5:
-                                       ml_phys_write_byte_64(src, (unsigned int)save->save_r7);
-                                       break;
-                               
-                               case 6:
-                                       ml_phys_write((unsigned int)src, (unsigned int)save->save_r7);
-                                       break;
-                               
-                               case 7:
-                                       ml_phys_write_64(src, (unsigned int)save->save_r7);
-                                       break;
-                       }
-
-                       return 1;                                                               /* Return and check for ASTs... */
-                       

                        
 /*
  *             Soft reset processor
                        
 /*
  *             Soft reset processor


@@ -211,7 +159,16 @@ int diagCall(struct savearea *save) {
  */
                case dgFlush:
                
  */
                case dgFlush:
                

+#if 1

                        cacheInit();                                                    /* Blow cache */
                        cacheInit();                                                    /* Blow cache */

+#else
+                       asm volatile("  mftb %0" : "=r" (tstrt));
+                       tend = tstrt;                   
+                       while((tend - tstrt) < 0x000A2837) {
+                               asm volatile("  mftb %0" : "=r" (tend));
+                       }
+
+#endif

                        return 1;                                                               /* Return and check for ASTs... */
 
 /*
                        return 1;                                                               /* Return and check for ASTs... */
 
 /*


@@ -232,9 +189,9 @@ int diagCall(struct savearea *save) {
  *             parms - vaddr, paddr, size, prot, attributes
  */
                case dgBMphys:
  *             parms - vaddr, paddr, size, prot, attributes
  */
                case dgBMphys:

-                                       
-                       pmap_map_block(current_act()->map->pmap, (addr64_t)save->save_r4,       /* Map in the block */ 
-                               save->save_r5, save->save_r6, save->save_r7, save->save_r8, 0);
+               
+                       pmap_map_block(current_act()->map->pmap, save->save_r4, save->save_r5, save->save_r6,   /* Map in the block */
+                               save->save_r7, save->save_r8, 0);

 
                        return 1;                                                               /* Return and check for ASTs... */
                
 
                        return 1;                                                               /* Return and check for ASTs... */
                


@@ -253,16 +210,28 @@ int diagCall(struct savearea *save) {
 /*
  *             Allows direct control of alignment handling.
  *
 /*
  *             Allows direct control of alignment handling.
  *

- *             The bottom bit of the parameter is used to set the control bit, enaNotifyEM.
+ *             The bottom two bits of the parameter are used to set the two control bits:
+ *             0b00 - !trapUnalignbit - !notifyUnalignbit - default - instruction is emulated
+ *             0b01 - !trapUnalignbit -  notifyUnalignbit - emulation is done, but traps afterwards
+ *             0b10 -  trapUnalignbit - !notifyUnalignbit - no emulation - causes exception
+ *             0b11 -  trapUnalignbit -  notifyUnalignbit - no emulation - causes exception

  */
                case dgAlign:
                
  */
                case dgAlign:
                

-                       temp = dgWork.dgFlags;                          /* Save the old values */
+                       temp = current_act()->mact.specFlags;   /* Save the old values */

                        
                        

-                       temp2 = (save->save_r4 & 1) << (31 - enaNotifyEMb);     /* Move parms into flag format */
-                       dgWork.dgFlags = (temp & ~enaNotifyEM) | temp2; /* Set the flag */
-               
-                       save->save_r3 = (temp >> (31 - enaNotifyEMb)) & 1;      /* Return the original */
+                       temp = ((current_act()->mact.specFlags >> (31 - trapUnalignbit - 1))    /* Reformat them to pass back */
+                               | (current_act()->mact.specFlags >> (31 - notifyUnalignbit))) & 3;
+                               
+                       temp2 = ((save->save_r4 << (31 - trapUnalignbit - 1)) & trapUnalign)    /* Move parms into flag format */
+                               | ((save->save_r4 << (31 - notifyUnalignbit)) & notifyUnalign);
+
+                       current_act()->mact.specFlags &= ~(trapUnalign | notifyUnalign);                /* Clean the old ones */
+                       current_act()->mact.specFlags |= temp2;                                                                 /* Set the new ones */
+                       
+                       per_proc_info[cpu_number()].spcFlags = current_act()->mact.specFlags;
+                       
+                       save->save_r3 = temp;

                        
                        return 1;                                                               /* Return and check for ASTs... */
                        
                        
                        return 1;                                                               /* Return and check for ASTs... */
                        


@@ -271,102 +240,14 @@ int diagCall(struct savearea *save) {
  */
                case dgBootScreen:
                        
  */
                case dgBootScreen:
                        

+#if 0

                        ml_set_interrupts_enabled(1);
                        (void)copyout((char *)&vinfo, (char *)save->save_r4, sizeof(struct vc_info));   /* Copy out the video info */
                        ml_set_interrupts_enabled(0);
                        ml_set_interrupts_enabled(1);
                        (void)copyout((char *)&vinfo, (char *)save->save_r4, sizeof(struct vc_info));   /* Copy out the video info */
                        ml_set_interrupts_enabled(0);

+#endif

                        return 1;                                                               /* Return and check for ASTs... */
                        
                        return 1;                                                               /* Return and check for ASTs... */
                        

-/*
- *             Don't return info for boot screen
- */
-               case dgCPNull:
-                       
-                       ml_set_interrupts_enabled(1);
-                       (void)copyout((char *)&vinfo, (char *)save->save_r4, 0);        /* Copy out nothing */
-                       ml_set_interrupts_enabled(0);
-                       return 1;                                                               /* Return and check for ASTs... */
-                       
-/*
- *             Test machine check handler - only on 64-bit machines
- */
-               case dgmck:
-                       if(!(per_proc_info[0].pf.Available & pf64Bit)) return 0;        /* Leave if not correct machine */
-
-                       fwEmMck(save->save_r4, save->save_r5, save->save_r6, save->save_r7, save->save_r8, save->save_r9);      /* Start injecting */ 
-
-                       return -1;                                                              /* Return and don't check for ASTs... */
-
-/*
- *             Set 64-bit on or off - only on 64-bit machines
- */
-               case dg64:
-                       if(!(per_proc_info[0].pf.Available & pf64Bit)) return 0;        /* Leave if not correct machine */
-
-                       srrwrk = save->save_srr1 >> 63;                 /* Save the old 64-bit bit */
-                       
-                       save->save_srr1 = (save->save_srr1 & 0x7FFFFFFFFFFFFFFFULL) | (save->save_r4 << 63);    /* Set the requested mode */
-                       save->save_r3 = srrwrk;                                 /* Return the old value */
-
-                       return -1;                                                              /* Return and don't check for ASTs... */
-               
-/*
- *             Test the probe read function
- */
-
-               case dgProbeRead:
-               
-                       src = (save->save_r4 << 32) | (0x00000000FFFFFFFFULL & save->save_r5);  /* Merge into 64-bit */
-                       save->save_r3 = ml_probe_read_64(src, &temp);   /* Try the address */
-                       save->save_r4 = temp;                                   /* Return the data */
-                       return -1;                                                              /* Regurn and don't check for ASTs */
-               
-/*
- *             Do perf monitor stuff
- */
-
-               case dgPerfMon:

                
                

-                       setPmon(save->save_r4, save->save_r5);  /* Go load up MMCR0 and MMCR1 */
-                       return -1;                                                              /* Regurn and don't check for ASTs */
-
-/*
- *             Map a page
- *             Don't bother to check for any errors.
- *             parms - vaddr, paddr, prot, attributes
- */
-               case dgMapPage:
-                                       
-                       (void)mapping_map(current_act()->map->pmap, /* Map in the page */ 
-                               (addr64_t)(((save->save_r5 & 0xFFFFFFFF) << 32) | (save->save_r5 & 0xFFFFFFFF)), save->save_r6, 0, 1, VM_PROT_READ|VM_PROT_WRITE);
-
-                       return -1;                                                              /* Return and check for ASTs... */
-               
-/*
- *             SCOM interface
- *             parms - pointer to scomcomm
- */
-               case dgScom:
-                                       
-                       ret = copyin((unsigned int)(save->save_r4), &sarea, sizeof(scomcomm));  /* Get the data */
-                       if(ret) return 0;                                               /* Copyin failed - return an exception */
-                       
-                       sarea.scomstat = 0xFFFFFFFFFFFFFFFFULL; /* Clear status */
-                       cpu = cpu_number();                                             /* Get us */
-                       
-                       if((sarea.scomcpu < NCPUS) && machine_slot[sarea.scomcpu].running) {
-                               if(sarea.scomcpu == cpu) fwSCOM(&sarea);        /* Do it if it is us */
-                               else {                                                                  /* Otherwise, tell the other processor */
-                                       (void)cpu_signal(sarea.scomcpu, SIGPcpureq, CPRQscom ,(unsigned int)&sarea);    /* Ask him to do this */
-                                       (void)hw_cpu_sync((unsigned long)&sarea.scomstat, LockTimeOut); /* Wait for the other processor to get its temperature */
-                               }
-                       }
-
-                       ret = copyout(&sarea, (unsigned int)(save->save_r4), sizeof(scomcomm)); /* Get the data */
-                       if(ret) return 0;                                               /* Copyin failed - return an exception */
-       
-                       return -1;                                                              /* Return and check for ASTs... */
-               
-

                default:                                                                        /* Handle invalid ones */
                        return 0;                                                               /* Return an exception */
                
                default:                                                                        /* Handle invalid ones */
                        return 0;                                                               /* Return an exception */