Changeset 549 for trunk/modules/vci_io_bridge/caba/source/src

Timestamp:

Oct 17, 2013, 8:50:46 PM (11 years ago)

Author:

alain

Message:

Compliance with mapping_table defined in release 2462
Introducing the dspin_router_tsar component used in tsar_generic_iob
platform to implement the RAM networt (between L2 & L3).

File:

• trunk/modules/vci_io_bridge/caba/source/src/vci_io_bridge.cpp (modified) (8 diffs)

trunk/modules/vci_io_bridge/caba/source/src/vci_io_bridge.cpp

@@ -93 +93 @@
     };
 
-const char *miss_wti_fsm_state_str[] = {  
-        "MISS_WTI_IDLE_MISS",
-        "MISS_WTI_IDLE_WTI",
+const char *miss_wti_cmd_state_str[] = 
+    {  
+        "MISS_WTI_CMD_IDLE",
         "MISS_WTI_CMD_WTI",
+        "MISS_WTI_CMD_MISS",
+    };
+const char *miss_wti_rsp_state_str[] = 
+    {  
+        "MISS_WTI_RSP_IDLE",
         "MISS_WTI_RSP_WTI",
-        "MISS_WTI_CMD_MISS",
         "MISS_WTI_RSP_MISS",
     };
@@ -268 +272 @@
         std::cout << "    => segment " << int_seg->name()
                   << " / base = " << std::hex << int_seg->baseAddress()
-                  << " / size = " << int_seg->size() << std::endl; 
+                  << " / size = " << int_seg->size() 
+                  << " / special = " << int_seg->special() << std::endl; 
     }
 
@@ -332 +337 @@
 ////////////////////////////////////
 {
-    // b0 : IOtlb trace
+    // b0 : IOTLB trace
 
     std::cout << std::dec << "IO_BRIDGE " << name() << std::endl;
@@ -341 +346 @@
               << " | " << config_cmd_fsm_state_str[r_config_cmd_fsm.read()]
               << " | " << config_rsp_fsm_state_str[r_config_rsp_fsm.read()]
-              << " | " << miss_wti_fsm_state_str[r_miss_wti_cmd_fsm.read()]
+              << " | " << miss_wti_cmd_state_str[r_miss_wti_cmd_fsm.read()]
+              << " | " << miss_wti_rsp_state_str[r_miss_wti_rsp_fsm.read()]
               << std::endl;
 
@@ -348 +354 @@
         std::cout << "  IOTLB" << std::endl;
         r_iotlb.printTrace();
-    }
-    if(mode & 0x02)
-    {
-        
     }
 }
@@ -1248 +1250 @@
             // chek segments
             std::list<soclib::common::Segment>::iterator seg;
-            bool found = false;
+            bool found   = false;
+            bool special = false;
             for ( seg = m_int_seglist.begin() ; 
                   seg != m_int_seglist.end() and not found ; seg++ )
             {
-                if ( seg->contains(paddr) )  found = true;
+                if ( seg->contains(paddr) )  
+                {
+                   found   = true;
+                   special = seg->special();
+                }
             }
            
-            if ( found and seg->special() )  // IO_BRIDGE itself
+            if ( found and special )  // IO_BRIDGE itself
             {
                 uint32_t      rdata  = 0;
@@ -1988 +1995 @@
 
     // VCI initiator command  on INT network 
-    // it depends on the MISS_WTI_CMD FSM state
+    // it depends on the MISS_WTI_CMD FSM state   
+    // - WTI : single flit WRITE
+    // - MISS TLB : multi-flit READ for a complete cache line
 
     // default values
@@ -1997 +2006 @@
     p_vci_ini_int.wrap    = false;
     p_vci_ini_int.clen    = 0;
-    p_vci_ini_int.contig  = false;
-    p_vci_ini_int.cons    = true;
-    p_vci_ini_int.be      = 0xFF;
+    p_vci_ini_int.contig  = true;
+    p_vci_ini_int.cons    = false;
+    p_vci_ini_int.be      = 0xF;
     
     switch ( r_miss_wti_cmd_fsm.read() )