x300/mpmd: Port all RFNoC devices to the new RFNoC framework

Co-Authored-By: Alex Williams <alex.williams@ni.com>
Co-Authored-By: Sugandha Gupta <sugandha.gupta@ettus.com>
Co-Authored-By: Brent Stapleton <brent.stapleton@ettus.com>
Co-Authored-By: Ciro Nishiguchi <ciro.nishiguchi@ni.com>

8 files changed, 238 insertions, 0 deletions

diff --git a/host/include/uhd/erfnoc/blocks/e310_bsp.yml b/host/include/uhd/erfnoc/blocks/e310_bsp.yml
new file mode 100644
index 000000000..8fabbb55a
--- /dev/null
+++ b/host/include/uhd/erfnoc/blocks/e310_bsp.yml
@@ -0,0 +1,24 @@
+type: e31x
+type_id: E310
+family: 7SERIES
+transports:
+- name: dma
+  type: dma
+  width: 64
+
+clocks:
+- name: radio
+
+io_ports:
+  ctrlport_radio:
+    type: ctrl_port
+    drive: slave
+    rename:
+      pattern: (ctrlport_)(.*)
+      repl: m_\1\2
+  time_keeper:
+    type: time_keeper
+    drive: broadcaster
+  x300_radio:
+    type: x300_radio
+    drive: master
diff --git a/host/include/uhd/erfnoc/core/e320_bsp.yml b/host/include/uhd/erfnoc/core/e320_bsp.yml
new file mode 100644
index 000000000..c8d5b7de0
--- /dev/null
+++ b/host/include/uhd/erfnoc/core/e320_bsp.yml
@@ -0,0 +1,27 @@
+type: e320
+type_id: E320
+family: 7SERIES
+transports:
+- name: eth
+  type: 10G
+  width: 64
+- name: dma
+  type: dma
+  width: 64
+
+clocks:
+- name: radio
+
+io_ports:
+  ctrl_port:
+    type: ctrl_port
+    drive: slave
+    rename:
+      pattern: (ctrlport_)(.*)
+      repl: m_\1\2
+  time_keeper:
+    type: time_keeper
+    drive: broadcaster
+  x300_radio:
+    type: x300_radio
+    drive: master
diff --git a/host/include/uhd/erfnoc/core/n300_bsp.yml b/host/include/uhd/erfnoc/core/n300_bsp.yml
new file mode 100644
index 000000000..f0c75df4e
--- /dev/null
+++ b/host/include/uhd/erfnoc/core/n300_bsp.yml
@@ -0,0 +1,36 @@
+type: n300
+type_id: 1300
+family: 7SERIES
+transports:
+- name: eth0
+  type: 1G
+  width: 64
+- name: eth1
+  type: 10G
+  width: 64
+- name: dma
+  type: dma
+  width: 64
+
+clocks:
+- name: radio
+
+io_ports:
+  ctrlport_radio0:
+    type: ctrl_port
+    drive: slave
+    rename:
+      pattern: (ctrlport_)(.*)
+      repl: m_\1radio0_\2
+  time_keeper:
+    type: time_keeper
+    drive: broadcaster
+  x300_radio0:
+    type: x300_radio
+    drive: master
+    rename:
+      pattern: (.*)
+      repl: \1_radio0
+  dram:
+    type: axi4_mm_4x64_4g
+    drive: master
diff --git a/host/include/uhd/erfnoc/core/n310_bsp.yml b/host/include/uhd/erfnoc/core/n310_bsp.yml
new file mode 100644
index 000000000..08690ed5a
--- /dev/null
+++ b/host/include/uhd/erfnoc/core/n310_bsp.yml
@@ -0,0 +1,48 @@
+type: n310
+type_id: 1300
+family: 7SERIES
+transports:
+- name: eth0
+  type: 1G
+  width: 64
+- name: eth1
+  type: 10G
+  width: 64
+- name: dma
+  type: dma
+  width: 64
+
+clocks:
+- name: radio
+
+io_ports:
+  ctrlport_radio0:
+    type: ctrl_port
+    drive: slave
+    rename:
+      pattern: (ctrlport_)(.*)
+      repl: m_\1radio0_\2
+  ctrlport_radio1:
+    type: ctrl_port
+    drive: slave
+    rename:
+      pattern: (ctrlport_)(.*)
+      repl: m_\1radio1_\2
+  time_keeper:
+    type: time_keeper
+    drive: broadcaster
+  x300_radio0:
+    type: x300_radio
+    drive: master
+    rename:
+      pattern: (.*)
+      repl: \1_radio0
+  x300_radio1:
+    type: x300_radio
+    drive: master
+    rename:
+      pattern: (.*)
+      repl: \1_radio1
+  dram:
+    type: axi4_mm_4x64_4g
+    drive: master
diff --git a/host/include/uhd/erfnoc/core/n320_bsp.yml b/host/include/uhd/erfnoc/core/n320_bsp.yml
new file mode 100644
index 000000000..5d31da947
--- /dev/null
+++ b/host/include/uhd/erfnoc/core/n320_bsp.yml
@@ -0,0 +1,48 @@
+type: n320
+type_id: 1320
+family: 7SERIES
+transports:
+- name: eth0
+  type: 1G
+  width: 64
+- name: eth1
+  type: 10G
+  width: 64
+- name: dma
+  type: dma
+  width: 64
+
+clocks:
+- name: radio
+
+io_ports:
+  ctrlport_radio0:
+    type: ctrl_port
+    drive: slave
+    rename:
+      pattern: (ctrlport_)(.*)
+      repl: m_\1radio0_\2
+  ctrlport_radio1:
+    type: ctrl_port
+    drive: slave
+    rename:
+      pattern: (ctrlport_)(.*)
+      repl: m_\1radio1_\2
+  time_keeper:
+    type: time_keeper
+    drive: broadcaster
+  radio_ch0:
+    type: radio_1x32
+    drive: master
+    rename:
+      pattern: (.*)
+      repl: \1_radio0
+  radio_ch1:
+    type: radio_1x32
+    drive: master
+    rename:
+      pattern: (.*)
+      repl: \1_radio1
+  dram:
+    type: axi4_mm_4x64_4g
+    drive: master
diff --git a/host/include/uhd/erfnoc/core/x300_bsp.yml b/host/include/uhd/erfnoc/core/x300_bsp.yml
new file mode 100644
index 000000000..20a78958f
--- /dev/null
+++ b/host/include/uhd/erfnoc/core/x300_bsp.yml
@@ -0,0 +1,49 @@
+type: x300
+type_id: A300
+family: 7SERIES
+transports:
+- name: eth0
+  type: 10G
+  width: 64
+- name: eth1
+  type: 1G
+  width: 64
+- name: pcie
+  type: PCIe
+  width: 64
+
+clocks:
+- name: radio
+- name: ce
+
+io_ports:
+  ctrlport_radio0:
+    type: ctrl_port
+    drive: slave
+    rename:
+      pattern: (ctrlport_)(.*)
+      repl: m_\1radio0_\2
+  ctrlport_radio1:
+    type: ctrl_port
+    drive: slave
+    rename:
+      pattern: (ctrlport_)(.*)
+      repl: m_\1radio1_\2
+  time_keeper:
+    type: time_keeper
+    drive: broadcaster
+  x300_radio0:
+    type: x300_radio
+    drive: master
+    rename:
+      pattern: (.*)
+      repl: \1_radio0
+  x300_radio1:
+    type: x300_radio
+    drive: master
+    rename:
+      pattern: (.*)
+      repl: \1_radio1
+  dram:
+    type: axi4_mm_2x64_4g
+    drive: master
diff --git a/host/include/uhd/erfnoc/core/x310_bsp.yml b/host/include/uhd/erfnoc/core/x310_bsp.yml
index e63d382d8..20a78958f 100644
--- a/host/include/uhd/erfnoc/core/x310_bsp.yml
+++ b/host/include/uhd/erfnoc/core/x310_bsp.yml
@@ -44,3 +44,6 @@ io_ports:
     rename:
       pattern: (.*)
       repl: \1_radio1
+  dram:
+    type: axi4_mm_2x64_4g
+    drive: master
diff --git a/host/include/uhd/rfnoc/defaults.hpp b/host/include/uhd/rfnoc/defaults.hpp
index 9a3ce252f..0b95ddc2e 100644
--- a/host/include/uhd/rfnoc/defaults.hpp
+++ b/host/include/uhd/rfnoc/defaults.hpp
@@ -12,6 +12,9 @@
 
 namespace uhd { namespace rfnoc {
 
+// FIXME come up with a better place for this
+static const size_t CHDR_MAX_LEN_HDR = 16;
+
 static const std::string CLOCK_KEY_GRAPH("__graph__");
 
 static const std::string PROP_KEY_DECIM("decim");