Changeset 496 for soft/giet_vm/giet_drivers/mmc_driver.c

Timestamp:

Feb 8, 2015, 1:12:23 PM (9 years ago)

Author:

alain

Message:

1) Introduce access functions to MMC intrumentation registers.
2) Use _printf for error or debug messages.

File:

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

soft/giet_vm/giet_drivers/mmc_driver.c

@@ -9 +9 @@
 #include <mmc_driver.h>
 #include <tty0.h>
-#include <locks.h>
+#include <kernel_locks.h>
 #include <utils.h>
 
@@ -37 +37 @@
 # error: You must define PERI_CLUSTER_INCREMENT in the hard_config.h file
 #endif
+
+///////////////////////////////////////////////////////////////////////////////
+// Distributed locks protecting MMC components (one per cluster)
+///////////////////////////////////////////////////////////////////////////////
+
+__attribute__((section(".kdata")))
+spin_lock_t  _mmc_lock[X_SIZE][Y_SIZE]  __attribute__((aligned(64)));
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -87 +94 @@
     if ( (x >= X_SIZE) || (y >= Y_SIZE) )
     {
-        _puts("\n[GIET ERROR] in _memc_inval() : illegal cluster coordinates\n");
+        _puts("\n[GIET ERROR] in _mmc_inval() : illegal cluster coordinates\n");
         _exit();
     }
 
-    // get the hard queuing lock protecting exclusive access to MEMC
+    // get the lock protecting exclusive access to MEMC
     _spin_lock_acquire( &_mmc_lock[x][y] );
 
     // write inval arguments
-    _mmc_set_register( cluster_xy , 0 , MEMC_ADDR_LO   , (unsigned int)buf_paddr );
-    _mmc_set_register( cluster_xy , 0 , MEMC_ADDR_HI   , (unsigned int)(buf_paddr>>32) );
-    _mmc_set_register( cluster_xy , 0 , MEMC_BUF_LENGTH, buf_length );
-    _mmc_set_register( cluster_xy , 0 , MEMC_CMD_TYPE  , MEMC_CMD_INVAL );
+    _mmc_set_register(cluster_xy, 0, MEMC_ADDR_LO   , (unsigned int)buf_paddr );
+    _mmc_set_register(cluster_xy, 0, MEMC_ADDR_HI   , (unsigned int)(buf_paddr>>32) );
+    _mmc_set_register(cluster_xy, 0, MEMC_BUF_LENGTH, buf_length );
+    _mmc_set_register(cluster_xy, 0, MEMC_CMD_TYPE  , MEMC_CMD_INVAL );
 
     // release the lock 
@@ -116 +123 @@
     if ( (x >= X_SIZE) || (y >= Y_SIZE) )
     {
-        _puts( "\n[GIET ERROR] in _memc_sync() : illegal cluster coordinates");
+        _puts( "\n[GIET ERROR] in _mmc_sync() : illegal cluster coordinates");
         _exit();
     }
 
-    // get the hard queuing lock protecting exclusive access to MEMC
+    // get the lock protecting exclusive access to MEMC
     _spin_lock_acquire( &_mmc_lock[x][y] );
 
@@ -131 +138 @@
     // release the lock 
     _spin_lock_release( &_mmc_lock[x][y] );
+}
+
+/////////////////////////////////////////////
+unsigned int _mmc_instrument( unsigned int x, 
+                              unsigned int y,
+                              unsigned int reg )
+{
+    // parameters checking 
+    if ( (x >= X_SIZE) || (y >= Y_SIZE) )
+    {
+        _puts( "\n[GIET ERROR] in _mmc_instrument() : illegal cluster coordinates");
+        _exit();
+    }
+
+    unsigned int cluster_xy = (x << Y_WIDTH) + y;
+    return( _mmc_get_register(cluster_xy , 1 , reg) );
 }