Changeset 748 for branches/reconfiguration/platforms/tsar_generic_iob/tsar_iob_cluster

Timestamp:

Jul 10, 2014, 2:35:05 PM (11 years ago)

Author:

cfuguet

Message:

reconfiguration: tsar_generic_iob distributed boot

• Introducing optional distributed boot in the tsar_generic_iob platform.

• To support this, a distributed boot ROM is instantiated in each cluster.

• Physical address extension register for instructions and data of L1 caches is initialized with local cluster index when distributed boot is activated.

Location:

branches/reconfiguration/platforms/tsar_generic_iob/tsar_iob_cluster/caba

Files:

• metadata/tsar_iob_cluster.sd (modified) (2 diffs)
• source/include/tsar_iob_cluster.h (modified) (5 diffs)
• source/src/tsar_iob_cluster.cpp (modified) (7 diffs)

branches/reconfiguration/platforms/tsar_generic_iob/tsar_iob_cluster/caba/metadata/tsar_iob_cluster.sd

@@ -2 +2 @@
 # -*- python -*-
 
-Module('caba:tsar_iob_cluster',
+Module('caba:reconfiguration:tsar_iob_cluster',
     classname = 'soclib::caba::TsarIobCluster',
 
@@ -48 +48 @@
 
         Uses('caba:vci_multi_dma',
+              cell_size          = parameter.Reference('vci_data_width_int')),
+
+        Uses('caba:vci_simple_rom',
               cell_size          = parameter.Reference('vci_data_width_int')),
 

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

@@ -32 +32 @@
 #include "vci_cc_vcache_wrapper.h"
 #include "vci_io_bridge.h"
+#include "vci_simple_rom.h"
 
 namespace soclib { namespace caba   {
@@ -94 +95 @@
     VciSignals<vci_param_int>             signal_int_vci_tgt_xicu;
     VciSignals<vci_param_int>             signal_int_vci_tgt_mdma;
+    VciSignals<vci_param_int>             signal_int_vci_tgt_brom;
     VciSignals<vci_param_int>             signal_int_vci_tgt_iobx;
 
@@ -146 +148 @@
     VciMultiDma<vci_param_int>*                       mdma;
 
+    VciSimpleRom<vci_param_int>*                      brom;
+
     VciLocalCrossbar<vci_param_int>*                  int_xbar_d;
     
@@ -205 +209 @@
                     size_t                             int_xicu_tgt_id,
                     size_t                             int_mdma_tgt_id,
+                    size_t                             int_brom_tgt_id,
                     size_t                             int_iobx_tgt_id,
                     size_t                             int_proc_ini_id,
@@ -227 +232 @@
                     size_t                             xcu_nb_inputs,
 
+                    bool                               distboot,
+
                     const Loader                       &loader,       // loader for XRAM
 

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

@@ -50 +50 @@
                     size_t                             int_xicu_tgt_id, // local index
                     size_t                             int_mdma_tgt_id, // local index
+                    size_t                             int_brom_tgt_id, // local index
                     size_t                             int_iobx_tgt_id, // local index
 
@@ -73 +74 @@
                     size_t                             xcu_nb_inputs,
 
-                    const Loader                      &loader,
+                    bool                               distboot,
+
+                    const Loader                       &loader,
 
                     uint32_t                           frozen_cycles,
@@ -137 +140 @@
                       debug_start_cycle,
                       proc_debug_ok);
+
+        // initialize physical address extension with cluster ID when using
+        // distributed boot
+        if (distboot)
+        {
+            proc[p]->set_dcache_paddr_ext_reset(cluster_id);
+            proc[p]->set_icache_paddr_ext_reset(cluster_id);
+        }
     }
 
@@ -193 +204 @@
                      nb_dmas);                            // number of IRQs
 
+    ///////////   DISTRIBUTED BOOT ROM
+    std::ostringstream s_brom;
+    s_brom << "brom_" << x_id << "_" << y_id;
+    brom = new VciSimpleRom<vci_param_int>(
+                     s_brom.str().c_str(),
+                     IntTab(cluster_id, int_brom_tgt_id),
+                     mt_int,
+                     loader,
+                     x_width + y_width);                  // msb drop bits
+
     ///////////  Direct LOCAL_XBAR(S)
     size_t nb_direct_initiators = is_io ? nb_procs + 2 : nb_procs + 1;
-    size_t nb_direct_targets    = is_io ? 4 : 3;
+    size_t nb_direct_targets    = is_io ? 5 : 4;
 
     std::ostringstream s_int_xbar_d;
@@ -432 +453 @@
     int_xbar_d->p_to_target[int_xicu_tgt_id]          (signal_int_vci_tgt_xicu);
     int_xbar_d->p_to_target[int_mdma_tgt_id]          (signal_int_vci_tgt_mdma);
+    int_xbar_d->p_to_target[int_brom_tgt_id]          (signal_int_vci_tgt_brom);
     int_xbar_d->p_to_initiator[int_mdma_ini_id]       (signal_int_vci_ini_mdma);
     for (size_t p = 0; p < nb_procs; p++)
@@ -550 +572 @@
         mdma->p_irq[i]                           (signal_irq_mdma[i]);
 
+    /////////////////////////////////// BROM
+    brom->p_clk                                  (this->p_clk);
+    brom->p_resetn                               (this->p_resetn);
+    brom->p_vci                                  (signal_int_vci_tgt_brom);
+
     //////////////////////////// RAM network CMD & RSP routers
     ram_router_cmd->p_clk                        (this->p_clk);
@@ -626 +653 @@
 
 // Local Variables:
-// tab-width: 3
-// c-basic-offset: 3
+// tab-width: 4
+// c-basic-offset: 4
 // c-file-offsets:((innamespace . 0)(inline-open . 0))
 // indent-tabs-mode: nil
 // End:
 
-// vim: filetype=cpp:expandtab:shiftwidth=3:tabstop=3:softtabstop=3
-
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=4:softtabstop=4
+