miegl/b210-k7-fpga
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fpga: rfnoc: Add ability to disable output flow control

Browse Source 
Per the RFNoC specification, if we set the frequency of flow
control updates to 0 then the input stream will not send flow control
status updates to the output stream handler.

This change makes it so that when the frequency of flow control status
updates is configured to be zero in the FPGA output stream handler
(i.e., cfg_fc_freq_bytes and cfg_fc_freq_pkts are both 0 in
chdr_stream_output) then the output stream handler will not use flow
control. That is, chdr_stream_output will not expect stream status
updates and will not restrict output packets.


Original-commit: 184999c54f0f30a7952d4e8560b393730c00e353
This commit is contained in:
Wade Fife
2021-04-14 07:24:49 -05:00
parent bababc79eb
commit 40c76b8d9a
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/rfnoc/core/chdr_stream_endpoint.v
+9 -5
View File
@@ -218,11 +218,15 @@ module chdr_stream_endpoint #(
// - [1]: Flush control path // - [1]: Flush control path
// * REG_OSTRM_CTRL_STATUS (Read-Write): // * REG_OSTRM_CTRL_STATUS (Read-Write):
// Control and status register for the output stream // Control and status register for the output stream
// - [0] : Configuration start (strobe) // - [0] : Configuration start (strobe)
// - [1] : Is this transport lossy? // - [1] : Is this transport lossy?
// - [3:2]: Payload SW buff (0=u64, 1=u32, 2=u16, 3=u8) // - [3:2] : Payload SW buff (0=u64, 1=u32, 2=u16, 3=u8)
// - [5:4]: Metadata SW buff (0=u64, 1=u32, 2=u16, 3=u8) // - [5:4] : Metadata SW buff (0=u64, 1=u32, 2=u16, 3=u8)
// - [6] : Swap endianness // - [6] : Swap endianness
// - [28:7]: <Unused>
// - [29] : Configuration is pending (read-only)
// - [30] : Configuration has failed (read-only)
// - [31] : Is flow-control enabled? (read-only)
// * REG_OSTRM_DST_EPID (Write-Only): // * REG_OSTRM_DST_EPID (Write-Only):
// The endpoint ID of a downstream stream endpoint // The endpoint ID of a downstream stream endpoint
// - [15:0]: Endpoint ID // - [15:0]: Endpoint ID
lib/rfnoc/core/chdr_stream_output.v
+13 -2
View File
@@ -10,7 +10,7 @@
// a downstream endpoint module (chdr_stream_input). Once // a downstream endpoint module (chdr_stream_input). Once
// a stream is setup, the CHDR data on the axis_data port // a stream is setup, the CHDR data on the axis_data port
// can be sent downstream with full flow control. Stream // can be sent downstream with full flow control. Stream
// status messages are recieved from the downstream node // status messages are received from the downstream node
// to update flow control state. This module has an external // to update flow control state. This module has an external
// configuration bus to initiate stream creation. // configuration bus to initiate stream creation.
// //
@@ -340,6 +340,9 @@ module chdr_stream_output #(
reg [15:0] strc_seq_num = 16'd0; reg [15:0] strc_seq_num = 16'd0;
reg [2:0] cfg_delay = 3'd0; reg [2:0] cfg_delay = 3'd0;
reg cfg_fc_freq_bytes_nz;
reg cfg_fc_freq_pkts_nz;
always @(posedge clk) begin always @(posedge clk) begin
if (rst) begin if (rst) begin
state <= ST_PASS_DATA; state <= ST_PASS_DATA;
@@ -348,7 +351,13 @@ module chdr_stream_output #(
strc_seq_num <= 16'd0; strc_seq_num <= 16'd0;
cfg_pending <= 1'b0; cfg_pending <= 1'b0;
cfg_failed <= 1'b0; cfg_failed <= 1'b0;
cfg_fc_freq_bytes_nz <= 1'bX;
cfg_fc_freq_pkts_nz <= 1'bX;
end else begin end else begin
// Capture if the flow-control update frequency is 0 (never)
cfg_fc_freq_bytes_nz <= (cfg_fc_freq_bytes != 0);
cfg_fc_freq_pkts_nz <= (cfg_fc_freq_pkts != 0);
case (state) case (state)
// ST_PASS_DATA // ST_PASS_DATA
@@ -431,9 +440,11 @@ module chdr_stream_output #(
if (msg_o_tdata == CHDR_STRS_STATUS_OKAY) begin if (msg_o_tdata == CHDR_STRS_STATUS_OKAY) begin
state <= ST_INIT_DLY; state <= ST_INIT_DLY;
cfg_delay <= 3'd4; cfg_delay <= 3'd4;
fc_enabled <= 1'b1;
data_seq_num <= 16'd0; data_seq_num <= 16'd0;
strc_seq_num <= 16'd0; strc_seq_num <= 16'd0;
// Only enable flow control if we're requesting periodic flow
// control updates.
fc_enabled <= cfg_fc_freq_bytes_nz || cfg_fc_freq_pkts_nz;
end else begin end else begin
state <= ST_PASS_DATA; state <= ST_PASS_DATA;
cfg_failed <= 1'b1; cfg_failed <= 1'b1;