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

core/udp: add cdc support (untested)

This commit is contained in:
Florent Kermarrec 2017-06-30 11:01:44 +02:00
parent 5bc6e879ae
commit 34460cec47
2 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
liteeth/core/udp.py
View File

@ -30,26 +30,43 @@ class LiteEthUDPCrossbar(LiteEthCrossbar):
def __init__(self): def __init__(self):
LiteEthCrossbar.__init__(self, LiteEthUDPMasterPort, "dst_port") LiteEthCrossbar.__init__(self, LiteEthUDPMasterPort, "dst_port")
def get_port(self, udp_port, dw=8): def get_port(self, udp_port, dw=8, cd=None):
if udp_port in self.users.keys(): if udp_port in self.users.keys():
raise ValueError("Port {0:#x} already assigned".format(udp_port)) raise ValueError("Port {0:#x} already assigned".format(udp_port))
user_port = LiteEthUDPUserPort(dw) user_port = LiteEthUDPUserPort(dw)
internal_port = LiteEthUDPUserPort(8) internal_port = LiteEthUDPUserPort(8)
if dw != 8: if dw != 8:
converter = stream.StrideConverter(eth_udp_user_description(user_port.dw), # tx
tx_converter = stream.StrideConverter(eth_udp_user_description(user_port.dw),
eth_udp_user_description(8)) eth_udp_user_description(8))
self.submodules += converter self.submodules += tx_converter
if cd is not None:
tx_cdc = stream.AsyncFIFO(eth_udp_user_description(user_port.dw), 4)
tx_cdc = ClockDomainsRenamer({"write": cd, "read": "sys"})(tx_cdc)
self.submodules += tx_cdc
self.comb += [ self.comb += [
user_port.sink.connect(converter.sink), user_port.sink.connect(tx_cdc.sink),
converter.source.connect(internal_port.sink) tx_cdc.source.connect(tx_converter.sink)
] ]
converter = stream.StrideConverter(eth_udp_user_description(8), else:
self.comb += user_port.sink.connect(tx_converter.sink)
self.comb += tx_converter.source.connect(internal_port.sink)
# rx
rx_converter = stream.StrideConverter(eth_udp_user_description(8),
eth_udp_user_description(user_port.dw)) eth_udp_user_description(user_port.dw))
self.submodules += converter self.submodules += rx_converter
self.comb += internal_port.source.connect(rx_converter.sink)
if cd is not None:
rx_cdc = stream.AsyncFIFO(eth_udp_user_description(user_port.dw), 4)
rx_cdc = ClockDomainsRenamer({"write": "sys", "read": cd})(rx_cdc)
self.submodules += rx_cdc
self.comb += [ self.comb += [
internal_port.source.connect(converter.sink), rx_converter.source.connect(rx_cdc.sink),
converter.source.connect(user_port.source) rx_cdc.source.connect(user_port.source)
] ]
else:
self.comb += rx_converter.source.connect(user_port.source)
self.users[udp_port] = internal_port self.users[udp_port] = internal_port
else: else:
self.users[udp_port] = user_port self.users[udp_port] = user_port

8
liteeth/frontend/etherbone.py
View File

@ -137,10 +137,10 @@ class LiteEthEtherbonePacketRX(Module):
class LiteEthEtherbonePacket(Module): class LiteEthEtherbonePacket(Module):
def __init__(self, udp, udp_port): def __init__(self, udp, udp_port, cd=None):
self.submodules.tx = tx = LiteEthEtherbonePacketTX(udp_port) self.submodules.tx = tx = LiteEthEtherbonePacketTX(udp_port)
self.submodules.rx = rx = LiteEthEtherbonePacketRX() self.submodules.rx = rx = LiteEthEtherbonePacketRX()
udp_port = udp.crossbar.get_port(udp_port, dw=32) udp_port = udp.crossbar.get_port(udp_port, dw=32, cd=cd)
self.comb += [ self.comb += [
tx.source.connect(udp_port.sink), tx.source.connect(udp_port.sink),
udp_port.source.connect(rx.sink) udp_port.source.connect(rx.sink)
@ -497,9 +497,9 @@ class LiteEthEtherboneWishboneSlave(Module):
# etherbone # etherbone
class LiteEthEtherbone(Module): class LiteEthEtherbone(Module):
def __init__(self, udp, udp_port, mode="master"): def __init__(self, udp, udp_port, mode="master", cd=None):
# decode/encode etherbone packets # decode/encode etherbone packets
self.submodules.packet = packet = LiteEthEtherbonePacket(udp, udp_port) self.submodules.packet = packet = LiteEthEtherbonePacket(udp, udp_port, cd)
# packets can be probe (etherbone discovering) or records with # packets can be probe (etherbone discovering) or records with
# writes and reads # writes and reads