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

cxp GW: add write_pointer csr

This commit is contained in:
morgan 2024-10-03 12:00:27 +08:00
parent 05761c5307
commit cbd1a20e07
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/gateware/cxp.py
View File

@ -203,20 +203,24 @@ class DownConn_Interface(Module, AutoCSR):
# Priority level 2 packet - data, test packet # Priority level 2 packet - data, test packet
self.submodules.packet_decoder = packet_decoder = cdr(CXP_Data_Packet_Decode()) self.submodules.packet_decoder = packet_decoder = cdr(CXP_Data_Packet_Decode())
self.new_rx_packet = CSR()
self.decoder_error = CSR()
self.test_error = CSR()
self.submodules.new_packet_ps = new_packet_ps = PulseSynchronizer("cxp_gtx_rx", "sys")
self.submodules.decode_err_ps = decode_err_ps = PulseSynchronizer("cxp_gtx_rx", "sys") self.submodules.decode_err_ps = decode_err_ps = PulseSynchronizer("cxp_gtx_rx", "sys")
self.submodules.test_err_ps = test_err_ps = PulseSynchronizer("cxp_gtx_rx", "sys") self.submodules.test_err_ps = test_err_ps = PulseSynchronizer("cxp_gtx_rx", "sys")
self.comb += [ self.comb += [
new_packet_ps.i.eq(packet_decoder.new_packet),
decode_err_ps.i.eq(packet_decoder.decode_err), decode_err_ps.i.eq(packet_decoder.decode_err),
test_err_ps.i.eq(packet_decoder.test_err), test_err_ps.i.eq(packet_decoder.test_err),
] ]
self.packet_type = CSRStatus(8)
self.decoder_error = CSR()
self.test_error = CSR()
# self.read_pointer = CSR()
self.specials += MultiReg(packet_decoder.packet_type, self.packet_type.status)
self.sync += [ self.sync += [
If(new_packet_ps.o,
self.new_rx_packet.w.eq(1),
).Elif(self.new_rx_packet.re,
self.new_rx_packet.w.eq(0),
),
If(decode_err_ps.o, If(decode_err_ps.o,
self.decoder_error.w.eq(1), self.decoder_error.w.eq(1),
).Elif(self.decoder_error.re, ).Elif(self.decoder_error.re,
@ -227,12 +231,16 @@ class DownConn_Interface(Module, AutoCSR):
).Elif(self.test_error.re, ).Elif(self.test_error.re,
self.test_error.w.eq(0), self.test_error.w.eq(0),
), ),
# FIXME: this cannot be routed ]
# self.read_pointer.w.eq(packet_decoder.read_ptr_rx),
# If(self.read_pointer.re,
# packet_decoder.read_ptr_rx.eq(packet_decoder.read_ptr_rx + 1),
# ),
# Cicular buffer interface
self.packet_type = CSRStatus(8)
self.write_pointer = CSRStatus(bits_for(buffer_depth)) # for firmware to sync with buffer
self.specials += [
MultiReg(packet_decoder.packet_type, self.packet_type.status),
MultiReg(packet_decoder.write_ptr, self.write_pointer.status),
] ]
# DEBUG: remove this cdc fifo # DEBUG: remove this cdc fifo
@ -240,11 +248,12 @@ class DownConn_Interface(Module, AutoCSR):
self.submodules += ClockDomainsRenamer({"write": "cxp_gtx_rx", "read": "sys"})(cdc_fifo) self.submodules += ClockDomainsRenamer({"write": "cxp_gtx_rx", "read": "sys"})(cdc_fifo)
self.submodules.debug_out = debug_out = RX_Debug_Buffer() self.submodules.debug_out = debug_out = RX_Debug_Buffer()
# TODO: move the rx pipeline to cxp_gtx_rx clockdomain
rx_pipeline = [phy, trig_ack_checker, packet_decoder, cdc_fifo, debug_out] rx_pipeline = [phy, trig_ack_checker, packet_decoder, cdc_fifo, debug_out]
for s, d in zip(rx_pipeline, rx_pipeline[1:]): for s, d in zip(rx_pipeline, rx_pipeline[1:]):
self.comb += s.source.connect(d.sink) self.comb += s.source.connect(d.sink)
# DEBUG: CSR # DEBUG: CSR
self.trigger_ack = CSR() self.trigger_ack = CSR()
self.sync += [ self.sync += [
@ -258,6 +267,8 @@ class DownConn_Interface(Module, AutoCSR):
] ]
self.specials += [ self.specials += [
Instance("OBUF", i_I=phy.gtx.cd_cxp_gtx_rx.clk, o_O=debug_sma.p_tx),
# Instance("OBUF", i_I=, o_O=debug_sma.p_rx),
# # pmod 0-7 pin # # pmod 0-7 pin
Instance("OBUF", i_I=packet_decoder.test_err, o_O=pmod_pads[0]), Instance("OBUF", i_I=packet_decoder.test_err, o_O=pmod_pads[0]),
Instance("OBUF", i_I=pak_start, o_O=pmod_pads[1]), Instance("OBUF", i_I=pak_start, o_O=pmod_pads[1]),