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

Timestamp:

2011-04-13T14:45:41Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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) (4 diffs)

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

@@ -44 +44 @@
 #include <align.h>
 #include <macros.h>
-
 #include <print.h>
 
-#define PHYSMEM_LIMIT32  0x07c000000ull
-#define PHYSMEM_LIMIT64  0x200000000ull
+#define PHYSMEM_LIMIT32  UINT64_C(0x07c000000)
+#define PHYSMEM_LIMIT64  UINT64_C(0x200000000)
 
 size_t hardcoded_unmapped_ktext_size = 0;
@@ -131 +130 @@
                         if (last_frame < ALIGN_UP(new_base + new_size, FRAME_SIZE))
                                 last_frame = ALIGN_UP(new_base + new_size, FRAME_SIZE);
-                }
-                
-                if (e820table[i].type == MEMMAP_MEMORY_RESERVED) {
+                } else if ((e820table[i].type == MEMMAP_MEMORY_ACPI) ||
+                    (e820table[i].type == MEMMAP_MEMORY_NVS)) {
+                        /* To be safe, make the firmware zone possibly larger */
+                        uint64_t new_base = ALIGN_DOWN(base, FRAME_SIZE);
+                        uint64_t new_size = ALIGN_UP(size + (base - new_base),
+                            FRAME_SIZE);
+                        
+                        zone_create(ADDR2PFN(new_base), SIZE2FRAMES(new_size), 0,
+                            ZONE_FIRMWARE);
+                } else {
                         /* To be safe, make the reserved zone possibly larger */
                         uint64_t new_base = ALIGN_DOWN(base, FRAME_SIZE);
@@ -141 +147 @@
                         zone_create(ADDR2PFN(new_base), SIZE2FRAMES(new_size), 0,
                             ZONE_RESERVED);
-                }
-                
-                if (e820table[i].type == MEMMAP_MEMORY_ACPI) {
-                        /* To be safe, make the firmware zone possibly larger */
-                        uint64_t new_base = ALIGN_DOWN(base, FRAME_SIZE);
-                        uint64_t new_size = ALIGN_UP(size + (base - new_base),
-                            FRAME_SIZE);
-                        
-                        zone_create(ADDR2PFN(new_base), SIZE2FRAMES(new_size), 0,
-                            ZONE_FIRMWARE);
                 }
         }
@@ -203 +199 @@
 #ifdef CONFIG_SMP
                 /* Reserve AP real mode bootstrap memory */
-                frame_mark_unavailable(AP_BOOT_OFFSET >> FRAME_WIDTH, 
+                frame_mark_unavailable(AP_BOOT_OFFSET >> FRAME_WIDTH,
                     (hardcoded_unmapped_ktext_size +
                     hardcoded_unmapped_kdata_size) >> FRAME_WIDTH);