From dd1988a40d6da10482a768a156d01edbf0094d33 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Fri, 20 Sep 2024 12:15:18 +0200 Subject: [PATCH] frontend/etherbone/LiteEthEtherbonePacketRX: Only enable LiteEthLastHandler for 64-bit case. --- liteeth/frontend/etherbone.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/liteeth/frontend/etherbone.py b/liteeth/frontend/etherbone.py index bba0c71..d24e5a5 100644 --- a/liteeth/frontend/etherbone.py +++ b/liteeth/frontend/etherbone.py @@ -80,19 +80,22 @@ class LiteEthEtherbonePacketDepacketizer(Depacketizer): class LiteEthEtherbonePacketRX(LiteXModule): - def __init__(self): + def __init__(self, with_last_handler=False): self.sink = sink = stream.Endpoint(eth_udp_user_description(32)) self.source = source = stream.Endpoint(eth_etherbone_packet_user_description(32)) # # # - self.last_handler = LiteEthLastHandler(eth_udp_user_description(32)) - self.depacketizer = depacketizer = LiteEthEtherbonePacketDepacketizer() - self.comb += [ - sink.connect(self.last_handler.sink), - self.last_handler.source.connect(depacketizer.sink), - ] + + if with_last_handler: + self.last_handler = LiteEthLastHandler(eth_udp_user_description(32)) + self.comb += [ + sink.connect(self.last_handler.sink), + self.last_handler.source.connect(depacketizer.sink), + ] + else: + self.comb += sink.connect(depacketizer.sink) self.fsm = fsm = FSM(reset_state="IDLE") fsm.act("IDLE", @@ -131,7 +134,7 @@ class LiteEthEtherbonePacketRX(LiteXModule): class LiteEthEtherbonePacket(LiteXModule): def __init__(self, udp, udp_port, cd="sys"): self.tx = tx = LiteEthEtherbonePacketTX(udp_port) - self.rx = rx = LiteEthEtherbonePacketRX() + self.rx = rx = LiteEthEtherbonePacketRX(with_last_handler=(udp.crossbar.dw == 64)) # FIXME: Avoid 64-bit specific behavior. udp_port = udp.crossbar.get_port(udp_port, dw=32, cd=cd) self.comb += [ tx.source.connect(udp_port.sink),