Skip to content

Commit

Permalink
Revert "RFNoC: Remove incorrect flush"
Browse files Browse the repository at this point in the history
This reverts commit c8e01d4.

The commit introduced random phase offsets for TwinRX phase alignment.
  • Loading branch information
michael-west committed Mar 25, 2019
1 parent e7acb05 commit 6c2418b
Showing 1 changed file with 19 additions and 0 deletions.
19 changes: 19 additions & 0 deletions host/lib/rfnoc/source_block_ctrl_base.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,25 @@ void source_block_ctrl_base::configure_flow_control_out(const bool enable_fc_out
% buf_size_bytes % unique_id()));
}

// Disable flow control entirely and let all upstream data flush out
// We need to do this every time the window is changed because
// a) We don't know what state the flow-control module was left in
// in the previous run (it should still be enabled)
// b) Changing the window size where data is buffered upstream may
// result in stale packets entering the stream.
sr_write(SR_FLOW_CTRL_EN, 0, block_port);

// Wait for data to flush out.
// In the FPGA we are guaranteed that all buffered packets are more-or-less
// consecutive. 1ms@200MHz = 200,000 cycles of "flush time". 200k cycles = 200k * 8
// bytes (64 bits) = 1.6MB of data that can be flushed. Typically in the FPGA we have
// buffering in the order of kilobytes so waiting for 1MB to flush is more than enough
// time.
// TODO: Enhancement. We should get feedback from the FPGA about when the
// source_flow_control
// module is done flushing.
std::this_thread::sleep_for(std::chrono::milliseconds(1));

// Enable source flow control module and conditionally enable byte based and/or packet
// count based flow control
const bool enable_byte_fc = (buf_size_bytes != 0);
Expand Down

0 comments on commit 6c2418b

Please sign in to comment.