code clean up due to hw tests

diff --git a/liteeth/common.py b/liteeth/common.py
index f881fa2ce798f09d92183490db11a19ec43cb68e..07e168cf1753687c0b8935abde04e8252706c549 100644 (file)
--- a/liteeth/common.py
+++ b/liteeth/common.py
@@ -14,6 +14,7 @@ from migen.actorlib.fifo import SyncFIFO, AsyncFIFO
 from migen.bank.description import *
 
 eth_mtu = 1532
+eth_min_len = 46
 eth_preamble = 0xD555555555555555
 buffer_depth = 2**log2_int(eth_mtu, need_pow2=False)
 
@@ -53,14 +54,10 @@ arp_header = {
 
 ipv4_header_len = 20
 ipv4_header = {
-       "version":                      HField(0,  4, 4), # XXX works on hardware but need to fix
-       "ihl":                          HField(0,  0, 4), # header encoding/decoding when not aligned
-       "diff_services":        HField(1,  0, 6), # on bytes
-       "ecn":                          HField(1,  6, 2),
+       "ihl":                          HField(0,  0, 4),
+       "version":                      HField(0,  4, 4),
        "total_length":         HField(2,  0, 16),
        "identification":       HField(4,  0, 16),
-       "flags":                        HField(6,  0, 3),
-       "fragment_offset":      HField(6,  3, 13),
        "ttl":                          HField(8,  0, 8),
        "protocol":                     HField(9,  0, 8),
        "checksum":                     HField(10,  0, 16),

diff --git a/liteeth/core/arp.py b/liteeth/core/arp.py
index 700b91ca8d406d2e8115b5336448ba456bb068f2..85acd407747781a8c39e1f661da567104b58055a 100644 (file)
--- a/liteeth/core/arp.py
+++ b/liteeth/core/arp.py
@@ -34,7 +34,7 @@ class LiteEthARPTX(Module):
                self.submodules += packetizer
                source = packetizer.sink
 
-               counter = Counter(max=arp_header_len)
+               counter = Counter(max=max(arp_header_len, eth_min_len))
                self.submodules += counter
 
                self.submodules.fsm = fsm = FSM(reset_state="IDLE")
@@ -66,7 +66,7 @@ class LiteEthARPTX(Module):
                fsm.act("SEND",
                        source.stb.eq(1),
                        source.sop.eq(counter.value == 0),
-                       source.eop.eq(counter.value == arp_header_len-1),
+                       source.eop.eq(counter.value == max(arp_header_len, eth_min_len)-1),
                        Record.connect(packetizer.source, self.source),
                        self.source.target_mac.eq(source.target_mac),
                        self.source.sender_mac.eq(mac_address),

diff --git a/liteeth/core/ip.py b/liteeth/core/ip.py
index 5d123297ab00fa639edf6aa76e3444c92a1f4099..baff8124454b7775e811ffbf1771823c6ceb744b 100644 (file)
--- a/liteeth/core/ip.py
+++ b/liteeth/core/ip.py
@@ -55,11 +55,7 @@ class LiteEthIPTX(Module):
                        packetizer.sink.total_length.eq(self.sink.length + (0x5*4)),
                        packetizer.sink.version.eq(0x4),        # ipv4
                        packetizer.sink.ihl.eq(0x5),            # 20 bytes
-                       packetizer.sink.diff_services.eq(0),
-                       packetizer.sink.ecn.eq(0),
                        packetizer.sink.identification.eq(0),
-                       packetizer.sink.flags.eq(0),
-                       packetizer.sink.fragment_offset.eq(0),
                        packetizer.sink.ttl.eq(0x80),
                        packetizer.sink.sender_ip.eq(ip_address),
                        packetizer.sink.data.eq(self.sink.data)

diff --git a/liteeth/mac/core/__init__.py b/liteeth/mac/core/__init__.py
index 0e8b72652df64415065366a893b45ba8ec1ca78e..f887c61199918a82d79424d2d57c2593e9a6b809 100644 (file)
--- a/liteeth/mac/core/__init__.py
+++ b/liteeth/mac/core/__init__.py
@@ -2,14 +2,14 @@ from liteeth.common import *
 from liteeth.mac.core import preamble, crc, last_be
 
 class LiteEthMACCore(Module, AutoCSR):
-       def __init__(self, phy, dw, endianness="be", with_hw_preamble_crc=True):
+       def __init__(self, phy, dw, endianness="big", with_hw_preamble_crc=True):
                if dw < phy.dw:
                        raise ValueError("Core data width({}) must be larger than PHY data width({})".format(dw, phy.dw))
 
                rx_pipeline = [phy]
                tx_pipeline = [phy]
 
-               # Preamble / CRC (optional)
+               # Preamble / CRC
                if with_hw_preamble_crc:
                        self._hw_preamble_crc = CSRStatus(reset=1)
                        # Preamble insert/check
@@ -27,8 +27,8 @@ class LiteEthMACCore(Module, AutoCSR):
                        tx_pipeline += [preamble_inserter, crc32_inserter]
                        rx_pipeline += [preamble_checker, crc32_checker]
 
+               # Delimiters
                if dw != 8:
-                       # Delimiters
                        tx_last_be = last_be.LiteEthMACTXLastBE(phy.dw)
                        rx_last_be = last_be.LiteEthMACRXLastBE(phy.dw)
                        self.submodules += RenameClockDomains(tx_last_be, "eth_tx")
@@ -37,9 +37,9 @@ class LiteEthMACCore(Module, AutoCSR):
                        tx_pipeline += [tx_last_be]
                        rx_pipeline += [rx_last_be]
 
+               # Converters
                if dw != phy.dw:
-                       # Converters
-                       reverse = endianness == "be"
+                       reverse = endianness == "big"
                        tx_converter = Converter(eth_phy_description(dw), eth_phy_description(phy.dw), reverse=reverse)
                        rx_converter = Converter(eth_phy_description(phy.dw), eth_phy_description(dw), reverse=reverse)
                        self.submodules += RenameClockDomains(tx_converter, "eth_tx")

diff --git a/liteeth/test/ip_tb.py b/liteeth/test/ip_tb.py
index 1815c243bced18f60dea678a639d6f1d773c7ad7..267760e004691c5517912519ce44fb247b8164a5 100644 (file)
--- a/liteeth/test/ip_tb.py
+++ b/liteeth/test/ip_tb.py
@@ -46,7 +46,7 @@ class TB(Module):
                        selfp.ip.sink.sop = 1
                        selfp.ip.sink.eop = 1
                        selfp.ip.sink.ip_address = 0x12345678
-                       selfp.ip.sink.protocol = 0x11
+                       selfp.ip.sink.protocol = udp_protocol
 
                        selfp.ip.source.ack = 1
                        if selfp.ip.source.stb == 1 and selfp.ip.source.sop == 1:

diff --git a/liteeth/test/model/arp.py b/liteeth/test/model/arp.py
index 8b27b4a605bb208cf0ad5aed35e0cae10089bd5d..7a23f23ff1a4f51e202d1d3169094215807e61dc 100644 (file)
--- a/liteeth/test/model/arp.py
+++ b/liteeth/test/model/arp.py
@@ -73,7 +73,7 @@ class ARP(Module):
                self.process(packet)
 
        def process(self, packet):
-               if len(packet) != arp_packet_length-arp_header_len:
+               if len(packet) != eth_min_len-arp_header_len:
                        raise ValueError
                if packet.hwtype != arp_hwtype_ethernet:
                        raise ValueError
@@ -90,7 +90,7 @@ class ARP(Module):
 
        def process_request(self, request):
                if request.target_ip == self.ip_address:
-                       reply = ARPPacket([0]*(arp_packet_length-arp_header_len))
+                       reply = ARPPacket([0]*(eth_min_len-arp_header_len))
                        reply.hwtype = arp_hwtype_ethernet
                        reply.proto = arp_proto_ip
                        reply.opcode = arp_opcode_reply
@@ -106,7 +106,7 @@ class ARP(Module):
                self.table[reply.sender_ip] = reply.sender_mac
 
        def request(self, ip_address):
-               request = ARPPacket([0]*(arp_packet_length-arp_header_len))
+               request = ARPPacket([0]*(eth_min_len-arp_header_len))
                request.hwtype = arp_hwtype_ethernet
                request.proto = arp_proto_ip
                request.opcode = arp_opcode_request

diff --git a/liteeth/test/model/udp.py b/liteeth/test/model/udp.py
index f43a32aa3f83e0bd815cdada6308907c3906e853..f48dcb294f778fecb30bd149c26da05bb2477166 100644 (file)
--- a/liteeth/test/model/udp.py
+++ b/liteeth/test/model/udp.py
@@ -57,8 +57,6 @@ class UDP(Module):
                ip_packet = ip.IPPacket(packet)
                ip_packet.version = 0x4
                ip_packet.ihl = 0x5
-               ip_packet.diff_services = 0x0
-               ip_packet.ecn = 0x0
                ip_packet.total_length = len(packet) + ip_packet.ihl
                ip_packet.identification = 0
                ip_packet.flags = 0