diff options
author | Ciro Nishiguchi <ciro.nishiguchi@ni.com> | 2018-11-09 10:21:28 -0600 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2018-11-14 14:12:01 -0800 |
commit | dcd31bb2e56f97ed35ab2c95fd985bbbed830045 (patch) | |
tree | 2b153c787322e702a0918fe33a45bb87ec21af69 /host/lib/usrp/x300/x300_impl.cpp | |
parent | a69ab0c23a0c38e3fed3e412df36538d8959d23c (diff) | |
download | uhd-dcd31bb2e56f97ed35ab2c95fd985bbbed830045.tar.gz uhd-dcd31bb2e56f97ed35ab2c95fd985bbbed830045.tar.bz2 uhd-dcd31bb2e56f97ed35ab2c95fd985bbbed830045.zip |
uhd: Add device arg to enable dual ethernet for tx
UHD currently only uses a single ethernet link for tx data, even if the
device is initialized with dual 10GbE links. Using both links when a DMA
FIFO is present causes sequence errors due to DMA FIFO bandwidth
limitations. This maintains the current default behavior but allows
users to override it through a device arg "enable_tx_dual_eth".
Diffstat (limited to 'host/lib/usrp/x300/x300_impl.cpp')
-rw-r--r-- | host/lib/usrp/x300/x300_impl.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp index 0b173beb3..d3eeeef10 100644 --- a/host/lib/usrp/x300/x300_impl.cpp +++ b/host/lib/usrp/x300/x300_impl.cpp @@ -1286,7 +1286,13 @@ uhd::both_xports_t x300_impl::make_transport( next_src_addr==0 ? x300::SRC_ADDR0 : x300::SRC_ADDR1; const uint32_t xbar_src_dst = conn.type==X300_IFACE_ETH0 ? x300::XB_DST_E0 : x300::XB_DST_E1; - if (xport_type != TX_DATA) next_src_addr = (next_src_addr + 1) % mb.eth_conns.size(); + + // Do not increment src addr for tx_data by default, using dual ethernet + // with the DMA FIFO causes sequence errors to DMA FIFO bandwidth + // limitations. + if (xport_type != TX_DATA || mb.args.get_enable_tx_dual_eth()) { + next_src_addr = (next_src_addr + 1) % mb.eth_conns.size(); + } xports.send_sid = this->allocate_sid(mb, address, xbar_src_addr, xbar_src_dst); xports.recv_sid = xports.send_sid.reversed(); |