Changeset 34259b9 in mainline

Timestamp:

2009-02-02T12:55:40Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7b187ef

Parents:

108a60f9

Message:

flush cache during image copying

Files:

• boot/arch/ppc32/loader/asm.S (modified) (4 diffs)
• kernel/arch/ppc32/_link.ld.in (modified) (3 diffs)

boot/arch/ppc32/loader/asm.S

@@ -30 +30 @@
 #include "regname.h"
 
+.macro FLUSH_CACHE addr
+        dcbst 0, \addr
+        sync
+        icbi 0, \addr
+        isync
+.endm
+
 .text
 
@@ -165 +172 @@
                         stw r28, 0(r30)
                         
+                        FLUSH_CACHE r30
+                        
                         addi r29, r29, 4
                         addi r30, r30, 4
@@ -186 +195 @@
         mtctr r29
         li r30, 0                     # ASID 0 (VSIDs 0 .. 7)
-
+        
         seg_fill_uspace:
         
@@ -260 +269 @@
                 
                 stw r29, 0(r31)
+                FLUSH_CACHE r31
                 
                 addi r31, r31, 4

kernel/arch/ppc32/_link.ld.in

@@ -2 +2 @@
  *
  * umapped section:
- *      kernel text
- *      kernel data
+ *  kernel text
+ *  kernel data
  * mapped section:
- *      kernel text
- *      kernel data 
+ *  kernel text
+ *  kernel data
  *
  */
@@ -28 +28 @@
         }
         
-        .mapped PA2KA(BOOT_OFFSET): AT (BOOT_OFFSET) { 
+        .mapped PA2KA(BOOT_OFFSET): AT (BOOT_OFFSET) {
                 ktext_start = .;
                 *(K_TEXT_START);
@@ -38 +38 @@
                 *(.rodata);
                 *(.rodata.*);
-                *(.data);               /* initialized data */
+                *(.data);       /* initialized data */
                 *(.sdata);
                 *(.sdata2);
                 *(.sbss);
                 hardcoded_ktext_size = .;
-                LONG(ktext_end - ktext_start);  
+                LONG(ktext_end - ktext_start);
                 hardcoded_kdata_size = .;
                 LONG(kdata_end - kdata_start);
                 hardcoded_load_address = .;
                 LONG(PA2KA(BOOT_OFFSET));
-                *(.bss);                /* uninitialized static variables */    
-                *(COMMON);              /* global variables */
-
+                *(.bss);        /* uninitialized static variables */
+                *(COMMON);      /* global variables */
+                
                 symbol_table = .;
-                *(symtab.*);            /* Symbol table, must be LAST symbol!*/
-
+                *(symtab.*);    /* Symbol table, must be LAST symbol!*/
+                
                 kdata_end = .;
         }