Changeset bcad855 in mainline

Timestamp:

2012-12-06T23:03:08Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3f69f63d

Parents:

295732b

Message:

Use the SDRAM size as passed from YAMON.

• Do not probe memory beyond the end of SDRAM.

Files:

• boot/arch/mips32/include/types.h (modified) (1 diff)
• boot/arch/mips32/src/asm.S (modified) (1 diff)
• kernel/arch/mips32/include/arch.h (modified) (2 diffs)
• kernel/arch/mips32/src/mips32.c (modified) (2 diffs)
• kernel/arch/mips32/src/mm/frame.c (modified) (2 diffs)

boot/arch/mips32/include/types.h

@@ -47 +47 @@
 
 typedef struct {
+#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+        uint32_t sdram_size;
+#endif
         uint32_t cpumap;
         size_t cnt;

boot/arch/mips32/src/asm.S

@@ -51 +51 @@
         and $a0, $a1, $a0
         mtc0 $a0, $status
+
+#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+        /*
+         * Remember the size of the SDRAM in bootinfo.
+         */
+        la $a0, PA2KA(BOOTINFO_OFFSET)
+        sw $a3, 0($a0)
+#endif
         
         /*

kernel/arch/mips32/include/arch.h

@@ -44 +44 @@
 extern size_t cpu_count;
 
+#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+extern size_t sdram_size;
+#endif
+
 typedef struct {
         void *addr;
@@ -51 +55 @@
 
 typedef struct {
+#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+        uint32_t sdram_size;
+#endif
         uint32_t cpumap;
         size_t cnt;

kernel/arch/mips32/src/mips32.c

@@ -71 +71 @@
 size_t cpu_count = 0;
 
+#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+size_t sdram_size = 0;
+#endif
+
 /** Performs mips32-specific initialization before main_bsp() is called. */
 void arch_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo)
@@ -88 +92 @@
                         cpu_count++;
         }
+
+#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+        sdram_size = bootinfo->sdram_size;
+#endif
 }
 

kernel/arch/mips32/src/mm/frame.c

@@ -41 +41 @@
 #include <config.h>
 #include <arch/drivers/msim.h>
+#include <arch/arch.h>
 #include <print.h>
 
@@ -82 +83 @@
         /* MSIM device (dkeyboard) */
         if (frame == (KA2PA(MSIM_KBD_ADDRESS) >> ZERO_PAGE_WIDTH))
+                return false;
+#endif
+
+#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+        if (frame >= (sdram_size >> ZERO_PAGE_WIDTH))
                 return false;
 #endif