Changeset 103 for trunk/kernel/kern/kernel_init.c

Timestamp:

Jun 29, 2017, 6:22:27 PM (7 years ago)

Author:

alain

Message:

Introducing a nolock_printk() function used by kernel_init.

File:

• trunk/kernel/kern/kernel_init.c (modified) (13 diffs)

trunk/kernel/kern/kernel_init.c

@@ -641 +641 @@
 // To comply with the multi-kernels paradigm, it accesses only local cluster memory, using
 // only information contained in the local boot_info_t structure, set by the bootloader.
+// Only CP0 in cluster 0 print the log messages.
 ///////////////////////////////////////////////////////////////////////////////////////////
 // @ info    : pointer on the local boot-info structure.
@@ -654 +655 @@
     error_t      error;
 
-    // all cores get core identifiers
+    // all cores get and check core identifiers
     error = get_core_identifiers( info,
                                   &core_lid,
@@ -668 +669 @@
     // each core registers this thread pointer in hardware register 
     hal_set_current_thread( thread );
-
-#ifdef __HAL_x86_64__
-        return;
-#endif
 
     // CP0 in I/O cluster initialises TXT0 chdev descriptor
@@ -683 +680 @@
     /////////////////////////////////////////////////////////////////////////////////
 
-    kinit_dmsg("\n[INFO] %s : core[%x][%d] exit barrier 0 at cycle %d\n",
-               __FUNCTION__ , core_cxy , core_lid , hal_get_cycles() );
+    if( (core_lid ==  0) && (local_cxy == info->io_cxy) ) 
+    {
+        kinit_dmsg("\n[INFO] %s : core[%x][%d] exit barrier 0 at cycle %d\n",
+                   __FUNCTION__ , core_cxy , core_lid , hal_get_cycles() );
+    }
 
     // all cores check core identifiers
     if( error )
     {
-        printk("\n[PANIC] in %s : illegal core identifiers"
+        nolock_printk("\n[PANIC] in %s : illegal core identifiers"
                " gid = %x / cxy = %x / lid = %d\n",
                __FUNCTION__ , core_lid , core_cxy , core_lid );
@@ -702 +702 @@
         if( error )
         {
-            printk("\n[PANIC] in %s : cannot initialise cluster manager in cluster %x",
+            nolock_printk("\n[PANIC] in %s : cannot initialise cluster manager in cluster %x",
                    __FUNCTION__ , local_cxy );
             hal_core_sleep();
@@ -715 +715 @@
     /////////////////////////////////////////////////////////////////////////////////
 
-    kinit_dmsg("\n[INFO] %s : core[%x][%d] exit barrier 1 at cycle %d\n",
-               __FUNCTION__ , core_cxy , core_lid , hal_get_cycles() );
+    if( (core_lid ==  0) && (local_cxy == info->io_cxy) ) 
+    {
+        kinit_dmsg("\n[INFO] %s : core[%x][%d] exit barrier 1 at cycle %d\n",
+                   __FUNCTION__ , core_cxy , core_lid , hal_get_cycles() );
+    }
 
     // all cores get pointer on local cluster manager and on core descriptor
@@ -744 +747 @@
             if( wti_id != lid )
             {
-                printk("\n[PANIC] in %s : WTI index for IPI = %d / core_lid = %d",
-                       __FUNCTION__ , wti_id , lid );
+                nolock_printk("\n[PANIC] in %s : WTI index for IPI = %d / core_lid = %d",
+                              __FUNCTION__ , wti_id , lid );
                 hal_core_sleep();
             }
@@ -766 +769 @@
     /////////////////////////////////////////////////////////////////////////////////
 
-    kinit_dmsg("\n[INFO] %s : core[%x][%d] exit barrier 2 at cycle %d\n", 
-               __FUNCTION__ , core_cxy , core_lid , hal_get_cycles() );
-
+    if( (core_lid ==  0) && (local_cxy == info->io_cxy) ) 
+    {
+        kinit_dmsg("\n[INFO] %s : core[%x][%d] exit barrier 2 at cycle %d\n", 
+                   __FUNCTION__ , core_cxy , core_lid , hal_get_cycles() );
+    }
 
     error = thread_kernel_init( thread,
@@ -777 +782 @@
     if( error )
     {
-        printk("\n[PANIC] in %s : core[%x][%d] cannot initialize idle thread\n",
-               __FUNCTION__ , local_cxy , core_lid );
+        nolock_printk("\n[PANIC] in %s : core[%x][%d] cannot initialize idle thread\n",
+                      __FUNCTION__ , local_cxy , core_lid );
         hal_core_sleep();
     }
-    else
-    {
-        // register idle thread in scheduler
-        core->scheduler.idle = thread;
-
-        // activate the idle thread
-        thread_unblock( XPTR( local_cxy , thread ) , THREAD_BLOCKED_GLOBAL );
-
+
+    // register idle thread in scheduler
+    core->scheduler.idle = thread;
+
+    // activate the idle thread
+    thread_unblock( XPTR( local_cxy , thread ) , THREAD_BLOCKED_GLOBAL );
+
+    if( (core_lid ==  0) && (local_cxy == info->io_cxy) ) 
+    {
         kinit_dmsg("\n[INFO] %s : core[%x][%d] created idle thread %x at cycle %d\n",
                    __FUNCTION__ , core_cxy , core_lid , thread , hal_get_cycles());
@@ -805 +811 @@
         else
         {
-            printk("\n[PANIC] in %s : root FS must be FATFS\n", __FUNCTION__ );
+            nolock_printk("\n[PANIC] in %s : root FS must be FATFS\n", __FUNCTION__ );
             hal_core_sleep();
         }
@@ -811 +817 @@
         if( root_inode_xp == XPTR_NULL )
         {
-            printk("\n[PANIC] in %s : core[%x][%d] cannot initialize file system\n",
+            nolock_printk("\n[PANIC] in %s : core[%x][%d] cannot initialize file system\n",
                    __FUNCTION__ , local_cxy , core_lid );
             hal_core_sleep();
@@ -882 +888 @@
     /////////////////////////////////////////////////////////////////////////////////
 
-    kinit_dmsg("\n[INFO] %s : core[%x][%d] exit barrier 3 at cycle %d\n", 
-               __FUNCTION__ , core_cxy , core_lid , hal_get_cycles() );
+    if( (core_lid ==  0) && (local_cxy == info->io_cxy) ) 
+    {
+        kinit_dmsg("\n[INFO] %s : core[%x][%d] exit barrier 3 at cycle %d\n", 
+                   __FUNCTION__ , core_cxy , core_lid , hal_get_cycles() );
+    }
 
     // each core activates its private PTI IRQ 
@@ -895 +904 @@
     dev_icu_get_masks( core_lid , &hwi_mask , &wti_mask , &pti_mask );
 
-    thread_dmsg("\n[INFO] %s : core[%x][%d] activates scheduler at cycle %d\n"
+    thread_dmsg("\n[INFO] %s : core[%x][%d] complete kernel init at cycle %d\n"
                 "   hwi_mask = %x / wti_mask = %x / pti_mask = %x\n",
                     __FUNCTION__ , local_cxy , core_lid , hal_get_cycles() ,