Changeset 84dd253 in mainline for arch

Timestamp:

2005-09-21T13:37:50Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

aed4eca

Parents:

fcacfb7

Message:

Physical memory management work.
New frame allocator.
Some architectures need to have bigger heap.

Location:

arch

Files:

• amd64/src/mm/page.c (modified) (1 diff)
• ia32/src/mm/frame.c (modified) (2 diffs)
• ia32/src/mm/page.c (modified) (1 diff)
• ia32/src/smp/mps.c (modified) (2 diffs)
• ia64/Makefile.inc (modified) (1 diff)
• ia64/src/dummy.s (modified) (2 diffs)
• ia64/src/mm/frame.c (added)
• mips32/src/mm/frame.c (modified) (1 diff)
• ppc32/src/mm/frame.c (modified) (1 diff)

arch/amd64/src/mm/page.c

@@ -53 +53 @@
                  * PA2KA(identity) mapping for all frames.
                  */
-                for (i = 0; i < frames; i++) {
+                for (i = 0; i < config.memory_size/FRAME_SIZE; i++) {
                         map_page_to_frame(PA2KA(i * PAGE_SIZE), i * PAGE_SIZE, PAGE_CACHEABLE | PAGE_EXEC, KA2PA(dba));
                 }

arch/ia32/src/mm/frame.c

@@ -33 +33 @@
 #include <arch/boot/boot.h>
 #include <arch/boot/memmap.h>
+#include <panic.h>
 
 size_t hardcoded_unmapped_ktext_size = 0;
@@ -39 +40 @@
 void frame_arch_init(void)
 {
+        zone_t *z;
         __u8 i;
         
         if (config.cpu_active == 1) {
-                /* Reserve the NULL frame */
-                frame_not_free(0x0);
+                for (i=e820counter;i>0;i--) {
+                        if (e820table[i-1].type==MEMMAP_MEMORY_AVAILABLE) {
+                                z = zone_create(e820table[i-1].base_address, e820table[i-1].size & ~(FRAME_SIZE-1), 0);
+                                if (!z) {
+                                        panic("Cannot allocate zone (%dB).\n", e820table[i-1].size & ~(FRAME_SIZE-1));
+                                }
+                                zone_attach(z);
+                        }
+                }
                 
-                /* Reserve well-known memory regions */
-                frame_region_not_free(0xa0000,0xff000);
-                frame_region_not_free(0xfec00000,0xffffffff);
-                
+                frame_not_free(0);
+
                 /* Reserve real mode bootstrap memory */
-                frame_region_not_free(BOOTSTRAP_OFFSET, BOOTSTRAP_OFFSET + hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size);
-                
-                for (i=e820counter;i>0;i--) {
-                        if (e820table[i-1].type!=MEMMAP_MEMORY_AVAILABLE) {
-                                        frame_region_not_free(e820table[i-1].base_address, e820table[i-1].base_address+e820table[i-1].size);
-                                }
-                        }
+                frame_region_not_free(BOOTSTRAP_OFFSET, BOOTSTRAP_OFFSET + hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size);
         }
 }

arch/ia32/src/mm/page.c

@@ -56 +56 @@
                  * PA2KA(identity) mapping for all frames.
                  */
-                for (i = 0; i < frames; i++)
+                for (i = 0; i < config.memory_size/PAGE_SIZE; i++)
                         map_page_to_frame(PA2KA(i * PAGE_SIZE), i * PAGE_SIZE, PAGE_CACHEABLE, KA2PA(dba));
 

arch/ia32/src/smp/mps.c

@@ -188 +188 @@
         printf("%P: MPS Floating Pointer Structure\n", fs);
 
-        frame_not_free((__address) fs);
-
         if (fs->config_type == 0 && fs->configuration_table) {
                 if (fs->mpfib2 >> 7) {
@@ -197 +195 @@
 
                 ct = (struct mps_ct *)PA2KA((__address)fs->configuration_table);
-                frame_not_free((__address) ct);
                 config.cpu_count = configure_via_ct();
         } 

arch/ia64/Makefile.inc

@@ -33 +33 @@
         arch/ivt.S \
         arch/interrupt_handler.c \
-        arch/fmath.c
+        arch/fmath.c \
+        arch/mm/frame.c

arch/ia64/src/dummy.s

@@ -41 +41 @@
 .global cpu_priority_restore
 .global cpu_sleep
-.global frame_arch_init
 .global dummy
 .global fpu_enable
@@ -59 +58 @@
 cpu_priority_restore:
 cpu_sleep:
-frame_arch_init:
 fpu_init:
 fpu_enable:

arch/mips32/src/mm/frame.c

@@ -31 +31 @@
 #include <arch/asm/boot.h>
 #include <arch/mm/page.h>
+#include <config.h>
+#include <panic.h>
 
 void frame_arch_init(void)
 {
+        zone_t *z;
+        
+        z = zone_create(0, config.memory_size, 0);
+        if (!z) {
+                panic("Can't allocate zone (%dB).\n", config.memory_size);
+        }
+        zone_attach(z);
+
         /* Disable Everything until load address */
         frame_region_not_free(0, KA2PA(KERNEL_LOAD_ADDRESS));

arch/ppc32/src/mm/frame.c

@@ -29 +29 @@
 #include <arch/mm/frame.h>
 #include <mm/frame.h>
+#include <config.h>
+#include <panic.h>
 
 void frame_arch_init(void)
 {
+        zone_t *z;
+
+        z = zone_create(0, config.memory_size & ~(FRAME_SIZE-1), 0);
+        if (!z) {
+                panic("Can't allocate zone (%dB).\n", config.memory_size & ~(FRAME_SIZE-1));
+        }
+        zone_attach(z);
 }