Changeset 9ea6cc5 in mainline

Timestamp:

2006-05-19T13:46:21Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1068f6a

Parents:

5ca586a1

Message:

kernel identity mapping still to be done using BAT

Location:

arch/ppc32

Files:

• include/asm.h (modified) (1 diff)
• src/asm.S (modified) (2 diffs)
• src/mm/page.c (modified) (6 diffs)

arch/ppc32/include/asm.h

@@ -141 +141 @@
 void cpu_halt(void);
 void asm_delay_loop(__u32 t);
-void invalidate_bat(void);
 
 extern void userspace_asm(__address uspace_uarg, __address stack, __address entry);

arch/ppc32/src/asm.S

@@ -34 +34 @@
 .global iret
 .global iret_syscall
-.global invalidate_bat
 .global memsetb
 .global memcpy
@@ -195 +194 @@
         rfi
         
-invalidate_bat:
-        
-        # invalidate block address translation registers
-        
-        li r14, 0
-        
-        mtspr ibat0u, r14
-        mtspr ibat0l, r14
-        
-        mtspr ibat1u, r14
-        mtspr ibat1l, r14
-        
-        mtspr ibat2u, r14
-        mtspr ibat2l, r14
-        
-        mtspr ibat3u, r14
-        mtspr ibat3l, r14
-        
-        mtspr dbat0u, r14
-        mtspr dbat0l, r14
-        
-        mtspr dbat1u, r14
-        mtspr dbat1l, r14
-        
-        mtspr dbat2u, r14
-        mtspr dbat2l, r14
-        
-        mtspr dbat3u, r14
-        mtspr dbat3l, r14
-        
-        blr
-        
 memsetb:
         rlwimi r5, r5, 8, 16, 23

arch/ppc32/src/mm/page.c

@@ -50 +50 @@
  *
  * @param badvaddr Faulting virtual address.
- * @param istate Pointer to interrupted state.
- * @param pfrc Pointer to variable where as_page_fault() return code will be stored.
+ * @param istate   Pointer to interrupted state.
+ * @param pfrc     Pointer to variable where as_page_fault() return code will be stored.
  * @return         PTE on success, NULL otherwise.
  *
@@ -115 +115 @@
 }
 
+
 static void pht_insert(const __address vaddr, const pfn_t pfn)
 {
@@ -131 +132 @@
         
         __u32 i;
+        bool found = false;
         /* Find unused PTE in PTEG */
         for (i = 0; i < 8; i++) {
-                if (!phte[hash + i].v)
+                if (!phte[hash + i].v) {
+                        found = true;
                         break;
-        }
-        
-        // TODO: Check access/change bits, secondary hash
-        
-        if (i == 8) 
-                i = page % 8;
+                }
+        }
+        
+        if (!found) {
+                /* Secondary hash (not) */
+                hash = ~hash;
+                
+                /* Find unused PTE in PTEG */
+                for (i = 0; i < 8; i++) {
+                        if (!phte[hash + i].v) {
+                                found = true;
+                                break;
+                        }
+                }
+                
+                if (!found) {
+                        // TODO: A/C precedence groups
+                        i = page % 8;
+                }
+        }
         
         phte[hash + i].v = 1;
@@ -184 +201 @@
         if (!pte) {
                 switch (pfcr) {
-                case AS_PF_FAULT:
-                        goto fail;
-                        break;
-                case AS_PF_DEFER:
-                        /*
-                         * The page fault came during copy_from_uspace()
-                         * or copy_to_uspace().
-                         */
-                        page_table_unlock(AS, true);
-                        return;
-                default:
-                        panic("Unexpected pfrc (%d)\n", pfcr);
-                        break;
+                        case AS_PF_FAULT:
+                                goto fail;
+                                break;
+                        case AS_PF_DEFER:
+                                /*
+                                 * The page fault came during copy_from_uspace()
+                                 * or copy_to_uspace().
+                                 */
+                                page_table_unlock(AS, true);
+                                return;
+                        default:
+                                panic("Unexpected pfrc (%d)\n", pfcr);
                 }
         }
@@ -215 +231 @@
 {
         memsetb((__address) phte, 1 << PHT_BITS, 0);
-        
-        /* Insert global kernel mapping */
-        
-        __address cur;
-        for (cur = 0; cur < last_frame; cur += FRAME_SIZE) {
-                pte_t *pte = page_mapping_find(AS_KERNEL, PA2KA(cur));
-                if ((pte) && (pte->p) && (pte->g))
-                        pht_insert(PA2KA(cur), pte->pfn);
-        }
 }
 
@@ -257 +264 @@
                         : "r" ((__address) physical_phte)
                 );
-                
-                /* Invalidate block address translation registers,
-                   thus remove the temporary mapping */
-//              invalidate_bat();
-        }
-}
+        }
+}