xnu-201.14.tar.gz

[apple/xnu.git] / osfmk / ppc / hw_vm.s

diff --git a/osfmk/ppc/hw_vm.s b/osfmk/ppc/hw_vm.s
index f525675f6a7b3910d65acb8859f665ae003f04a6..18b11ef36a499a90949794ef2fab3a0c3fa5fa2b 100644 (file)
--- a/osfmk/ppc/hw_vm.s
+++ b/osfmk/ppc/hw_vm.s
@@ -574,6 +574,7 @@ tlbhang1:   lwarx   r5,0,r12                                        /* Get the TLBIE lock */
                        
                        eieio                                                           /* Make sure that the tlbie happens first */
                        tlbsync                                                         /* wait for everyone to catch up */
+                       isync                                                           
                        
 its603a:       sync                                                            /* Make sure of it all */
                        stw             r11,0(r12)                                      /* Clear the tlbie lock */
@@ -798,6 +799,7 @@ tlbhangp:   lwarx   r11,0,r12                                       /* Get the TLBIE lock */
                        
                        eieio                                                           /* Make sure that the tlbie happens first */
                        tlbsync                                                         /* wait for everyone to catch up */
+                       isync                                                           
                        
 its603p:       stw             r11,0(r12)                                      /* Clear the lock */
                        srw             r5,r5,r8                                        /* Make a "free slot" mask */
@@ -974,6 +976,7 @@ tlbhangpv:  lwarx   r11,0,r12                                       /* Get the TLBIE lock */
                        
                        eieio                                                           /* Make sure that the tlbie happens first */
                        tlbsync                                                         /* wait for everyone to catch up */
+                       isync                                                           
                        
 its603pv:      stw             r11,0(r12)                                      /* Clear the lock */
                        srw             r5,r5,r8                                        /* Make a "free slot" mask */
@@ -1148,6 +1151,7 @@ tlbhangav:        lwarx   r11,0,r12                                       /* Get the TLBIE lock */
                        
                        eieio                                                           /* Make sure that the tlbie happens first */
                        tlbsync                                                         /* wait for everyone to catch up */
+                       isync                                                           
                        
 its603av:      stw             r11,0(r12)                                      /* Clear the lock */
                        srw             r5,r5,r8                                        /* Make a "free slot" mask */
@@ -1431,6 +1435,7 @@ tlbhangco:        lwarx   r11,0,r12                                       /* Get the TLBIE lock */
                        
                        eieio                                                           /* Make sure that the tlbie happens first */
                        tlbsync                                                         /* wait for everyone to catch up */
+                       isync                                                           
                        
 its603co:      stw             r11,0(r12)                                      /* Clear the lock */
                        srw             r5,r5,r8                                        /* Make a "free slot" mask */
@@ -1667,6 +1672,7 @@ htrtlbhang:       lwarx   r11,0,r12                                       ; Get the TLBIE lock
                        
                        eieio                                                           ; Make sure that the tlbie happens first
                        tlbsync                                                         ; wait for everyone to catch up
+                       isync                                                           
                        
 htr603:                stw             r11,0(r12)                                      ; Clear the lock
                        srw             r5,r5,r8                                        ; Make a "free slot" mask 
@@ -2273,6 +2279,7 @@ tlbhang:  lwarx   r5,0,r9                                         /* Get the TLBIE lock */
                        
                        eieio                                                           /* Make sure that the tlbie happens first */
                        tlbsync                                                         /* wait for everyone to catch up */
+                       isync                                                           
                        
 its603:                rlwinm. r21,r21,0,0,0                           ; See if we just stole an autogenned entry
                        sync                                                            /* Make sure of it all */
@@ -2678,6 +2685,9 @@ rbChk:            mr              r12,r10                                         ; Save the previous
 rbnFirst:      bne-    rbPerm                                          ; This is permanent, do not remove...
                        lwz             r8,bmspace(r10)                         ; Get the VSID
                        stw             r2,bmnext(r12)                          ; Unchain us
+
+                       sync
+                       stw             r9,0(r3)                                        ; Unlock and chain the new first one
                        
                        eqv             r4,r4,r4                                        ; Fill the bottom with foxes
                        mfspr   r12,sdr1                                        ; Get hash table base and size
@@ -2693,7 +2703,8 @@ rbnFirst: bne-    rbPerm                                          ; This is permanent, do not remove...
                        blt             rbHash                                          ; Nope, length is right
                        subi    r6,r4,32+31                                     ; Back down to correct length
                        
-rbHash:                xor             r2,r8,r5                                        ; Hash into table
+rbHash:                rlwinm  r5,r5,0,10,25                           ; Keep only the page index
+                       xor             r2,r8,r5                                        ; Hash into table
                        and             r2,r2,r4                                        ; Wrap into the table
                        add             r2,r2,r12                                       ; Point right at the PCA
 
@@ -2784,13 +2795,13 @@ rbTlbN:         addic.  r5,r5,-1                                        ; See if we did them all
                        
                        eieio                                                           ; Make sure that the tlbie happens first
                        tlbsync                                                         ; wait for everyone to catch up
+                       isync                                                           
 
 rbits603a:     sync                                                            ; Wait for quiet again
                        stw             r2,0(r12)                                       ; Unlock invalidates
                        
                        sync                                                            ; Make sure that is done
                        
-                       stw             r9,0(r3)                                        ; Unlock and chain the new first one
                        mtmsr   r0                                                      ; Restore xlation and rupts
                        mr              r3,r10                                          ; Pass back the removed block
                        isync