Changeset 95498e5 in mainline

Timestamp:

2005-12-05T23:18:18Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

59b6a70

Parents:

eef75f6

Message:

Map all available frames of memory on ia32 and amd64 (ticket #10).

Location:

arch

Files:

• amd64/include/mm/frame.h (modified) (1 diff)
• amd64/src/mm/page.c (modified) (3 diffs)
• ia32/include/boot/memmap.h (modified) (2 diffs)
• ia32/include/mm/frame.h (modified) (1 diff)
• ia32/src/mm/frame.c (modified) (2 diffs)
• ia32/src/mm/page.c (modified) (3 diffs)

arch/amd64/include/mm/frame.h

@@ -30 +30 @@
 #define __amd64_FRAME_H__
 
+#ifndef __ASM__
+#include <arch/types.h>
+#endif /* __ASM__ */
+
 #define FRAME_SIZE              4096
 
 #ifndef __ASM__
+extern __address last_frame;
 extern void frame_arch_init(void);
-#endif
+#endif /* __ASM__ */
 
 #endif

arch/amd64/src/mm/page.c

@@ -27 +27 @@
  */
 
+#include <arch/mm/page.h>
+#include <arch/mm/frame.h>
 #include <mm/page.h>
 #include <mm/frame.h>
-#include <arch/mm/page.h>
 #include <arch/interrupt.h>
 #include <arch/asm.h>
 #include <config.h>
-
 #include <memstr.h>
-
 
 __address bootstrap_dba; 
@@ -42 +41 @@
 {
         __address dba;
-        count_t i;
+        __address cur;
 
         if (config.cpu_active == 1) {
@@ -53 +52 @@
                  * PA2KA(identity) mapping for all frames.
                  */
-                for (i = 0; i < config.memory_size/FRAME_SIZE; i++) {
-                        page_mapping_insert(PA2KA(i * PAGE_SIZE), i * PAGE_SIZE, PAGE_CACHEABLE | PAGE_EXEC, KA2PA(dba));
+                for (cur = 0; cur < last_frame; cur += FRAME_SIZE) {
+                        page_mapping_insert(PA2KA(cur), cur, PAGE_CACHEABLE | PAGE_EXEC, KA2PA(dba));
                 }
 

arch/ia32/include/boot/memmap.h

@@ -56 +56 @@
         __u64 size;
         __u32 type;
-        } __attribute__ ((packed));
+} __attribute__ ((packed));
 
 extern struct e820memmap_ e820table[MEMMAP_E820_MAX_RECORDS];
@@ -62 +62 @@
 extern __u8 e820counter; 
 
-extern __u32 e801memorysize; // size of memory in KB
+extern __u32 e801memorysize; /**< Size of available memory in KB. */
 
 #endif

arch/ia32/include/mm/frame.h

@@ -35 +35 @@
 
 extern __address bootstrap_dba;
+extern __address last_frame;
 
 extern void frame_arch_init(void);

arch/ia32/src/mm/frame.c

@@ -35 +35 @@
 #include <panic.h>
 #include <debug.h>
+#include <align.h>
 
 size_t hardcoded_unmapped_ktext_size = 0;
 size_t hardcoded_unmapped_kdata_size = 0;
+
+__address last_frame = 0;
 
 void frame_arch_init(void)
@@ -54 +57 @@
                 for (i = 0; i < e820counter; i++) {
                         if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) {
-                                zone_create_in_region(e820table[i].base_address,  e820table[i].size & ~(FRAME_SIZE-1));
-                        }
+                                zone_create_in_region(e820table[i].base_address, e820table[i].size & ~(FRAME_SIZE-1));
+                                if (last_frame < ALIGN(e820table[i].base_address + e820table[i].size, FRAME_SIZE))
+                                        last_frame = ALIGN(e820table[i].base_address + e820table[i].size, FRAME_SIZE);
+                        }                       
                 }
         }

arch/ia32/src/mm/page.c

@@ -27 +27 @@
  */
 
+#include <arch/mm/page.h>
+#include <arch/mm/frame.h>
+#include <mm/frame.h>
+#include <mm/page.h>
 #include <arch/types.h>
 #include <config.h>
 #include <func.h>
-#include <mm/frame.h>
-#include <mm/page.h>
-#include <arch/mm/page.h>
 #include <arch/interrupt.h>
 #include <arch/asm.h>
@@ -45 +46 @@
 {
         __address dba;
-        __u32 i;
+        __address cur;
 
         if (config.cpu_active == 1) {
@@ -54 +55 @@
                 
                 /*
-                 * PA2KA(identity) mapping for all frames.
+                 * PA2KA(identity) mapping for all frames until last_frame.
                  */
-                for (i = 0; i < config.memory_size/PAGE_SIZE; i++)
-                        page_mapping_insert(PA2KA(i * PAGE_SIZE), i * PAGE_SIZE, PAGE_CACHEABLE, KA2PA(dba));
+                for (cur = 0; cur < last_frame; cur += FRAME_SIZE)
+                        page_mapping_insert(PA2KA(cur), cur, PAGE_CACHEABLE, KA2PA(dba));
 
                 trap_register(14, page_fault);