kc705: revive DRTIO master with updated syntax

* KC705 master variant now uses Si5324 as synthesiser.
* Multi-channel has not been implemented yet.

artiq/firmware/runtime/rtio_clocking.rs

@@ -153,6 +153,8 @@ fn setup_si5324_as_synthesizer() {
     let si5324_ref_input = si5324::Input::Ckin2;
     #[cfg(soc_platform = "metlino")]
     let si5324_ref_input = si5324::Input::Ckin2;
+    #[cfg(soc_platform = "kc705")]
+    let si5324_ref_input = si5324::Input::Ckin2;
     si5324::setup(&SI5324_SETTINGS, si5324_ref_input).expect("cannot initialize Si5324");
 }
 
@@ -165,6 +167,8 @@ pub fn init() {
         let si5324_ext_input = si5324::Input::Ckin2;
         #[cfg(soc_platform = "metlino")]
         let si5324_ext_input = si5324::Input::Ckin2;
+        #[cfg(soc_platform = "kc705")]
+        let si5324_ext_input = si5324::Input::Ckin2;
         match get_rtio_clock_cfg() {
             RtioClock::Internal => setup_si5324_as_synthesizer(),
             RtioClock::External => si5324::bypass(si5324_ext_input).expect("cannot bypass Si5324")

artiq/gateware/targets/kc705_drtio_master.py

@@ -4,39 +4,50 @@ import argparse
 
 from migen import *
 from migen.build.generic_platform import *
+from migen.build.xilinx.vivado import XilinxVivadoToolchain
+from migen.build.xilinx.ise import XilinxISEToolchain
 
 from misoc.cores import spi as spi_csr
+from misoc.cores import gpio
 from misoc.targets.kc705 import MiniSoC, soc_kc705_args, soc_kc705_argdict
 from misoc.integration.builder import builder_args, builder_argdict
 
-from artiq.gateware.amp import AMPSoC, build_artiq_soc
+from artiq.gateware.amp import AMPSoC
 from artiq.gateware import rtio
 from artiq.gateware.rtio.phy import ttl_simple
 from artiq.gateware.drtio.transceiver import gtx_7series
-from artiq.gateware.drtio import DRTIOMaster
+from artiq.gateware.drtio import *
-from artiq import __version__ as artiq_version
+from artiq.build_soc import *
 
 
 class Master(MiniSoC, AMPSoC):
     mem_map = {
-        "cri_con":       0x10000000,
+        "cri_con":      0x10000000,
-        "rtio":          0x20000000,
+        "rtio":         0x20000000,
-        "rtio_dma":      0x30000000,
+        "rtio_dma":     0x30000000,
-        "drtio_aux":     0x50000000,
+        "drtioaux":     0x50000000,
-        "mailbox":       0x70000000
+        "mailbox":      0x70000000
     }
     mem_map.update(MiniSoC.mem_map)
 
-    def __init__(self, **kwargs):
+    def __init__(self, gateware_identifier_str=None, **kwargs):
         MiniSoC.__init__(self,
                          cpu_type="or1k",
                          sdram_controller_type="minicon",
                          l2_size=128*1024,
-                         ident=artiq_version,
+                         integrated_sram_size=8192,
                          ethmac_nrxslots=4,
                          ethmac_ntxslots=4,
                          **kwargs)
         AMPSoC.__init__(self)
+        add_identifier(self, gateware_identifier_str=gateware_identifier_str)
+
+        if isinstance(self.platform.toolchain, XilinxVivadoToolchain):
+            self.platform.toolchain.bitstream_commands.extend([
+                "set_property BITSTREAM.GENERAL.COMPRESS True [current_design]",
+            ])
+        if isinstance(self.platform.toolchain, XilinxISEToolchain):
+            self.platform.toolchain.bitgen_opt += " -g compress"
 
         platform = self.platform
 
@@ -44,35 +55,55 @@ class Master(MiniSoC, AMPSoC):
         tx_pads = platform.request("sfp_tx")
         rx_pads = platform.request("sfp_rx")
 
-        # 1000BASE_BX10 Ethernet compatible, 62.5MHz RTIO clock
+        # 1000BASE_BX10 Ethernet compatible, 125MHz RTIO clock
-        self.submodules.transceiver = gtx_7series.GTX_1000BASE_BX10(
+        self.submodules.drtio_transceiver = gtx_7series.GTX_1000BASE_BX10(
-            clock_pads=platform.request("sgmii_clock"),
+            clock_pads=platform.request("si5324_clkout"),
             tx_pads=tx_pads,
             rx_pads=rx_pads,
-            sys_clk_freq=self.clk_freq,
+            sys_clk_freq=self.clk_freq)
-            clock_div2=True)
+        self.csr_devices.append("drtio_transceiver")
 
-        self.submodules.drtio0 = ClockDomainsRenamer({"rtio_rx": "rtio_rx0"})(
+        self.submodules.rtio_tsc = rtio.TSC("async", glbl_fine_ts_width=3)
-            DRTIOMaster(self.transceiver.channels[0]))
+        cdr = ClockDomainsRenamer({"rtio_rx": "rtio_rx0"})
+
+        self.submodules.drtio0 = cdr(DRTIOMaster(
+            self.rtio_tsc, self.drtio_transceiver.channels[0]))
         self.csr_devices.append("drtio0")
-        self.add_wb_slave(self.mem_map["drtio_aux"], 0x800,
+
-                          self.drtio0.aux_controller.bus)
+        self.submodules.drtioaux0 = cdr(DRTIOAuxController(
-        self.add_memory_region("drtio0_aux", self.mem_map["drtio_aux"] | self.shadow_base, 0x800)
+            self.drtio0.link_layer))
+        self.csr_devices.append("drtioaux0")
+        self.add_wb_slave(self.mem_map["drtioaux"], 0x800,
+                          self.drtioaux0.bus)
+        self.add_memory_region("drtioaux0_mem", self.mem_map["drtioaux"] | self.shadow_base, 0x800)
+
         self.config["HAS_DRTIO"] = None
+        self.config["HAS_DRTIO_ROUTING"] = None
         self.add_csr_group("drtio", ["drtio0"])
-        self.add_memory_group("drtio_aux", ["drtio0_aux"])
+        self.add_csr_group("drtioaux", ["drtioaux0"])
+        self.add_memory_group("drtioaux_mem", ["drtioaux0_mem"])
+
+        self.config["RTIO_FREQUENCY"] = str(self.drtio_transceiver.rtio_clk_freq/1e6)
+        self.submodules.si5324_rst_n = gpio.GPIOOut(platform.request("si5324").rst_n)
+        self.csr_devices.append("si5324_rst_n")
+        i2c = self.platform.request("i2c")
+        self.submodules.i2c = gpio.GPIOTristate([i2c.scl, i2c.sda])
+        self.csr_devices.append("i2c")
+        self.config["I2C_BUS_COUNT"] = 1
+        self.config["HAS_SI5324"] = None
+        self.config["SI5324_AS_SYNTHESIZER"] = None
 
         self.comb += [
             platform.request("user_sma_clock_p").eq(ClockSignal("rtio_rx0")),
             platform.request("user_sma_clock_n").eq(ClockSignal("rtio"))
         ]
 
-        rtio_clk_period = 1e9/self.transceiver.rtio_clk_freq
+        rtio_clk_period = 1e9/self.drtio_transceiver.rtio_clk_freq
-        platform.add_period_constraint(self.transceiver.txoutclk, rtio_clk_period)
+        platform.add_period_constraint(self.drtio_transceiver.txoutclk, rtio_clk_period)
-        platform.add_period_constraint(self.transceiver.rxoutclk, rtio_clk_period)
+        platform.add_period_constraint(self.drtio_transceiver.rxoutclk, rtio_clk_period)
         platform.add_false_path_constraints(
             self.crg.cd_sys.clk,
-            self.transceiver.txoutclk, self.transceiver.rxoutclk)
+            self.drtio_transceiver.txoutclk, self.drtio_transceiver.rxoutclk)
 
         rtio_channels = []
         for i in range(8):
@@ -87,18 +118,21 @@ class Master(MiniSoC, AMPSoC):
         self.submodules.rtio_moninj = rtio.MonInj(rtio_channels)
         self.csr_devices.append("rtio_moninj")
 
-        self.submodules.rtio_core = rtio.Core(rtio_channels, 3)
+        self.submodules.rtio_core = rtio.Core(self.rtio_tsc, rtio_channels)
         self.csr_devices.append("rtio_core")
 
-        self.submodules.rtio = rtio.KernelInitiator()
+        self.submodules.rtio = rtio.KernelInitiator(self.rtio_tsc)
         self.submodules.rtio_dma = ClockDomainsRenamer("sys_kernel")(
             rtio.DMA(self.get_native_sdram_if()))
         self.register_kernel_cpu_csrdevice("rtio")
         self.register_kernel_cpu_csrdevice("rtio_dma")
         self.submodules.cri_con = rtio.CRIInterconnectShared(
             [self.rtio.cri, self.rtio_dma.cri],
-            [self.rtio_core.cri, self.drtio0.cri])
+            [self.rtio_core.cri, self.drtio0.cri],
+            enable_routing=True)
         self.register_kernel_cpu_csrdevice("cri_con")
+        self.submodules.routing_table = rtio.RoutingTableAccess(self.cri_con)
+        self.csr_devices.append("routing_table")
 
 
 def main():
@@ -106,6 +140,7 @@ def main():
         description="ARTIQ device binary builder / KC705 DRTIO master")
     builder_args(parser)
     soc_kc705_args(parser)
+    parser.set_defaults(output_dir="artiq_kc705/master")
     args = parser.parse_args()
 
     soc = Master(**soc_kc705_argdict(args))