Changeset c621f4aa in mainline for kernel/generic/src/main/main.c

Timestamp:

2010-07-25T10:11:13Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline.

File:

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

kernel/generic/src/main/main.c

@@ -84 +84 @@
 #include <main/main.h>
 #include <ipc/event.h>
+#include <sysinfo/sysinfo.h>
+#include <sysinfo/stats.h>
 
 /** Global configuration structure. */
@@ -102 +104 @@
 
 /** Lowest safe stack virtual address. */
-uintptr_t stack_safe = 0;               
+uintptr_t stack_safe = 0;
 
 /*
@@ -111 +113 @@
  */
 static void main_bsp_separated_stack(void);
+
 #ifdef CONFIG_SMP
 static void main_ap_separated_stack(void);
 #endif
 
-#define CONFIG_STACK_SIZE       ((1 << STACK_FRAMES) * STACK_SIZE)
+#define CONFIG_STACK_SIZE  ((1 << STACK_FRAMES) * STACK_SIZE)
 
 /** Main kernel routine for bootstrap CPU.
@@ -128 +131 @@
  *
  */
-void main_bsp(void)
+NO_TRACE void main_bsp(void)
 {
         config.cpu_count = 1;
@@ -144 +147 @@
         size_t i;
         for (i = 0; i < init.cnt; i++) {
-                if (PA_overlaps(config.stack_base, config.stack_size,
+                if (PA_OVERLAPS(config.stack_base, config.stack_size,
                     init.tasks[i].addr, init.tasks[i].size))
                         config.stack_base = ALIGN_UP(init.tasks[i].addr +
                             init.tasks[i].size, config.stack_size);
         }
-
+        
         /* Avoid placing stack on top of boot allocations. */
         if (ballocs.size) {
-                if (PA_overlaps(config.stack_base, config.stack_size,
+                if (PA_OVERLAPS(config.stack_base, config.stack_size,
                     ballocs.base, ballocs.size))
                         config.stack_base = ALIGN_UP(ballocs.base +
@@ -168 +171 @@
 }
 
-
 /** Main kernel routine for bootstrap CPU using new stack.
  *
@@ -174 +176 @@
  *
  */
-void main_bsp_separated_stack(void) 
+void main_bsp_separated_stack(void)
 {
         /* Keep this the first thing. */
@@ -181 +183 @@
         version_print();
         
-        LOG("\nconfig.base=%#" PRIp " config.kernel_size=%" PRIs
-            "\nconfig.stack_base=%#" PRIp " config.stack_size=%" PRIs,
+        LOG("\nconfig.base=%p config.kernel_size=%" PRIs
+            "\nconfig.stack_base=%p config.stack_size=%" PRIs,
             config.base, config.kernel_size, config.stack_base,
             config.stack_size);
@@ -192 +194 @@
          * commands.
          */
-        LOG_EXEC(kconsole_init());
+        kconsole_init();
 #endif
         
@@ -199 +201 @@
          * starts adding its own handlers
          */
-        LOG_EXEC(exc_init());
+        exc_init();
         
         /*
          * Memory management subsystems initialization.
          */
-        LOG_EXEC(arch_pre_mm_init());
-        LOG_EXEC(frame_init());
+        arch_pre_mm_init();
+        frame_init();
         
         /* Initialize at least 1 memory segment big enough for slab to work. */
-        LOG_EXEC(slab_cache_init());
-        LOG_EXEC(btree_init());
-        LOG_EXEC(as_init());
-        LOG_EXEC(page_init());
-        LOG_EXEC(tlb_init());
-        LOG_EXEC(ddi_init());
-        LOG_EXEC(tasklet_init());
-        LOG_EXEC(arch_post_mm_init());
-        LOG_EXEC(arch_pre_smp_init());
-        LOG_EXEC(smp_init());
+        slab_cache_init();
+        sysinfo_init();
+        btree_init();
+        as_init();
+        page_init();
+        tlb_init();
+        ddi_init();
+        tasklet_init();
+        arch_post_mm_init();
+        arch_pre_smp_init();
+        smp_init();
         
         /* Slab must be initialized after we know the number of processors. */
-        LOG_EXEC(slab_enable_cpucache());
+        slab_enable_cpucache();
         
         printf("Detected %" PRIs " CPU(s), %" PRIu64" MiB free memory\n",
-            config.cpu_count, SIZE2MB(zone_total_size()));
-        
-        LOG_EXEC(cpu_init());
-        
-        LOG_EXEC(calibrate_delay_loop());
-        LOG_EXEC(clock_counter_init());
-        LOG_EXEC(timeout_init());
-        LOG_EXEC(scheduler_init());
-        LOG_EXEC(task_init());
-        LOG_EXEC(thread_init());
-        LOG_EXEC(futex_init());
+            config.cpu_count, SIZE2MB(zones_total_size()));
+        
+        cpu_init();
+        
+        calibrate_delay_loop();
+        clock_counter_init();
+        timeout_init();
+        scheduler_init();
+        task_init();
+        thread_init();
+        futex_init();
         
         if (init.cnt > 0) {
                 size_t i;
                 for (i = 0; i < init.cnt; i++)
-                        LOG("init[%" PRIs "].addr=%#" PRIp ", init[%" PRIs
-                            "].size=%#" PRIs, i, init.tasks[i].addr, i,
+                        LOG("init[%" PRIs "].addr=%p, init[%" PRIs
+                            "].size=%" PRIs, i, init.tasks[i].addr, i,
                             init.tasks[i].size);
         } else
                 printf("No init binaries found.\n");
         
-        LOG_EXEC(ipc_init());
-        LOG_EXEC(event_init());
-        LOG_EXEC(klog_init());
+        ipc_init();
+        event_init();
+        klog_init();
+        stats_init();
         
         /*
@@ -262 +266 @@
         if (!kinit_thread)
                 panic("Cannot create kinit thread.");
-        LOG_EXEC(thread_ready(kinit_thread));
+        thread_ready(kinit_thread);
         
         /*
@@ -272 +276 @@
 }
 
-
 #ifdef CONFIG_SMP
+
 /** Main kernel routine for application CPUs.
  *
@@ -292 +296 @@
          */
         config.cpu_active++;
-
+        
         /*
          * The THE structure is well defined because ctx.sp is used as stack.
@@ -307 +311 @@
         calibrate_delay_loop();
         arch_post_cpu_init();
-
+        
         the_copy(THE, (the_t *) CPU->stack);
-
+        
         /*
          * If we woke kmp up before we left the kernel stack, we could
@@ -322 +326 @@
 }
 
-
 /** Main kernel routine for application CPUs using new stack.
  *
@@ -334 +337 @@
          */
         timeout_init();
-
+        
         waitq_wakeup(&ap_completion_wq, WAKEUP_FIRST);
         scheduler();
         /* not reached */
 }
+
 #endif /* CONFIG_SMP */