Changeset bd48f4c in mainline for kernel/arch/sparc64/src/mm/sun4u/frame.c

Timestamp:

2010-07-12T10:53:30Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd11d3e

Parents:

c40e6ef (diff), bee2d4c (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/sparc64/src/mm/sun4u/frame.c (modified) (2 diffs)

kernel/arch/sparc64/src/mm/sun4u/frame.c

@@ -49 +49 @@
 void frame_arch_init(void)
 {
-        unsigned int i;
-        pfn_t confdata;
-
         if (config.cpu_active == 1) {
+                unsigned int i;
+                
                 for (i = 0; i < memmap.cnt; i++) {
-                        uintptr_t start = (uintptr_t) memmap.zones[i].start;
-                        size_t size = memmap.zones[i].size;
-
+                        /* To be safe, make the available zone possibly smaller */
+                        uintptr_t new_start = ALIGN_UP((uintptr_t) memmap.zones[i].start,
+                            FRAME_SIZE);
+                        size_t new_size = ALIGN_DOWN(memmap.zones[i].size -
+                            (new_start - ((uintptr_t) memmap.zones[i].start)), FRAME_SIZE);
+                        
                         /*
                          * The memmap is created by HelenOS boot loader.
                          * It already contains no holes.
                          */
-
-                        confdata = ADDR2PFN(start);
+                        
+                        pfn_t confdata = ADDR2PFN(new_start);
+                        
                         if (confdata == ADDR2PFN(KA2PA(PFN2ADDR(0))))
                                 confdata = ADDR2PFN(KA2PA(PFN2ADDR(2)));
-                        zone_create(ADDR2PFN(start),
-                            SIZE2FRAMES(ALIGN_DOWN(size, FRAME_SIZE)),
+                        
+                        zone_create(ADDR2PFN(new_start), SIZE2FRAMES(new_size),
                             confdata, 0);
-                        last_frame = max(last_frame, start + ALIGN_UP(size,
-                            FRAME_SIZE));
+                        
+                        last_frame = max(last_frame, new_start + new_size);
                 }
-
+                
                 /*
                  * On sparc64, physical memory can start on a non-zero address.
@@ -80 +83 @@
                 frame_mark_unavailable(ADDR2PFN(KA2PA(PFN2ADDR(0))), 1);
         }
-
+        
         end_of_identity = PA2KA(last_frame);
 }