Changeset 263 for soft/giet_vm/giet_drivers/mwr_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/mwr_driver.c (modified) (4 diffs)

soft/giet_vm/giet_drivers/mwr_driver.c

@@ -12 +12 @@
 // The (virtual) base address of the associated segment is:
 //
-//       seg_mwr_base + cluster_id * vseg_cluster_increment
+//       seg_mwr_base + cluster_xy * vseg_cluster_increment
 //
 // The seg_mwr_base and vseg_cluster_increment values must be defined 
@@ -22 +22 @@
 #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
 
 //////////////////////////////////////////////////////////////////////////////////
-//    _mwmr_hw_init()
+//    _mwr_hw_init()
 // This function initializes one MWMR controller channel (i.e. one coprocessor
 // port) in a given cluster.
-// - cluster_id    : cluster index
+// - cluster_xy    : cluster index
 // _ port_id       : port index
 // - way           : direction (to_coproc/from_coproc)
@@ -40 +48 @@
 // TODO : The MWMR controler should be modified to support 40 bits addresses...
 //        Introduce a MWMR_CONFIG_PADDR_EXT register in the MWMR coprocessor
-//        To support addresses > 32 bits and remove this limitation...
 //////////////////////////////////////////////////////////////////////////////////
 // Returns 0 if success, returns > 0 if error.
 //////////////////////////////////////////////////////////////////////////////////
-unsigned int _mwmr_hw_init( unsigned int           cluster_id, 
-                            unsigned int           port_id, 
-                            unsigned int           from_coproc,
-                            paddr_t                channel_pbase ) 
+unsigned int _mwr_hw_init( unsigned int           cluster_xy, 
+                           unsigned int           port_id, 
+                           unsigned int           from_coproc,
+                           paddr_t                channel_pbase ) 
 {
-    _puts(" [GIET_ERROR] _mwmr_hw_init() function not implemented yet\n");
+    _puts(" [GIET_ERROR] _mwr_hw_init() function not supported yet\n");
     _exit();
 
 /*
     // parameters checking 
-    if (cluster_id >= NB_CLUSTERS)      return 1;
+    unsigned int x = cluster_xy >> Y_WIDTH;
+    unsigned int y = cluster_xy & ((1<<Y_WIDTH)-1);
+    if (x >= X_SIZE)                    return 1; 
+    if (y >= Y_SIZE)                    return 1; 
 
-    // compute MWMR base address
-    unsigned int* mwmr_address = (unsigned int*) ((unsigned int)&seg_mwmr_base + 
-                                 (cluster_id * (unsigned int)&vseg_cluster_increment));
+    // compute base address
+    unsigned int* mwr_address = (unsigned int*) ((unsigned int)&seg_mwr_base + 
+                                 (cluster_xy * (unsigned int)&vseg_cluster_increment));
 
     unsigned int lsb = (unsigned int)channel_pbase;
@@ -68 +78 @@
 
     // initializes and launches mwmr controler
-    mwmr_address[port_id * MWMR_SPAN + MWMR_CONFIG_FIFO_WAY]  = from_coproc;
-    mwmr_address[port_id * MWMR_SPAN + MWMR_CONFIG_FIFO_NO]   = port_id;
-    mwmr_address[port_id * MWMR_SPAN + MWMR_CONFIG_WIDTH]     = width;
-    mwmr_address[port_id * MWMR_SPAN + MWMR_CONFIG_DEPTH]     = depth;
-    mwmr_address[port_id * MWMR_SPAN + MWMR_CONFIG_STATUS]    = lsb;
-    mwmr_address[port_id * MWMR_SPAN + MWMR_CONFIG_DATA]      = lsb + 24;
-    mwmr_address[port_id * MWMR_SPAN + MWMR_CONFIG_EXT]       = msb;
-    mwmr_address[port_id * MWMR_SPAN + MWMR_CONFIG_RUNNING]   = 1;
+    mwr_address[port_id * MWMR_SPAN + MWMR_CONFIG_FIFO_WAY]  = from_coproc;
+    mwr_address[port_id * MWMR_SPAN + MWMR_CONFIG_FIFO_NO]   = port_id;
+    mwr_address[port_id * MWMR_SPAN + MWMR_CONFIG_WIDTH]     = width;
+    mwr_address[port_id * MWMR_SPAN + MWMR_CONFIG_DEPTH]     = depth;
+    mwr_address[port_id * MWMR_SPAN + MWMR_CONFIG_STATUS]    = lsb;
+    mwr_address[port_id * MWMR_SPAN + MWMR_CONFIG_DATA]      = lsb + 24;
+    mwr_address[port_id * MWMR_SPAN + MWMR_CONFIG_EXT]       = msb;
+    mwr_address[port_id * MWMR_SPAN + MWMR_CONFIG_RUNNING]   = 1;
 */
     return 0;