xnu-201.14.tar.gz

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

diff --git a/osfmk/ppc/pmap.c b/osfmk/ppc/pmap.c
index e7b6e01f84383eab69aebdc943fd4d2ce3ec34b4..b9153c7b9c7812ba90e0bc84b055cccd2c7298d8 100644 (file)
--- a/osfmk/ppc/pmap.c
+++ b/osfmk/ppc/pmap.c
@@ -1091,6 +1091,30 @@ pmap_reference(pmap_t pmap)
        if (pmap != PMAP_NULL) hw_atomic_add(&pmap->ref_count, 1);      /* Bump the count */
 }
 
+/*
+ * pmap_remove_some_phys
+ *
+ *     Removes mappings of the associated page from the specified pmap
+ *
+ */
+void pmap_remove_some_phys(
+            pmap_t pmap,
+            vm_offset_t pa)
+{
+       register struct phys_entry      *pp;
+       register struct mapping         *mp, *mpv;
+
+
+       if (pmap == PMAP_NULL) return;                          /* Do nothing if no pmap */
+
+       pp = pmap_find_physentry(pa);                           /* Get the physent for this page */
+       if (pp == PHYS_NULL) return;                            /* Leave if not in physical RAM */
+
+       mapping_purge_pmap(pp, pmap);   
+
+       return;                                                 /* Leave... */
+}
+
 /*
  * pmap_remove(pmap, s, e)
  *     unmaps all virtual addresses v in the virtual address
@@ -1600,6 +1624,23 @@ pmap_attribute(pmap, address, size, attribute, value)
        return ret;
 }
 
+/*
+ * pmap_sync_caches_phys(vm_offset_t pa)
+ * 
+ * Invalidates all of the instruction cache on a physical page and
+ * pushes any dirty data from the data cache for the same physical page
+ */
+ 
+void pmap_sync_caches_phys(vm_offset_t pa) {
+       
+       spl_t s;
+
+       s = splhigh();                                          /* No interruptions here */
+       sync_cache(trunc_page(pa), PAGE_SIZE);                  /* Sync up dem caches */
+       splx(s);                                                        /* Allow interruptions */
+       return;
+}
+
 /*
  * pmap_collect
  * 
@@ -2114,14 +2155,11 @@ kern_return_t pmap_nest(pmap_t grand, pmap_t subord, vm_offset_t vaddr, vm_size_
  *     Note that the following will force the segment registers to be reloaded following
  *     the next interrupt on all processors if they are using the pmap we just changed.
  *
- *     This probably isn't needed, but it just feels better to do it.  The reason it isn't
- *     needed is that there is no mapped memory in the grand pmap's segment before we
- *     nest and we will take a fault if it is accessed.
  */
 
 
        for(i=0; i < real_ncpus; i++) {                                                 /* Cycle through processors */
-               (void)hw_compare_and_store((unsigned int)grand, 0, &per_proc_info[i].userpmap); /* Clear if ours */
+               (void)hw_compare_and_store((unsigned int)grandr, 0, &per_proc_info[i].Lastpmap);        /* Clear if ours */
        }
                
        return KERN_SUCCESS;                                            /* Bye, bye, butterfly... */
@@ -2185,13 +2223,13 @@ kern_return_t pmap_unnest(pmap_t grand, vm_offset_t vaddr, vm_size_t size) {
 
        mycpu = cpu_number();                                           /* Who am I? Am I just a dream? */
        for(i=0; i < real_ncpus; i++) {                         /* Cycle through processors */
-               if(hw_compare_and_store((unsigned int)grand, 0, &per_proc_info[i].userpmap)) {  /* Clear if ours and kick the other guy if he was using it */
+               if(hw_compare_and_store((unsigned int)grandr, 0, &per_proc_info[i].Lastpmap)) { /* Clear if ours and kick the other guy if he was using it */
                        if(i == mycpu) continue;                                /* Don't diddle ourselves */
                        tstamp = per_proc_info[i].ruptStamp[1]; /* Save the processor's last interrupt time stamp */
-                       if(cpu_signal(i, SIGPwake, 0, 0) != KERN_SUCCESS) {     /* Make sure we see the pmap change
-                               panic("pmap_unnest: Signal processor (%d) failed\n", i);
+                       if(cpu_signal(i, SIGPwake, 0, 0) != KERN_SUCCESS) {     /* Make sure we see the pmap change */
+                               continue;
                        }
-                       if(!hw_cpu_wcng(tstamp, &per_proc_info[i].ruptStamp[1], LockTimeOut) {  /* Wait for the other processors to enter debug */
+                       if(!hw_cpu_wcng(&per_proc_info[i].ruptStamp[1], tstamp, LockTimeOut)) { /* Wait for the other processors to enter debug */
                                panic("pmap_unnest: Other processor (%d) did not see interruption request\n", i);
                        }
                }