Changeset 68667ce in mainline

Timestamp:

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

Author:

Martin Decky <martin@…>

Branches:

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

Children:

74c5a1ca

Parents:

720db0c

Message:

add physical memory workaround for amd64

File:

• kernel/arch/ia32/src/mm/frame.c (modified) (3 diffs)

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

@@ -47 +47 @@
 #include <print.h>
 
-#define PHYSMEM_LIMIT  0x7C000000ull
+#define PHYSMEM_LIMIT32  0x7c000000ull
+#define PHYSMEM_LIMIT64  0xe0000000ull
 
 size_t hardcoded_unmapped_ktext_size = 0;
@@ -66 +67 @@
                  * XXX FIXME:
                  *
-                 * Ignore zones which start above PHYSMEM_LIMIT
-                 * or clip zones which go beyond PHYSMEM_LIMIT.
-                 *
-                 * The PHYSMEM_LIMIT (2 GB - 64 MB) is a rather
+                 * Ignore zones which start above PHYSMEM_LIMIT32
+                 * or clip zones which go beyond PHYSMEM_LIMIT32.
+                 *
+                 * The PHYSMEM_LIMIT32 (2 GB - 64 MB) is a rather
                  * arbitrary constant which allows to have at
                  * least 64 MB in the kernel address space to
@@ -81 +82 @@
                  */
                 
-                if (base > PHYSMEM_LIMIT)
+                if (base > PHYSMEM_LIMIT32)
                         continue;
                 
-                if (base + size > PHYSMEM_LIMIT)
-                        size = PHYSMEM_LIMIT - base;
+                if (base + size > PHYSMEM_LIMIT32)
+                        size = PHYSMEM_LIMIT32 - base;
+#endif
+                
+#ifdef __64_BITS__
+                /*
+                 * XXX FIXME:
+                 *
+                 * Ignore zones which start above PHYSMEM_LIMIT64
+                 * or clip zones which go beyond PHYSMEM_LIMIT64.
+                 *
+                 * The limit PHYSMEM_LIMIT64 (3.5 GB) is caused
+                 * by various limitations of the current kernel
+                 * memory management.
+                 *
+                 */
+                
+                if (base > PHYSMEM_LIMIT64)
+                        continue;
+                
+                if (base + size > PHYSMEM_LIMIT64)
+                        size = PHYSMEM_LIMIT64 - base;
 #endif