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

Timestamp:

Jun 25, 2014, 2:19:37 PM (10 years ago)

Author:

cfuguet

Message:

giet_vm optimizations:

• Several modifications in GIET_VM in order to support compilation with GCC optimizations (-O2) activated.

• Adding missing volatile in some global variables.

• Using ioread and iowrite utility functions in peripheral drivers which prevent GCC to remove writes or reads in hardware memory mapped registers.

• Code refactoring of stdio printf functions. Now, shr_printf and tty_printf function reuse the same function body. The only difference is that shr_printf wraps printf function call with TTY get lock and release lock.

File:

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

soft/giet_vm/giet_drivers/dma_driver.c

@@ -32 +32 @@
 #include <vmem.h>
 #include <utils.h>
+#include <io.h>
 
 #if !defined(X_SIZE) 
@@ -61 +62 @@
 #endif
 
-extern unsigned int _ptabs_vaddr[];
+extern volatile unsigned int _ptabs_vaddr[];
+
+///////////////////////////////////////////////////////////////////////////////
+// This low level function returns the value contained in register "index"
+// in the DMA component contained in cluster "cluster_xy"
+///////////////////////////////////////////////////////////////////////////////
+static
+unsigned int _dma_get_register( unsigned int cluster_xy, // cluster index
+                                unsigned int channel_id, // channel index
+                                unsigned int index )     // register index
+{
+    unsigned int vaddr =
+        SEG_DMA_BASE + 
+        (cluster_xy * PERI_CLUSTER_INCREMENT) +
+        (channel_id * DMA_SPAN) +
+        (index << 2);
+
+    return ioread32( (void*)vaddr );
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// This low level function sets a new value in register "index"
+// in the DMA component contained in cluster "cluster_xy"
+///////////////////////////////////////////////////////////////////////////////
+static
+void _dma_set_register( unsigned int cluster_xy,       // cluster index
+                        unsigned int channel_id,       // channel index
+                        unsigned int index,            // register index
+                        unsigned int value )           // value to be written
+{
+    unsigned int vaddr =
+        SEG_DMA_BASE + 
+        (cluster_xy * PERI_CLUSTER_INCREMENT) +
+        (channel_id * DMA_SPAN) +
+        (index << 2);
+
+    iowrite32( (void*)vaddr, value );
+}
 
 //////////////////////////////////////////////////////////////////////////////////
@@ -81 +119 @@
     if (channel_id >= NB_DMA_CHANNELS)  return 1; 
 
-    // compute DMA base address
-    unsigned int* dma_address = (unsigned int*) ( SEG_DMA_BASE + 
-                                (cluster_xy * PERI_CLUSTER_INCREMENT) );
-
     // disable interrupt for selected channel
-    dma_address[channel_id * DMA_SPAN + DMA_IRQ_DISABLE] = 1;            
+    _dma_set_register(cluster_xy, channel_id, DMA_IRQ_DISABLE, 1);
     return 0;
 #else
@@ -109 +143 @@
     if (channel_id >= NB_DMA_CHANNELS)  return 1; 
 
-    // compute DMA base address
-    unsigned int* dma_address = (unsigned int*) ( SEG_DMA_BASE + 
-                                (cluster_xy * PERI_CLUSTER_INCREMENT) );
-
     // reset selected channel
-    dma_address[channel_id * DMA_SPAN + DMA_RESET] = 0;            
+    _dma_set_register(cluster_xy, channel_id, DMA_RESET, 0);
     return 0;
 #else
@@ -136 +166 @@
     if (channel_id >= NB_DMA_CHANNELS)  return 1;
 
-    // compute DMA base address
-    unsigned int * dma_address = (unsigned int *) ( SEG_DMA_BASE + 
-                                 (cluster_xy * PERI_CLUSTER_INCREMENT) );
-
     // get selected channel status
-    return dma_address[channel_id * DMA_SPAN + DMA_LEN];
+    return _dma_get_register(cluster_xy, channel_id, DMA_LEN);
 #else
     return DMA_IDLE;
@@ -160 +186 @@
 #if NB_DMA_CHANNELS > 0
 
-    // compute DMA base address
-    unsigned int * dma_address = (unsigned int *) ( SEG_DMA_BASE + 
-                                 (cluster_xy * PERI_CLUSTER_INCREMENT) );
-
     // selected channel configuration and lauching
-    dma_address[channel_id * DMA_SPAN + DMA_SRC]     = (unsigned int)(src_paddr);
-    dma_address[channel_id * DMA_SPAN + DMA_SRC_EXT] = (unsigned int)(src_paddr>>32);
-    dma_address[channel_id * DMA_SPAN + DMA_DST]     = (unsigned int)(dst_paddr);
-    dma_address[channel_id * DMA_SPAN + DMA_DST_EXT] = (unsigned int)(dst_paddr>>32);
-    dma_address[channel_id * DMA_SPAN + DMA_LEN]     = (unsigned int)size;
+    _dma_set_register(cluster_xy, channel_id, DMA_SRC,
+            (unsigned int)(src_paddr));
+    _dma_set_register(cluster_xy, channel_id, DMA_SRC_EXT,
+            (unsigned int)(src_paddr>>32));
+    _dma_set_register(cluster_xy, channel_id, DMA_DST,
+            (unsigned int)(dst_paddr));
+    _dma_set_register(cluster_xy, channel_id, DMA_DST_EXT,
+            (unsigned int)(dst_paddr>>32));
+    _dma_set_register(cluster_xy, channel_id, DMA_LEN,
+            (unsigned int)size);
 
 #endif
@@ -312 +339 @@
 
     // get vspace page table pointer 
-    unsigned int pt =  _ptabs_vaddr[vspace_id];
+    unsigned int pt = _ptabs_vaddr[vspace_id];
 
     // get src_paddr buffer physical addresse