Changeset 04225a7 in mainline

Timestamp:

2006-02-04T19:06:07Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

3260ada

Parents:

55ab0f1

Message:

Fixed boot process not to call malloc when slab not initialized.
Added simics workaround.

Files:

• arch/amd64/Makefile.inc (modified) (1 diff)
• arch/ia32/Makefile.inc (modified) (1 diff)
• arch/ia32/src/mm/frame.c (modified) (1 diff)
• genarch/src/acpi/matd.c (modified) (1 diff)
• generic/include/mm/as.h (modified) (1 diff)
• generic/include/mm/frame.h (modified) (1 diff)
• generic/src/mm/as.c (modified) (2 diffs)
• generic/src/mm/slab.c (modified) (3 diffs)
• kernel.config (modified) (1 diff)

arch/amd64/Makefile.inc

@@ -74 +74 @@
 endif
 
+ifeq ($(CONFIG_SIMICS_FIX),y)
+        DEFS += -DCONFIG_SIMICS_FIX
+endif
+
 ARCH_SOURCES = \
         arch/$(ARCH)/src/dummy.s \

arch/ia32/Makefile.inc

@@ -92 +92 @@
         DEFS += -DCONFIG_HT
 endif
+ifeq ($(CONFIG_SIMICS_FIX),y)
+        DEFS += -DCONFIG_SIMICS_FIX
+endif
 
 ARCH_SOURCES = \

arch/ia32/src/mm/frame.c

@@ -54 +54 @@
                 /* Reserve AP real mode bootstrap memory */
                 frame_region_not_free(AP_BOOT_OFFSET, hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size);
+                
+#ifdef CONFIG_SIMICS_FIX
+                /* Don't know why, but this addresses help */
+                frame_region_not_free(0xf000,FRAME_SIZE);
+                frame_region_not_free(0xe000,FRAME_SIZE);
+                frame_region_not_free(0xd000,FRAME_SIZE);
+#endif
 #endif
                 

genarch/src/acpi/matd.c

@@ -145 +145 @@
 
         /* create madt apic entries index array */
-        madt_entries_index = (struct madt_apic_header * *) malloc(madt_entries_index_cnt * sizeof(struct madt_apic_header * *));
+        madt_entries_index = (struct madt_apic_header * *) early_malloc(madt_entries_index_cnt * sizeof(struct madt_apic_header * *));
 
         __u32 index = 0;

generic/include/mm/as.h

@@ -49 +49 @@
 #define UDATA_ADDRESS   UDATA_ADDRESS_ARCH
 
-#define FLAG_AS_KERNEL  (1<<0)          /**< Kernel address space. */
+#define FLAG_AS_KERNEL      (1 << 0)    /**< Kernel address space. */
+#define FLAG_AS_EARLYMALLOC (1 << 1)    /**< Use early malloc */
 
 enum as_area_type {

generic/include/mm/frame.h

@@ -60 +60 @@
 #define IS_BUDDY_RIGHT_BLOCK_ABS(zone, frame)   (((FRAME_INDEX_ABS((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 1)
 
-#define ZONE_BLACKLIST_SIZE     4
+#define ZONE_BLACKLIST_SIZE     8
 
 struct zone {

generic/src/mm/as.c

@@ -66 +66 @@
 {
         as_arch_init();
-        AS_KERNEL = as_create(FLAG_AS_KERNEL);
+        AS_KERNEL = as_create(FLAG_AS_KERNEL | FLAG_AS_EARLYMALLOC);
         if (!AS_KERNEL)
                 panic("can't create kernel address space\n");
@@ -79 +79 @@
         as_t *as;
 
-        as = (as_t *) early_malloc(sizeof(as_t));
+        if (flags & FLAG_AS_EARLYMALLOC)
+                as = (as_t *) early_malloc(sizeof(as_t));
+        else
+                as = (as_t *) malloc(sizeof(as_t));
         if (as) {
                 list_initialize(&as->as_with_asid_link);

generic/src/mm/slab.c

@@ -756 +756 @@
         spinlock_unlock(&slab_cache_lock);
 }
+
+#ifdef CONFIG_DEBUG
+static int _slab_initialized = 0;
+#endif
 
 void slab_cache_init(void)
@@ -789 +793 @@
                                                      NULL,NULL,0);
         }
+#ifdef CONFIG_DEBUG       
+        _slab_initialized = 1;
+#endif
 }
 
@@ -796 +803 @@
 {
         int idx;
-        
+
+        ASSERT(_slab_initialized);
         ASSERT( size && size <= (1 << SLAB_MAX_MALLOC_W));
         

kernel.config

@@ -51 +51 @@
 ! [(ARCH=ia32|ARCH=amd64)&CONFIG_SMP=y] CONFIG_HT (y/n)
 
+# Simics BIOS AP boot fix
+! [(ARCH=ia32|ARCH=amd64)&CONFIG_SMP=y] CONFIG_SIMICS_FIX (y/n)
+
 # Lazy FPU context switching
 ! [(ARCH=mips32&MIPS_MACHINE!=msim&MIPS_MACHINE!=simics)|ARCH=amd64|ARCH=ia32] CONFIG_FPU_LAZY (y/n)