M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

sayma_amc: support uTCA backplane for DRTIO

This commit is contained in:
Sebastien Bourdeauducq 2020-05-29 14:58:49 +08:00
parent 8b939b7cb3
commit d8b5bcf019
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
artiq/gateware/targets/sayma_amc.py
View File

@ -50,7 +50,7 @@ class SatelliteBase(MiniSoC):
} }
mem_map.update(MiniSoC.mem_map) mem_map.update(MiniSoC.mem_map)
def __init__(self, rtio_clk_freq=125e6, identifier_suffix="", *, with_wrpll, **kwargs): def __init__(self, rtio_clk_freq=125e6, identifier_suffix="", with_sfp=False, *, with_wrpll, **kwargs):
MiniSoC.__init__(self, MiniSoC.__init__(self,
cpu_type="or1k", cpu_type="or1k",
sdram_controller_type="minicon", sdram_controller_type="minicon",
@ -68,15 +68,15 @@ class SatelliteBase(MiniSoC):
clock_recout_pads = platform.request("ddmtd_rec_clk") clock_recout_pads = platform.request("ddmtd_rec_clk")
else: else:
clock_recout_pads = None clock_recout_pads = None
# Use SFP0 to connect to master (Kasli) if with_sfp:
self.comb += platform.request("sfp_tx_disable", 0).eq(0) # Use SFP0 to connect to master (Kasli)
drtio_data_pads = [ self.comb += platform.request("sfp_tx_disable", 0).eq(0)
platform.request("sfp", 0), drtio_uplink = platform.request("sfp", 0)
platform.request("rtm_amc_link") else:
] drtio_uplink = platform.request("fat_pipe", 0)
self.submodules.drtio_transceiver = gth_ultrascale.GTH( self.submodules.drtio_transceiver = gth_ultrascale.GTH(
clock_pads=platform.request("cdr_clk_clean"), clock_pads=platform.request("cdr_clk_clean"),
data_pads=drtio_data_pads, data_pads=[drtio_uplink, platform.request("rtm_amc_link")],
sys_clk_freq=self.clk_freq, sys_clk_freq=self.clk_freq,
rtio_clk_freq=rtio_clk_freq, rtio_clk_freq=rtio_clk_freq,
clock_recout_pads=clock_recout_pads) clock_recout_pads=clock_recout_pads)
@ -393,6 +393,8 @@ def main():
parser.add_argument("-V", "--variant", default="satellite", parser.add_argument("-V", "--variant", default="satellite",
help="variant: satellite/simplesatellite " help="variant: satellite/simplesatellite "
"(default: %(default)s)") "(default: %(default)s)")
parser.add_argument("--sfp", default=False,
help="use SFP port for DRTIO instead of uTCA backplane")
parser.add_argument("--rtm-csr-csv", parser.add_argument("--rtm-csr-csv",
default=os.path.join("artiq_sayma", "rtm_gateware", "rtm_csr.csv"), default=os.path.join("artiq_sayma", "rtm_gateware", "rtm_csr.csv"),
help="CSV file listing remote CSRs on RTM (default: %(default)s)") help="CSV file listing remote CSRs on RTM (default: %(default)s)")
@ -405,10 +407,10 @@ def main():
variant = args.variant.lower() variant = args.variant.lower()
if variant == "satellite": if variant == "satellite":
soc = Satellite(jdcg_type=args.jdcg_type, with_wrpll=args.with_wrpll, soc = Satellite(with_sfp=args.sfp, jdcg_type=args.jdcg_type, with_wrpll=args.with_wrpll,
**soc_sayma_amc_argdict(args)) **soc_sayma_amc_argdict(args))
elif variant == "simplesatellite": elif variant == "simplesatellite":
soc = SimpleSatellite(with_wrpll=args.with_wrpll, **soc_sayma_amc_argdict(args)) soc = SimpleSatellite(with_sfp=args.sfp, with_wrpll=args.with_wrpll, **soc_sayma_amc_argdict(args))
else: else:
raise SystemExit("Invalid variant (-V/--variant)") raise SystemExit("Invalid variant (-V/--variant)")