Changeset 297 for soft/giet_vm/giet_drivers/bdv_driver.c

Timestamp:

Mar 28, 2014, 10:48:51 AM (11 years ago)

Author:

alain

Message:

Bug fix in both _tty_rx_isr() and _bdv_isr():
The ISR must do nothing it the status indicates that
there is no pending ISR.

File:

• soft/giet_vm/giet_drivers/bdv_driver.c (modified) (3 diffs)

soft/giet_vm/giet_drivers/bdv_driver.c

@@ -304 +304 @@
     unsigned int lpid       = procid % NB_PROCS_MAX;
 
-    // acknowledge WTI in local XCU if required 
-    unsigned int value;
-    if ( irq_type == IRQ_TYPE_WTI ) _xcu_get_wti_value( cluster_xy, irq_id, &value );
-
-    // save status in _bdv_status variable and reset IRQ
-    _bdv_status = _bdv_get_register( BLOCK_DEVICE_STATUS ); 
+    // get BDV status (and reset IRQ)
+    unsigned int status =  _bdv_get_register( BLOCK_DEVICE_STATUS ); 
+
+    // check status: does nothing if IDLE or BUSY
+    if ( (status == BLOCK_DEVICE_IDLE) ||
+         (status == BLOCK_DEVICE_BUSY) )   return;
+ 
+    // reset WTI in XCU if WTI type
+    if ( irq_type == IRQ_TYPE_WTI ) 
+    {
+        unsigned int value;
+        _xcu_get_wti_value( cluster_xy, irq_id, &value );
+    }
+    
+    // save status in kernel buffer _bdv_status
+    _bdv_status = status; 
 
     // identify task waiting on BDV
@@ -315 +325 @@
     unsigned int ltid       = _bdv_gtid & 0xFFFF;
     unsigned int remote_xy  = rprocid / NB_PROCS_MAX;
+
+    // re-activates sleeping task
+    _set_task_slot( rprocid,     // global processor index
+                    ltid,        // local task index on processor
+                    CTX_RUN_ID,  // CTX_RUN slot 
+                    1 );         // running
+
+    // requires a context switch for remote processor running the waiting task 
+    _xcu_send_wti( remote_xy,    // cluster index
+                   lpid,         // local processor index
+                   0 );          // don't force context switch if not idle
 
 #if GIET_DEBUG_IRQS  // we don't take the TTY lock to avoid deadlock
@@ -343 +364 @@
 #endif
 
-    // re-activates sleeping task
-    _set_task_slot( rprocid,     // global processor index
-                    ltid,        // local task index on processor
-                    CTX_RUN_ID,  // CTX_RUN slot 
-                    1 );         // running
-
-    // requires a context switch for remote processor running the waiting task 
-    _xcu_send_wti( remote_xy,    // cluster index
-                   lpid,         // local processor index
-                   0 );          // don't force context switch if not idle
 }