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

Timestamp:

Jun 29, 2017, 4:44:52 PM (7 years ago)

Author:

alain

Message:

euh...

File:

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

trunk/kernel/kern/kernel_init.c

@@ -56 +56 @@
 #include <devfs.h>
 #include <mapper.h>
-
+#include <soclib_tty.h>
 
 #define KERNEL_INIT_SYNCHRO  0xA5A5B5B5
@@ -189 +189 @@
             remote_spinlock_init( XPTR( local_cxy , &txt0_chdev.wait_lock ) );
 
-            // complete TXT-specific initialization
-            hal_drivers_txt_init( &txt0_chdev );
+            // TODO use generic device initialisation
+            // hal_drivers_txt_init( &txt0_chdev );
+
+            if( impl == IMPL_TXT_TTY )
+            {
+                txt0_chdev.cmd = &soclib_tty_cmd;
+                txt0_chdev.isr = &soclib_tty_isr;
+                soclib_tty_init( &txt0_chdev );
+            }
 
             // initialize the replicated chdev_dir[x][y] structures
@@ -206 +213 @@
                        " / paddr = %l at cycle %d\n",
                        __FUNCTION__ , local_cxy , chdev_func_str( func ),
-                       XPTR(local_cxy , &txt0_chdev) , hal_time_stamp() );
+                       XPTR(local_cxy , &txt0_chdev) , hal_get_cycles() );
         }
 
@@ -295 +302 @@
 
     kinit_dmsg("\n[INFO] %s : core[%x][0] created ICU chdev at cycle %d\n",
-               __FUNCTION__ , local_cxy , hal_time_stamp() );
+               __FUNCTION__ , local_cxy , hal_get_cycles() );
 
     /////////// MMC internal chdev ///////////  
@@ -337 +344 @@
 
         kinit_dmsg("\n[INFO] %s : core[%x][0] created MMC chdev at cycle %d\n",
-                   __FUNCTION__ , local_cxy , hal_time_stamp() );
+                   __FUNCTION__ , local_cxy , hal_get_cycles() );
     }
 
@@ -372 +379 @@
 
             kinit_dmsg("\n[INFO] %s : core[%x][0] created DMA[%d] chdev at cycle %d\n",
-                       __FUNCTION__ , local_cxy , channel , hal_time_stamp() );
+                       __FUNCTION__ , local_cxy , channel , hal_get_cycles() );
         }
     } 
@@ -530 +537 @@
                             kinit_dmsg("\n[INFO] %s : core[%x][0] create chdev %s[%d] at cycle %d\n",
                                __FUNCTION__ , local_cxy , chdev_func_str( func ),
-                               channel , hal_time_stamp() );
+                               channel , hal_get_cycles() );
 
                 }  // end if match
@@ -677 +684 @@
 
     kinit_dmsg("\n[INFO] %s : core[%x][%d] exit barrier 0 at cycle %d\n",
-               __FUNCTION__ , core_cxy , core_lid , hal_time_stamp() );
+               __FUNCTION__ , core_cxy , core_lid , hal_get_cycles() );
 
     // all cores check core identifiers
@@ -709 +716 @@
 
     kinit_dmsg("\n[INFO] %s : core[%x][%d] exit barrier 1 at cycle %d\n",
-               __FUNCTION__ , core_cxy , core_lid , hal_time_stamp() );
+               __FUNCTION__ , core_cxy , core_lid , hal_get_cycles() );
 
     // all cores get pointer on local cluster manager and on core descriptor
@@ -716 +723 @@
 
     // CP0 initializes the process_zero descriptor
-    if( core_lid == 0 ) process_zero_init( info );
+    if( core_lid == 0 ) process_reference_init( &process_zero , 0 , XPTR_NULL );
 
     // CP0 allocates and initialises the internal peripheral chdev descriptors.
@@ -727 +734 @@
     // external devices initialisation to enforce the rule :
     // "The WTI index for the IPI routed to core[lid] is lid"
-    if( core_lid == 0 )
+    if( core_lid == 1 )
     {
         uint32_t  wti_id;
@@ -760 +767 @@
 
     kinit_dmsg("\n[INFO] %s : core[%x][%d] exit barrier 2 at cycle %d\n", 
-               __FUNCTION__ , core_cxy , core_lid , hal_time_stamp() );
+               __FUNCTION__ , core_cxy , core_lid , hal_get_cycles() );
 
 
@@ -783 +790 @@
 
         kinit_dmsg("\n[INFO] %s : core[%x][%d] created idle thread %x at cycle %d\n",
-                   __FUNCTION__ , core_cxy , core_lid , thread , hal_time_stamp());
+                   __FUNCTION__ , core_cxy , core_lid , thread , hal_get_cycles());
     }
 
@@ -809 +816 @@
         }
 
+        // register VFS root inode in process_zero
+        process_zero.vfs_root_xp = root_inode_xp;
+        process_zero.vfs_cwd_xp  = root_inode_xp;
+
         // mount the DEVFS File system
             devfs_mount( root_inode_xp , "dev" );
     }
 
-    // CP0 in I/O cluster print banner
+
+    // CP0 in I/O cluster creates the process_init and print banner
     if( (core_lid ==  0) && (local_cxy == info->io_cxy) ) 
     {
+        process_init_create();
+
         print_banner( (info->x_size * info->y_size) , info->cores_nr );
 
@@ -869 +883 @@
 
     kinit_dmsg("\n[INFO] %s : core[%x][%d] exit barrier 3 at cycle %d\n", 
-               __FUNCTION__ , core_cxy , core_lid , hal_time_stamp() );
+               __FUNCTION__ , core_cxy , core_lid , hal_get_cycles() );
 
     // each core activates its private PTI IRQ 
@@ -875 +889 @@
     dev_icu_enable_irq( core_lid , PTI_TYPE , core_lid , NULL );
 
-    // each core get its private IRQ masks values and
+    // each core get its private IRQ masks values
     uint32_t hwi_mask;
     uint32_t wti_mask;
@@ -883 +897 @@
     thread_dmsg("\n[INFO] %s : core[%x][%d] activates scheduler at cycle %d\n"
                 "   hwi_mask = %x / wti_mask = %x / pti_mask = %x\n",
-                    __FUNCTION__ , local_cxy , core_lid , hal_time_stamp() ,
+                    __FUNCTION__ , local_cxy , core_lid , hal_get_cycles() ,
                     hwi_mask , wti_mask , pti_mask );