Merge pull request #419 from DUNE-DAQ/feature/dpdk_multiproc

adding eth pcie id
DUNE-DAQ · Jan 18, 2024 · 0a8c557 · 0a8c557
2 parents 0d727b1 + 3c5b6fe
commit 0a8c557
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/schema/daqconf/detreadoutmap.jsonnet b/schema/daqconf/detreadoutmap.jsonnet
@@ -21,6 +21,7 @@ local cs = {
     host:   s.string("Host", pattern=moo.re.dnshost, doc="Generic string"),
     ipv4:   s.string("ipv4", pattern=moo.re.ipv4, doc="ipv4 string"),
     mac:    s.string("mac", pattern="^[a-fA-F0-9]{2}(:[a-fA-F0-9]{2}){5}$", doc="mac string"),
+    pcie:   s.string("pcie", pattern="^0{0,4}:[0-9]{2}:[0-9]{2}.[0-9]$", doc="pcie id string"),
     kind:   s.enum("StreamKind", ["eth", "flx"]),
     mode:   s.enum("StreamMode", ["fix_rate", "var_rate"]),
     flx_protocol: s.enum("FlxProtocol", ["full", "half"]),
@@ -40,6 +41,7 @@ local cs = {
       s.field("mode", self.mode, "fix_rate", doc="fix_rate, var_rate"),
       s.field("rx_iface", self.short, 0, doc="Reaout interface"),
       s.field("rx_host", self.host, "localhost", doc="Readout hostname"),
+      s.field("rx_pcie_dev", self.pcie, "0000:00:00.0", doc="Destination NIC PCIE id on readout host"),
       s.field("rx_mac", self.mac,  "00:00:00:00:00:00", doc="Destination MAC on readout host"),
       s.field("rx_ip", self.ipv4, "0.0.0.0", doc="Destination IP on readout host"),
       s.field("tx_host", self.host, "localhost", doc="Transmitter control host"),

diff --git a/scripts/dromap_editor b/scripts/dromap_editor
@@ -96,6 +96,7 @@ def add_flx(obj, force, src_id, **kwargs):
 @click.option('--eth-tx-ip')
 @click.option('--eth-rx-host')
 @click.option('--eth-rx-mac')
+@click.option('--eth-rx-pcie-dev')
 @click.option('--eth-rx-ip')
 @click.option('--eth-rx-iface')
 @click.pass_obj