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

Timestamp:

Nov 21, 2015, 2:53:00 PM (9 years ago)

Author:

alain

Message:

bloup

File:

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

soft/giet_vm/giet_drivers/bdv_driver.c

@@ -97 +97 @@
     unsigned int status;
 
-    // get the BDV lock and register it in task context
-    static_scheduler_t*  psched = _get_sched();
-    unsigned int         ltid   = _get_thread_ltid();
-    _spin_lock_acquire( &_bdv_lock );
-    _atomic_or( &psched->context[ltid].slot[CTX_LOCKS_ID] , LOCKS_MASK_BDV ); 
-
-    // set device registers
-    _bdv_set_register( BLOCK_DEVICE_BUFFER    , (unsigned int)buf_paddr );
-    _bdv_set_register( BLOCK_DEVICE_BUFFER_EXT, (unsigned int)(buf_paddr>>32) );
-    _bdv_set_register( BLOCK_DEVICE_COUNT     , count );
-    _bdv_set_register( BLOCK_DEVICE_LBA       , lba );
-
 #if USE_IOB    // software L2/L3 cache coherence
     if ( to_mem )  _mmc_inval( buf_paddr, count<<9 );
@@ -120 +108 @@
     if ( use_irq == 0 ) 
     {
+        // set device registers
+        _bdv_set_register( BLOCK_DEVICE_BUFFER    , (unsigned int)buf_paddr );
+        _bdv_set_register( BLOCK_DEVICE_BUFFER_EXT, (unsigned int)(buf_paddr>>32) );
+        _bdv_set_register( BLOCK_DEVICE_COUNT     , count );
+        _bdv_set_register( BLOCK_DEVICE_LBA       , lba );
+
         // Launch transfert
         if (to_mem == 0) _bdv_set_register( BLOCK_DEVICE_OP, BLOCK_DEVICE_WRITE );
@@ -162 +156 @@
         unsigned int save_sr;
 
-        // activates BDV interrupt
+        // get the BDV lock and register it in calling task context
+        static_scheduler_t*  psched = _get_sched();
+        unsigned int         ltid = psched->current;
+        _spin_lock_acquire( &_bdv_lock );
+        _atomic_or( &psched->context[ltid].slot[CTX_LOCKS_ID] , LOCKS_MASK_BDV ); 
+
+        // set device registers
+        _bdv_set_register( BLOCK_DEVICE_BUFFER    , (unsigned int)buf_paddr );
+        _bdv_set_register( BLOCK_DEVICE_BUFFER_EXT, (unsigned int)(buf_paddr>>32) );
+        _bdv_set_register( BLOCK_DEVICE_COUNT     , count );
+        _bdv_set_register( BLOCK_DEVICE_LBA       , lba );
         _bdv_set_register( BLOCK_DEVICE_IRQ_ENABLE, 1 );
 
@@ -172 +176 @@
 
         // Set NORUN_MASK_IOC bit 
-        static_scheduler_t* psched  = (static_scheduler_t*)_get_sched();
-        unsigned int ltid = psched->current;
         _atomic_or( &psched->context[ltid].slot[CTX_NORUN_ID] , NORUN_MASK_IOC );
         
@@ -202 +204 @@
         error = ( (_bdv_status == BLOCK_DEVICE_READ_ERROR) ||
                   (_bdv_status == BLOCK_DEVICE_WRITE_ERROR) );
-    }
-
-    // release BDV lock and clear task context
-    _spin_lock_release( &_bdv_lock );      
-    _atomic_and( &psched->context[ltid].slot[CTX_LOCKS_ID] , ~LOCKS_MASK_BDV ); 
+
+        // release BDV lock and clear task context
+        _spin_lock_release( &_bdv_lock );      
+        _atomic_and( &psched->context[ltid].slot[CTX_LOCKS_ID] , ~LOCKS_MASK_BDV ); 
+    }
 
 #if GIET_DEBUG_IOC