srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

drtio: integrate GTH transceiver for Sayma

This commit is contained in:
Sebastien Bourdeauducq 2017-12-23 01:19:59 +08:00
parent c57b66497c
commit 1af21c0b29
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
artiq/gateware/targets/sayma_amc_drtio_master.py
View File

@ -6,6 +6,7 @@ from migen import *
from migen.build.generic_platform import * from migen.build.generic_platform import *
from misoc.cores import spi as spi_csr from misoc.cores import spi as spi_csr
from misoc.cores import gpio
from misoc.integration.soc_sdram import soc_sdram_args, soc_sdram_argdict from misoc.integration.soc_sdram import soc_sdram_args, soc_sdram_argdict
from misoc.integration.builder import builder_args, builder_argdict from misoc.integration.builder import builder_args, builder_argdict
from misoc.targets.sayma_amc import MiniSoC from misoc.targets.sayma_amc import MiniSoC
@ -40,6 +41,7 @@ class Master(MiniSoC, AMPSoC):
AMPSoC.__init__(self) AMPSoC.__init__(self)
platform = self.platform platform = self.platform
rtio_clk_freq = 150e6
# Si5324 used as a free-running oscillator, to avoid dependency on RTM. # Si5324 used as a free-running oscillator, to avoid dependency on RTM.
self.submodules.si5324_rst_n = gpio.GPIOOut(platform.request("si5324").rst_n) self.submodules.si5324_rst_n = gpio.GPIOOut(platform.request("si5324").rst_n)
@ -55,7 +57,8 @@ class Master(MiniSoC, AMPSoC):
clock_pads=platform.request("si5324_clkout"), clock_pads=platform.request("si5324_clkout"),
tx_pads=[platform.request("sfp_tx")], tx_pads=[platform.request("sfp_tx")],
rx_pads=[platform.request("sfp_rx")], rx_pads=[platform.request("sfp_rx")],
sys_clk_freq=self.clk_freq) sys_clk_freq=self.clk_freq,
rtio_clk_freq=rtio_clk_freq)
self.submodules.drtio0 = ClockDomainsRenamer({"rtio_rx": "rtio_rx0"})( self.submodules.drtio0 = ClockDomainsRenamer({"rtio_rx": "rtio_rx0"})(
DRTIOMaster(self.transceiver.channels[0])) DRTIOMaster(self.transceiver.channels[0]))
@ -67,12 +70,13 @@ class Master(MiniSoC, AMPSoC):
self.add_csr_group("drtio", ["drtio0"]) self.add_csr_group("drtio", ["drtio0"])
self.add_memory_group("drtio_aux", ["drtio0_aux"]) self.add_memory_group("drtio_aux", ["drtio0_aux"])
rtio_clk_period = 1e9/self.transceiver.rtio_clk_freq rtio_clk_period = 1e9/rtio_clk_freq
platform.add_period_constraint(self.transceiver.txoutclk, rtio_clk_period) for gth in self.transceiver.gths:
platform.add_period_constraint(self.transceiver.rxoutclk, rtio_clk_period) platform.add_period_constraint(gth.txoutclk, rtio_clk_period)
platform.add_period_constraint(gth.rxoutclk, rtio_clk_period)
platform.add_false_path_constraints( platform.add_false_path_constraints(
self.crg.cd_sys.clk, self.crg.cd_sys.clk,
self.transceiver.txoutclk, self.transceiver.rxoutclk) gth.txoutclk, gth.rxoutclk)
rtio_channels = [] rtio_channels = []
for i in range(4): for i in range(4):

28
artiq/gateware/targets/sayma_amc_drtio_satellite.py
View File

@ -8,7 +8,7 @@ from migen.build.generic_platform import *
from misoc.cores import spi as spi_csr from misoc.cores import spi as spi_csr
from misoc.cores import gpio from misoc.cores import gpio
from misoc.integration.soc_sdram import soc_sdram_args, soc_sdram_argdict from misoc.integration.soc_sdram import soc_sdram_args, soc_sdram_argdict
from misoc.integration.builder import builder_args, builder_argdict from misoc.integration.builder import *
from misoc.targets.sayma_amc import BaseSoC from misoc.targets.sayma_amc import BaseSoC
from artiq.gateware import rtio from artiq.gateware import rtio
@ -34,6 +34,7 @@ class Satellite(BaseSoC):
**kwargs) **kwargs)
platform = self.platform platform = self.platform
rtio_clk_freq = 150e6
rtio_channels = [] rtio_channels = []
for i in range(4): for i in range(4):
@ -54,17 +55,15 @@ class Satellite(BaseSoC):
self.submodules.rtio_moninj = rtio.MonInj(rtio_channels) self.submodules.rtio_moninj = rtio.MonInj(rtio_channels)
self.csr_devices.append("rtio_moninj") self.csr_devices.append("rtio_moninj")
self.submodules.transceiver = gth_7series.GTH( self.submodules.transceiver = gth_ultrascale.GTH(
clock_pads=platform.request("si5324_clkout"), clock_pads=platform.request("si5324_clkout"),
tx_pads=platform.request("sfp_tx"), tx_pads=[platform.request("sfp_tx")],
rx_pads=platform.request("sfp_rx"), rx_pads=[platform.request("sfp_rx")],
sys_clk_freq=self.clk_freq) sys_clk_freq=self.clk_freq,
rtio_clk_freq=rtio_clk_freq)
rx0 = ClockDomainsRenamer({"rtio_rx": "rtio_rx0"}) rx0 = ClockDomainsRenamer({"rtio_rx": "rtio_rx0"})
self.submodules.rx_synchronizer0 = rx0(gth_ultrascale.RXSynchronizer(
self.transceiver.rtio_clk_freq, initial_phase=180.0))
self.submodules.drtio0 = rx0(DRTIOSatellite( self.submodules.drtio0 = rx0(DRTIOSatellite(
self.transceiver.channels[0], rtio_channels, self.rx_synchronizer0)) self.transceiver.channels[0], rtio_channels))
self.csr_devices.append("rx_synchronizer0")
self.csr_devices.append("drtio0") self.csr_devices.append("drtio0")
self.add_wb_slave(self.mem_map["drtio_aux"], 0x800, self.add_wb_slave(self.mem_map["drtio_aux"], 0x800,
self.drtio0.aux_controller.bus) self.drtio0.aux_controller.bus)
@ -73,7 +72,7 @@ class Satellite(BaseSoC):
self.add_csr_group("drtio", ["drtio0"]) self.add_csr_group("drtio", ["drtio0"])
self.add_memory_group("drtio_aux", ["drtio0_aux"]) self.add_memory_group("drtio_aux", ["drtio0_aux"])
self.config["RTIO_FREQUENCY"] = str(self.transceiver.rtio_clk_freq/1e6) self.config["RTIO_FREQUENCY"] = str(rtio_clk_freq/1e6)
si5324_clkin = platform.request("si5324_clkin") si5324_clkin = platform.request("si5324_clkin")
self.specials += \ self.specials += \
Instance("OBUFDS", Instance("OBUFDS",
@ -88,12 +87,13 @@ class Satellite(BaseSoC):
self.config["I2C_BUS_COUNT"] = 1 self.config["I2C_BUS_COUNT"] = 1
self.config["HAS_SI5324"] = None self.config["HAS_SI5324"] = None
rtio_clk_period = 1e9/self.transceiver.rtio_clk_freq rtio_clk_period = 1e9/rtio_clk_freq
platform.add_period_constraint(self.transceiver.txoutclk, rtio_clk_period) gth = self.transceiver.gths[0]
platform.add_period_constraint(self.transceiver.rxoutclk, rtio_clk_period) platform.add_period_constraint(gth.txoutclk, rtio_clk_period)
platform.add_period_constraint(gth.rxoutclk, rtio_clk_period)
platform.add_false_path_constraints( platform.add_false_path_constraints(
self.crg.cd_sys.clk, self.crg.cd_sys.clk,
self.transceiver.txoutclk, self.transceiver.rxoutclk) gth.txoutclk, gth.rxoutclk)
def main(): def main():