From 4b1ce1a6ffec91460187d272c844ba4118039a8d Mon Sep 17 00:00:00 2001 From: mwojcik Date: Tue, 21 Mar 2023 15:54:58 +0800 Subject: [PATCH] satellites: add rtio_dma, connect as cri master --- src/gateware/kasli_soc.py | 2 +- src/gateware/zc706.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gateware/kasli_soc.py b/src/gateware/kasli_soc.py index 0610252..17e8820 100755 --- a/src/gateware/kasli_soc.py +++ b/src/gateware/kasli_soc.py @@ -427,7 +427,7 @@ class GenericSatellite(SoCCore): self.comb += self.drtiosat.async_errors.eq(self.local_io.async_errors) self.submodules.cri_con = rtio.CRIInterconnectShared( - [self.drtiosat.cri], + [self.drtiosat.cri, self.rtio_dma.cri], [self.local_io.cri] + self.drtio_cri, enable_routing=True) self.csr_devices.append("cri_con") diff --git a/src/gateware/zc706.py b/src/gateware/zc706.py index 13f7fee..363a4d9 100755 --- a/src/gateware/zc706.py +++ b/src/gateware/zc706.py @@ -476,9 +476,12 @@ class _SatelliteBase(SoCCore): self.submodules.rtio = rtio.KernelInitiator(self.rtio_tsc, now64=True) self.csr_devices.append("rtio") + self.submodules.rtio_dma = dma.DMA(self.ps7.s_axi_hp0) + self.csr_devices.append("rtio_dma") + self.submodules.local_io = SyncRTIO(self.rtio_tsc, rtio_channels) self.submodules.cri_con = rtio.CRIInterconnectShared( - [self.drtiosat.cri], + [self.drtiosat.cri, self.rtio_dma.cri], [self.local_io.cri] + self.drtio_cri, enable_routing=True) self.csr_devices.append("cri_con")