Hardware
/
liteeth
mirror of https://github.com/enjoy-digital/liteeth.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

liteeth/core: handle last_be.

This commit is contained in:
Florent Kermarrec 2021-02-10 19:18:55 +01:00
parent 497d4d6501
commit 0c003c8ee7
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
liteeth/core/arp.py
View File

@ -36,7 +36,9 @@ class LiteEthARPTX(Module):
# # # # # #
counter = Signal(max=max(arp_header.length, eth_min_len), reset_less=True) packet_length = max(arp_header.length, eth_min_len)
packet_words = packet_length//(dw//8)
counter = Signal(max=packet_words, reset_less=True)
self.submodules.packetizer = packetizer = LiteEthARPPacketizer(dw) self.submodules.packetizer = packetizer = LiteEthARPPacketizer(dw)
@ -50,7 +52,8 @@ class LiteEthARPTX(Module):
) )
) )
self.comb += [ self.comb += [
packetizer.sink.last.eq(counter == max(arp_header.length, eth_min_len)-1), packetizer.sink.last.eq(counter == (packet_words - 1)),
packetizer.sink.last_be.eq(1 if len(packetizer.sink.last_be) == 1 else 2**(packet_length%(dw//8)-1)),
packetizer.sink.hwtype.eq(arp_hwtype_ethernet), packetizer.sink.hwtype.eq(arp_hwtype_ethernet),
packetizer.sink.proto.eq(arp_proto_ip), packetizer.sink.proto.eq(arp_proto_ip),
packetizer.sink.hwsize.eq(6), packetizer.sink.hwsize.eq(6),

6
liteeth/core/icmp.py
View File

@ -34,7 +34,8 @@ class LiteEthICMPTX(Module):
packetizer.sink.code.eq(sink.code), packetizer.sink.code.eq(sink.code),
packetizer.sink.checksum.eq(sink.checksum), packetizer.sink.checksum.eq(sink.checksum),
packetizer.sink.quench.eq(sink.quench), packetizer.sink.quench.eq(sink.quench),
packetizer.sink.data.eq(sink.data) packetizer.sink.data.eq(sink.data),
packetizer.sink.last_be.eq(sink.last_be)
] ]
self.submodules.fsm = fsm = FSM(reset_state="IDLE") self.submodules.fsm = fsm = FSM(reset_state="IDLE")
@ -104,7 +105,8 @@ class LiteEthICMPRX(Module):
source.ip_address.eq(sink.ip_address), source.ip_address.eq(sink.ip_address),
source.length.eq(sink.length - icmp_header.length), source.length.eq(sink.length - icmp_header.length),
source.data.eq(depacketizer.source.data), source.data.eq(depacketizer.source.data),
source.error.eq(depacketizer.source.error) source.error.eq(depacketizer.source.error),
source.last_be.eq(depacketizer.source.last_be)
] ]
fsm.act("PRESENT", fsm.act("PRESENT",
source.valid.eq(depacketizer.source.valid), source.valid.eq(depacketizer.source.valid),

4
liteeth/core/ip.py
View File

@ -106,6 +106,7 @@ class LiteEthIPTX(Module):
self.comb += [ self.comb += [
packetizer.sink.valid.eq(sink.valid & checksum.done), packetizer.sink.valid.eq(sink.valid & checksum.done),
packetizer.sink.last.eq(sink.last), packetizer.sink.last.eq(sink.last),
packetizer.sink.last_be.eq(sink.last_be),
sink.ready.eq(packetizer.sink.ready & checksum.done), sink.ready.eq(packetizer.sink.ready & checksum.done),
packetizer.sink.target_ip.eq(sink.ip_address), packetizer.sink.target_ip.eq(sink.ip_address),
packetizer.sink.protocol.eq(sink.protocol), packetizer.sink.protocol.eq(sink.protocol),
@ -231,7 +232,8 @@ class LiteEthIPRX(Module):
source.protocol.eq(depacketizer.source.protocol), source.protocol.eq(depacketizer.source.protocol),
source.ip_address.eq(depacketizer.source.sender_ip), source.ip_address.eq(depacketizer.source.sender_ip),
source.data.eq(depacketizer.source.data), source.data.eq(depacketizer.source.data),
source.error.eq(depacketizer.source.error) source.error.eq(depacketizer.source.error),
source.last_be.eq(depacketizer.source.last_be)
] ]
fsm.act("PRESENT", fsm.act("PRESENT",
source.valid.eq(depacketizer.source.valid), source.valid.eq(depacketizer.source.valid),

1
liteeth/core/udp.py
View File

@ -102,6 +102,7 @@ class LiteEthUDPTX(Module):
self.comb += [ self.comb += [
packetizer.sink.valid.eq(sink.valid), packetizer.sink.valid.eq(sink.valid),
packetizer.sink.last.eq(sink.last), packetizer.sink.last.eq(sink.last),
packetizer.sink.last_be.eq(sink.last_be),
sink.ready.eq(packetizer.sink.ready), sink.ready.eq(packetizer.sink.ready),
packetizer.sink.src_port.eq(sink.src_port), packetizer.sink.src_port.eq(sink.src_port),
packetizer.sink.dst_port.eq(sink.dst_port), packetizer.sink.dst_port.eq(sink.dst_port),