Changeset 7a4202d in mainline

Timestamp:

2008-06-19T12:17:02Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0db266f

Parents:

934b2e0

Message:

Don't print anything before the kernel initializes the first THE
structure. This fixes a regression introduced in r3061. If anything
worked from r3061 until now, it was only due to luck. arm32 was not
that lucky when built with gcc 4.3.1.

File:

• kernel/generic/src/main/main.c (modified) (6 diffs)

kernel/generic/src/main/main.c

@@ -132 +132 @@
 /** Main kernel routine for bootstrap CPU.
  *
- * Initializes the kernel by bootstrap CPU.
- * This function passes control directly to
- * main_bsp_separated_stack().
+ * The code here still runs on the boot stack, which knows nothing about
+ * preemption counts.  Because of that, this function cannot directly call
+ * functions that disable or enable preemption (e.g. spinlock_lock()). The
+ * primary task of this function is to calculate address of a new stack and
+ * switch to it.
  *
  * Assuming interrupts_disable().
@@ -141 +143 @@
 void main_bsp(void)
 {
-        LOG();
-        
         config.cpu_count = 1;
         config.cpu_active = 1;
@@ -174 +174 @@
                 config.stack_base = ALIGN_UP(stack_safe, PAGE_SIZE);
         
-        version_print();
-        
-        LOG("\nconfig.base=%#" PRIp " config.kernel_size=%" PRIs
-                "\nconfig.stack_base=%#" PRIp " config.stack_size=%" PRIs,
-                config.base, config.kernel_size,
-                config.stack_base, config.stack_size);
-        
         context_save(&ctx);
         context_set(&ctx, FADDR(main_bsp_separated_stack), config.stack_base,
@@ -196 +189 @@
 void main_bsp_separated_stack(void) 
 {
+        /* Keep this the first thing. */
+        the_initialize(THE);
+
         LOG();
         
-        the_initialize(THE);
+        version_print();
+        
+        LOG("\nconfig.base=%#" PRIp " config.kernel_size=%" PRIs
+            "\nconfig.stack_base=%#" PRIp " config.stack_size=%" PRIs,
+            config.base, config.kernel_size, config.stack_base,
+            config.stack_size);
+        
 
         /*
@@ -250 +252 @@
                 count_t i;
                 for (i = 0; i < init.cnt; i++)
-                        printf("init[%" PRIc "].addr=%#" PRIp
-                                ", init[%" PRIc "].size=%#" PRIs "\n",
-                                i, init.tasks[i].addr,
-                                i, init.tasks[i].size);
+                        printf("init[%" PRIc "].addr=%#" PRIp ", init[%" PRIc
+                            "].size=%#" PRIs "\n", i, init.tasks[i].addr,
+                            i, init.tasks[i].size);
         } else
                 printf("No init binaries found\n");
@@ -270 +271 @@
          * Create the first thread.
          */
-        thread_t *kinit_thread = thread_create(kinit, NULL, kernel, 0, "kinit", true);
+        thread_t *kinit_thread = thread_create(kinit, NULL, kernel, 0, "kinit",
+            true);
         if (!kinit_thread)
                 panic("Can't create kinit thread\n");