Changeset 547 for soft/giet_vm/giet_kernel/kernel_init.c

Timestamp:

Apr 5, 2015, 12:09:09 AM (10 years ago)

Author:

alain

Message:

Move the peripheral initialisation from the boot.c to the kernel_init.c

File:

• soft/giet_vm/giet_kernel/kernel_init.c (modified) (7 diffs)

soft/giet_vm/giet_kernel/kernel_init.c

@@ -18 +18 @@
 #include <fat32.h>
 #include <xcu_driver.h>
+#include <nic_driver.h>
+#include <hba_driver.h>
 #include <mmc_driver.h>
 #include <ctx_handler.h>
@@ -144 +146 @@
     unsigned int y          = cluster_xy & ((1<<Y_WIDTH)-1);
     unsigned int p          = gpid & ((1<<P_WIDTH)-1);
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Step 0 : P[0,0,0] initialises various global vaiables
-    ////////////////////////////////////////////////////////////////////////////
+    unsigned int unused;
+    
+    ////////////////////////////////////////////////////////////////////////////
+    // Step 0 : P[0,0,0] initialises global variables and peripherals
+   ////////////////////////////////////////////////////////////////////////////
 
     if ( gpid == 0 )
     {
-        // distributed kernel heap initialisation
+        //////  distributed kernel heap initialisation
         _heap_init();
         
 #if GIET_DEBUG_INIT
-_nolock_printf("\n[DEBUG KERNEL_INIT] P[%d,%d,%d] completes kernel HEAP init\n",
-               x, y, p );
-#endif
-        // distributed lock for TTY0
+_nolock_printf("\n[DEBUG KINIT] P[%d,%d,%d] completes kernel heap init\n", x, y, p );
+#endif
+        //////  distributed lock for TTY0
         _sqt_lock_init( &_tty0_sqt_lock );
 
 #if GIET_DEBUG_INIT
-_nolock_printf("\n[DEBUG KERNEL_INIT] P[%d,%d,%d] completes TTY0 lock init\n", 
-               x , y , p );
-#endif
-        // distributed kernel barrier between all processors
+_nolock_printf("\n[DEBUG KINIT] P[%d,%d,%d] completes TTY0 lock init\n", x , y , p );
+#endif
+        //////  distributed kernel barrier between all processors
         _sqt_barrier_init( &_all_procs_barrier );
 
 #if GIET_DEBUG_INIT
-_nolock_printf("\n[DEBUG KERNEL_INIT] P[%d,%d,%d] completes barrier init\n", 
-               x , y , p );
-#endif
-
-#if USE_PIC
-
-        // _ext_irq_index[isr][channel] initialisation
-        _ext_irq_init();
-
-        // routing HBA IRQ to proc[0,0,0] EXT_IRQ_ONE
-        unsigned int unused = 0;
-        if ( USE_IOC_HBA ) _ext_irq_alloc( ISR_HBA , 0 , &unused );
-
-#if GIET_DEBUG_INIT
-_nolock_printf("\n[DEBUG KERNEL_INIT] P[%d,%d,%d] completes ext_irq init\n", 
-               x , y , p );
-#endif
-
-#endif // USE_PIC
-
-        // release other processors
+_nolock_printf("\n[DEBUG KINIT] P[%d,%d,%d] completes barrier init\n", x , y , p );
+#endif
+
+        ////// _ext_irq_index[isr][channel] initialisation
+        if ( USE_PIC ) _ext_irq_init();
+
+#if GIET_DEBUG_INIT
+_nolock_printf("\n[DEBUG KINIT] P[%d,%d,%d] completes ext_irq init\n", x , y , p );
+#endif
+
+        //////  NIC peripheral initialization
+        if ( USE_NIC ) _nic_global_init( 1,      // broadcast accepted
+                                         1,      // bypass activated
+                                         0,      // tdm non activated
+                                         0 );    // tdm period
+#if GIET_DEBUG_INIT
+_nolock_printf("\n[DEBUG KINIT] P[%d,%d,%d] completes NIC init\n", x , y , p );
+#endif
+
+        //////  HBA peripheral initialisation
+        if ( USE_IOC_HBA )
+        {
+            _hba_init();
+
+            // routing HBA IRQ to proc[0,0,0]
+            _ext_irq_alloc( ISR_HBA , 0 , &unused );
+        }
+
+#if GIET_DEBUG_INIT
+_nolock_printf("\n[DEBUG KINIT] P[%d,%d,%d] completes HBA init\n", x , y , p );
+#endif
+
+        //////  release other processors
         _kernel_init_done = 1;
     }
@@ -209 +222 @@
 
 #if GIET_DEBUG_INIT
-_printf("\n[DEBUG KERNEL_INIT] P[%d,%d,%d] initialises SCHED array\n"
+_printf("\n[DEBUG KINIT] P[%d,%d,%d] initialises SCHED array\n"
         " - scheduler vbase = %x\n"
         " - tasks           = %d\n",
@@ -255 +268 @@
 
 #if GIET_DEBUG_INIT
-_printf("\n[DEBUG KERNEL_INIT] P[%d,%d,%d] initialises PTABS arrays"
+_printf("\n[DEBUG KINIT] P[%d,%d,%d] initialises PTABS arrays"
         " and context for task %d \n"
         " - ptabs_vaddr[%d][%d][%d] = %x\n"
@@ -297 +310 @@
 
 #if GIET_DEBUG_INIT
-_printf("\n[DEBUG KERNEL_INIT] P[%d,%d,%d] initializes idle_task and starts TICK\n",  
+_printf("\n[DEBUG KINIT] P[%d,%d,%d] initializes idle_task and starts TICK\n",  
         x, y, p );
 #endif
@@ -306 +319 @@
 
 #if GIET_DEBUG_INIT
-_printf("\n[DEBUG KERNEL_INIT] P[%d,%d,%d] completes kernel FAT init\n",
+_printf("\n[DEBUG KINIT] P[%d,%d,%d] completes kernel FAT init\n",
         x, y, p );
 #endif
@@ -334 +347 @@
 
 #if GIET_DEBUG_INIT
-_printf("\n[DEBUG KERNEL_INIT] P[%d,%d,%d] jumps to user code at cycle %d\n"
+_printf("\n[DEBUG KINIT] P[%d,%d,%d] jumps to user code at cycle %d\n"
         " ltid = %d / sp = %x / sr = %x / ptpr = %x / epc = %x\n",
         x , y , p , _get_proctime() ,