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

serwb/phys: remove phy_width (revert linerate to 1Gbps)

Browse Source
This commit is contained in:
Florent Kermarrec 2018-04-17 19:19:18 +02:00
parent c86d41edc6
commit 816a6f2ec7
2 changed files with 15 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
artiq/gateware/serwb/kusphy.py
View File

@ -12,8 +12,7 @@ def K(x, y):
@ResetInserter() @ResetInserter()
class KUSSerdes(Module): class KUSSerdes(Module):
def __init__(self, pads, mode="master", phy_width=8): def __init__(self, pads, mode="master"):
assert phy_width in [2, 4, 8]
if mode == "slave": if mode == "slave":
self.refclk = Signal() self.refclk = Signal()
@ -79,7 +78,7 @@ class KUSSerdes(Module):
# tx datapath # tx datapath
# tx_data -> encoders -> converter -> serdes # tx_data -> encoders -> converter -> serdes
self.submodules.tx_converter = tx_converter = stream.Converter(40, phy_width) self.submodules.tx_converter = tx_converter = stream.Converter(40, 8)
self.comb += [ self.comb += [
tx_converter.sink.stb.eq(1), tx_converter.sink.stb.eq(1),
self.tx_ce.eq(tx_converter.sink.ack), self.tx_ce.eq(tx_converter.sink.ack),
@ -106,22 +105,6 @@ class KUSSerdes(Module):
] ]
serdes_o = Signal() serdes_o = Signal()
serdes_d = Signal(8)
if phy_width == 2:
self.comb += [
serdes_d[0:4].eq(Replicate(tx_converter.source.data[0], 4)),
serdes_d[4:8].eq(Replicate(tx_converter.source.data[1], 4))
]
elif phy_width == 4:
self.comb += [
serdes_d[0:2].eq(Replicate(tx_converter.source.data[0], 2)),
serdes_d[2:4].eq(Replicate(tx_converter.source.data[1], 2)),
serdes_d[4:6].eq(Replicate(tx_converter.source.data[2], 2)),
serdes_d[6:8].eq(Replicate(tx_converter.source.data[3], 2))
]
else:
self.comb += serdes_d.eq(tx_converter.source.data)
self.specials += [ self.specials += [
Instance("OSERDESE3", Instance("OSERDESE3",
p_DATA_WIDTH=8, p_INIT=0, p_DATA_WIDTH=8, p_INIT=0,
@ -130,7 +113,7 @@ class KUSSerdes(Module):
o_OQ=serdes_o, o_OQ=serdes_o,
i_RST=ResetSignal("sys"), i_RST=ResetSignal("sys"),
i_CLK=ClockSignal("sys4x"), i_CLKDIV=ClockSignal("sys"), i_CLK=ClockSignal("sys4x"), i_CLKDIV=ClockSignal("sys"),
i_D=serdes_d i_D=tx_converter.source.data
), ),
Instance("OBUFDS", Instance("OBUFDS",
i_I=serdes_o, i_I=serdes_o,
@ -163,7 +146,7 @@ class KUSSerdes(Module):
# rx datapath # rx datapath
# serdes -> converter -> bitslip -> decoders -> rx_data # serdes -> converter -> bitslip -> decoders -> rx_data
self.submodules.rx_converter = rx_converter = stream.Converter(phy_width, 40) self.submodules.rx_converter = rx_converter = stream.Converter(8, 40)
self.comb += [ self.comb += [
self.rx_ce.eq(rx_converter.source.stb), self.rx_ce.eq(rx_converter.source.stb),
rx_converter.source.ack.eq(1) rx_converter.source.ack.eq(1)
@ -211,23 +194,9 @@ class KUSSerdes(Module):
) )
] ]
self.comb += rx_converter.sink.stb.eq(1)
if phy_width == 2:
self.comb += [
rx_converter.sink.data[0].eq(serdes_q[0]),
rx_converter.sink.data[1].eq(serdes_q[4])
]
elif phy_width == 4:
self.comb += [
rx_converter.sink.data[0].eq(serdes_q[0]),
rx_converter.sink.data[1].eq(serdes_q[2]),
rx_converter.sink.data[2].eq(serdes_q[4]),
rx_converter.sink.data[3].eq(serdes_q[6]),
]
else:
self.comb += rx_converter.sink.data.eq(serdes_q)
self.comb += [ self.comb += [
rx_converter.sink.stb.eq(1),
rx_converter.sink.data.eq(serdes_q),
rx_bitslip.value.eq(self.rx_bitslip_value), rx_bitslip.value.eq(self.rx_bitslip_value),
rx_bitslip.i.eq(rx_converter.source.data), rx_bitslip.i.eq(rx_converter.source.data),
decoders[0].input.eq(rx_bitslip.o[0:10]), decoders[0].input.eq(rx_bitslip.o[0:10]),

49
artiq/gateware/serwb/s7phy.py
View File

@ -12,8 +12,7 @@ def K(x, y):
@ResetInserter() @ResetInserter()
class S7Serdes(Module): class S7Serdes(Module):
def __init__(self, pads, mode="master", phy_width=8): def __init__(self, pads, mode="master"):
assert phy_width in [2, 4, 8]
if mode == "slave": if mode == "slave":
self.refclk = Signal() self.refclk = Signal()
@ -82,7 +81,7 @@ class S7Serdes(Module):
# tx datapath # tx datapath
# tx_data -> encoders -> converter -> serdes # tx_data -> encoders -> converter -> serdes
self.submodules.tx_converter = tx_converter = stream.Converter(40, phy_width) self.submodules.tx_converter = tx_converter = stream.Converter(40, 8)
self.comb += [ self.comb += [
tx_converter.sink.stb.eq(1), tx_converter.sink.stb.eq(1),
self.tx_ce.eq(tx_converter.sink.ack), self.tx_ce.eq(tx_converter.sink.ack),
@ -109,22 +108,6 @@ class S7Serdes(Module):
] ]
serdes_o = Signal() serdes_o = Signal()
serdes_d = Signal(8)
if phy_width == 2:
self.comb += [
serdes_d[0:4].eq(Replicate(tx_converter.source.data[0], 4)),
serdes_d[4:8].eq(Replicate(tx_converter.source.data[1], 4))
]
elif phy_width == 4:
self.comb += [
serdes_d[0:2].eq(Replicate(tx_converter.source.data[0], 2)),
serdes_d[2:4].eq(Replicate(tx_converter.source.data[1], 2)),
serdes_d[4:6].eq(Replicate(tx_converter.source.data[2], 2)),
serdes_d[6:8].eq(Replicate(tx_converter.source.data[3], 2))
]
else:
self.comb += serdes_d.eq(tx_converter.source.data)
self.specials += [ self.specials += [
Instance("OSERDESE2", Instance("OSERDESE2",
p_DATA_WIDTH=8, p_TRISTATE_WIDTH=1, p_DATA_WIDTH=8, p_TRISTATE_WIDTH=1,
@ -135,10 +118,10 @@ class S7Serdes(Module):
i_OCE=1, i_OCE=1,
i_RST=ResetSignal("sys"), i_RST=ResetSignal("sys"),
i_CLK=ClockSignal("sys4x"), i_CLKDIV=ClockSignal("sys"), i_CLK=ClockSignal("sys4x"), i_CLKDIV=ClockSignal("sys"),
i_D1=serdes_d[0], i_D2=serdes_d[1], i_D1=tx_converter.source.data[0], i_D2=tx_converter.source.data[1],
i_D3=serdes_d[2], i_D4=serdes_d[3], i_D3=tx_converter.source.data[2], i_D4=tx_converter.source.data[3],
i_D5=serdes_d[4], i_D6=serdes_d[5], i_D5=tx_converter.source.data[4], i_D6=tx_converter.source.data[5],
i_D7=serdes_d[6], i_D8=serdes_d[7] i_D7=tx_converter.source.data[6], i_D8=tx_converter.source.data[7]
), ),
Instance("OBUFDS", Instance("OBUFDS",
i_I=serdes_o, i_I=serdes_o,
@ -171,7 +154,7 @@ class S7Serdes(Module):
# rx datapath # rx datapath
# serdes -> converter -> bitslip -> decoders -> rx_data # serdes -> converter -> bitslip -> decoders -> rx_data
self.submodules.rx_converter = rx_converter = stream.Converter(phy_width, 40) self.submodules.rx_converter = rx_converter = stream.Converter(8, 40)
self.comb += [ self.comb += [
self.rx_ce.eq(rx_converter.source.stb), self.rx_ce.eq(rx_converter.source.stb),
rx_converter.source.ack.eq(1) rx_converter.source.ack.eq(1)
@ -222,23 +205,9 @@ class S7Serdes(Module):
) )
] ]
self.comb += rx_converter.sink.stb.eq(1)
if phy_width == 2:
self.comb += [
rx_converter.sink.data[0].eq(serdes_q[3]),
rx_converter.sink.data[1].eq(serdes_q[7])
]
elif phy_width == 4:
self.comb += [
rx_converter.sink.data[0].eq(serdes_q[1]),
rx_converter.sink.data[1].eq(serdes_q[3]),
rx_converter.sink.data[2].eq(serdes_q[5]),
rx_converter.sink.data[3].eq(serdes_q[7]),
]
else:
self.comb += rx_converter.sink.data.eq(serdes_q)
self.comb += [ self.comb += [
rx_converter.sink.stb.eq(1),
rx_converter.sink.data.eq(serdes_q),
rx_bitslip.value.eq(self.rx_bitslip_value), rx_bitslip.value.eq(self.rx_bitslip_value),
rx_bitslip.i.eq(rx_converter.source.data), rx_bitslip.i.eq(rx_converter.source.data),
decoders[0].input.eq(rx_bitslip.o[0:10]), decoders[0].input.eq(rx_bitslip.o[0:10]),