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

Timestamp:

Aug 13, 2012, 10:52:25 PM (12 years ago)

Author:

alain

Message:

Introducing support for XICU

File:

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

soft/giet_vm/sys/kernel_init.c

@@ -76 +76 @@
 
     // step 2 : initialise page table addresse arrays
-    //          it scans all tasks contexts in the scheduler 
-    //          and get VSID, PTAB and PTPR values
+    //          each processor scans all tasks contexts in its
+    //          private scheduler and get VSID, PTAB and PTPR values
 
     unsigned int ltid;
@@ -87 +87 @@
         unsigned int ptab_vaddr = _get_context_slot( ltid , CTX_PTAB_ID ); 
         unsigned int ptab_paddr = _get_context_slot( ltid , CTX_PTPR_ID ) << 13; 
+
         _ptabs_vaddr[vspace_id] = ptab_vaddr;
         _ptabs_paddr[vspace_id] = ptab_paddr;
@@ -106 +107 @@
     }
  
-    // step 3 : compute and set ICU mask 
+    // step 3 : compute and set ICU masks
+    //          there is at most 32 interrupts per processor
+    //          software interrupts are not supported yet
+
     unsigned int irq_id;
-    unsigned int mask = 0;
+    unsigned int hwi_mask = 0;
+    unsigned int pti_mask = 0;
+
     for ( irq_id = 0 ; irq_id < 32 ; irq_id++ )
     {
-        unsigned int entry   = _get_interrupt_vector_entry(irq_id);
-        if ( entry ) mask = mask | 0x1<< irq_id;
-    }
-    _icu_write( cluster_id,
-                lpid,
-                ICU_MASK_SET,
-                mask );
+        unsigned int entry  = _get_interrupt_vector_entry(irq_id);
+        unsigned int isr    = entry & 0x000000FF;
+
+        if ( (isr == ISR_DMA) || (isr == ISR_IOC) || (isr == ISR_TTY) )
+        {
+             hwi_mask = hwi_mask | 0x1<< irq_id;
+        }
+        else if ( (isr == ISR_SWITCH) || (isr == ISR_TIMER) )
+        { 
+            pti_mask = pti_mask | 0x1<< irq_id;
+        }
+    }
+    _icu_set_mask( cluster_id, lpid, hwi_mask, 0 ); // set HWI_MASK
+    _icu_set_mask( cluster_id, lpid, pti_mask, 1 );     // set PTI_MASK
    
 #if GIET_DEBUG_INIT
@@ -123 +136 @@
 _puts("\n[GIET DEBUG] step 3 for processor ");
 _putd( proc_id );
-_puts(" / ICU mask = ");
-_putw( mask );
+_puts("\n - ICU HWI_MASK = ");
+_putw( hwi_mask );
+_puts("\n - ICU PTI_MASK = ");
+_putw( pti_mask );
 _puts("\n");
 _release_lock(&_tty_put_lock);
@@ -133 +148 @@
     if ( tasks > 1 )
     {
-        unsigned int period     = GIET_TICK_VALUE;
-        unsigned int mode       = 0x3;
-        _timer_access( 0,                       // write access
-                       cluster_id, 
-                       proc_id, 
-                       TIMER_PERIOD, 
-                       &period );
-        _timer_access( 0,                       // write access
-                       cluster_id, 
-                       proc_id, 
-                       TIMER_MODE, 
-                       &mode );
+        _timer_start( cluster_id, 
+                      proc_id, 
+                      GIET_TICK_VALUE );
         
 #if GIET_DEBUG_INIT
@@ -150 +156 @@
 _puts("\n[GIET DEBUG] Step 4 for processor ");
 _putd( proc_id );
-_puts(" / TICK activated\n");
+_puts(" / context switch activated\n");
 _release_lock(&_tty_put_lock);
 #endif