Changeset 720db0c in mainline for kernel/arch/ppc32/src/mm/frame.c

Timestamp:

2010-06-26T23:00:54Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

68667ce

Parents:

cae5404

Message:

fix erroneous resizing of physical zones (ticket #240)

File:

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

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

@@ -60 +60 @@
         
         for (i = 0; i < memmap.cnt; i++) {
-                pfn_t start = ADDR2PFN(ALIGN_UP((uintptr_t) memmap.zones[i].start,
-                    FRAME_SIZE));
-                size_t size = SIZE2FRAMES(ALIGN_DOWN(memmap.zones[i].size, FRAME_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);
+                
+                pfn_t pfn = ADDR2PFN(new_start);
+                size_t count = SIZE2FRAMES(new_size);
                 
                 pfn_t conf;
-                if ((minconf < start) || (minconf >= start + size))
-                        conf = start;
+                if ((minconf < pfn) || (minconf >= pfn + count))
+                        conf = pfn;
                 else
                         conf = minconf;
                 
-                zone_create(start, size, conf, 0);
-                if (last_frame < ALIGN_UP((uintptr_t) memmap.zones[i].start
-                    + memmap.zones[i].size, FRAME_SIZE))
-                        last_frame = ALIGN_UP((uintptr_t) memmap.zones[i].start
-                            + memmap.zones[i].size, FRAME_SIZE);
+                zone_create(pfn, count, conf, 0);
+                
+                if (last_frame < ALIGN_UP(new_start + new_size, FRAME_SIZE))
+                        last_frame = ALIGN_UP(new_start + new_size, FRAME_SIZE);
         }