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

Timestamp:

2009-02-27T11:32:31Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c1f7f6ea

Parents:

5f0f29ce

Message:

kernel memory management revisited (phase 2): map physical memory according to zones

• ia32: register reserved and ACPI zones
• pareas are now used only for mapping of present physical memory (hw_area() is gone)
• firmware zones and physical addresses outside any zones are allowed to be mapped generally
• fix nasty antient bug in zones_insert_zone()

File:

• kernel/arch/ia32/src/mm/frame.c (modified) (1 diff)

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

@@ -51 +51 @@
 
 uintptr_t last_frame = 0;
-uintptr_t end_frame = 0;
 
 static void init_e820_memory(pfn_t minconf)
 {
         unsigned int i;
-        pfn_t start, conf;
-        size_t size;
-        
         for (i = 0; i < e820counter; i++) {
+                uint64_t base = e820table[i].base_address;
+                uint64_t size = e820table[i].size;
+                
+#ifdef __32_BITS__
+                
+                /* Ignore physical memory above 4 GB */
+                if ((base >> 32) != 0)
+                        continue;
+                
+                /* Clip regions above 4 GB */
+                if (((base + size) >> 32) != 0)
+                        size = 0xffffffff - base;
+                
+#endif
+                pfn_t pfn;
+                count_t count;
+                
                 if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) {
-                        start = ADDR2PFN(ALIGN_UP(e820table[i].base_address, FRAME_SIZE));
-                        size = SIZE2FRAMES(ALIGN_DOWN(e820table[i].size, FRAME_SIZE));
+                        /* To be safe, make available zone possibly smaller */
+                        pfn = ADDR2PFN(ALIGN_UP(base, FRAME_SIZE));
+                        count = SIZE2FRAMES(ALIGN_DOWN(size, FRAME_SIZE));
                         
-                        if ((minconf < start) || (minconf >= start + size))
-                                conf = start;
+                        pfn_t conf;
+                        if ((minconf < pfn) || (minconf >= pfn + count))
+                                conf = pfn;
                         else
                                 conf = minconf;
                         
-                        zone_create(start, size, conf, 0);
+                        zone_create(pfn, count, conf, ZONE_AVAILABLE);
                         
-                        if (last_frame < ALIGN_UP(e820table[i].base_address +
-                            e820table[i].size, FRAME_SIZE))
-                                last_frame =
-                                    ALIGN_UP(e820table[i].base_address + e820table[i].size, FRAME_SIZE);
+                        // XXX this has to be removed
+                        if (last_frame < ALIGN_UP(base + size, FRAME_SIZE))
+                                last_frame = ALIGN_UP(base + size, FRAME_SIZE);
+                }
+                
+                if (e820table[i].type == MEMMAP_MEMORY_RESERVED) {
+                        /* To be safe, make reserved zone possibly larger */
+                        pfn = ADDR2PFN(ALIGN_DOWN(base, FRAME_SIZE));
+                        count = SIZE2FRAMES(ALIGN_UP(size, FRAME_SIZE));
+                        
+                        zone_create(pfn, count, 0, ZONE_RESERVED);
+                }
+                
+                if (e820table[i].type == MEMMAP_MEMORY_ACPI) {
+                        /* To be safe, make firmware zone possibly larger */
+                        pfn = ADDR2PFN(ALIGN_DOWN(base, (uintptr_t) FRAME_SIZE));
+                        count = SIZE2FRAMES(ALIGN_UP(size, (uintptr_t) FRAME_SIZE));
+                        
+                        zone_create(pfn, count, 0, ZONE_FIRMWARE);
                 }
         }
-        
-        end_frame = last_frame;
 }