Changeset 207 for soft/giet_vm/sys/kernel_init.c

Timestamp:

Aug 16, 2012, 6:36:16 PM (12 years ago)

Author:

alain

Message:

Several bugs have been fixed to support TSAR multi-cluster architecture
such as the "tsarv4-generic_mmu" platform.

File:

• soft/giet_vm/sys/kernel_init.c (modified) (9 diffs)

soft/giet_vm/sys/kernel_init.c

@@ -54 +54 @@
 {
     // compute cluster and local processor index
-    unsigned int        proc_id    = _procid();
-    unsigned int    cluster_id = proc_id / NB_PROCS_MAX;
-    unsigned int    lpid       = proc_id % NB_PROCS_MAX;
+    unsigned int        global_pid = _procid();
+    unsigned int    cluster_id = global_pid / NB_PROCS_MAX;
+    unsigned int    proc_id    = global_pid % NB_PROCS_MAX;
+
+    // Step 0 : Compute number of tasks allocated to proc
+
+    unsigned int tasks = _get_tasks_number();
+
+#if GIET_DEBUG_INIT
+_get_lock(&_tty_put_lock);
+_puts("\n[GIET DEBUG] step 0 for processor ");
+_putd( global_pid );
+_puts(" : tasks = ");
+_putd( tasks );
+_puts("\n");
+_release_lock(&_tty_put_lock);
+#endif
 
     // step 1 : Initialise scheduler physical addresses array
-
-    // get scheduler physical address from register
+    //          get scheduler physical address (from CP0 register)
+
     static_scheduler_t*         psched = (static_scheduler_t*)_get_sched();
-    _schedulers_paddr[proc_id]     = psched;
+    _schedulers_paddr[global_pid]  = psched;
 
 #if GIET_DEBUG_INIT
 _get_lock(&_tty_put_lock);
 _puts("\n[GIET DEBUG] step 1 for processor ");
-_putd( proc_id );
+_putd( global_pid );
 _puts(" / scheduler pbase = ");
-_putw( (unsigned int)psched );
-_puts("\n");
-_release_lock(&_tty_put_lock);
-#endif
-
+_putx( (unsigned int)psched );
+_puts("\n");
+_release_lock(&_tty_put_lock);
+#endif
 
     // step 2 : initialise page table addresse arrays
@@ -80 +93 @@
 
     unsigned int ltid;
-    unsigned int tasks = _get_tasks_number();
 
     for ( ltid = 0 ; ltid < tasks ; ltid++ )
@@ -94 +106 @@
 _get_lock(&_tty_put_lock);
 _puts("\n[GIET DEBUG] step 2 for processor ");
-_putd( proc_id );
+_putd( global_pid );
 _puts(" / vspace ");
 _putd( vspace_id );
 _puts("\n- ptab vbase = ");
-_putw( ptab_vaddr );
+_putx( ptab_vaddr );
 _puts("\n- ptab pbase = ");
-_putw( ptab_paddr );
+_putx( ptab_paddr );
 _puts("\n");
 _release_lock(&_tty_put_lock);
@@ -129 +141 @@
         }
     }
-    _icu_set_mask( cluster_id, lpid, hwi_mask, 0 ); // set HWI_MASK
-    _icu_set_mask( cluster_id, lpid, pti_mask, 1 );     // set PTI_MASK
+    _icu_set_mask( cluster_id, proc_id, hwi_mask, 0 ); // set HWI_MASK
+    _icu_set_mask( cluster_id, proc_id, pti_mask, 1 );  // set PTI_MASK
    
 #if GIET_DEBUG_INIT
 _get_lock(&_tty_put_lock);
 _puts("\n[GIET DEBUG] step 3 for processor ");
-_putd( proc_id );
+_putd( global_pid );
 _puts("\n - ICU HWI_MASK = ");
-_putw( hwi_mask );
+_putx( hwi_mask );
 _puts("\n - ICU PTI_MASK = ");
-_putw( pti_mask );
-_puts("\n");
-_release_lock(&_tty_put_lock);
-#endif
-
+_putx( pti_mask );
+_puts("\n");
+_release_lock(&_tty_put_lock);
+#endif
 
     // step 4 : start TICK timer if more than one task
@@ -155 +166 @@
 _get_lock(&_tty_put_lock);
 _puts("\n[GIET DEBUG] Step 4 for processor ");
-_putd( proc_id );
+_putd( global_pid );
 _puts(" / context switch activated\n");
 _release_lock(&_tty_put_lock);
@@ -169 +180 @@
     _set_context_slot( IDLE_TASK_INDEX, CTX_RUN_ID,  1 );
     _set_context_slot( IDLE_TASK_INDEX, CTX_SR_ID,   0xFF03 );
-    _set_context_slot( IDLE_TASK_INDEX, CTX_SP_ID,   (unsigned int)&_idle_stack[proc_id] + 64 );
+    _set_context_slot( IDLE_TASK_INDEX, CTX_SP_ID,   (unsigned int)&_idle_stack[global_pid] + 64 );
     _set_context_slot( IDLE_TASK_INDEX, CTX_RA_ID,   (unsigned int)&_ctx_eret );
     _set_context_slot( IDLE_TASK_INDEX, CTX_EPC_ID,  (unsigned int)&_ctx_idle );
@@ -178 +189 @@
 _get_lock(&_tty_put_lock);
 _puts("\n[GIET DEBUG] Step 5 for processor ");
-_putd( proc_id );
+_putd( global_pid );
 _puts(" / idle task context set\n");
 _release_lock(&_tty_put_lock);
@@ -195 +206 @@
         _get_lock( &_tty_put_lock );
         _puts("\n [GIET WARNING] No task allocated to processor ");
-        _putw( proc_id );
+        _putd( global_pid );
         _puts(" => idle\n");
         _release_lock ( &_tty_put_lock );
@@ -212 +223 @@
 _get_lock(&_tty_put_lock);
 _puts("\n[GIET DEBUG] step 6 for processor ");
-_putd( proc_id );
+_putd( global_pid );
 _puts(" / registers initialised \n");
 _puts("- sp   = ");
-_putw( sp_value );
+_putx( sp_value );
 _puts("\n");
 _puts("- sr   = ");
-_putw( sr_value );
+_putx( sr_value );
 _puts("\n");
 _puts("- ptpr = ");
-_putw( ptpr_value<<13 );
+_putx( ptpr_value<<13 );
 _puts("\n");
 _puts("- epc  = ");
-_putw( epc_value );
+_putx( epc_value );
 _puts("\n");
 _release_lock(&_tty_put_lock);