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

pipeline GW: expose writer_ptr

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

22
src/gateware/cxp_pipeline.py
View File

@ -301,8 +301,10 @@ class RX_Debug_Buffer(Module,AutoCSR):
class CXP_Data_Packet_Decode(Module): class CXP_Data_Packet_Decode(Module):
def __init__(self): def __init__(self):
self.packet_type = Signal(8) self.packet_type = Signal(8)
self.decode_err = Signal() self.write_ptr = Signal(bits_for(buffer_depth))
self.new_packet = Signal()
self.decode_err = Signal()
self.test_err = Signal() self.test_err = Signal()
# # # # # #
@ -338,6 +340,7 @@ class CXP_Data_Packet_Decode(Module):
fsm.act("DECODE", fsm.act("DECODE",
self.sink.ack.eq(1), self.sink.ack.eq(1),
If(self.sink.stb, If(self.sink.stb,
self.new_packet.eq(1),
NextValue(self.packet_type, self.sink.data[:8]), NextValue(self.packet_type, self.sink.data[:8]),
Case(self.sink.data[:8],{ Case(self.sink.data[:8],{
@ -393,20 +396,11 @@ class CXP_Data_Packet_Decode(Module):
) )
) )
# TODO: add overflow error # A circular buffer for firmware to read packet from
# TODO: reclock this to cxp_gtx_rx
self.specials.mem = mem = Memory(word_dw, buffer_depth) self.specials.mem = mem = Memory(word_dw, buffer_depth)
self.specials.mem_port = mem_port = mem.get_port(write_capable=True, clock_domain="sys") self.specials.mem_port = mem_port = mem.get_port(write_capable=True)
# write pointer represents where the gateware is self.comb += mem_port.adr.eq(self.write_ptr),
write_ptr_rx = Signal(bits_for(buffer_depth))
# read pointer represents where CPU is
# write reaching read is an error, read reaching write is buffer clear
self.read_ptr_rx = Signal.like(write_ptr_rx)
self.new_packet_rx = Signal()
self.comb += mem_port.adr.eq(write_ptr_rx),
self.sync += self.new_packet_rx.eq(self.read_ptr_rx != write_ptr_rx)
# For control ack, event packet # For control ack, event packet
fsm.act("LOAD_BUFFER", fsm.act("LOAD_BUFFER",
@ -418,7 +412,7 @@ class CXP_Data_Packet_Decode(Module):
).Else( ).Else(
mem_port.we.eq(1), mem_port.we.eq(1),
mem_port.dat_w.eq(self.sink.data), mem_port.dat_w.eq(self.sink.data),
NextValue(write_ptr_rx, write_ptr_rx + 1), NextValue(self.write_ptr, self.write_ptr + 1),
) )
) )
) )