rfnoc: Fix block buffer sizes referring to MTU

In the HDL, the parameter named 'MTU' is clog2 of the size of the
desired MTU. For example, when the 'MTU' parameter is 10, that means
the actual MTU setting is 2**MTU or 1024. So we need to set our
buffers to 2**MTU if we want them to be one MTU in size.

8 files changed, 23 insertions, 17 deletions

diff --git a/host/include/uhd/rfnoc/blocks/ddc.yml b/host/include/uhd/rfnoc/blocks/ddc.yml
index f3de25a01..1a00add2d 100644
--- a/host/include/uhd/rfnoc/blocks/ddc.yml
+++ b/host/include/uhd/rfnoc/blocks/ddc.yml
@@ -37,7 +37,7 @@ data:
       item_width: 32
       nipc: 1
       info_fifo_depth: 32
-      payload_fifo_depth: MTU
+      payload_fifo_depth: 32
       format: sc16
       mdata_sig: ~
   outputs:
@@ -46,7 +46,8 @@ data:
       item_width: 32
       nipc: 1
       info_fifo_depth: 32
-      payload_fifo_depth: MTU
+      payload_fifo_depth: 2**MTU
+      sideband_at_end: True
       format: sc16
       mdata_sig: ~
 
diff --git a/host/include/uhd/rfnoc/blocks/duc.yml b/host/include/uhd/rfnoc/blocks/duc.yml
index 769b7b80f..16af27ddd 100644
--- a/host/include/uhd/rfnoc/blocks/duc.yml
+++ b/host/include/uhd/rfnoc/blocks/duc.yml
@@ -37,7 +37,7 @@ data:
       item_width: 32
       nipc: 1
       info_fifo_depth: 32
-      payload_fifo_depth: MTU
+      payload_fifo_depth: 32
       format: sc16
       mdata_sig: ~
   outputs:
@@ -46,7 +46,8 @@ data:
       item_width: 32
       nipc: 1
       info_fifo_depth: 32
-      payload_fifo_depth: MTU
+      payload_fifo_depth: 2**MTU
+      sideband_at_end: True
       format: sc16
       mdata_sig: ~
 
diff --git a/host/include/uhd/rfnoc/blocks/keep_one_in_n.yml b/host/include/uhd/rfnoc/blocks/keep_one_in_n.yml
index c7b18a37c..6523e5dfd 100644
--- a/host/include/uhd/rfnoc/blocks/keep_one_in_n.yml
+++ b/host/include/uhd/rfnoc/blocks/keep_one_in_n.yml
@@ -46,7 +46,7 @@ data:
       item_width: 32
       nipc: 1
       info_fifo_depth: 32
-      payload_fifo_depth: MTU
+      payload_fifo_depth: 2**MTU
       format: int32
       mdata_sig: ~
 
diff --git a/host/include/uhd/rfnoc/blocks/radio.yml b/host/include/uhd/rfnoc/blocks/radio.yml
index 0fe9c461a..8ec2b1566 100644
--- a/host/include/uhd/rfnoc/blocks/radio.yml
+++ b/host/include/uhd/rfnoc/blocks/radio.yml
@@ -37,7 +37,7 @@ data:
       item_width: ITEM_W
       nipc: NIPC
       info_fifo_depth: 32
-      payload_fifo_depth: MTU
+      payload_fifo_depth: 2**MTU
       format: sc16
       mdata_sig: ~
   outputs:
@@ -46,7 +46,8 @@ data:
       item_width: ITEM_W
       nipc: NIPC
       info_fifo_depth: 32
-      payload_fifo_depth: MTU
+      payload_fifo_depth: 2**(MTU+1)
+      sideband_at_end: True
       format: sc16
       mdata_sig: ~
 
diff --git a/host/include/uhd/rfnoc/blocks/radio_1x64.yml b/host/include/uhd/rfnoc/blocks/radio_1x64.yml
index 8d6c93894..50b463a8d 100644
--- a/host/include/uhd/rfnoc/blocks/radio_1x64.yml
+++ b/host/include/uhd/rfnoc/blocks/radio_1x64.yml
@@ -34,7 +34,7 @@ data:
       item_width: 32
       nipc: 1
       info_fifo_depth: 32
-      payload_fifo_depth: MTU
+      payload_fifo_depth: 2**MTU
       format: sc16
       mdata_sig: ~
   outputs:
@@ -42,7 +42,8 @@ data:
       item_width: 32
       nipc: 1
       info_fifo_depth: 32
-      payload_fifo_depth: MTU
+      payload_fifo_depth: 2**(MTU+1)
+      sideband_at_end: True
       format: sc16
       mdata_sig: ~
 
diff --git a/host/include/uhd/rfnoc/blocks/radio_2x64.yml b/host/include/uhd/rfnoc/blocks/radio_2x64.yml
index a21574591..bab8e457c 100644
--- a/host/include/uhd/rfnoc/blocks/radio_2x64.yml
+++ b/host/include/uhd/rfnoc/blocks/radio_2x64.yml
@@ -34,14 +34,14 @@ data:
       item_width: 32
       nipc: 1
       info_fifo_depth: 32
-      payload_fifo_depth: MTU
+      payload_fifo_depth: 2**MTU
       format: sc16
       mdata_sig: ~
     in_1:
       item_width: 32
       nipc: 1
       info_fifo_depth: 32
-      payload_fifo_depth: MTU
+      payload_fifo_depth: 2**MTU
       format: sc16
       mdata_sig: ~
   outputs:
@@ -49,14 +49,16 @@ data:
       item_width: 32
       nipc: 1
       info_fifo_depth: 32
-      payload_fifo_depth: MTU
+      payload_fifo_depth: 2**(MTU+1)
+      sideband_at_end: True
       format: sc16
       mdata_sig: ~
     out_1:
       item_width: 32
       nipc: 1
       info_fifo_depth: 32
-      payload_fifo_depth: MTU
+      payload_fifo_depth: 2**(MTU+1)
+      sideband_at_end: True
       format: sc16
       mdata_sig: ~
 
diff --git a/host/include/uhd/rfnoc/blocks/replay.yml b/host/include/uhd/rfnoc/blocks/replay.yml
index 5b60ed28f..93ec74889 100644
--- a/host/include/uhd/rfnoc/blocks/replay.yml
+++ b/host/include/uhd/rfnoc/blocks/replay.yml
@@ -38,7 +38,7 @@ data:
       item_width: 32
       nipc: MEM_DATA_W/32
       info_fifo_depth: 32
-      payload_fifo_depth: MTU
+      payload_fifo_depth: 32
       format: int32
       mdata_sig: ~
   outputs:
@@ -47,8 +47,8 @@ data:
       item_width: 32
       nipc: MEM_DATA_W/32
       info_fifo_depth: 32
-      payload_fifo_depth: MTU
-      sideband_at_end: 1
+      payload_fifo_depth: 2**MTU
+      sideband_at_end: True
       format: int32
       mdata_sig: ~
 
diff --git a/host/include/uhd/rfnoc/blocks/siggen.yml b/host/include/uhd/rfnoc/blocks/siggen.yml
index 7cda86436..3a17e7938 100644
--- a/host/include/uhd/rfnoc/blocks/siggen.yml
+++ b/host/include/uhd/rfnoc/blocks/siggen.yml
@@ -45,7 +45,7 @@ data:
       nipc: 1
       info_fifo_depth: 32
       payload_fifo_depth: 32
-      sideband_at_end: 0
+      sideband_at_end: False
       format: sc16
       mdata_sig: ~