Changeset 904 for branches/reconfiguration/platforms/tsar_generic_iob/tsar_iob_cluster/caba

Timestamp:

Dec 11, 2014, 4:52:15 PM (9 years ago)

Author:

cfuguet

Message:

reconf: any router in any NoC can be faulty. Moreover, each NoC has its
own config register in the XICU.

Location:

branches/reconfiguration/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source

Files:

• include/tsar_iob_cluster.h (modified) (1 diff)
• src/tsar_iob_cluster.cpp (modified) (4 diffs)

branches/reconfiguration/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/include/tsar_iob_cluster.h

@@ -73 +73 @@
     sc_signal<bool>                       signal_irq_mdma[8];
     sc_signal<bool>                       signal_irq_memc;
-    sc_signal<uint32_t>                   signal_cfg_router;
+    sc_signal<uint32_t>                   signal_cfg_router_cmd[3];
+    sc_signal<uint32_t>                   signal_cfg_router_rsp[2];
 
     // INT network DSPIN signals between DSPIN routers and DSPIN local_crossbars

branches/reconfiguration/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp

@@ -197 +197 @@
                      xcu_nb_inputs,                       // number of soft IRQs
                      16,                                  // number of output IRQs
-                     1);                                  // number of config regs
+                     5);                                  // number of config regs
 
     ////////////  MDMA
@@ -431 +431 @@
         int_router_cmd[k]->p_clk                 (this->p_clk);
         int_router_cmd[k]->p_resetn              (this->p_resetn);
-        (*int_router_cmd[k]->p_blackhole_pos)    (signal_cfg_router);
+        (*int_router_cmd[k]->p_blackhole_pos)    (signal_cfg_router_cmd[k]);
         for (int i = 0; i < 4; i++)
         {
@@ -443 +443 @@
         int_router_rsp[k]->p_clk                 (this->p_clk);
         int_router_rsp[k]->p_resetn              (this->p_resetn);
-        (*int_router_rsp[k]->p_blackhole_pos)    (signal_cfg_router);
+        (*int_router_rsp[k]->p_blackhole_pos)    (signal_cfg_router_rsp[k]);
         for (int i = 0; i < 4; i++)
         {
@@ -554 +554 @@
         else                     xicu->p_hwi[i]  (signal_false);
     }
-    xicu->p_cfg[0]                               (signal_cfg_router);
+    xicu->p_cfg[0]                               (signal_cfg_router_cmd[0]); // CMD
+    xicu->p_cfg[1]                               (signal_cfg_router_rsp[0]); // RSP
+    xicu->p_cfg[2]                               (signal_cfg_router_cmd[1]); // M2P
+    xicu->p_cfg[3]                               (signal_cfg_router_rsp[1]); // P2M
+    xicu->p_cfg[4]                               (signal_cfg_router_cmd[2]); // CLACK
 
     ///////////////////////////////////// MEMC