Changeset 8480714 in mainline

Timestamp:

2008-07-27T20:26:02Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

29f8f8e

Parents:

94fa807d

Message:

limit physical memory to 512 MB (more cannot be used right now, see ticket #29)
fix physical memory detection in gxemul (which doesn't honor uncached flag in TLB)

File:

• kernel/arch/mips32/src/mm/frame.c (modified) (5 diffs)

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

@@ -45 +45 @@
 
 #define ZERO_PAGE_MASK          TLB_PAGE_MASK_256K
-#define ZERO_FRAMES                     16384
+#define ZERO_FRAMES                     2048
 #define ZERO_PAGE_WIDTH         18  /* 256K */
 #define ZERO_PAGE_SIZE          (1 << ZERO_PAGE_WIDTH)
@@ -54 +54 @@
 #define ZERO_PAGE_VALUE         (((volatile uint32_t *) ZERO_PAGE_ADDR)[ZERO_PAGE_OFFSET])
 
+#define ZERO_PAGE_VALUE_KSEG1(frame) (((volatile uint32_t *) (0xa0000000 + (frame << ZERO_PAGE_WIDTH)))[ZERO_PAGE_OFFSET])
+
 #define MAX_REGIONS                     32
 
@@ -74 +76 @@
 static bool frame_available(pfn_t frame)
 {
+#if MACHINE == msim
         /* MSIM device (dprinter) */
         if (frame == (KA2PA(MSIM_VIDEORAM) >> ZERO_PAGE_WIDTH))
@@ -81 +84 @@
         if (frame == (KA2PA(MSIM_KBD_ADDRESS) >> ZERO_PAGE_WIDTH))
                 return false;
-        
+#endif
+
+#if MACHINE == simics
         /* Simics device (serial line) */
         if (frame == (KA2PA(SERIAL_ADDRESS) >> ZERO_PAGE_WIDTH))
                 return false;
+#endif
+
+#if (MACHINE == lgxemul) || (MACHINE == bgxemul)
+        /* gxemul devices */
+        if (overlaps(frame << ZERO_PAGE_WIDTH, ZERO_PAGE_SIZE,
+            0x10000000, MB2SIZE(256)))
+                return false;
+#endif
         
         return true;
@@ -206 +219 @@
                                         if (ZERO_PAGE_VALUE != 0xdeadbeef)
                                                 avail = false;
+#if (MACHINE == lgxemul) || (MACHINE == bgxemul)
+                                        else {
+                                                ZERO_PAGE_VALUE_KSEG1(frame) = 0xaabbccdd;
+                                                if (ZERO_PAGE_VALUE_KSEG1(frame) != 0xaabbccdd)
+                                                        avail = false;
+                                        }
+#endif
                                 }
                         }