Changeset 295 for soft/giet_vm/giet_drivers/dma_driver.c

Timestamp:

Mar 26, 2014, 6:44:44 PM (11 years ago)

Author:

alain

Message:

Introducing a major release, to suppoort the tsar_generic_leti platform
and the various (external or internal) peripherals configurations.
The map.xml format has been modified, in order to support the new
vci_iopic componentand a new policy for peripherals initialisation.
The IRQs are nom described in the XICU and IOPIC components
(and not anymore in the processors).
To enforce this major change, the map.xml file signature changed:
The signature value must be: 0xDACE2014

This new release has been tested on the tsar_generic_leti platform
for the following mappings:

• 4c_4p_sort_leti
• 4c_4p_sort_leti_ext
• 4c_4p_transpose_leti
• 4c_4p_transpose_leti_ext
• 4c_1p_four_leti_ext

File:

• soft/giet_vm/giet_drivers/dma_driver.c (modified) (10 diffs)

soft/giet_vm/giet_drivers/dma_driver.c

@@ -196 +196 @@
     unsigned int procid    = _get_procid();
     unsigned int cluster_xy = procid/NB_PROCS_MAX;
+    unsigned int x          = cluster_xy >> Y_WIDTH;
+    unsigned int y          = cluster_xy & ((1<<Y_WIDTH)-1);
     unsigned int channel_id = procid%NB_PROCS_MAX;
 
@@ -203 +205 @@
 
 #if GIET_DEBUG_DMA_DRIVER
-_tty_get_lock( 0 );
-_puts("\n[DMA DEBUG] Enter _dma_copy() at cycle ");
-_putd( _get_proctime() );
-_puts("\n - vspace_id  = ");
-_putx( vspace_id );
-_puts("\n - cluster_xy = ");
-_putx( cluster_xy );
-_puts("\n - channel_id = ");
-_putx( channel_id );
-_puts("\n - dest       = ");
-_putx( (unsigned int)dest );
-_puts("\n - source     = ");
-_putx( (unsigned int)source );
-_puts("\n - bytes      = ");
-_putd( size );
-_tty_release_lock( 0 );
+unsigned int x          = cluster_xy >> Y_WIDTH;
+unsigned int y          = cluster_xy & ((1<<Y_WIDTH)-1);
+
+_printf("\n[DMA DEBUG] Processor[%d,%d,%d] enters _dma_copy() at cycle %d\n"
+        " - vspace_id  = %d\n"
+        " - cluster_xy = %x\n"
+        " - channel_id = %d\n"
+        " - dest       = %x\n"
+        " - source     = %x\n"
+        " - bytes      = %x\n",
+        x, y, channel_id, _get_proctime(), vspace_id, cluster_xy,
+        (unsigned int)dest, (unsigned int)source, size );
 #endif
 
@@ -226 +224 @@
          (size & 0x3) )
     {
-        _tty_get_lock( 0 );
-        _puts("\n[GIET ERROR] in _dma_copy() : buffer unaligned\n");
-        _tty_release_lock( 0 );
+        _printf("\n[GIET ERROR] in _dma_copy() : buffer unaligned\n");
         _exit();
     }
@@ -242 +238 @@
     if ( ko ) 
     {
-        _tty_get_lock( 0 );
-        _puts("\n[GIET ERROR] in _dma_copy() : source buffer unmapped\n");
-        _tty_release_lock( 0 );
+        _printf("\n[GIET ERROR] in _dma_copy() : source buffer unmapped\n");
         _exit();
     }
@@ -257 +251 @@
     if ( ko ) 
     {
-        _tty_get_lock( 0 );
-        _puts("\n[GIET ERROR] in _dma_copy() : dest buffer unmapped\n");
-        _tty_release_lock( 0 );
+        _printf("\n[GIET ERROR] in _dma_copy() : dest buffer unmapped\n");
         _exit();
     }
@@ -266 +258 @@
 
 #if GIET_DEBUG_DMA_DRIVER
-_tty_get_lock( 0 );
-_puts("\n - src_paddr  = ");
-_putl( src_paddr );
-_puts("\n - dst_paddr  = ");
-_putl( dst_paddr );
-_puts("\n");
-_tty_release_lock( 0 );
+_printf(" - src_paddr  = %llx\n"
+        " - dst_paddr  = %llx\n",
+        src_paddr, dst_paddr );
 #endif
 
@@ -282 +270 @@
     if ( ko ) 
     {
-        _tty_get_lock( 0 );
-        _puts("\n[GIET ERROR] in _dma_copy() : cannot start transfer\n");
-        _tty_release_lock( 0 );
+        _printf("\n[GIET ERROR] in _dma_copy() : cannot start transfer\n");
         _exit();
     }
@@ -297 +283 @@
 
 #if GIET_DEBUG_DMA_DRIVER
-_tty_get_lock( 0 );
-_puts("\n[DMA DEBUG] _dma_copy() : ... waiting on DMA_STATUS register ...\n");
-_tty_release_lock( 0 );
+_printf("\n[DMA DEBUG] _dma_copy() : ... waiting on DMA_STATUS register ...\n");
 #endif
 
@@ -307 +291 @@
     if( status != DMA_SUCCESS )
     {
-        _tty_get_lock( 0 );
-        _puts("\n[GIET ERROR] in _dma_copy() : DMA_STATUS error = ");
-        _putd( status );
-        _puts("\n");
-        _tty_release_lock( 0 );
+        _printf("\n[GIET ERROR] in _dma_copy() : DMA_STATUS = %x\n", status );
         _exit();
     }
@@ -318 +298 @@
 
 #if GIET_DEBUG_DMA_DRIVER
-_tty_get_lock( 0 );
-_puts("\n[DMA DEBUG] _dma_copy() completed at cycle ");
-_putd( _get_proctime() );
-_puts("\n");
-_tty_release_lock( 0 );
+_printf("\n[DMA DEBUG] _dma_copy() completed at cycle %d\n", _get_proctime() );
 #endif
 
 #else // NB_DMA_CHANNELS == 0
-    _tty_get_lock( 0 );
-    _puts("\n[GIET ERROR] in _dma_copy() : NB_DMA_CHANNELS = 0 !\n");
-    _tty_release_lock( 0 );
+    _printf("\n[GIET ERROR] in _dma_copy() : NB_DMA_CHANNELS = 0 !\n");
     _exit();
 #endif