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

cxp upconn: add upconn pads & cleanup 

cxp upconn: cleanup
This commit is contained in:
morgan 2024-08-27 10:54:15 +08:00
parent 0cf8cd42d5
commit 75407b2ff4
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/gateware/cxp_upconn.py
View File

@ -8,8 +8,7 @@ from misoc.interconnect.csr import *
class CXP_UpConn(Module, AutoCSR): class CXP_UpConn(Module, AutoCSR):
nfifos = 3 def __init__(self, pad, sys_clk_freq, debug_sma, pmod_pads, fifo_depth, nfifos=3):
def __init__(self, pads, sys_clk_freq, pmod, fifo_depth=32):
self.clock_domains.cd_cxp_upconn = ClockDomain() self.clock_domains.cd_cxp_upconn = ClockDomain()
self.clk_reset = CSRStorage(reset=1) self.clk_reset = CSRStorage(reset=1)
self.bitrate2x_enable = CSRStorage() self.bitrate2x_enable = CSRStorage()
@ -50,11 +49,14 @@ class CXP_UpConn(Module, AutoCSR):
AsyncResetSynchronizer(self.cd_cxp_upconn, ~pll_locked | self.clk_reset.storage) AsyncResetSynchronizer(self.cd_cxp_upconn, ~pll_locked | self.clk_reset.storage)
] ]
self.submodules.fsm = ClockDomainsRenamer("cxp_upconn")(FSM(reset_state="WAIT_TX_ENABLE")) self.submodules.startup_fsm = startup_fsm = ClockDomainsRenamer("cxp_upconn")(FSM(reset_state="WAIT_TX_ENABLE"))
self.submodules.encoder = encoder = ClockDomainsRenamer("cxp_upconn")(SingleEncoder(True))
self.submodules.tx_fifos = tx_fifos = TxFIFOs(self.nfifos, fifo_depth) self.submodules.tx_fifos = tx_fifos = TxFIFOs(self.nfifos, fifo_depth)
self.submodules.tx_idle = tx_idle = TxIdle() self.submodules.tx_idle = tx_idle = TxIdle()
o = Signal() o = Signal()
self.specials += Instance("OBUF", i_I=o, o_O=pad),
tx_en = Signal() tx_en = Signal()
tx_bitcount = Signal(max=10) tx_bitcount = Signal(max=10)
tx_charcount = Signal(max=4) tx_charcount = Signal(max=4)
@ -64,24 +66,22 @@ class CXP_UpConn(Module, AutoCSR):
priorities = Signal(max=self.nfifos) priorities = Signal(max=self.nfifos)
idling = Signal() idling = Signal()
self.submodules.encoder = encoder = ClockDomainsRenamer("cxp_upconn")(SingleEncoder(True))
# startup sequence startup_fsm.act("WAIT_TX_ENABLE",
self.fsm.act("WAIT_TX_ENABLE",
If(self.tx_enable.storage, If(self.tx_enable.storage,
NextValue(tx_idle.word_idx, 0), NextValue(tx_idle.word_idx, 0),
NextState("ENCODE_CHAR") NextState("ENCODE_CHAR")
) )
) )
self.fsm.act("ENCODE_CHAR", startup_fsm.act("ENCODE_CHAR",
NextValue(tx_idle.source_ack, 1), NextValue(tx_idle.source_ack, 1),
NextValue(encoder.d, tx_idle.source_data), NextValue(encoder.d, tx_idle.source_data),
NextValue(encoder.k, tx_idle.source_k), NextValue(encoder.k, tx_idle.source_k),
NextState("LOAD_CHAR"), NextState("LOAD_CHAR"),
) )
self.fsm.act("LOAD_CHAR", startup_fsm.act("LOAD_CHAR",
NextValue(idling, 1), NextValue(idling, 1),
NextValue(tx_charcount, 0), NextValue(tx_charcount, 0),
NextValue(tx_bitcount, 0), NextValue(tx_bitcount, 0),
@ -91,7 +91,7 @@ class CXP_UpConn(Module, AutoCSR):
NextState("START_TX") NextState("START_TX")
) )
self.fsm.act("START_TX", startup_fsm.act("START_TX",
tx_en.eq(1), tx_en.eq(1),
If((~self.tx_enable.storage) & (tx_charcount == 3), If((~self.tx_enable.storage) & (tx_charcount == 3),
NextState("WAIT_TX_ENABLE") NextState("WAIT_TX_ENABLE")
@ -183,21 +183,21 @@ class CXP_UpConn(Module, AutoCSR):
] ]
self.specials += [ self.specials += [
# # debug sma # # debug sma
# Instance("OBUF", i_I=o, o_O=pads.p_tx), Instance("OBUF", i_I=o, o_O=debug_sma.p_tx),
# Instance("OBUF", i_I=self.cd_cxp_upconn.clk, o_O=pads.n_rx), Instance("OBUF", i_I=self.cd_cxp_upconn.clk, o_O=debug_sma.n_rx),
# # pmod 0-7 pin # # pmod 0-7 pin
Instance("OBUF", i_I=o, o_O=pmod[0]), Instance("OBUF", i_I=o, o_O=pmod_pads[0]),
Instance("OBUF", i_I=self.cd_cxp_upconn.clk, o_O=pmod[1]), Instance("OBUF", i_I=self.cd_cxp_upconn.clk, o_O=pmod_pads[1]),
Instance("OBUF", i_I=~tx_fifos.pe.n, o_O=pmod[2]), Instance("OBUF", i_I=~tx_fifos.pe.n, o_O=pmod_pads[2]),
Instance("OBUF", i_I=prioity_0, o_O=pmod[3]), Instance("OBUF", i_I=prioity_0, o_O=pmod_pads[3]),
Instance("OBUF", i_I=word_bound, o_O=pmod[4]), Instance("OBUF", i_I=word_bound, o_O=pmod_pads[4]),
Instance("OBUF", i_I=idling, o_O=pmod[5]), Instance("OBUF", i_I=idling, o_O=pmod_pads[5]),
# Instance("OBUF", i_I=tx_fifos.source_ack[0], o_O=pmod[6]), # Instance("OBUF", i_I=tx_fifos.source_ack[0], o_O=pmod[6]),
# Instance("OBUF", i_I=tx_fifos.source_ack[2], o_O=pmod[6]), # Instance("OBUF", i_I=tx_fifos.source_ack[2], o_O=pmod[6]),
# Instance("OBUF", i_I=tx_fifos.source_ack[1], o_O=pmod[7]), # Instance("OBUF", i_I=tx_fifos.source_ack[1], o_O=pmod[7]),
Instance("OBUF", i_I=p0, o_O=pmod[6]), Instance("OBUF", i_I=p0, o_O=pmod_pads[6]),
Instance("OBUF", i_I=p3, o_O=pmod[7]), Instance("OBUF", i_I=p3, o_O=pmod_pads[7]),
] ]
self.symbol0 = CSR(9) self.symbol0 = CSR(9)
self.symbol1 = CSR(9) self.symbol1 = CSR(9)