diff options
| -rw-r--r-- | host/lib/include/uhdlib/rfnoc/chdr_ctrl_xport.hpp | 11 | ||||
| -rw-r--r-- | host/lib/include/uhdlib/rfnoc/chdr_rx_data_xport.hpp | 22 | ||||
| -rw-r--r-- | host/lib/include/uhdlib/rfnoc/chdr_tx_data_xport.hpp | 49 | ||||
| -rw-r--r-- | host/lib/include/uhdlib/rfnoc/mb_iface.hpp | 8 | ||||
| -rw-r--r-- | host/lib/include/uhdlib/rfnoc/mgmt_portal.hpp | 3 | ||||
| -rw-r--r-- | host/lib/rfnoc/chdr_ctrl_xport.cpp | 16 | ||||
| -rw-r--r-- | host/lib/rfnoc/link_stream_manager.cpp | 12 | ||||
| -rw-r--r-- | host/lib/rfnoc/mgmt_portal.cpp | 76 |
8 files changed, 100 insertions, 97 deletions
diff --git a/host/lib/include/uhdlib/rfnoc/chdr_ctrl_xport.hpp b/host/lib/include/uhdlib/rfnoc/chdr_ctrl_xport.hpp index 3365dcb23..9cf2f305f 100644 --- a/host/lib/include/uhdlib/rfnoc/chdr_ctrl_xport.hpp +++ b/host/lib/include/uhdlib/rfnoc/chdr_ctrl_xport.hpp @@ -45,8 +45,8 @@ public: size_t num_send_frames, size_t num_recv_frames) { - return std::make_shared<chdr_ctrl_xport>(io_srv, send_link, recv_link, my_epid, - num_send_frames, num_recv_frames); + return std::make_shared<chdr_ctrl_xport>( + io_srv, send_link, recv_link, my_epid, num_send_frames, num_recv_frames); } /*! @@ -111,6 +111,13 @@ public: */ void release_recv_buff(frame_buff::uptr buff); + /*! + * Get this xport's EPID + * + * \return the source EPID for this transport + */ + sep_id_t get_epid() const; + private: chdr_ctrl_xport(const chdr_ctrl_xport&) = delete; diff --git a/host/lib/include/uhdlib/rfnoc/chdr_rx_data_xport.hpp b/host/lib/include/uhdlib/rfnoc/chdr_rx_data_xport.hpp index 69dceebe1..41af766b4 100644 --- a/host/lib/include/uhdlib/rfnoc/chdr_rx_data_xport.hpp +++ b/host/lib/include/uhdlib/rfnoc/chdr_rx_data_xport.hpp @@ -125,7 +125,6 @@ public: * \param recv_link The recv link, already attached to the I/O service * \param send_link The send link, already attached to the I/O service * \param pkt_factory Factory to create packets with the desired chdr_w and endianness - * \param addrs Source and destination addresses * \param epids Source and destination endpoint IDs * \param pyld_buff_fmt Datatype of SW buffer that holds the data payload * \param mdata_buff_fmt Datatype of SW buffer that holds the data metadata @@ -138,8 +137,8 @@ public: chdr_rx_data_xport(uhd::transport::io_service::sptr io_srv, uhd::transport::recv_link_if::sptr recv_link, uhd::transport::send_link_if::sptr send_link, + uhd::rfnoc::mgmt::mgmt_portal& mgmt_portal, const chdr::chdr_packet_factory& pkt_factory, - const uhd::rfnoc::sep_addr_pair_t& addrs, const uhd::rfnoc::sep_id_pair_t& epids, const uhd::rfnoc::sw_buff_t pyld_buff_fmt, const uhd::rfnoc::sw_buff_t mdata_buff_fmt, @@ -150,8 +149,6 @@ public: const bool lossy_xport) : _fc_state(epids), _fc_sender(pkt_factory, epids), _epid(epids.second) { - const sep_addr_t remote_sep_addr = addrs.first; - const sep_addr_t local_sep_addr = addrs.second; const sep_id_t remote_epid = epids.first; const sep_id_t local_epid = epids.second; @@ -198,22 +195,14 @@ public: 0, // num_send_frames 0); // num_recv_frames - // Create new temporary management portal with the transports used for this stream - // TODO: This is a bit excessive. Maybe we can pare down the functionality of the - // portal just for route setup purposes. Whatever we do, we *must* use xport in it - // though otherwise the transport will not behave correctly. - auto data_mgmt_portal = uhd::rfnoc::mgmt::mgmt_portal::make( - *ctrl_xport, pkt_factory, local_sep_addr, local_epid); - // Setup a route to the EPID // Note that this may be gratuitous--The endpoint may already have been set up - data_mgmt_portal->initialize_endpoint(*ctrl_xport, remote_sep_addr, remote_epid); - data_mgmt_portal->setup_local_route(*ctrl_xport, remote_epid); + mgmt_portal.setup_local_route(*ctrl_xport, remote_epid); // Initialize flow control - management portal sends a stream command // containing its requested flow control frequency, the rx transport // responds with a stream status containing its buffer capacity. - data_mgmt_portal->config_local_rx_stream_start(*ctrl_xport, + mgmt_portal.config_local_rx_stream_start(*ctrl_xport, remote_epid, lossy_xport, pyld_buff_fmt, @@ -221,7 +210,7 @@ public: fc_freq, fc_headroom); - data_mgmt_portal->config_local_rx_stream_commit(*ctrl_xport, remote_epid); + mgmt_portal.config_local_rx_stream_commit(*ctrl_xport, remote_epid); UHD_LOG_TRACE("XPORT::RX_DATA_XPORT", "Stream endpoint was configured with:" @@ -233,9 +222,8 @@ public: << "fc frequency bytes=" << fc_freq.bytes << ", packets=" << fc_freq.packets); - // We no longer need the control xport and mgmt_portal, release them so + // We no longer need the control xport, release it so // the control xport is no longer connected to the I/O service. - data_mgmt_portal.reset(); ctrl_xport.reset(); } diff --git a/host/lib/include/uhdlib/rfnoc/chdr_tx_data_xport.hpp b/host/lib/include/uhdlib/rfnoc/chdr_tx_data_xport.hpp index 62b811bf5..0fb0ab5d1 100644 --- a/host/lib/include/uhdlib/rfnoc/chdr_tx_data_xport.hpp +++ b/host/lib/include/uhdlib/rfnoc/chdr_tx_data_xport.hpp @@ -121,7 +121,6 @@ public: * \param recv_link The recv link, already attached to the I/O service * \param send_link The send link, already attached to the I/O service * \param pkt_factory Factory to create packets with the desired chdr_w and endianness - * \param addrs Source and destination addresses * \param epids Source and destination endpoint IDs * \param pyld_buff_fmt Datatype of SW buffer that holds the data payload * \param mdata_buff_fmt Datatype of SW buffer that holds the data metadata @@ -132,8 +131,8 @@ public: chdr_tx_data_xport(uhd::transport::io_service::sptr io_srv, uhd::transport::recv_link_if::sptr recv_link, uhd::transport::send_link_if::sptr send_link, + uhd::rfnoc::mgmt::mgmt_portal& mgmt_portal, const chdr::chdr_packet_factory& pkt_factory, - const uhd::rfnoc::sep_addr_pair_t& addrs, const uhd::rfnoc::sep_id_pair_t& epids, const uhd::rfnoc::sw_buff_t pyld_buff_fmt, const uhd::rfnoc::sw_buff_t mdata_buff_fmt, @@ -142,8 +141,6 @@ public: const double fc_headroom_ratio) : _fc_sender(pkt_factory, epids), _epid(epids.first) { - const sep_addr_t remote_sep_addr = addrs.second; - const sep_addr_t local_sep_addr = addrs.first; const sep_id_t remote_epid = epids.second; const sep_id_t local_epid = epids.first; @@ -163,10 +160,8 @@ public: _configure_sep(io_srv, recv_link, send_link, - pkt_factory, - local_sep_addr, + mgmt_portal, local_epid, - remote_sep_addr, remote_epid, pyld_buff_fmt, mdata_buff_fmt); @@ -236,8 +231,8 @@ public: * \param info Information to include in the header * \return A pointer to the payload data area and the packet size in bytes */ - std::pair<void*, size_t> write_packet_header(buff_t::uptr& buff, - const packet_info_t& info) + std::pair<void*, size_t> write_packet_header( + buff_t::uptr& buff, const packet_info_t& info) { uint64_t tsf = 0; @@ -254,8 +249,7 @@ public: _send_packet->refresh(buff->data(), _send_header, tsf); _send_packet->update_payload_size(info.payload_bytes); - return std::make_pair( - _send_packet->get_payload_ptr(), + return std::make_pair(_send_packet->get_payload_ptr(), _send_packet->get_chdr_header().get_length()); } @@ -289,8 +283,8 @@ private: _recv_packet->get_payload_size() / sizeof(uint64_t), _recv_packet->conv_to_host<uint64_t>()); - _fc_state.update_dest_recv_count({strs.xfer_count_bytes, - static_cast<uint32_t>(strs.xfer_count_pkts)}); + _fc_state.update_dest_recv_count( + {strs.xfer_count_bytes, static_cast<uint32_t>(strs.xfer_count_pkts)}); // TODO: check strs status here and push into async msg queue @@ -339,10 +333,8 @@ private: void _configure_sep(uhd::transport::io_service::sptr io_srv, uhd::transport::recv_link_if::sptr recv_link, uhd::transport::send_link_if::sptr send_link, - const chdr::chdr_packet_factory& pkt_factory, - const uhd::rfnoc::sep_addr_t& local_sep_addr, + uhd::rfnoc::mgmt::mgmt_portal& mgmt_portal, const uhd::rfnoc::sep_id_t& local_epid, - const uhd::rfnoc::sep_addr_t& remote_sep_addr, const uhd::rfnoc::sep_id_t& remote_epid, const uhd::rfnoc::sw_buff_t pyld_buff_fmt, const uhd::rfnoc::sw_buff_t mdata_buff_fmt) @@ -356,23 +348,14 @@ private: 1, // num_send_frames 1); // num_recv_frames - // Create new temporary management portal with the transports used for this stream - // TODO: This is a bit excessive. Maybe we can pare down the functionality of the - // portal just for route setup purposes. Whatever we do, we *must* use xport in it - // though otherwise the transport will not behave correctly. - auto data_mgmt_portal = uhd::rfnoc::mgmt::mgmt_portal::make( - *ctrl_xport, pkt_factory, local_sep_addr, local_epid); - // Setup a route to the EPID - data_mgmt_portal->initialize_endpoint(*ctrl_xport, remote_sep_addr, remote_epid); - data_mgmt_portal->setup_local_route(*ctrl_xport, remote_epid); + mgmt_portal.setup_local_route(*ctrl_xport, remote_epid); - data_mgmt_portal->config_local_tx_stream( + mgmt_portal.config_local_tx_stream( *ctrl_xport, remote_epid, pyld_buff_fmt, mdata_buff_fmt); - // We no longer need the control xport and mgmt_portal, release them so + // We no longer need the control xport, release it so // the control xport is no longer connected to the I/O service. - data_mgmt_portal.reset(); ctrl_xport.reset(); } @@ -481,8 +464,7 @@ private: recv_io->release_recv_buff(std::move(buff)); - return {strs.capacity_bytes, - static_cast<uint32_t>(strs.capacity_pkts)}; + return {strs.capacity_bytes, static_cast<uint32_t>(strs.capacity_pkts)}; }; // Send a strc init to get the buffer size @@ -491,14 +473,13 @@ private: _fc_state.set_dest_capacity(capacity); UHD_LOG_TRACE("XPORT::TX_DATA_XPORT", - "Received strs initializing buffer capacity to " - << capacity.bytes << " bytes"); + "Received strs initializing buffer capacity to " << capacity.bytes + << " bytes"); // Calculate the requested fc_freq parameters uhd::rfnoc::stream_buff_params_t fc_freq = { static_cast<uint64_t>(std::ceil(double(capacity.bytes) * fc_freq_ratio)), - static_cast<uint32_t>( - std::ceil(double(capacity.packets) * fc_freq_ratio))}; + static_cast<uint32_t>(std::ceil(double(capacity.packets) * fc_freq_ratio))}; const size_t headroom_bytes = static_cast<uint64_t>(std::ceil(double(capacity.bytes) * fc_headroom_ratio)); diff --git a/host/lib/include/uhdlib/rfnoc/mb_iface.hpp b/host/lib/include/uhdlib/rfnoc/mb_iface.hpp index 840fcf709..1a06d44e2 100644 --- a/host/lib/include/uhdlib/rfnoc/mb_iface.hpp +++ b/host/lib/include/uhdlib/rfnoc/mb_iface.hpp @@ -99,7 +99,9 @@ public: * \param xport_args Transport configuration args * \return A CHDR RX data transport */ - virtual chdr_rx_data_xport::uptr make_rx_data_transport(const sep_addr_pair_t& addrs, + virtual chdr_rx_data_xport::uptr make_rx_data_transport( + mgmt::mgmt_portal& mgmt_portal, + const sep_addr_pair_t& addrs, const sep_id_pair_t& epids, const sw_buff_t pyld_buff_fmt, const sw_buff_t mdata_buff_fmt, @@ -116,7 +118,9 @@ public: * \param xport_args Transport configuration args * \return A CHDR TX data transport */ - virtual chdr_tx_data_xport::uptr make_tx_data_transport(const sep_addr_pair_t& addrs, + virtual chdr_tx_data_xport::uptr make_tx_data_transport( + mgmt::mgmt_portal& mgmt_portal, + const sep_addr_pair_t& addrs, const sep_id_pair_t& epids, const uhd::rfnoc::sw_buff_t pyld_buff_fmt, const uhd::rfnoc::sw_buff_t mdata_buff_fmt, diff --git a/host/lib/include/uhdlib/rfnoc/mgmt_portal.hpp b/host/lib/include/uhdlib/rfnoc/mgmt_portal.hpp index ac72931bf..850cee460 100644 --- a/host/lib/include/uhdlib/rfnoc/mgmt_portal.hpp +++ b/host/lib/include/uhdlib/rfnoc/mgmt_portal.hpp @@ -190,8 +190,7 @@ public: // static uptr make(chdr_ctrl_xport& xport, const chdr::chdr_packet_factory& pkt_factory, - sep_addr_t my_sep_addr, - sep_id_t my_epid); + sep_addr_t my_sep_addr); }; }}} // namespace uhd::rfnoc::mgmt diff --git a/host/lib/rfnoc/chdr_ctrl_xport.cpp b/host/lib/rfnoc/chdr_ctrl_xport.cpp index 72fe5bf7f..a6cfda0de 100644 --- a/host/lib/rfnoc/chdr_ctrl_xport.cpp +++ b/host/lib/rfnoc/chdr_ctrl_xport.cpp @@ -52,12 +52,8 @@ chdr_ctrl_xport::chdr_ctrl_xport(io_service::sptr io_srv, link->release_recv_buff(std::move(buff)); }; - _ctrl_recv_if = io_srv->make_recv_client(recv_link, - num_recv_frames, - ctrl_recv_cb, - send_link_if::sptr(), - 0, - release_cb); + _ctrl_recv_if = io_srv->make_recv_client( + recv_link, num_recv_frames, ctrl_recv_cb, send_link_if::sptr(), 0, release_cb); uhd::transport::recv_callback_t mgmt_recv_cb = [this](frame_buff::uptr& buff, recv_link_if* /*recv_link*/, @@ -145,3 +141,11 @@ void chdr_ctrl_xport::release_recv_buff(frame_buff::uptr buff) std::lock_guard<std::mutex> lock(_mutex); _ctrl_recv_if->release_recv_buff(std::move(buff)); } + +/*! + * Get this xport's EPID + */ +sep_id_t chdr_ctrl_xport::get_epid() const +{ + return _my_epid; +} diff --git a/host/lib/rfnoc/link_stream_manager.cpp b/host/lib/rfnoc/link_stream_manager.cpp index 6855162de..b0e864347 100644 --- a/host/lib/rfnoc/link_stream_manager.cpp +++ b/host/lib/rfnoc/link_stream_manager.cpp @@ -66,10 +66,8 @@ public: _ctrl_xport = _mb_iface.make_ctrl_transport(_my_device_id, _my_mgmt_ctrl_epid); // Create management portal using one of the child transports - _mgmt_portal = mgmt_portal::make(*_ctrl_xport, - _pkt_factory, - sep_addr_t(_my_device_id, SEP_INST_MGMT_CTRL), - _my_mgmt_ctrl_epid); + _mgmt_portal = mgmt_portal::make( + *_ctrl_xport, _pkt_factory, sep_addr_t(_my_device_id, SEP_INST_MGMT_CTRL)); } virtual ~link_stream_manager_impl() @@ -235,7 +233,8 @@ public: sep_id_t src_epid = _epid_alloc->allocate_epid(sw_epid_addr); _allocated_epids.insert(src_epid); - return _mb_iface.make_tx_data_transport({sw_epid_addr, dst_addr}, + return _mb_iface.make_tx_data_transport(*_mgmt_portal, + {sw_epid_addr, dst_addr}, {src_epid, dst_epid}, pyld_buff_fmt, mdata_buff_fmt, @@ -263,7 +262,8 @@ public: sep_id_t dst_epid = _epid_alloc->allocate_epid(sw_epid_addr); _allocated_epids.insert(dst_epid); - return _mb_iface.make_rx_data_transport({src_addr, sw_epid_addr}, + return _mb_iface.make_rx_data_transport(*_mgmt_portal, + {src_addr, sw_epid_addr}, {src_epid, dst_epid}, pyld_buff_fmt, mdata_buff_fmt, diff --git a/host/lib/rfnoc/mgmt_portal.cpp b/host/lib/rfnoc/mgmt_portal.cpp index a8b72cbdf..ed3e754a2 100644 --- a/host/lib/rfnoc/mgmt_portal.cpp +++ b/host/lib/rfnoc/mgmt_portal.cpp @@ -158,7 +158,8 @@ std::string to_string(const node_addr_t& node_addr) if (!node_addr.empty()) { std::string str(""); for (const auto& hop : node_addr) { - str += hop.first.to_string() + std::string(",") + std::to_string(hop.second) + std::string("->"); + str += hop.first.to_string() + std::string(",") + std::to_string(hop.second) + + std::string("->"); } return str; } else { @@ -177,13 +178,11 @@ class mgmt_portal_impl : public mgmt_portal public: mgmt_portal_impl(chdr_ctrl_xport& xport, const chdr::chdr_packet_factory& pkt_factory, - sep_addr_t my_sep_addr, - sep_id_t my_epid) - : _my_epid(my_epid) - , _protover(pkt_factory.get_protover()) + sep_addr_t my_sep_addr) + : _protover(pkt_factory.get_protover()) , _chdr_w(pkt_factory.get_chdr_w()) , _endianness(pkt_factory.get_endianness()) - , _my_node_id(my_sep_addr.first, NODE_TYPE_STRM_EP, my_epid) + , _my_node_id(my_sep_addr.first, NODE_TYPE_STRM_EP, xport.get_epid()) , _send_seqnum(0) , _send_pkt(std::move(pkt_factory.make_mgmt())) , _recv_pkt(std::move(pkt_factory.make_mgmt())) @@ -208,6 +207,7 @@ public: chdr_ctrl_xport& xport, const sep_addr_t& addr, const sep_id_t& epid) { std::lock_guard<std::recursive_mutex> lock(_mutex); + auto my_epid = xport.get_epid(); // Create a node ID from lookup info node_id_t lookup_node(addr.first, NODE_TYPE_STRM_EP, addr.second); @@ -216,10 +216,13 @@ public: "initialize_endpoint(): Cannot reach node with specified address."); } const node_addr_t& node_addr = _node_addr_map.at(lookup_node); + if (is_endpoint_initialized(epid)) { + return; + } // Build a management transaction to first get to the node mgmt_payload cfg_xact; - cfg_xact.set_header(_my_epid, _protover, _chdr_w); + cfg_xact.set_header(my_epid, _protover, _chdr_w); _traverse_to_node(cfg_xact, node_addr); mgmt_hop_t cfg_hop; @@ -283,14 +286,27 @@ public: virtual void setup_local_route(chdr_ctrl_xport& xport, const sep_id_t& dst_epid) { std::lock_guard<std::recursive_mutex> lock(_mutex); + auto my_epid = xport.get_epid(); // Lookup the physical stream endpoint address using the endpoint ID const node_addr_t& node_addr = _lookup_sep_node_addr(dst_epid); + node_addr_t route_addr = node_addr_t(); + route_addr.push_back(std::make_pair(_my_node_id, next_dest_t(-1))); + for (const auto& addr_pair : node_addr) { + mgmt_payload init_req_xact; + _traverse_to_node(init_req_xact, route_addr); + _push_node_init_hop(init_req_xact, addr_pair.first, my_epid); + const mgmt_payload resp_xact = + _send_recv_mgmt_transaction(xport, init_req_xact); + route_addr.push_back(addr_pair); + } + // Build a management transaction to configure all the nodes in the path going to // dst_epid mgmt_payload cfg_xact; - cfg_xact.set_header(_my_epid, _protover, _chdr_w); + cfg_xact.set_header(my_epid, _protover, _chdr_w); + for (const auto& addr_pair : node_addr) { const node_id_t& curr_node = addr_pair.first; const next_dest_t& curr_dest = addr_pair.second; @@ -347,8 +363,8 @@ public: } UHD_LOG_DEBUG("RFNOC::MGMT", - (boost::format("Established a route from EPID=%d (SW) to EPID=%d") % _my_epid - % dst_epid)); + (boost::format("Established a route from EPID=%d (SW) to EPID=%d") + % xport.get_epid() % dst_epid)); UHD_LOG_TRACE("RFNOC::MGMT", (boost::format("The destination for EPID=%d has been added to all routers in " "the path: %s") @@ -432,6 +448,7 @@ public: const bool reset = false) { std::lock_guard<std::recursive_mutex> lock(_mutex); + auto my_epid = xport.get_epid(); // The discovery process has already setup a route from the // destination to us. No additional action is necessary. @@ -440,7 +457,7 @@ public: // Build a management transaction to first get to the node mgmt_payload cfg_xact; - cfg_xact.set_header(_my_epid, _protover, _chdr_w); + cfg_xact.set_header(my_epid, _protover, _chdr_w); _traverse_to_node(cfg_xact, node_addr); mgmt_hop_t cfg_hop; @@ -451,7 +468,7 @@ public: } // Set destination of the stream to us (this endpoint) cfg_hop.add_op(mgmt_op_t(mgmt_op_t::MGMT_OP_CFG_WR_REQ, - mgmt_op_t::cfg_payload(REG_OSTRM_DST_EPID, _my_epid))); + mgmt_op_t::cfg_payload(REG_OSTRM_DST_EPID, my_epid))); // Configure flow control parameters _push_ostrm_flow_control_config(lossy_xport, pyld_buff_fmt, @@ -495,6 +512,7 @@ public: const bool reset = false) { std::lock_guard<std::recursive_mutex> lock(_mutex); + auto my_epid = xport.get_epid(); // First setup a route between to the endpoint setup_local_route(xport, epid); @@ -503,7 +521,7 @@ public: // Build a management transaction to first get to the node mgmt_payload cfg_xact; - cfg_xact.set_header(_my_epid, _protover, _chdr_w); + cfg_xact.set_header(my_epid, _protover, _chdr_w); _traverse_to_node(cfg_xact, node_addr); mgmt_hop_t cfg_hop; @@ -541,6 +559,7 @@ public: const double timeout = 0.2) { std::lock_guard<std::recursive_mutex> lock(_mutex); + auto my_epid = xport.get_epid(); // First setup a route between the two endpoints setup_remote_route(xport, dst_epid, src_epid); @@ -553,7 +572,7 @@ public: // Reset source and destination (in that order) for (size_t i = 0; i < 2; i++) { mgmt_payload rst_xact; - rst_xact.set_header(_my_epid, _protover, _chdr_w); + rst_xact.set_header(my_epid, _protover, _chdr_w); _traverse_to_node(rst_xact, (i == 0) ? src_node_addr : dst_node_addr); mgmt_hop_t rst_hop; rst_hop.add_op(mgmt_op_t(mgmt_op_t::MGMT_OP_CFG_WR_REQ, @@ -568,7 +587,7 @@ public: // Build a management transaction to configure the source node { mgmt_payload cfg_xact; - cfg_xact.set_header(_my_epid, _protover, _chdr_w); + cfg_xact.set_header(my_epid, _protover, _chdr_w); _traverse_to_node(cfg_xact, src_node_addr); mgmt_hop_t cfg_hop; // Set destination of the stream to dst_epid @@ -615,6 +634,7 @@ private: // Functions // traversal of the dataflow graph. The queue consists of a previously discovered // node and the next destination to take from that node. std::queue<std::pair<node_id_t, next_dest_t>> pending_paths; + auto my_epid = xport.get_epid(); // Add ourselves to the the pending queue to kick off the search UHD_LOG_DEBUG("RFNOC::MGMT", @@ -641,7 +661,7 @@ private: // Functions // Build a management transaction to first get to our destination so that we // can ask it to identify itself mgmt_payload route_xact; - route_xact.set_header(_my_epid, _protover, _chdr_w); + route_xact.set_header(my_epid, _protover, _chdr_w); _traverse_to_node(route_xact, next_addr); // Discover downstream node (we ask the node to identify itself) @@ -697,7 +717,7 @@ private: // Functions // Initialize the node (first time config) mgmt_payload init_req_xact(route_xact); - _push_node_init_hop(init_req_xact, new_node); + _push_node_init_hop(init_req_xact, new_node, my_epid); const mgmt_payload init_resp_xact = _send_recv_mgmt_transaction(xport, init_req_xact); UHD_LOG_DEBUG("RFNOC::MGMT", "Initialized node " << new_node.to_string()); @@ -828,9 +848,10 @@ private: // Functions std::tuple<uint32_t, stream_buff_params_t> _get_ostrm_status( chdr_ctrl_xport& xport, const node_addr_t& node_addr) { + auto my_epid = xport.get_epid(); // Build a management transaction to first get to the node mgmt_payload status_xact; - status_xact.set_header(_my_epid, _protover, _chdr_w); + status_xact.set_header(my_epid, _protover, _chdr_w); _traverse_to_node(status_xact, node_addr); // Read all the status registers @@ -929,16 +950,17 @@ private: // Functions } // Push a hop onto a transaction to initialize the current node - void _push_node_init_hop(mgmt_payload& transaction, const node_id_t& node) + void _push_node_init_hop( + mgmt_payload& transaction, const node_id_t& node, const sep_id_t& my_epid) { mgmt_hop_t init_hop; switch (node.type) { case NODE_TYPE_XBAR: { - // Configure the routing table to route all packets going to _my_epid back + // Configure the routing table to route all packets going to my_epid back // to the port where the packet is entering // The address for the transaction is the EPID and the data is the port # init_hop.add_op(mgmt_op_t(mgmt_op_t::MGMT_OP_CFG_WR_REQ, - mgmt_op_t::cfg_payload(_my_epid, node.inst))); + mgmt_op_t::cfg_payload(my_epid, node.inst))); } break; case NODE_TYPE_STRM_EP: { // Do nothing @@ -1004,8 +1026,9 @@ private: // Functions const mgmt_payload _send_recv_mgmt_transaction( chdr_ctrl_xport& xport, const mgmt_payload& transaction, double timeout = 0.1) { + auto my_epid = xport.get_epid(); mgmt_payload send(transaction); - send.set_header(_my_epid, _protover, _chdr_w); + send.set_header(my_epid, _protover, _chdr_w); // If we are expecting to receive a response then we have to add an additional // NO-OP hop for the receive endpoint. All responses will be appended to this hop. mgmt_hop_t nop_hop; @@ -1020,15 +1043,13 @@ private: // Functions } _recv_pkt->refresh(recv_buff->data()); mgmt_payload recv; - recv.set_header(_my_epid, _protover, _chdr_w); + recv.set_header(my_epid, _protover, _chdr_w); _recv_pkt->fill_payload(recv); xport.release_recv_buff(std::move(recv_buff)); return recv; } private: // Members - // The endpoint ID of this software endpoint - const sep_id_t _my_epid; // The software RFNoC protocol version const uint16_t _protover; // CHDR Width for this design/application @@ -1061,10 +1082,9 @@ private: // Members mgmt_portal::uptr mgmt_portal::make(chdr_ctrl_xport& xport, const chdr::chdr_packet_factory& pkt_factory, - sep_addr_t my_sep_addr, - sep_id_t my_epid) + sep_addr_t my_sep_addr) { - return std::make_unique<mgmt_portal_impl>(xport, pkt_factory, my_sep_addr, my_epid); + return std::make_unique<mgmt_portal_impl>(xport, pkt_factory, my_sep_addr); } }}} // namespace uhd::rfnoc::mgmt |