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

Timestamp:

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

Author:

alain

Message:

Introducing support for XICU

File:

• soft/giet_vm/sys/irq_handler.c (modified) (5 diffs)

soft/giet_vm/sys/irq_handler.c

@@ -42 +42 @@
 
     // get the highest priority active IRQ index 
-
-#if GIET_USE_XICU
-
-#else
-
-    if ( _icu_read( pid / NB_PROCS_MAX,
-                    pid % NB_PROCS_MAX,
-                    ICU_IT_VECTOR,
-                    &irq_id ) )
+    if ( _icu_get_index( pid / NB_PROCS_MAX,
+                         pid % NB_PROCS_MAX,
+                         &irq_id ) )
     {
-        _puts("\n[GIET ERROR] wrong _icu_read in _irq_demux() function\n");
-        _exit();
+        _get_lock(&_tty_put_lock);
+        _puts("\n[GIET ERROR] Strange... Wrong _icu_read in _irq_demux()\n");
+        _release_lock(&_tty_put_lock);
     }
-
-#endif
 
     if ( irq_id < 32 )  // do nothing if no interrupt active 
@@ -74 +67 @@
 //      _isr_default()
 // The default ISR is called when no specific ISR has been installed in the
-// interrupt vector. It simply displays a message on kernel TTY[0].
+// interrupt vector. It simply displays an error message on kernel TTY[0].
 ///////////////////////////////////////////////////////////////////////////////////
 void _isr_default()
 {
-    _puts("\n\n!!! Strange... Default ISR activated !!!\n");
+    _get_lock(&_tty_put_lock);
+    _puts("\n[GIET ERROR] Strange... Default ISR activated for processor ");
+    _putd( _procid() );
+    _puts("\n");
+    _release_lock(&_tty_put_lock);
 }
 
@@ -122 +119 @@
     unsigned int* ioc_address = (unsigned int*)&seg_ioc_base;
 
-    _ioc_status = ioc_address[BLOCK_DEVICE_STATUS]; /* save status & reset IRQ */
-    _ioc_done   = 1;                                /* signals completion */
+    _ioc_status = ioc_address[BLOCK_DEVICE_STATUS]; // save status & reset IRQ 
+    _ioc_done   = 1;                                // signals completion 
 }
 
 ///////////////////////////////////////////////////////////////////////////////////
 //         _isr_timer()
-// This ISR handles the IRQs generated by the "user" timers (the IRQs
-// generated by the "system" timers should be handled by the _isr_switch().
+// This ISR handles the IRQs generated by the "user" timers (the IRQs generated
+// by the "system" timers should be handled by the _isr_switch().
 // These timers are distributed in all clusters, and can be implemented
 // in a vci_multi_timer component, or in a vci_xicu component.
-// The channel_id argument is the global channel index:
-//     channel_id = cluster_id*(NB_TIMERS_MAX+NB_PROCS_MAX) + loc_id 
+// The timer_id argument is a global index:
+//     timer_id = cluster_id*(NB_TIMERS_MAX+NB_PROCS_MAX) + local_id 
 // The user timer local index is (loc_id - NB_PROCS_MAX).
 //
 // The ISR acknowledges the IRQ and registers the event in the proper entry
-// of the _timer_event[] array.
-// A log message is displayed on the kernel terminal.
-///////////////////////////////////////////////////////////////////////////////////
-void _isr_timer(unsigned int channel_id)
-{
-
-    unsigned int cluster_id = channel_id / (NB_TIMERS_MAX + NB_PROCS_MAX);
-    unsigned int loc_id     = channel_id % (NB_TIMERS_MAX + NB_PROCS_MAX); 
-
-    if (loc_id < NB_PROCS_MAX )
+// of the _timer_event[] array, and a log message is displayed on kernel terminal.
+///////////////////////////////////////////////////////////////////////////////////
+void _isr_timer(unsigned int timer_id)
+{
+
+    unsigned int cluster_id = timer_id / (NB_TIMERS_MAX + NB_PROCS_MAX);
+    unsigned int local_id   = timer_id % (NB_TIMERS_MAX + NB_PROCS_MAX); 
+
+    // checking timer type
+    if (local_id < NB_PROCS_MAX )
     {
-        _puts("[GIET ERROR] Receiving a user timer IRQ for a system timer\n");
-        _puts("             cluster = ");
-        _putw(cluster_id);
-        _puts(" / local_id = ");
-        _putw(loc_id);
+        _get_lock(&_tty_put_lock);
+        _puts("[GIET ERROR] Strange... User timer ISR for a system timer\n");
+        _release_lock(&_tty_put_lock);
     }
 
-#if GIET_USE_XICU
-
-// TODO
-
-#else
-
-    // compute Timer address
-    unsigned int* timer_address = (unsigned int*)&seg_timer_base +
-                                  (loc_id * TIMER_SPAN) +
-                                  (cluster_id * CLUSTER_SPAN);
-
-    // reset IRQ 
-    timer_address[TIMER_RESETIRQ] = 0;
-
-#endif
+    // aknowledge IRQ 
+    _timer_reset_irq( cluster_id, local_id );
 
 #if NB_TIMERS_MAX
@@ -177 +159 @@
 
     // display a message on TTY 0 
-    _puts("[GIET] User Timer IRQ / cluster = ");
-    _putw(cluster_id);
-    _puts(" / timer = ");
-    _putw(loc_id - NB_PROCS_MAX);
+    _get_lock(&_tty_put_lock);
+    _puts("[GIET] User Timer IRQ at cycle ");
+    _putd( _proctime() );
+    _puts(" / index = ");
+    _putd(timer_id);
     _puts("\n");
+    _release_lock(&_tty_put_lock);
 }
 
@@ -219 +203 @@
     // get cluster index and proc local index
     unsigned int pid        = _procid();
-    unsigned int loc_id     = pid % NB_PROCS_MAX;
+    unsigned int local_id   = pid % NB_PROCS_MAX;
     unsigned int cluster_id = pid / NB_PROCS_MAX;
 
-#if GIET_USE_XICU
-
-    unsigned int* timer_address = // TODO
-
-#else
-
-    // compute Timer address
-    unsigned int* timer_address = (unsigned int*)&seg_timer_base +
-                                  (loc_id * TIMER_SPAN) +
-                                  (cluster_id * CLUSTER_SPAN);
-
-    // reset IRQ
-    timer_address[TIMER_RESETIRQ] = 0; 
-
-#endif
+    // acknowledge IRQ
+    _timer_reset_irq( cluster_id, local_id ); 
 
     // performs the context switch
     _ctx_switch();
-
-}
-
+}
+