Changeset 2988616b in mainline

Timestamp:

2006-06-18T00:25:55Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a88ab795

Parents:

c04bdb4

Message:

ppc32: BAT usage is now optional
better VSID support
Page Hash Table cleanup
boot API change

Files:

• arch/ppc32/loader/asm.S (modified) (5 diffs)
• arch/ppc32/loader/debug.inc (modified) (1 diff)
• arch/ppc32/loader/main.h (modified) (1 diff)
• boot.config (modified) (1 diff)

arch/ppc32/loader/asm.S

@@ -191 +191 @@
         
         # initially fill segment registers
-
-        li r31, 16
-        mtctr r31
+        
         li r31, 0
-        li r30, 0x2000
-
-        seg_fill:
+        
+        li r29, 8
+        mtctr r29
+        li r30, 0
+
+        seg_fill_uspace:
         
                 mtsrin r30, r31
-                addi r30, r30, 0x111
+                addi r30, r30, 1
                 addis r31, r31, 0x1000    # move to next SR
                 
-                bdnz seg_fill
+                bdnz seg_fill_uspace
+        
+        li r29, 8
+        mtctr r29
+        li r30, 0x4000
+        
+        seg_fill_kernel:
+        
+                mtsrin r30, r31
+                addi r30, r30, 1
+                addis r31, r31, 0x1000    # move to next SR
+                
+                bdnz seg_fill_kernel
         
         # invalidate block address translation registers
@@ -242 +255 @@
         ori r31, r31, 0x0000
         
+        li r30, 0x4000
+        li r29, 0
+        
+        pht_clear:
+                
+                stw r29, 0(r31)
+                
+                addi r31, r31, 4
+                subi r30, r30, 4
+                
+                cmpwi r30, 0
+                beq clear_end
+                
+                bdnz pht_clear
+
+                DEBUG_end_pht_clear
+                
+        clear_end:
+        
+        lis r31, 0x07ff
+        ori r31, r31, 0x0000
+        
         mtsdr1 r31
         
         # create identity mapping
+        
+#ifdef CONFIG_BAT
         
         DEBUG_mapping
@@ -261 +298 @@
         mtspr dbat0u, r31
         mtspr dbat0l, r30
+
+#endif
         
         DEBUG_tlb
@@ -271 +310 @@
         # start the kernel
         #
+        # pc = KERNEL_START_ADDR
         # r3 = bootinfo (pa)
+        # sprg0 = KA2PA(KERNEL_START_ADDR)
+        # sprg3 = physical memory size
+        # sp = 0 (pa)
         
         lis r31, KERNEL_START_ADDR@ha
@@ -277 +320 @@
         
         mtspr srr0, r31
+        
+        subis r31, r31, 0x8000
+        mtsprg0 r31
+        
+        lwz r31, 0(r3)
+        mtsprg3 r31
+        
+        li sp, 0
         
         mfmsr r31

arch/ppc32/loader/debug.inc

@@ -8303 +8303 @@
 #endif
 .endm
+
+.macro DEBUG_end_pht_clear
+#ifdef CONFIG_DEBUG
+#endif
+.endm

arch/ppc32/loader/main.h

@@ -52 +52 @@
 
 typedef struct {
+        memmap_t memmap;
         taskmap_t taskmap;
-        memmap_t memmap;
         screen_t screen;
         keyboard_t keyboard;

boot.config

@@ -20 +20 @@
 ! [ARCH=ppc32] CONFIG_DEBUG (n/y)
 
+# Use Block Address Translation
+! [ARCH=ppc32] CONFIG_BAT (y/n)
+
 # PPC64 Compiler
 @ "cross" Cross-compiler