Changeset 052da81 in mainline

Timestamp:

2006-02-18T14:40:15Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

daea4bf

Parents:

ede493e

Message:

Fixes in memory allocator

• proper kernel blacklisting, when kernel not loaded on page boundary
• correct zone adding in zone list (how could this work??)

Files:

• arch/mips32/include/mm/tlb.h (modified) (2 diffs)
• arch/mips32/src/console.c (modified) (1 diff)
• arch/mips32/src/drivers/arc.c (modified) (5 diffs)
• arch/mips32/src/exception.c (modified) (1 diff)
• contrib/conf/bootindy (added)
• generic/src/mm/frame.c (modified) (7 diffs)

arch/mips32/include/mm/tlb.h

@@ -75 +75 @@
 /** Page Table Entry. */
 struct pte {
-#ifdef BIG_ENDIAN
-        unsigned a : 1;                 /**< Accessed bit. */
-        unsigned w : 1;                 /**< Page writable bit. */
-        unsigned pfn : 24;              /**< Physical frame number. */
-        unsigned soft_valid : 1;        /**< Valid content even if not present. */
-        unsigned : 1;                   /**< Unused. */
-        unsigned cacheable : 1;         /**< Cacheable bit. */
-        unsigned d : 1;                 /**< Dirty bit. */
-        unsigned p : 1;                 /**< Present bit. */
-        unsigned g : 1;                 /**< Global bit. */
-#else
         unsigned g : 1;                 /**< Global bit. */
         unsigned p : 1;                 /**< Present bit. */
@@ -95 +84 @@
         unsigned w : 1;                 /**< Page writable bit. */
         unsigned a : 1;                 /**< Accessed bit. */
-#endif
 };
 

arch/mips32/src/console.c

@@ -40 +40 @@
         } else if (serial_init()) {
                 serial_console();
-        } else
+        } else {
                 msim_console();
 #ifdef CONFIG_FB
-        fb_init(0xb2000000, 640, 480, 3); // gxemul framebuffer
+                fb_init(0xb2000000, 640, 480, 3); // gxemul framebuffer
 #endif
+        }
 }

arch/mips32/src/drivers/arc.c

@@ -37 +37 @@
 #include <align.h>
 #include <console/console.h>
+#include <console/kconsole.h>
+#include <console/cmd.h>
 
 /* This is a good joke, SGI HAS different types than NT bioses... */
@@ -153 +155 @@
         desc = arc_entry->getmemorydescriptor(NULL);
         while (desc) {
-                printf("%s: %d (size: %dKB)\n",basetypes[desc->type],
+                printf("%s: %d(%P) (size: %dKB)\n",basetypes[desc->type],
+                       desc->basepage * ARC_FRAME,
                        desc->basepage * ARC_FRAME,
                        desc->basecount*ARC_FRAME/1024);
@@ -173 +176 @@
 }
 
+static int cmd_reboot(cmd_arg_t *argv)
+{
+        arc_entry->reboot();
+        return 0;
+}
+static cmd_info_t reboot_info = {
+        .name = "reboot",
+        .description = "Reboot computer",
+        .func = cmd_reboot,
+        .argc = 0
+};
+
 /** Initialize ARC structure
  *
@@ -189 +204 @@
         arc_putchar('C');
         arc_putchar('\n');
+
+        /* Add command for resetting the computer */
+        cmd_initialize(&reboot_info);
+        cmd_register(&reboot_info);
 
         return 0;
@@ -305 +324 @@
                         total += basesize;
                         
-                        zone_create(ADDR2PFN(base),
-                                    SIZE2FRAMES(ALIGN_DOWN(basesize,FRAME_SIZE)),
-                                    ADDR2PFN(base),0);
+                        zone_create(ADDR2PFN(base), SIZE2FRAMES(basesize),
+                                    ADDR2PFN(base), 0);
                 }
                 desc = arc_entry->getmemorydescriptor(desc);

arch/mips32/src/exception.c

@@ -75 +75 @@
                 rasymbol = s;
         
-        printf("PC: %X(%s) RA: %X(%s)\n",pstate->epc,pcsymbol,
-               pstate->ra,rasymbol);
+        printf("PC: %X(%s) RA: %X(%s), SP(%P)\n",pstate->epc,pcsymbol,
+               pstate->ra,rasymbol, pstate->sp);
 }
 

generic/src/mm/frame.c

@@ -137 +137 @@
         if (zones.count+1 == ZONES_MAX)
                 panic("Maximum zone(%d) count exceeded.", ZONES_MAX);
-
         for (i=0; i < zones.count; i++) {
                 /* Check for overflow */
-                z = zones.info[zones.count];
+                z = zones.info[i];
                 if (overlaps(newzone->base,newzone->count,
                              z->base, z->count)) {
@@ -146 +145 @@
                         return -1;
                 }
-                if (z->base < newzone->base)
+                if (newzone->base < z->base)
                         break;
         }
@@ -152 +151 @@
         for (j=i;j < zones.count;j++)
                 zones.info[j+1] = zones.info[j];
-
         zones.info[i] = newzone;
         zones.count++;
-
         spinlock_unlock(&zones.lock);
         interrupts_restore(ipl);
@@ -768 +765 @@
                 frame_initialize(&z->frames[i]);
         }
-
+        
         /* Stuffing frames */
         for (i = 0; i < count; i++) {
@@ -844 +841 @@
                         zone_mark_unavailable(z, i - z->base);
                 }
-
         return znum;
 }
@@ -972 +968 @@
         zone_t *zone;
         int prefzone = 0;
-
+        
         for (i=0; i < count; i++) {
                 zone = find_zone_and_lock(start+i,&prefzone);
@@ -996 +992 @@
         frame_arch_init();
         if (config.cpu_active == 1) {
-                frame_mark_unavailable(ADDR2PFN(KA2PA(config.base)),
-                                       SIZE2FRAMES(config.kernel_size));
+                pfn_t firstframe = ADDR2PFN(KA2PA(config.base));
+                pfn_t lastframe = ADDR2PFN(KA2PA(config.base+config.kernel_size));
+                frame_mark_unavailable(firstframe,lastframe-firstframe+1);
                 if (config.init_size > 0)
                         frame_mark_unavailable(ADDR2PFN(KA2PA(config.init_addr)),