Changeset 4457455 in mainline for generic/src/mm/frame.c

Timestamp:

2005-12-05T17:02:40Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

61e6c39

Parents:

9ebc238

Message:

Buddy system cleanup and fixes.

• missing use of KA2PA in frame_init
• truncating black list addresses to frame boundaries
• removal of left-over obsolete structures
• fixing some comments

File:

• generic/src/mm/frame.c (modified) (8 diffs)

generic/src/mm/frame.c

@@ -64 +64 @@
         if (config.cpu_active == 1) {
                 zone_init();
-                frame_region_not_free(config.base, config.kernel_size);
+                frame_region_not_free(KA2PA(config.base), config.kernel_size);
         }
 
@@ -70 +70 @@
 }
 
-/** Allocate a frame
- *
- * Allocate a frame of physical memory.
+/** Allocate power-of-two frames of physical memory.
  *
  * @param flags Flags for host zone selection and address processing.
+ * @param order Allocate exactly 2^order frames.
  *
  * @return Allocated frame.
@@ -203 +202 @@
  * Mark frame region not free.
  *
- * @param start First address.
- * @param stop Last address.
+ * @param base Base address of non-available region.
+ * @param size Size of non-available region.
  */
 void frame_region_not_free(__address base, size_t size)
 {
-        count_t index;
+        index_t index;
         index = zone_blacklist_count++;
-        ASSERT(base % FRAME_SIZE == 0);
-        
-        if (size % FRAME_SIZE != 0) {
-                size = ALIGN(size, FRAME_SIZE);
-        }
-        ASSERT(size % FRAME_SIZE == 0);
+
+        /* Force base to the nearest lower address frame boundary. */
+        base &= ~(FRAME_SIZE - 1);
+        /* Align size to frame boundary. */
+        size = ALIGN(size, FRAME_SIZE);
+
         ASSERT(zone_blacklist_count <= ZONE_BLACKLIST_SIZE);
         zone_blacklist[index].base = base;
@@ -236 +235 @@
         int i;
         zone_t * z;
-        __address s; size_t sz;
+        __address s;
+        size_t sz;
         
         ASSERT(base % FRAME_SIZE == 0);
         ASSERT(size % FRAME_SIZE == 0);
         
-        if (!size) return;
-        
+        if (!size)
+                return;
+
         for (i = 0; i < zone_blacklist_count; i++) {
                 if (zone_blacklist[i].base >= base && zone_blacklist[i].base < base + size) {
@@ -304 +305 @@
 
                 z->free_count = cnt;
-                list_initialize(&z->free_head);
-
                 z->busy_count = 0;
                 
@@ -316 +315 @@
                 for (i = 0; i<cnt; i++) {
                         frame_initialize(&z->frames[i], z);
-                        list_append(&z->frames[i].link, &z->free_head);
                 }
                 
@@ -322 +320 @@
                  * Create buddy system for the zone
                  */
-                for (max_order = 0; cnt >> max_order; max_order++);
+                for (max_order = 0; cnt >> max_order; max_order++)
+                        ;
                 z->buddy_system = buddy_system_create(max_order, &zone_buddy_system_operations, (void *) z);
                 
@@ -364 +363 @@
         frame->refcount = 1;
         frame->buddy_order = 0;
-        link_initialize(&frame->link);
 }