Index: trunk/modules/vci_block_device_tsar/caba/source/src/vci_block_device_tsar.cpp =================================================================== --- trunk/modules/vci_block_device_tsar/caba/source/src/vci_block_device_tsar.cpp (revision 450) +++ trunk/modules/vci_block_device_tsar/caba/source/src/vci_block_device_tsar.cpp (revision 451) @@ -552,5 +552,5 @@ 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; Index: trunk/modules/vci_io_bridge/caba/source/src/vci_io_bridge.cpp =================================================================== --- trunk/modules/vci_io_bridge/caba/source/src/vci_io_bridge.cpp (revision 450) +++ trunk/modules/vci_io_bridge/caba/source/src/vci_io_bridge.cpp (revision 451) @@ -1214,9 +1214,11 @@ // 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,8 +1246,14 @@ 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::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,11 +1333,17 @@ 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 Index: trunk/modules/vci_iox_network/caba/metadata/vci_iox_network.sd =================================================================== --- trunk/modules/vci_iox_network/caba/metadata/vci_iox_network.sd (revision 451) +++ trunk/modules/vci_iox_network/caba/metadata/vci_iox_network.sd (revision 451) @@ -0,0 +1,44 @@ + +# -*- python -*- + +Module('caba:vci_iox_network', + classname = 'soclib::caba::VciIoxNetwork', + + tmpl_parameters = [ + parameter.Module('vci_param', default = 'caba:vci_param'), + ], + + header_files = [ + '../source/include/vci_iox_network.h', + ], + + implementation_files = [ + '../source/src/vci_iox_network.cpp', + ], + + ports = [ + Port('caba:vci_initiator', 'p_to_local_tgt', parameter.Reference('nb_local_tgt')), + Port('caba:vci_target', 'p_to_local_ini', parameter.Reference('nb_local_ini')), + Port('caba:vci_initiator', 'p_to_global_tgt', parameter.Reference('nb_global_tgt')), + Port('caba:vci_target', 'p_to_global_ini', parameter.Reference('nb_global_ini')), + Port('caba:bit_in', 'p_resetn', auto = 'resetn'), + Port('caba:clock_in', 'p_clk', auto = 'clock'), + ], + + instance_parameters = [ + parameter.Module('mt', typename = 'common:mapping_table'), + parameter.Int('cluster_id'), + parameter.Int('nb_local_tgt'), + parameter.Int('nb_local_ini'), + parameter.Int('nb_global_tgt'), + parameter.Int('nb_global_ini'), + ], + + uses = [ + Uses('caba:base_module'), + Uses('common:mapping_table'), + Uses('common:address_decoding_table', input_t = 'uint64_t', output_t = 'size_t'), + Uses('common:address_decoding_table', input_t = 'uint32_t', output_t = 'size_t'), + Uses('caba:vci_buffers'), + ], +) Index: trunk/modules/vci_iox_network/caba/source/include/vci_iox_network.h =================================================================== --- trunk/modules/vci_iox_network/caba/source/include/vci_iox_network.h (revision 451) +++ trunk/modules/vci_iox_network/caba/source/include/vci_iox_network.h (revision 451) @@ -0,0 +1,128 @@ +/* -*- c++ -*- + * + * SOCLIB_LGPL_HEADER_BEGIN + * + * This file is part of SoCLib, GNU LGPLv2.1. + * + * SoCLib is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 of the License. + * + * SoCLib is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with SoCLib; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + * + * SOCLIB_LGPL_HEADER_END + * + * Copyright (c) UPMC, Lip6, Asim + * Alain Greiner , 2013 + * + * Maintainers: alain + */ + +////////////////////////////////////////////////////////////////////////////// +// This component emulates an external IO bus such as PCIe or Hypertransport, +// but respect the VCI protocol. +// It is considered as a local interconnect that must be attached to +// one OR SEVERAL clusters in a global interconnect. +// It uses two different routing table: +// - the cmd_routing_table decodes the local field of the VCI address +// to return the target port +// - The rsp_routing_table decodes the local field of the VCI srcid +// to return the initator port +// It is implemented as two independant crossbars, for VCI commands and +// VCI responses respectively. +// - The CMD crossbar has nb_ini input ports, and nb_tgt output ports. +// - The RSP crossbar has nb_tgt input ports, and nb_ini output ports. +// For both crossbars, output ports allocation policy is round robin. +////////////////////////////////////////////////////////////////////////////// + +#ifndef VCI_IOX_NETWORK_H +#define VCI_IOX_NETWORK_H + +#include +#include "caba_base_module.h" +#include "vci_initiator.h" +#include "vci_target.h" +#include "vci_buffers.h" +#include "mapping_table.h" +#include "address_decoding_table.h" + +namespace soclib { namespace caba { + +using namespace sc_core; +using namespace soclib::common; + +template class IoXbar; + +/////////////////////////////////////// +template +class VciIoxNetwork +/////////////////////////////////////// + : public BaseModule +{ + +public: + + sc_in p_clk; + sc_in p_resetn; + VciInitiator* p_to_tgt; + VciTarget* p_to_ini; + +private: + + typedef IoXbar > cmd_xbar_t; + typedef IoXbar > rsp_xbar_t; + + size_t m_nb_tgt; + size_t m_nb_ini; + + VciInitiator** m_ports_to_target; + VciTarget** m_ports_to_initiator; + + rsp_xbar_t* m_rsp_xbar; // RSP crossbar + cmd_xbar_t* m_cmd_xbar; // CMD crossbar + + AddressDecodingTable m_cmd_rt; // routing table for CMD + AddressDecodingTable m_rsp_rt; // routing table for RSP + + void transition(); + + void genMealy_cmd_val(); + void genMealy_cmd_ack(); + void genMealy_rsp_val(); + void genMealy_rsp_ack(); + +protected: + SC_HAS_PROCESS(VciIoxNetwork); + +public: + void print_trace(); + + VciIoxNetwork( sc_module_name name, + const soclib::common::MappingTable &mt, + size_t cluster_id, + size_t nb_tgt, + size_t nb_ini ); + + ~VciIoxNetwork(); +}; + +}} + +#endif + +// Local Variables: +// 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=4:tabstop=4:softtabstop=4 Index: trunk/modules/vci_iox_network/caba/source/src/vci_iox_network.cpp =================================================================== --- trunk/modules/vci_iox_network/caba/source/src/vci_iox_network.cpp (revision 451) +++ trunk/modules/vci_iox_network/caba/source/src/vci_iox_network.cpp (revision 451) @@ -0,0 +1,338 @@ +/* + * SOCLIB_LGPL_HEADER_BEGIN + * + * This file is part of SoCLib, GNU LGPLv2.1. + * + * SoCLib is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 of the License. + * + * SoCLib is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with SoCLib; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + * + * SOCLIB_LGPL_HEADER_END + * + * Copyright (c) UPMC, Lip6, Asim + * Alain Greiner 2013 + * + * Maintainers: alain + */ + +#include +#include +#include "vci_buffers.h" +#include "../include/vci_iox_network.h" +#include "alloc_elems.h" + +namespace soclib { namespace caba { + +using soclib::common::alloc_elems; +using soclib::common::dealloc_elems; + +using namespace sc_core; + +/////////////////////////////////////////////////////////////////////////////////// +// The IoXbar class is instanciated twice, to implement the CMD & RSP XBARs +/////////////////////////////////////////////////////////////////////////////////// +template class IoXbar +{ + // pkt_t type must be VciCmdBuffer or VciRspBuffer + // the two following types can be found in these two classes + + typedef typename pkt_t::input_port_t input_port_t; + typedef typename pkt_t::output_port_t output_port_t; + + const bool m_is_cmd; // CMD XBAR if true + const size_t m_inputs; // number of inputs + const size_t m_outputs; // number of outputs + AddressDecodingTable* m_rt; // pointer on routing table (CMD or RSP) + + sc_signal* r_out_allocated; // for each output: allocation state + sc_signal* r_out_origin; // for each output: input port index + sc_signal* r_in_allocated; // for each input: allocation state + sc_signal* r_in_dest; // for each input: output port index + +public: + /////////////////////// + IoXbar( bool is_cmd, + size_t nb_inputs, + size_t nb_outputs, + AddressDecodingTable* rt ) + : m_is_cmd( is_cmd ), + m_inputs( nb_inputs ), + m_outputs( nb_outputs ), + m_rt ( rt ) + { + r_out_allocated = new sc_signal[nb_outputs]; + r_out_origin = new sc_signal[nb_outputs]; + r_in_allocated = new sc_signal[nb_inputs]; + r_in_dest = new sc_signal[nb_inputs]; + } + + //////////// + void reset() + { + for (size_t i=0 ; i tgt " << out << " | "; + } + } + } + else + { + std::cout << "IOX_RSP_XBAR : " << std::dec; + for( size_t out=0 ; out ini " << out << " | "; + } + } + } + std::cout << std::endl; + } + + /////////////////////////////////////////// + void transition( input_port_t **input_port, + output_port_t **output_port ) + { + // loop on the output ports + for ( size_t out = 0; out < m_outputs; out++) + { + if ( r_out_allocated[out].read() and + output_port[out]->toPeerEnd() ) // desallocation + { + size_t in = r_out_origin[out].read(); + r_out_allocated[out] = false; + r_in_allocated[in] = false; + } + else // possible allocation + { + // loop on the intput ports + bool found = false; + for(size_t x = 0 ; (x < m_inputs) and not found ; x++) + { + size_t in = (x + r_out_origin[out] + 1) % m_inputs; + if ( input_port[in]->getVal() ) + { + size_t req; // requested output port index + if ( m_is_cmd ) + { + req = ((AddressDecodingTable*)m_rt)->get_value( + (uint64_t)(input_port[in]->address.read()) ); + } + else + { + req = ((AddressDecodingTable*)m_rt)->get_value( + (uint64_t)(input_port[in]->rsrcid.read()) ); + } + // allocate the output port if requested + if ( out == req ) + { + r_out_allocated[out] = true; + r_in_allocated[in] = true; + r_out_origin[out] = in; + r_in_dest[in] = out; + found = true; + } + } + } // end loop inputs + } + } // end loop outputs + } // end transition + + ////////////////////////////////////////////// + void genMealy_ack( input_port_t **input_port, + output_port_t **output_port ) + { + for ( size_t in = 0 ; in < m_inputs ; in++ ) + { + size_t out = r_in_dest[in].read(); + bool ack = r_in_allocated[in].read() and output_port[out]->getAck(); + input_port[in]->setAck(ack); + } + } + + /////////////////////////////////////////////////////////////////////// + void genMealy_val( input_port_t **input_port, + output_port_t **output_port ) + { + for( size_t out = 0 ; out < m_outputs ; out++) + { + if (r_out_allocated[out]) + { + size_t in = r_out_origin[out]; + pkt_t tmp; + tmp.readFrom(*input_port[in]); + tmp.writeTo(*output_port[out]); + } + else + { + output_port[out]->setVal(false); + } + } + } + +}; // end class IoXbar + + +/////////////////////////////////////////////////////////////////////////////////// +#define tmpl(x) template x VciIoxNetwork +/////////////////////////////////////////////////////////////////////////////////// + +///////////////////////// +tmpl(void)::print_trace() +{ + m_cmd_xbar->print_trace(); + m_rsp_xbar->print_trace(); +} + +//////////////////////// +tmpl(void)::transition() +{ + if ( ! p_resetn.read() ) + { + m_cmd_xbar->reset(); + m_rsp_xbar->reset(); + return; + } + + m_cmd_xbar->transition( m_ports_to_initiator, m_ports_to_target ); + m_rsp_xbar->transition( m_ports_to_target, m_ports_to_initiator ); +} + +////////////////////////////// +tmpl(void)::genMealy_cmd_val() +{ + m_cmd_xbar->genMealy_val( m_ports_to_initiator, m_ports_to_target ); +} + +////////////////////////////// +tmpl(void)::genMealy_cmd_ack() +{ + m_cmd_xbar->genMealy_ack( m_ports_to_initiator, m_ports_to_target ); +} + +////////////////////////////// +tmpl(void)::genMealy_rsp_val() +{ + m_rsp_xbar->genMealy_val( m_ports_to_target, m_ports_to_initiator ); +} + +////////////////////////////// +tmpl(void)::genMealy_rsp_ack() +{ + m_rsp_xbar->genMealy_ack( m_ports_to_target, m_ports_to_initiator ); +} + +/////////////////////////////////////////////////////////////////////////// +tmpl(/**/)::VciIoxNetwork( sc_core::sc_module_name name, + const soclib::common::MappingTable &mt, + size_t cluster_id, + size_t nb_tgt, + size_t nb_ini ) + : BaseModule(name), + p_clk("clk"), + p_resetn("resetn"), + p_to_tgt(soclib::common::alloc_elems >( + "p_to_tgt", nb_tgt)), + p_to_ini(soclib::common::alloc_elems >( + "p_to_ini", nb_ini)), + + m_nb_tgt( nb_tgt ), + m_nb_ini( nb_ini ), + + m_cmd_rt( mt.getPortidFromAddress(cluster_id) ), + m_rsp_rt( mt.getPortidFromSrcid(cluster_id) ) +{ + std::cout << " Building VciIoxNetwork : " << name << std::endl; + + SC_METHOD(transition); + dont_initialize(); + sensitive << p_clk.pos(); + + SC_METHOD(genMealy_cmd_val); // controls to targets CMDVAL + dont_initialize(); + sensitive << p_clk.neg(); + for ( size_t i=0; i*[nb_ini]; + for (size_t g = 0 ; g < nb_ini ; g++) m_ports_to_initiator[g] = &p_to_ini[g]; + + m_ports_to_target = new VciInitiator*[nb_tgt]; + for (size_t g = 0 ; g < nb_tgt ; g++) m_ports_to_target[g] = &p_to_tgt[g]; +} + +//////////////////////////// +tmpl(/**/)::~VciIoxNetwork() +{ + soclib::common::dealloc_elems(p_to_ini, m_nb_ini); + soclib::common::dealloc_elems(p_to_tgt, m_nb_tgt); +} + +}} + +// Local Variables: +// 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=4:tabstop=4:softtabstop=4