Changeset 451 for trunk

Timestamp:

Jul 18, 2013, 6:46:58 PM (11 years ago)

Author:

alain

Message:

Introducing the vci_iox_network modeling the external IO network.

Location:

trunk/modules

Files:

• vci_block_device_tsar/caba/source/src/vci_block_device_tsar.cpp (modified) (1 diff)
• vci_io_bridge/caba/source/src/vci_io_bridge.cpp (modified) (3 diffs)
• vci_iox_network (added)
• vci_iox_network/caba (added)
• vci_iox_network/caba/metadata (added)
• vci_iox_network/caba/metadata/vci_iox_network.sd (added)
• vci_iox_network/caba/source (added)
• vci_iox_network/caba/source/include (added)
• vci_iox_network/caba/source/include/vci_iox_network.h (added)
• vci_iox_network/caba/source/src (added)
• vci_iox_network/caba/source/src/vci_iox_network.cpp (added)

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

@@ -552 +552 @@
         p_vci_target.cmdack = false;
         p_vci_target.rspval = true;
-        p_vci_target.rdata  = m_words_per_block*vci_param::B;
+        p_vci_target.rdata  = m_words_per_block*4;
         p_vci_target.rerror = VCI_READ_OK;
         break;

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

@@ -1214 +1214 @@
     // This FSM is mainly intended to handle single flit config transactions, 
     // but it can also handle software driven, multi-flits data transactions.
-    // - The configuration requests can be local (IO_BRIDGE config registers)
-    //   or remote (config registers of peripherals on IOX network).
-    // - The data requests are always remote.
-    // In case of local config, this FSM put a VCI response in CONFIG_RSP fifo.
-    // In case of remote transaction, it put the VCI command in CONFIG_CMD fifo.
+    // The configuration requests can be local (IO_BRIDGE config registers)
+    // or remote (config registers of peripherals on IOX network).
+    // - The local configuration segment is identified by the "special" atribute.
+    // - All configuration requests are checkeg against segmentation violation.
+    // - In case of local config request, or in case of segmentation violation,
+    //   the FSM put a VCI response request in CONFIG_RSP fifo.
+    // - In case of remote transaction, it put the VCI command in CONFIG_CMD fifo.
     ///////////////////////////////////////////////////////////////////////////////
 
@@ -1244 +1246 @@
             uint32_t   cell  = (uint32_t)((paddr & 0x1FF)>>2); 
  
-            // The "local" segment must be the first in the seglist
-            soclib::common::Segment seg = m_int_seglist.front(); 
+            // chek segments
+            std::list<soclib::common::Segment>::iterator seg;
+            bool found = 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) )  // IO_BRIDGE itself
+            if ( found and seg->special() )  // IO_BRIDGE itself
             {
                 uint32_t      rdata  = 0;
@@ -1325 +1333 @@
                     rerror = true;
                 }
-                r_config_cmd_rdata  = rdata;
+                r_config_cmd_rdata = rdata;
                 r_config_cmd_error = rerror;
-                r_config_cmd_fsm    = CONFIG_CMD_FIFO_PUT_RSP;
-            }
-            else                                        // remote peripheral
+                r_config_cmd_fsm   = CONFIG_CMD_FIFO_PUT_RSP;
+            }
+            else if ( found )                            // remote peripheral
             {
                 r_config_cmd_fsm  = CONFIG_CMD_FIFO_PUT_CMD;
+            }
+            else                                         // out of segment
+            {
+                r_config_cmd_rdata = 0;
+                r_config_cmd_error = true;
+                r_config_cmd_fsm   = CONFIG_CMD_FIFO_PUT_RSP;
             }
         } // end if cmdval