hero123457/uhd
1
0
Fork 0
mirror of https://github.com/EttusResearch/uhd.git synced 2026-10-25 17:36:10 +00:00
Code Issues Projects Releases Wiki Activity

fpga: rfnoc: radio: Add control FIFO size parameter

Browse Source
This commit is contained in:
Wade Fife 2026-03-26 12:40:57 -05:00 committed by Martin Braun
parent fa10144c12
commit 4fe3aaff82
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_radio/noc_shell_radio.v
View File

@ -29,6 +29,8 @@
// response for writes. Set to 0 to wait for the response
// before ACK'ing on CtrlPort, which is the normal
// behavior.
// CTRL_FIFO_SIZE : Number of words in the AXI-Stream control slave FIFO.
// Will be rounded up to nearest power of 2.
//
`default_nettype none
@ -43,7 +45,8 @@ module noc_shell_radio #(
parameter NUM_PORTS = 2,
parameter NIPC = 1,
parameter ITEM_W = 32,
parameter SKIP_WR_ACK_WAIT = 0
parameter SKIP_WR_ACK_WAIT = 0,
parameter CTRL_FIFO_SIZE = 512
) (
//---------------------
// Framework Interface
@ -144,6 +147,8 @@ module noc_shell_radio #(
input wire [NUM_PORTS-1:0] s_out_axis_teob
);
localparam CTRL_FIFO_SIZE_LOG2 = $clog2(CTRL_FIFO_SIZE);
//---------------------------------------------------------------------------
// Backend Interface
//---------------------------------------------------------------------------
@ -161,7 +166,7 @@ module noc_shell_radio #(
.NOC_ID (32'h12AD1000),
.NUM_DATA_I (0+NUM_PORTS),
.NUM_DATA_O (0+NUM_PORTS),
.CTRL_FIFOSIZE ($clog2(512)),
.CTRL_FIFOSIZE (CTRL_FIFO_SIZE_LOG2),
.CTRL_CLK_IDX (CTRL_CLK_IDX),
.TB_CLK_IDX (TB_CLK_IDX),
.MTU (MTU)
@ -210,7 +215,7 @@ module noc_shell_radio #(
.SYNC_CLKS (0),
.AXIS_CTRL_MST_EN (1),
.AXIS_CTRL_SLV_EN (1),
.SLAVE_FIFO_SIZE ($clog2(512)),
.SLAVE_FIFO_SIZE (CTRL_FIFO_SIZE_LOG2),
.SKIP_WR_ACK_WAIT (SKIP_WR_ACK_WAIT)
) ctrlport_endpoint_i (
.rfnoc_ctrl_clk (rfnoc_ctrl_clk),

8
fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_radio/rfnoc_block_radio.v
View File

@ -28,6 +28,8 @@
// messages). This is useful in situations where packet
// loss is expected. Enabling this will prevent the RX
// state machine from hanging due to dropped packets.
// CTRL_FIFO_SIZE : Number of words in the AXI-Stream control slave FIFO.
// Will be rounded up to next power of 2.
//
@ -45,7 +47,8 @@ module rfnoc_block_radio #(
parameter PERIPH_ADDR_W = 19,
parameter [5:0] CTRL_CLK_IDX = 6'h3F,
parameter [5:0] TB_CLK_IDX = 6'h3F,
parameter SKIP_WR_ACK_WAIT = 0
parameter SKIP_WR_ACK_WAIT = 0,
parameter CTRL_FIFO_SIZE = 512
) (
//---------------------------------------------------------------------------
// AXIS CHDR Port
@ -192,7 +195,8 @@ module rfnoc_block_radio #(
.NUM_PORTS (NUM_PORTS),
.NIPC (NIPC),
.ITEM_W (ITEM_W),
.SKIP_WR_ACK_WAIT (SKIP_WR_ACK_WAIT)
.SKIP_WR_ACK_WAIT (SKIP_WR_ACK_WAIT),
.CTRL_FIFO_SIZE (CTRL_FIFO_SIZE)
) noc_shell_radio_i (
.rfnoc_chdr_clk (rfnoc_chdr_clk),
.rfnoc_ctrl_clk (rfnoc_ctrl_clk),