aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/mpmd/mpmd_mb_iface.cpp
diff options
context:
space:
mode:
authormattprost <matt.prost@ni.com>2021-03-31 11:33:33 -0500
committerAaron Rossetto <aaron.rossetto@ni.com>2021-04-29 14:35:26 -0500
commitd689df23fb4bf38e1abc23b06767fc26aa27c163 (patch)
treeb89a640a8e86ec572958d7602cc2c9d834f68fdf /host/lib/usrp/mpmd/mpmd_mb_iface.cpp
parent99e5230e4bf26166ee1accce1e57ff24b0629826 (diff)
downloaduhd-d689df23fb4bf38e1abc23b06767fc26aa27c163.tar.gz
uhd-d689df23fb4bf38e1abc23b06767fc26aa27c163.tar.bz2
uhd-d689df23fb4bf38e1abc23b06767fc26aa27c163.zip
rfnoc: Add option to disable flow control on rx streaming
Disabling this feature will allow the USRP to send a continuous stream of Rx data to a host machine without throttling due to lack of flow control credits. This is unnecessary overhead on lossless transports such as pcie or aurora. Usage: add 'enable_fc=false' to stream_args.args Signed-off-by: mattprost <matt.prost@ni.com>
Diffstat (limited to 'host/lib/usrp/mpmd/mpmd_mb_iface.cpp')
-rw-r--r--host/lib/usrp/mpmd/mpmd_mb_iface.cpp55
1 files changed, 39 insertions, 16 deletions
diff --git a/host/lib/usrp/mpmd/mpmd_mb_iface.cpp b/host/lib/usrp/mpmd/mpmd_mb_iface.cpp
index a24be5c57..70e982fc7 100644
--- a/host/lib/usrp/mpmd/mpmd_mb_iface.cpp
+++ b/host/lib/usrp/mpmd/mpmd_mb_iface.cpp
@@ -165,9 +165,15 @@ uhd::rfnoc::chdr_ctrl_xport::sptr mpmd_mboard_impl::mpmd_mb_iface::make_ctrl_tra
const size_t link_idx = _local_device_id_map.at(local_device_id);
uhd::transport::send_link_if::sptr send_link;
uhd::transport::recv_link_if::sptr recv_link;
- std::tie(send_link, std::ignore, recv_link, std::ignore, std::ignore, std::ignore) =
- _link_if_mgr->get_link(
- link_idx, uhd::transport::link_type_t::CTRL, uhd::device_addr_t());
+ std::tie(send_link,
+ std::ignore,
+ recv_link,
+ std::ignore,
+ std::ignore,
+ std::ignore,
+ std::ignore) = _link_if_mgr->get_link(link_idx,
+ uhd::transport::link_type_t::CTRL,
+ uhd::device_addr_t());
/* Associate local device ID with the adapter */
_adapter_map[local_device_id] = send_link->get_send_adapter_id();
@@ -211,11 +217,17 @@ mpmd_mboard_impl::mpmd_mb_iface::make_rx_data_transport(
uhd::transport::send_link_if::sptr send_link;
uhd::transport::recv_link_if::sptr recv_link;
- bool lossy_xport, packet_fc;
+ bool lossy_xport, packet_fc, enable_fc;
size_t recv_buff_size;
- std::tie(send_link, std::ignore, recv_link, recv_buff_size, lossy_xport, packet_fc) =
- _link_if_mgr->get_link(
- link_idx, uhd::transport::link_type_t::RX_DATA, xport_args);
+ std::tie(send_link,
+ std::ignore,
+ recv_link,
+ recv_buff_size,
+ lossy_xport,
+ packet_fc,
+ enable_fc) = _link_if_mgr->get_link(link_idx,
+ uhd::transport::link_type_t::RX_DATA,
+ xport_args);
/* Associate local device ID with the adapter */
_adapter_map[local_sep_addr.first] = send_link->get_send_adapter_id();
@@ -226,14 +238,19 @@ mpmd_mboard_impl::mpmd_mb_iface::make_rx_data_transport(
const double ratio = 1.0 / 32;
- // 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))};
+ if (enable_fc) {
+ // Configure flow control frequency to use either bytes only or packets only
+ 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};
+ }
} else {
- fc_freq = {static_cast<uint64_t>(std::ceil(double(recv_buff_size) * ratio)),
- uhd::rfnoc::MAX_FC_FREQ_PKTS};
+ fc_freq = {0, 0};
}
stream_buff_params_t fc_headroom = {0, 0};
@@ -306,9 +323,15 @@ mpmd_mboard_impl::mpmd_mb_iface::make_tx_data_transport(
uhd::transport::send_link_if::sptr send_link;
uhd::transport::recv_link_if::sptr recv_link;
bool lossy_xport;
- std::tie(send_link, std::ignore, recv_link, std::ignore, lossy_xport, std::ignore) =
- _link_if_mgr->get_link(
- link_idx, uhd::transport::link_type_t::TX_DATA, xport_args);
+ std::tie(send_link,
+ std::ignore,
+ recv_link,
+ std::ignore,
+ lossy_xport,
+ std::ignore,
+ std::ignore) = _link_if_mgr->get_link(link_idx,
+ uhd::transport::link_type_t::TX_DATA,
+ xport_args);
/* Associate local device ID with the adapter */
_adapter_map[local_sep_addr.first] = send_link->get_send_adapter_id();