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

cxp GW: clean up csr

Browse Source
This commit is contained in:
morgan 2025-01-24 13:10:40 +08:00
parent 513c3e055a
commit d663f4d263
1 changed files with 38 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/gateware/cxp.py
View File

@ -64,41 +64,44 @@ class RX_Pipeline(Module, AutoCSR):
def __init__(self, phy, ctrl_buffer_depth, nslot): def __init__(self, phy, ctrl_buffer_depth, nslot):
self.ready = CSRStatus() self.ready = CSRStatus()
self.trigger_ack = CSR()
self.pending_packet = CSR()
self.read_ptr = CSRStatus(log2_int(nslot))
self.reader_buffer_err = CSR()
self.reader_decode_err = CSR()
self.test_error_counter = CSRStatus(16)
self.test_packet_counter = CSRStatus(16)
self.test_counts_reset = CSR()
# # # # # #
gtx = phy.gtx gtx = phy.gtx
# GTX status
self.sync += self.ready.status.eq(gtx.rx_ready) self.sync += self.ready.status.eq(gtx.rx_ready)
# DEBUG: init status # # Connect all GTX connections' DRP
self.rxinit_phaligndone = CSRStatus() # self.gtx_daddr = CSRStorage(9)
self.comb += [ # self.gtx_dread = CSR()
self.rxinit_phaligndone.status.eq(gtx.rx_init.Xxphaligndone), # self.gtx_din_stb = CSR()
] # self.gtx_din = CSRStorage(16)
# Connect all GTX connections' DRP # self.gtx_dout = CSRStatus(16)
self.gtx_daddr = CSRStorage(9) # self.gtx_dready = CSR()
self.gtx_dread = CSR()
self.gtx_din_stb = CSR()
self.gtx_din = CSRStorage(16)
self.gtx_dout = CSRStatus(16) # self.comb += gtx.dclk.eq(ClockSignal("sys"))
self.gtx_dready = CSR() # self.sync += [
# gtx.daddr.eq(self.gtx_daddr.storage),
self.comb += gtx.dclk.eq(ClockSignal("sys")) # gtx.den.eq(self.gtx_dread.re | self.gtx_din_stb.re),
self.sync += [ # gtx.dwen.eq(self.gtx_din_stb.re),
gtx.daddr.eq(self.gtx_daddr.storage), # gtx.din.eq(self.gtx_din.storage),
gtx.den.eq(self.gtx_dread.re | self.gtx_din_stb.re), # If(gtx.dready,
gtx.dwen.eq(self.gtx_din_stb.re), # self.gtx_dready.w.eq(1),
gtx.din.eq(self.gtx_din.storage), # self.gtx_dout.status.eq(gtx.dout),
If(gtx.dready, # ).Elif(self.gtx_dready.re,
self.gtx_dready.w.eq(1), # self.gtx_dready.w.eq(0),
self.gtx_dout.status.eq(gtx.dout), # ),
).Elif(self.gtx_dready.re, # ]
self.gtx_dready.w.eq(0),
),
]
# Receiver Pipeline WIP # Receiver Pipeline WIP
@ -129,11 +132,15 @@ class RX_Pipeline(Module, AutoCSR):
), ),
] ]
# DEBUG: CSR
self.sync += [
self.trig_clr.eq(self.trigger_ack.re),
self.trigger_ack.w.eq(self.trig_ack),
]
# Priority level 2 packet - data, test packet # Priority level 2 packet - data, test packet
self.submodules.reader = reader = cdr(Control_Packet_Reader(ctrl_buffer_depth, nslot)) self.submodules.reader = reader = cdr(Control_Packet_Reader(ctrl_buffer_depth, nslot))
self.reader_decode_err = CSR()
self.reader_buffer_err = CSR()
decode_err_ps = PulseSynchronizer("cxp_gtx_rx", "sys") decode_err_ps = PulseSynchronizer("cxp_gtx_rx", "sys")
buffer_err_ps = PulseSynchronizer("cxp_gtx_rx", "sys") buffer_err_ps = PulseSynchronizer("cxp_gtx_rx", "sys")
@ -156,10 +163,6 @@ class RX_Pipeline(Module, AutoCSR):
] ]
# test packet error & packet counters # test packet error & packet counters
self.test_error_counter = CSRStatus(16)
self.test_packet_counter = CSRStatus(16)
self.test_counts_reset = CSR()
test_err_cnt_sys = Signal.like(self.test_error_counter.status) test_err_cnt_sys = Signal.like(self.test_error_counter.status)
test_pak_cnt_sys = Signal.like(self.test_packet_counter.status) test_pak_cnt_sys = Signal.like(self.test_packet_counter.status)
self.sync += [ self.sync += [
@ -193,9 +196,6 @@ class RX_Pipeline(Module, AutoCSR):
] ]
# reader nslot buffer control interface # reader nslot buffer control interface
self.pending_packet = CSR()
self.read_ptr = CSRStatus(len(reader.read_ptr))
write_ptr_sys = Signal.like(reader.write_ptr) write_ptr_sys = Signal.like(reader.write_ptr)
self.specials += [ self.specials += [
@ -223,12 +223,6 @@ class RX_Pipeline(Module, AutoCSR):
self.source = rx_pipeline[-1].source self.source = rx_pipeline[-1].source
# DEBUG: CSR
self.trigger_ack = CSR()
self.sync += [
self.trig_clr.eq(self.trigger_ack.re),
self.trigger_ack.w.eq(self.trig_ack),
]
@ -255,7 +249,7 @@ class TX_Pipeline(Module, AutoCSR):
# 0: Trigger packet # 0: Trigger packet
self.submodules.trig = trig = Trigger_Inserter() self.submodules.trig = trig = Trigger_Inserter()
# TODO: remove this?
# 1: IO acknowledgment for trigger packet # 1: IO acknowledgment for trigger packet
self.submodules.trig_ack = trig_ack = Trigger_ACK_Inserter() self.submodules.trig_ack = trig_ack = Trigger_ACK_Inserter()