Changeset b7068da in mainline for kernel/generic/include/mm/frame.h

Timestamp:

2012-02-09T20:35:12Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (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/generic/include/mm/frame.h (modified) (5 diffs)

kernel/generic/include/mm/frame.h

@@ -50 +50 @@
 typedef uint8_t frame_flags_t;
 
+#define FRAME_NONE        0x0
 /** Convert the frame address to kernel VA. */
 #define FRAME_KA          0x1
@@ -58 +59 @@
 /** Do not reserve / unreserve memory. */
 #define FRAME_NO_RESERVE  0x8
+/** Allocate a frame which can be identity-mapped. */
+#define FRAME_LOWMEM      0x10
+/** Allocate a frame which cannot be identity-mapped. */
+#define FRAME_HIGHMEM     0x20
 
 typedef uint8_t zone_flags_t;
 
+#define ZONE_NONE       0x0
 /** Available zone (free for allocation) */
-#define ZONE_AVAILABLE  0x0
+#define ZONE_AVAILABLE  0x1
 /** Zone is reserved (not available for allocation) */
-#define ZONE_RESERVED   0x8
+#define ZONE_RESERVED   0x2
 /** Zone is used by firmware (not available for allocation) */
-#define ZONE_FIRMWARE   0x10
+#define ZONE_FIRMWARE   0x4
+/** Zone contains memory that can be identity-mapped */
+#define ZONE_LOWMEM     0x8
+/** Zone contains memory that cannot be identity-mapped */
+#define ZONE_HIGHMEM    0x10
 
-/** Currently there is no equivalent zone flags
-    for frame flags */
-#define FRAME_TO_ZONE_FLAGS(frame_flags)  0
+/** Mask of zone bits that must be matched exactly. */
+#define ZONE_EF_MASK    0x7
+
+#define FRAME_TO_ZONE_FLAGS(ff) \
+        ((((ff) & FRAME_LOWMEM) ? ZONE_LOWMEM : \
+            (((ff) & FRAME_HIGHMEM) ? ZONE_HIGHMEM : \
+            ZONE_LOWMEM /* | ZONE_HIGHMEM */)) | \
+            ZONE_AVAILABLE) 
+
+#define ZONE_FLAGS_MATCH(zf, f) \
+        (((((zf) & ZONE_EF_MASK)) == ((f) & ZONE_EF_MASK)) && \
+            (((zf) & ~ZONE_EF_MASK) & (f)))
 
 typedef struct {
         size_t refcount;      /**< Tracking of shared frames */
-        uint8_t buddy_order;  /**< Buddy system block order */
         link_t buddy_link;    /**< Link to the next free block inside
                                    one order */
         void *parent;         /**< If allocated by slab, this points there */
+        uint8_t buddy_order;  /**< Buddy system block order */
 } frame_t;
 
@@ -129 +148 @@
 }
 
-NO_TRACE static inline bool zone_flags_available(zone_flags_t flags)
-{
-        return ((flags & (ZONE_RESERVED | ZONE_FIRMWARE)) == 0);
-}
-
 #define IS_BUDDY_ORDER_OK(index, order) \
     ((~(((sysarg_t) -1) << (order)) & (index)) == 0)
@@ -146 +160 @@
 
 extern void frame_init(void);
+extern bool frame_adjust_zone_bounds(bool, uintptr_t *, size_t *);
 extern void *frame_alloc_generic(uint8_t, frame_flags_t, size_t *);
 extern void *frame_alloc(uint8_t, frame_flags_t);
@@ -161 +176 @@
 extern void frame_mark_unavailable(pfn_t, size_t);
 extern size_t zone_conf_size(size_t);
+extern pfn_t zone_external_conf_alloc(size_t);
 extern bool zone_merge(size_t, size_t);
 extern void zone_merge_all(void);