stevefan1999/artiq-zynq
1
0
Fork 0
forked from M-Labs/artiq-zynq
Code Issues Pull Requests Projects Releases Wiki Activity

determined probable sys_clk_freq for GTX transcvr

Browse Source
This commit is contained in:
mwojcik 2021-08-06 10:05:04 +02:00
parent f45fa28dac
commit 97dfa07bdb
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gateware/kasli_soc.py
View File

@ -187,6 +187,9 @@ class GenericMaster(SoCCore):
mem_map.update(SoCCore.mem_map) mem_map.update(SoCCore.mem_map)
def __init__(self, description, acpki=False): def __init__(self, description, acpki=False):
sys_clk_freq = 800e6 # this is not set within SoCCore anymore, but rather - by SZL?
# not sure if it should be ArmPLL/CPU/IoPLL freq - they differ slightly
# necessary for GTX transceiver
rtio_clk_freq = 125e6 # should this be pulled from description? rtio freq isnt set rtio_clk_freq = 125e6 # should this be pulled from description? rtio freq isnt set
self.acpki = acpki self.acpki = acpki
@ -211,7 +214,7 @@ class GenericMaster(SoCCore):
self.submodules.drtio_transceiver = gtx_7series.GTX( self.submodules.drtio_transceiver = gtx_7series.GTX(
clock_pads=platform.request("clk125_gtp"), # referred to as clk gtp in schematics, but for gtx? clock_pads=platform.request("clk125_gtp"), # referred to as clk gtp in schematics, but for gtx?
data_pads=drtio_data_pads, data_pads=drtio_data_pads,
sys_clk_freq=self.clk_freq) sys_clk_freq=sys_clk_freq)
self.csr_devices.append("drtio_transceiver") self.csr_devices.append("drtio_transceiver")
self.crg = self.ps7 # HACK for eem_7series to find the clock self.crg = self.ps7 # HACK for eem_7series to find the clock
@ -319,7 +322,11 @@ class GenericSatellite(SoCCore):
mem_map.update(SoCCore.mem_map) mem_map.update(SoCCore.mem_map)
def __init__(self, description, acpki=False): def __init__(self, description, acpki=False):
rtio_clk_freq = 125e6 # same thing as with master sys_clk_freq = 800e6 # this is not set within SoCCore anymore, but rather - by SZL?
# not sure if it should be ArmPLL/CPU/IoPLL freq - they differ slightly
# necessary for GTX transceiver
rtio_clk_freq = 125e6 # same thing as with master - pulled from desc?
# will probably be replaced with rtio_config key as per #1735
self.acpki = acpki self.acpki = acpki
self.rustc_cfg = dict() self.rustc_cfg = dict()
@ -341,7 +348,7 @@ class GenericSatellite(SoCCore):
self.submodules.drtio_transceiver = gtx_7series.GTX( self.submodules.drtio_transceiver = gtx_7series.GTX(
clock_pads=platform.request("clk125_gtp"), # referred to as clk gtp in schematics, but for gtx? clock_pads=platform.request("clk125_gtp"), # referred to as clk gtp in schematics, but for gtx?
data_pads=drtio_data_pads, data_pads=drtio_data_pads,
sys_clk_freq=self.clk_freq) sys_clk_freq=sys_clk_freq)
self.csr_devices.append("drtio_transceiver") self.csr_devices.append("drtio_transceiver")
self.crg = self.ps7 # HACK for eem_7series to find the clock self.crg = self.ps7 # HACK for eem_7series to find the clock

9
src/gateware/zc706.py
View File

@ -269,6 +269,9 @@ class Master(ZC706):
def __init__(self, **kwargs): def __init__(self, **kwargs):
ZC706.__init__(self, **kwargs) ZC706.__init__(self, **kwargs)
sys_clk_freq = 800e6 # same as in Kasli-SoC - CPU freq set by SZL
# again not sure if correct value
platform = self.platform platform = self.platform
self.comb += platform.request("sfp_tx_disable_n").eq(1) self.comb += platform.request("sfp_tx_disable_n").eq(1)
@ -284,7 +287,7 @@ class Master(ZC706):
clock_pads=platform.request("si5324_clkout"), clock_pads=platform.request("si5324_clkout"),
tx_pads=tx_pads, tx_pads=tx_pads,
rx_pads=rx_pads, rx_pads=rx_pads,
sys_clk_freq=self.clk_freq) sys_clk_freq=sys_clk_freq)
self.csr_devices.append("drtio_transceiver") self.csr_devices.append("drtio_transceiver")
self.submodules.rtio_tsc = rtio.TSC("async", glbl_fine_ts_width=3) self.submodules.rtio_tsc = rtio.TSC("async", glbl_fine_ts_width=3)
@ -370,6 +373,8 @@ class Satellite(ZC706):
def __init__(self, **kwargs): def __init__(self, **kwargs):
ZC706.__init__(self, **kwargs) ZC706.__init__(self, **kwargs)
sys_clk_freq = 800e6 # same as in Kasli-SoC - CPU freq set by SZL
# again not sure if correct value
platform = self.platform platform = self.platform
@ -386,7 +391,7 @@ class Satellite(ZC706):
clock_pads=platform.request("si5324_clkout"), clock_pads=platform.request("si5324_clkout"),
tx_pads=tx_pads, tx_pads=tx_pads,
rx_pads=rx_pads, rx_pads=rx_pads,
sys_clk_freq=self.clk_freq) sys_clk_freq=sys_clk_freq)
self.csr_devices.append("drtio_transceiver") self.csr_devices.append("drtio_transceiver")
self.submodules.rtio_tsc = rtio.TSC("sync", glbl_fine_ts_width=3) self.submodules.rtio_tsc = rtio.TSC("sync", glbl_fine_ts_width=3)

3
src/satman/main.rs
View File

@ -16,7 +16,7 @@ extern crate libregister;
extern crate alloc; extern crate alloc;
use libboard_zynq::{i2c::I2c, timer::GlobalTimer, time::Milliseconds, print, println, mpcore, gic}; use libboard_zynq::{i2c::I2c, timer::GlobalTimer, time::Milliseconds, print, println, mpcore, gic, stdio};
use libsupport_zynq::ram; use libsupport_zynq::ram;
#[cfg(has_si5324)] #[cfg(has_si5324)]
use libboard_artiq::si5324; use libboard_artiq::si5324;
@ -580,6 +580,7 @@ interrupt_handler!(IRQ, irq, __irq_stack0_start, __irq_stack1_start, {
notify_spin_lock(); notify_spin_lock();
main_core1(); main_core1();
} }
stdio::drop_uart();
} }
loop {} loop {}
}); });