Changeset 25a76ab8 in mainline for boot/arch/ppc32/src/asm.S

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• boot/arch/ppc32/src/asm.S (moved) (moved from boot/arch/ppc32/loader/asm.S ) (12 diffs)

boot/arch/ppc32/src/asm.S

@@ -27 +27 @@
 #
 
-#include "asm.h"
-#include "regname.h"
-#include "ofwarch.h"
+#include <arch/arch.h>
+#include <arch/regname.h>
 
 .macro SMC_COHERENCY addr
@@ -59 +58 @@
 .endm
 
-.text
-
+.global start
 .global halt
 .global memcpy
 .global jump_to_kernel
-.global balloc_base
+.global real_mode
+
+.section BOOTSTRAP, "ax"
+
+start:
+        lis r4, ofw_cif@ha
+        addi r4, r4, ofw_cif@l
+        stw r5, 0(r4)
+        
+        bl ofw_init
+        b bootstrap
+
+.text
 
 halt:
@@ -127 +137 @@
 jump_to_kernel:
         
-        # r3 = bootinfo (pa)
-        # r4 = bootinfo_size
-        # r5 = trans (pa)
-        # r6 = bytes to copy
-        # r7 = real_mode (pa)
+        # arguments:
+        # r3 = bootinfo (physical address)
+        # r4 = translate table (physical address)
+        # r5 = pages to translate
+        # r6 = real mode meeting point (physical address)
         
         # disable interrupts
@@ -139 +149 @@
         mtmsr r31
         
-        # set real_mode meeting point address
-        
-        mtspr srr0, r7
-        
-        # jumps to real_mode
+        # set real mode meeting point physical address
+        
+        mtspr srr0, r6
+        
+        # jump to real_mode
         
         mfmsr r31
@@ -155 +165 @@
         rfi
 
+.section REALMODE, "ax"
+
 .align PAGE_WIDTH
-balloc_base:
-        .fill BALLOC_MAX_SIZE
-
-.section REALMODE, "ax"
-
-.align PAGE_WIDTH
-.global real_mode
 real_mode:
         
-        # copy kernel to proper location
-        #
-        # r3 = bootinfo (pa)
-        # r4 = bootinfo_size
-        # r5 = trans (pa)
-        # r6 = bytes to copy
+        # arguments:
+        # r3 = bootinfo (physical address)
+        # r4 = translate table (physical address)
+        # r5 = pages to translate
+        
+        # move the images of components to the proper
+        # location using the translate table
         
         li r31, PAGE_SIZE >> 2
@@ -177 +183 @@
         page_copy:
                 
-                cmpwi r6, 0
+                cmpwi r5, 0
                 beq copy_end
                 
-                # copy page
-                
                 mtctr r31
-                lwz r29, 0(r5)
+                lwz r29, 0(r4)
                 
                 copy_loop:
@@ -194 +198 @@
                         addi r29, r29, 4
                         addi r30, r30, 4
-                        subi r6, r6, 4
-                        
-                        cmpwi r6, 0
-                        beq copy_end
                         
                         bdnz copy_loop
-                        
-                addi r5, r5, 4
+                
+                addi r4, r4, 4
+                subi r5, r5, 1
                 b page_copy
         
@@ -266 +267 @@
         # on top of memory, size 64 KB
         
-        lwz r31, 0(r3)                # r31 = memory size
+        lwz r31, 4(r3)                # r31 = memory size
         
         lis r30, 65536@h
@@ -303 +304 @@
         # create BAT identity mapping
         
-        lwz r31, 0(r3)                # r31 = memory size
+        lwz r31, 4(r3)                # r31 = memory size
         
         lis r29, 0x0002
@@ -354 +355 @@
         #
         # pc = PA2KA(BOOT_OFFSET)
-        # r3 = bootinfo (pa)
+        # r3 = bootinfo (physical address)
         # sprg0 = BOOT_OFFSET
         # sprg3 = physical memory size
-        # sp = 0 (pa)
+        # sp = 0 (enforces the usage of sprg0 as exception stack)
         
         lis r31, PA2KA(BOOT_OFFSET)@ha
@@ -367 +368 @@
         mtsprg0 r31
         
-        lwz r31, 0(r3)
+        # bootinfo starts with a 64 bit integer containing
+        # the physical memory size, get the lower 4 bytes
+        
+        lwz r31, 4(r3)
         mtsprg3 r31
         
@@ -379 +383 @@
         isync
         rfi
-
-.align PAGE_WIDTH
-.global trans
-trans:
-        .rept TRANS_SIZE
-        .int 0
-        .endr