diff options
Diffstat (limited to 'host/lib/usrp/x300')
| -rw-r--r-- | host/lib/usrp/x300/x300_eth_mgr.cpp | 22 | ||||
| -rw-r--r-- | host/lib/usrp/x300/x300_mb_iface.cpp | 27 | ||||
| -rw-r--r-- | host/lib/usrp/x300/x300_pcie_mgr.cpp | 11 |
3 files changed, 33 insertions, 27 deletions
diff --git a/host/lib/usrp/x300/x300_eth_mgr.cpp b/host/lib/usrp/x300/x300_eth_mgr.cpp index fd826e484..02f9abe0f 100644 --- a/host/lib/usrp/x300/x300_eth_mgr.cpp +++ b/host/lib/usrp/x300/x300_eth_mgr.cpp @@ -263,25 +263,27 @@ both_links_t eth_manager::get_links(link_type_t link_type, link_params.num_send_frames = std::max(uhd::rfnoc::MIN_NUM_FRAMES, link_params.num_send_frames); link_params.num_recv_frames = std::max(uhd::rfnoc::MIN_NUM_FRAMES, link_params.num_recv_frames); - // Dummy variables for populating the return tuple - size_t recv_buff_size, send_buff_size; if (_args.get_use_dpdk()) { #ifdef HAVE_DPDK - auto link = uhd::transport::udp_dpdk_link::make( - conn.addr, BOOST_STRINGIZE(X300_VITA_UDP_PORT), link_params); - return std::make_tuple(link, send_buff_size, link, recv_buff_size, true); + auto link = uhd::transport::udp_dpdk_link::make( + conn.addr, BOOST_STRINGIZE(X300_VITA_UDP_PORT), link_params); + return std::make_tuple(link, + link_params.send_buff_size, + link, + link_params.recv_buff_size, + true, + true); #else UHD_LOG_WARNING("X300", "Cannot create DPDK transport, falling back to UDP"); #endif } - - // No DPDK, then return regular/kernel UDP auto link = uhd::transport::udp_boost_asio_link::make(conn.addr, BOOST_STRINGIZE(X300_VITA_UDP_PORT), link_params, - recv_buff_size, - send_buff_size); - return std::make_tuple(link, send_buff_size, link, recv_buff_size, true); + link_params.recv_buff_size, + link_params.send_buff_size); + return std::make_tuple( + link, link_params.send_buff_size, link, link_params.recv_buff_size, true, false); } /****************************************************************************** diff --git a/host/lib/usrp/x300/x300_mb_iface.cpp b/host/lib/usrp/x300/x300_mb_iface.cpp index e0c426138..412b28a92 100644 --- a/host/lib/usrp/x300/x300_mb_iface.cpp +++ b/host/lib/usrp/x300/x300_mb_iface.cpp @@ -98,7 +98,7 @@ uhd::rfnoc::chdr_ctrl_xport::sptr x300_impl::x300_mb_iface::make_ctrl_transport( send_link_if::sptr send_link; recv_link_if::sptr recv_link; bool lossy_xport; - std::tie(send_link, std::ignore, recv_link, std::ignore, lossy_xport) = + std::tie(send_link, std::ignore, recv_link, std::ignore, lossy_xport, std::ignore) = _conn_mgr->get_links(link_type_t::CTRL, local_device_id, local_epid, @@ -139,8 +139,8 @@ uhd::rfnoc::chdr_rx_data_xport::uptr x300_impl::x300_mb_iface::make_rx_data_tran send_link_if::sptr send_link; recv_link_if::sptr recv_link; size_t recv_buff_size; - bool lossy_xport; - std::tie(send_link, std::ignore, recv_link, recv_buff_size, lossy_xport) = + bool lossy_xport, packet_fc; + std::tie(send_link, std::ignore, recv_link, recv_buff_size, lossy_xport, packet_fc) = _conn_mgr->get_links(link_type_t::RX_DATA, local_sep_addr.first, local_epid, @@ -150,16 +150,21 @@ uhd::rfnoc::chdr_rx_data_xport::uptr x300_impl::x300_mb_iface::make_rx_data_tran /* Associate local device ID with the adapter */ _adapter_map[local_sep_addr.first] = send_link->get_send_adapter_id(); - // TODO: configure this based on the transport type - const uhd::rfnoc::stream_buff_params_t recv_capacity = { - recv_buff_size, uhd::rfnoc::MAX_FC_CAPACITY_PKTS}; + const uhd::rfnoc::stream_buff_params_t recv_capacity = {recv_buff_size, + packet_fc ? static_cast<uint32_t>(recv_link->get_num_recv_frames()) + : uhd::rfnoc::MAX_FC_CAPACITY_PKTS}; const double ratio = 1.0 / 32; - // Configure flow control frequency to use bytes only for UDP - uhd::rfnoc::stream_buff_params_t fc_freq = { - static_cast<uint64_t>(std::ceil(double(recv_buff_size) * ratio)), - uhd::rfnoc::MAX_FC_FREQ_PKTS}; + // Configure flow control frequency to use either bytes only or packets only + uhd::rfnoc::stream_buff_params_t fc_freq; + if (packet_fc) { + fc_freq = {uhd::rfnoc::MAX_FC_FREQ_BYTES, + static_cast<uint32_t>(std::ceil(recv_link->get_num_recv_frames() * ratio))}; + } else { + fc_freq = {static_cast<uint64_t>(std::ceil(double(recv_buff_size) * ratio)), + uhd::rfnoc::MAX_FC_FREQ_PKTS}; + } uhd::rfnoc::stream_buff_params_t fc_headroom = {0, 0}; @@ -220,7 +225,7 @@ uhd::rfnoc::chdr_tx_data_xport::uptr x300_impl::x300_mb_iface::make_tx_data_tran send_link_if::sptr send_link; recv_link_if::sptr recv_link; bool lossy_xport; - std::tie(send_link, std::ignore, recv_link, std::ignore, lossy_xport) = + std::tie(send_link, std::ignore, recv_link, std::ignore, lossy_xport, std::ignore) = _conn_mgr->get_links(link_type_t::TX_DATA, local_sep_addr.first, local_epid, diff --git a/host/lib/usrp/x300/x300_pcie_mgr.cpp b/host/lib/usrp/x300/x300_pcie_mgr.cpp index 41d9407f9..d2aad7e3c 100644 --- a/host/lib/usrp/x300/x300_pcie_mgr.cpp +++ b/host/lib/usrp/x300/x300_pcie_mgr.cpp @@ -351,14 +351,13 @@ both_links_t pcie_manager::get_links(link_type_t link_type, // Note: The nirio_link object's factory has a lot of code for sanity // checking the link params, and merging the link_args with the default // link_params, so we use that. - link_params_t link_params = get_default_link_params(link_type); + link_params_t link_params = get_default_link_params(link_type); // PCIe: Lossless, and little endian size_t recv_buff_size, send_buff_size; - auto link = nirio_link::make(_rio_fpga_interface, - dma_channel_num, - link_params, - link_args); + auto link = + nirio_link::make(_rio_fpga_interface, dma_channel_num, link_params, link_args); - return std::make_tuple(link, send_buff_size, link, recv_buff_size, false /*not lossy*/); + return std::make_tuple( + link, send_buff_size, link, recv_buff_size, false /*not lossy*/, false); } |