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

Timestamp:

Dec 19, 2013, 9:36:48 AM (11 years ago)

Author:

alain

Message:

Introducing support for TSAR fixed format cluster index (cluster_xy)
We have now 4 parameters defined in map.xml:

• X_WIDTH, Y_WIDTH define the fixed format (typically X_WIDTH = 4 / Y_WIDTH = 4)
• X_SIZE, Y_SIZE define the actual TSAR 2D mesh variable size (from 1 to 16)

File:

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

soft/giet_vm/giet_drivers/mmc_driver.c

@@ -21 +21 @@
 #include <giet_config.h>
 #include <mmc_driver.h>
+#include <tty_driver.h>
 #include <utils.h>
 
-#if !defined(NB_CLUSTERS) 
-# error: You must define NB_CLUSTERS in the hard_config.h file
+#if !defined(X_SIZE) 
+# error: You must define X_SIZE in the hard_config.h file
 #endif
 
-#if (NB_CLUSTERS > 256)
-# error: NB_CLUSTERS cannot be larger than 256!
+#if !defined(Y_SIZE) 
+# error: You must define X_SIZE in the hard_config.h file
+#endif
+
+#if !defined(X_WIDTH) 
+# error: You must define X_WIDTH in the hard_config.h file
+#endif
+
+#if !defined(Y_WIDTH) 
+# error: You must define X_WIDTH in the hard_config.h file
 #endif
 
@@ -40 +49 @@
                   unsigned int buf_length )
 {
-    unsigned int cluster_id    = (unsigned int)((buf_paddr>>32)/(256/NB_CLUSTERS));
+    // compute cluster coordinates
+    unsigned int cluster_xy = (unsigned int)(buf_paddr>>(40-X_WIDTH-Y_WIDTH));
+    unsigned int x          = cluster_xy >> Y_WIDTH;
+    unsigned int y          = cluster_xy & ((1<<Y_WIDTH)-1);
+
+    // parameters checking 
+    if ( (x >= X_SIZE) || (y >= Y_SIZE) )
+    {
+        _puts("\n[GIET ERROR] in _memc_inval() : illegal cluster index[");
+        _putd( x );
+        _puts(",");
+        _putd( y );
+        _puts("]\n");
+        _puts("   - paddr      = ");
+        _putl( buf_paddr );
+        _puts("\n   - cluster_xy = ");
+        _putx( cluster_xy );
+        _puts("\n");
+        _exit();
+    }
 
     unsigned int* mmc_address = (unsigned int*)((unsigned int)&seg_mmc_base + 
-                                (cluster_id * (unsigned int)&vseg_cluster_increment));
+                                (cluster_xy * (unsigned int)&vseg_cluster_increment));
 
     // get the hard lock protecting exclusive access to MEMC
@@ -66 +94 @@
                  unsigned int buf_length )
 {
-    unsigned int cluster_id    = (unsigned int)((buf_paddr>>32)/(256/NB_CLUSTERS));
+    // compute cluster coordinates
+    unsigned int cluster_xy = (unsigned int)(buf_paddr>>(40-X_WIDTH-Y_WIDTH));
+    unsigned int x          = cluster_xy >> Y_WIDTH;
+    unsigned int y          = cluster_xy & ((1<<Y_WIDTH)-1);
+
+    // parameters checking 
+    if ( (x >= X_SIZE) || (y >= Y_SIZE) )
+    {
+        _puts("\n[GIET ERROR] in _memc_sync() : illegal cluster index[");
+        _putd( x );
+        _puts(",");
+        _putd( y );
+        _puts("]\n");
+        _puts("   - paddr      = ");
+        _putl( buf_paddr );
+        _puts("\n   - cluster_xy = ");
+        _putx( cluster_xy );
+        _puts("\n");
+        _exit();
+    }
 
     unsigned int * mmc_address = (unsigned int *) ((unsigned int)&seg_mmc_base + 
-                                 (cluster_id * (unsigned int)&vseg_cluster_increment));
+                                 (cluster_xy * (unsigned int)&vseg_cluster_increment));
 
     // get the hard lock protecting exclusive access to MEMC