Changeset 0e4dd7b in mainline

Timestamp:

2006-02-17T16:49:52Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c1e43e4

Parents:

37c8975

Message:

sparc64 work.
Relocate kernel to 4M.

Location:

arch/sparc64

Files:

• _link.ld.in (modified) (2 diffs)
• include/boot/boot.h (added)
• src/mm/tlb.c (modified) (1 diff)
• src/start.S (modified) (2 diffs)

arch/sparc64/_link.ld.in

@@ -8 +8 @@
 
 #define __ASM__
+#include <arch/boot/boot.h>
 
 ENTRY(kernel_image_start)
 
 SECTIONS {
-        .image 0x4000: AT (0x4000) { 
+        .image VMA: AT (LMA) { 
                 ktext_start = .;
                 *(K_TEXT_START)
@@ -31 +32 @@
                 QUAD(kdata_end - kdata_start);
                 hardcoded_load_address = .;
-                QUAD(0x4000);
+                QUAD(VMA);
                 *(.bss);                /* uninitialized static variables */    
                 *(COMMON);              /* global variables */

arch/sparc64/src/mm/tlb.c

@@ -63 +63 @@
         
         /*
-         * For simplicity, we do identity mapping of first 4M of memory.
-         * The very next change should be leaving the first 4M unmapped.
+         * We do identity mapping of 4M-page at 4M.
          */
         tag.value = 0;

arch/sparc64/src/start.S

@@ -27 +27 @@
 #
 
+#include <arch/boot/boot.h>
+
 .register %g2, #scratch
 .register %g3, #scratch
@@ -51 +53 @@
 
 1:
+        flushw                          ! flush all but the active register window
+
+        /*
+         * Prepare to copy the kernel image to 4M.
+         */
+
+        set LMA, %g1                    ! source address
+        set VMA, %g2                    ! destination address (VMA)
+        set hardcoded_ktext_size, %g3   ! link address of hardcoded_ktext_size
+        set hardcoded_kdata_size, %g4   ! link address of hardcoded_kdata_size
+
+        sub %g3, %g2, %g3               ! offset of hardcoded_ktext_size from the beginning of the load address
+        sub %g4, %g2, %g4               ! offset of hardcoded_kdata_size from the beginning of the load address
+        
+        ldx [%g3 + %g1], %g3            ! hardcoded_ktext_size -> %g3
+        ldx [%g4 + %g1], %g4            ! hardcoded_kdata_size -> %g4
+
+        add %g3, %g4, %g3               ! size of kernel text and data
+
+        /*
+         * Start copying the kernel from higher addresses towards lower addresses.
+         */
+
+2:      dec %g3
+        ldub [%g1 + %g3], %g4
+        stb %g4, [%g2 + %g3]
+        cmp %g3, 0
+        bnz 2b
+        nop
+
+        set relocated, %g1
+        jmp %g1
+        nop
+
+relocated:
         set ofw, %l0