Changeset 475 for trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp

Timestamp:

Jul 26, 2013, 3:44:43 PM (11 years ago)

Author:

lambert

Message:

Introducing Vci_Chbuf_Dma in tsar_generic_xbar platform :

• The number of channels of the is dma is 2* nic_channels
• Adding one argument to the tsar_xbar_cluster for dma TGTID
• Chbuf Dma default address is 0x00B6000000

Changing Vci_Multi_Nic default Mac address to BABEBEEF0000

File:

• trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp (modified) (8 diffs)

trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp

@@ -57 +57 @@
          size_t                             tgtid_brom,
          size_t                             tgtid_mnic,
+         size_t                             tgtid_chbuf,
          size_t                             tgtid_bdev,
          size_t                             memc_ways,
@@ -214 +215 @@
     if ( io )
     {
-        nb_direct_initiators         = nb_procs + 2;
-        nb_direct_targets            = 8;
+        nb_direct_initiators         = nb_procs + 3;
+        nb_direct_targets            = 9;
     }
 
@@ -350 +351 @@
 
         /////////////////////////////////////////////
+        int mac = 0xBEEF0000;
         mnic = new VciMultiNic<vci_param_int>(
                      "mnic",
@@ -357 +359 @@
                      nic_rx_name,
                      nic_tx_name,
-                     0,             // mac_4 address
-                     0 );           // mac_2 address
+                     mac,             // mac_4 address
+                     0xBABE );           // mac_2 address
 
         wt_mnic = new VciDspinTargetWrapper<vci_param_int,
@@ -364 +366 @@
                                             dspin_rsp_width>(
                      "wt_mnic",
+                     x_width + y_width + l_width);
+
+        /////////////////////////////////////////////
+        chbuf = new VciChbufDma<vci_param_int>(
+                     "chbuf_dma",
+                     mtd,
+                     IntTab(cluster_id, nb_procs + 2),
+                     IntTab(cluster_id, tgtid_chbuf),
+                     64,
+                     2 * nic_channels ); // Two chbuf dma channel by nic channel
+
+        wt_chbuf = new VciDspinTargetWrapper<vci_param_int,
+                                            dspin_cmd_width,
+                                            dspin_rsp_width>(
+                     "wt_chbuf",
+                     x_width + y_width + l_width);
+
+        wi_chbuf = new VciDspinInitiatorWrapper<vci_param_int,
+                                            dspin_cmd_width,
+                                            dspin_rsp_width>(
+                     "wi_chbuf",
                      x_width + y_width + l_width);
 
@@ -449 +472 @@
         xbar_cmd_d->p_local_out[tgtid_fbuf]      (signal_dspin_cmd_fbuf_t);
         xbar_cmd_d->p_local_out[tgtid_mnic]      (signal_dspin_cmd_mnic_t);
+        xbar_cmd_d->p_local_out[tgtid_chbuf]      (signal_dspin_cmd_chbuf_t);
 
         xbar_cmd_d->p_local_in[nb_procs+1]       (signal_dspin_cmd_bdev_i);
+        xbar_cmd_d->p_local_in[nb_procs+2]       (signal_dspin_cmd_chbuf_i);
     }
 
@@ -477 +502 @@
         xbar_rsp_d->p_local_in[tgtid_fbuf]       (signal_dspin_rsp_fbuf_t);
         xbar_rsp_d->p_local_in[tgtid_mnic]       (signal_dspin_rsp_mnic_t);
+        xbar_rsp_d->p_local_in[tgtid_chbuf]       (signal_dspin_rsp_chbuf_t);
 
         xbar_rsp_d->p_local_out[nb_procs+1]      (signal_dspin_rsp_bdev_i);
+        xbar_rsp_d->p_local_out[nb_procs+2]      (signal_dspin_rsp_chbuf_i);
     }
 
@@ -686 +713 @@
         std::cout << "  - MNIC connected" << std::endl;
 
+        // CHBUF
+        chbuf->p_clk                    (this->p_clk);
+        chbuf->p_resetn                 (this->p_resetn);
+        chbuf->p_vci_target             (signal_vci_tgt_chbuf);
+        chbuf->p_vci_initiator          (signal_vci_ini_chbuf);
+        for ( size_t i=0 ; i < nic_channels * 2 ; i++ )
+        {
+            chbuf->p_irq[i]          (signal_irq_chbuf[i]);
+        }
+
+        // wrapper tgt CHBUF
+        wt_chbuf->p_clk                 (this->p_clk);
+        wt_chbuf->p_resetn              (this->p_resetn);
+        wt_chbuf->p_dspin_cmd           (signal_dspin_cmd_chbuf_t);
+        wt_chbuf->p_dspin_rsp           (signal_dspin_rsp_chbuf_t);
+        wt_chbuf->p_vci                 (signal_vci_tgt_chbuf);
+
+        // wrapper ini CHBUF
+        wi_chbuf->p_clk                 (this->p_clk);
+        wi_chbuf->p_resetn              (this->p_resetn);
+        wi_chbuf->p_dspin_cmd           (signal_dspin_cmd_chbuf_i);
+        wi_chbuf->p_dspin_rsp           (signal_dspin_rsp_chbuf_i);
+        wi_chbuf->p_vci                 (signal_vci_ini_chbuf);
+
+        std::cout << "  - CHBUF connected" << std::endl;
+
         // BROM
         brom->p_clk                    (this->p_clk);