Changeset 728

Timestamp:

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

Author:

alain

Message:

bloup

Location:

soft/giet_vm/giet_drivers

Files:

• bdv_driver.c (modified) (5 diffs)
• bdv_driver.h (modified) (1 diff)
• cma_driver.h (modified) (2 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

soft/giet_vm/giet_drivers/bdv_driver.h

@@ -15 +15 @@
 // - in "synchronous" mode, it uses a polling policy on the BDV STATUS 
 //   register to detect transfer completion, as interrupts are not activated. 
-//   This mode is used by the boot code to load the map.bin file into memory
+//   This mode must be used by the boot code to load the map.bin file into memory
 //   (before MMU activation), or to load the .elf files (after MMU activation). 
+//   As only one processor acces the block device, it doesn't take the _bdv_lock.
+//
 // - In "descheduling" mode, ir uses a descheduling + IRQ policy.
+//   This mode mus be used by the kernel code tho handle system calls.
 //   The ISR executed when transfer completes should restart the calling task,
 //   as the calling task global index has been saved in the _bdv_gtid variable.
-//   
-// As the BDV component can be used by several programs running in parallel,
-// the _bdv_lock variable guaranties exclusive access to the device.
+//   As the BDV component can be used by several programs running in parallel,
+//   it takes the _bdv_lock and registers it in the calling task context.
 //
 // The SEG_IOC_BASE address must be defined in the hard_config.h file.

soft/giet_vm/giet_drivers/cma_driver.h

@@ -49 +49 @@
 
 ///////////////////////////////////////////////////////////////////////////////////
+//  CMA channel running modes
+///////////////////////////////////////////////////////////////////////////////////
+
+enum CMA_modes_e
+{
+    MODE_IDLE           = 0,
+    MODE_NORMAL         = 1,
+    MODE_NO_DST_SYNC    = 2,
+    MODE_NO_SRC_SYNC    = 4,
+};
+
+///////////////////////////////////////////////////////////////////////////////////
 //  CMA channel status values
 ///////////////////////////////////////////////////////////////////////////////////
@@ -89 +101 @@
 };
 
+
 ///////////////////////////////////////////////////////////////////////////////////
 //    access functions