Changeset b7068da in mainline for kernel/arch/ia32/src/mm/frame.c

Timestamp:

2012-02-09T20:35:12Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/arch/ia32/src/mm/frame.c (modified) (5 diffs)

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

@@ -46 +46 @@
 #include <print.h>
 
-#define PHYSMEM_LIMIT32  UINT64_C(0x07c000000)
-#define PHYSMEM_LIMIT64  UINT64_C(0x200000000)
+#define PHYSMEM_LIMIT32  UINT64_C(0x100000000)
 
 size_t hardcoded_unmapped_ktext_size = 0;
 size_t hardcoded_unmapped_kdata_size = 0;
 
-uintptr_t last_frame = 0;
-
-static void init_e820_memory(pfn_t minconf)
+static void init_e820_memory(pfn_t minconf, bool low)
 {
         unsigned int i;
         
         for (i = 0; i < e820counter; i++) {
-                uint64_t base = e820table[i].base_address;
-                uint64_t size = e820table[i].size;
+                uint64_t base64 = e820table[i].base_address;
+                uint64_t size64 = e820table[i].size;
                 
-#ifdef __32_BITS__
+#ifdef KARCH_ia32
                 /*
-                 * XXX FIXME:
-                 *
-                 * Ignore zones which start above PHYSMEM_LIMIT32
-                 * or clip zones which go beyond PHYSMEM_LIMIT32.
-                 *
-                 * The PHYSMEM_LIMIT32 (2 GB - 64 MB) is a rather
-                 * arbitrary constant which allows to have at
-                 * least 64 MB in the kernel address space to
-                 * map hardware resources.
-                 *
-                 * The kernel uses fixed 1:1 identity mapping
-                 * of the physical memory with 2:2 GB split.
-                 * This is a severe limitation of the current
-                 * kernel memory management.
-                 *
+                 * Restrict the e820 table entries to 32-bits.
                  */
-                
-                if (base > PHYSMEM_LIMIT32)
+                if (base64 >= PHYSMEM_LIMIT32)
                         continue;
                 
-                if (base + size > PHYSMEM_LIMIT32)
-                        size = PHYSMEM_LIMIT32 - base;
+                if (base64 + size64 > PHYSMEM_LIMIT32)
+                        size64 = PHYSMEM_LIMIT32 - base64;
 #endif
                 
-#ifdef __64_BITS__
-                /*
-                 * XXX FIXME:
-                 *
-                 * Ignore zones which start above PHYSMEM_LIMIT64
-                 * or clip zones which go beyond PHYSMEM_LIMIT64.
-                 *
-                 * The PHYSMEM_LIMIT64 (8 GB) is the size of the
-                 * fixed 1:1 identically mapped physical memory
-                 * accessible during the bootstrap process.
-                 * This is a severe limitation of the current
-                 * kernel memory management.
-                 *
-                 */
+                uintptr_t base = (uintptr_t) base64;
+                size_t size = (size_t) size64;
                 
-                if (base > PHYSMEM_LIMIT64)
+                if (!frame_adjust_zone_bounds(low, &base, &size))
                         continue;
-                
-                if (base + size > PHYSMEM_LIMIT64)
-                        size = PHYSMEM_LIMIT64 - base;
-#endif
                 
                 if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) {
@@ -116 +82 @@
                             FRAME_SIZE);
                         
+                        size_t count = SIZE2FRAMES(new_size);
                         pfn_t pfn = ADDR2PFN(new_base);
-                        size_t count = SIZE2FRAMES(new_size);
+                        pfn_t conf;
                         
-                        pfn_t conf;
-                        if ((minconf < pfn) || (minconf >= pfn + count))
-                                conf = pfn;
-                        else
-                                conf = minconf;
-                        
-                        zone_create(pfn, count, conf, ZONE_AVAILABLE);
-                        
-                        // XXX this has to be removed
-                        if (last_frame < ALIGN_UP(new_base + new_size, FRAME_SIZE))
-                                last_frame = ALIGN_UP(new_base + new_size, FRAME_SIZE);
+                        if (low) {
+                                if ((minconf < pfn) || (minconf >= pfn + count))
+                                        conf = pfn;
+                                else
+                                        conf = minconf;
+                                zone_create(pfn, count, conf,
+                                    ZONE_AVAILABLE | ZONE_LOWMEM);
+                        } else {
+                                conf = zone_external_conf_alloc(count);
+                                if (conf != 0)
+                                        zone_create(pfn, count, conf,
+                                            ZONE_AVAILABLE | ZONE_HIGHMEM);
+                        }
                 } else if ((e820table[i].type == MEMMAP_MEMORY_ACPI) ||
                     (e820table[i].type == MEMMAP_MEMORY_NVS)) {
@@ -179 +148 @@
 
 
-void frame_arch_init(void)
+void frame_low_arch_init(void)
 {
         pfn_t minconf;
@@ -192 +161 @@
 #endif
                 
-                init_e820_memory(minconf);
+                init_e820_memory(minconf, true);
                 
                 /* Reserve frame 0 (BIOS data) */
@@ -206 +175 @@
 }
 
+void frame_high_arch_init(void)
+{
+        if (config.cpu_active == 1)
+                init_e820_memory(0, false);
+}
+
 /** @}
  */