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

Timestamp:

Aug 14, 2012, 8:14:55 PM (12 years ago)

Author:

alain

Message:

mproving support for multi-clusters architectures (CLUSTER_SIZE & CLUSTER_IO_ID parameters)

File:

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

soft/giet_vm/sys/irq_handler.c

@@ -92 +92 @@
     // compute cluster_id and loc_id
     unsigned int cluster_id = channel_id / NB_DMAS_MAX;
-    unsigned int loc_id     = channel_id % NB_DMAS_MAX;
-
-    // compute DMA channel address
-    unsigned int*       dma_address = (unsigned int*)&seg_dma_base + 
-                                  (loc_id * DMA_SPAN) +
-                                  (cluster_id * CLUSTER_SPAN);
+    unsigned int local_id   = channel_id % NB_DMAS_MAX;
 
     // save DMA channel status  
-    _dma_status[channel_id] = dma_address[DMA_LEN];
-
-    // reset DMA channel
-    dma_address[DMA_RESET] = 0;                 
+    if ( _dma_get_status(cluster_id, local_id, &_dma_status[channel_id]) )
+    {
+        _get_lock(&_tty_put_lock);
+        _puts("[GIET ERROR] illegal DMA channel detected by _isr_dma\n");
+        _release_lock(&_tty_put_lock);
+        return;
+    }
+
+    // reset DMA channel irq
+    if ( _dma_reset_irq(cluster_id, local_id) )
+    {
+        _get_lock(&_tty_put_lock);
+        _puts("[GIET ERROR] illegal DMA channel detected by _isr_dma\n");
+        _release_lock(&_tty_put_lock);
+        return;
+    }
 
     // release DMA channel 
@@ -117 +124 @@
 void _isr_ioc()
 {
-    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 
+     // save status & reset IRQ 
+    if ( _ioc_get_status( &_ioc_status ) )
+    {
+        _get_lock(&_tty_put_lock);
+        _puts("[GIET ERROR] bad access to IOC status detected by _isr_ioc\n");
+        _release_lock(&_tty_put_lock);
+        return;
+    }
+
+    // signals completion 
+    _ioc_done   = 1; 
 }
 
@@ -148 +162 @@
         _puts("[GIET ERROR] Strange... User timer ISR for a system timer\n");
         _release_lock(&_tty_put_lock);
+        return;
     }
 
     // aknowledge IRQ 
-    _timer_reset_irq( cluster_id, local_id );
+    if ( _timer_reset_irq( cluster_id, local_id ) )
+    {
+        _get_lock(&_tty_put_lock);
+        _puts("[GIET ERROR] illegal timer index detected by _isr_timer\n");
+        _release_lock(&_tty_put_lock);
+        return;
+    }
 
 #if NB_TIMERS_MAX
@@ -172 +193 @@
 // This ISR handles the IRQs generated by the multi_tty controler,
 // signaling that a character is available.
-// There is one single multi_tty component controling all TTYs, and the tty_id 
-// argument is the global TTY index.
+// There is one single multi_tty component controling all TTYs, 
+// and the tty_id // argument is the global TTY index.
 // There is one communication buffer _tty_buf[tty_id] per terminal.
 // The sychronisation variable _tty_full[tty_id], is set by the ISR,
@@ -181 +202 @@
 void _isr_tty(unsigned int tty_id)
 {
-    // compute terminal base address 
-    unsigned int *tty_address = (unsigned int*)&seg_tty_base + (tty_id * TTY_SPAN);
-
     // save character and reset IRQ 
-    _tty_get_buf[tty_id] = (unsigned char)tty_address[TTY_READ];
+    if ( _tty_get_char( tty_id, &_tty_get_buf[tty_id] ) )
+    {
+        _get_lock(&_tty_put_lock);
+        _puts("[GIET ERROR] illegal tty index detected by _isr_tty\n");
+        _release_lock(&_tty_put_lock);
+        return;
+    }
 
     // signals character available 
@@ -207 +231 @@
 
     // acknowledge IRQ
-    _timer_reset_irq( cluster_id, local_id ); 
+    if ( _timer_reset_irq( cluster_id, local_id ) ) 
+    {
+        _get_lock(&_tty_put_lock);
+        _puts("[GIET ERROR] illegal proc index detected by _isr_switch\n");
+        _release_lock(&_tty_put_lock);
+        return;
+    }
 
     // performs the context switch