Hardware/litex
1
0
Fork 0
mirror of https://github.com/enjoy-digital/litex.git synced 2025-01-04 09:52:26 -05:00
Code Issues Projects Releases Packages Wiki Activity

integrate phy in test design and start fix syntax errors

Browse source
This commit is contained in:
Florent Kermarrec 2014-09-24 14:28:52 +02:00
parent 18009303ae
commit 435bc22fa0
8 changed files with 331 additions and 302 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/sata/k7sataphy/__init__.py
View file

@ -1,8 +1,10 @@
from migen.fhdl.std import * from migen.fhdl.std import *
from migen.flow.actor import Sink, Source
from lib.sata.k7sataphy.std import * from lib.sata.k7sataphy.std import *
from lib.sata.k7sataphy.gtx import GTXE2_CHANNEL from lib.sata.k7sataphy.gtx import GTXE2_CHANNEL
from lib.sata.k7sataphy.clocking import K7SATAPHYClocking from lib.sata.k7sataphy.clocking import K7SATAPHYClocking
from lib.sata.k7sataphy.ctrl import K7SATAPHYHostCtrl, K7SATAPHYDeviceCtrl
class K7SATAPHY(Module): class K7SATAPHY(Module):
def __init__(self, pads, host=True): def __init__(self, pads, host=True):
@ -18,14 +20,16 @@ class K7SATAPHY(Module):
self.comb += [ self.comb += [
If(self.ctrl.link_up, If(self.ctrl.link_up,
self.gtx.sink.stb.eq(self.sink.stb), self.gtx.sink.stb.eq(self.sink.stb),
self.gtx.sink.data.eq(self.sink.data), self.gtx.sink.data.eq(self.sink.d),
self.gtx.sink.charisk.eq(0), self.gtx.sink.charisk.eq(0),
self.sink.ack.eq(self.gtx.sink.ack), self.sink.ack.eq(self.gtx.sink.ack),
).Else( ).Else(
self.gtx.sink.stb.eq(1), self.gtx.sink.stb.eq(1),
self.gtx.sink.data.eq(self.ctrl.txdata), self.gtx.sink.data.eq(self.ctrl.txdata),
self.gtx.sink.charisk.eq(self.ctrl.txcharisk), self.gtx.sink.charisk.eq(self.ctrl.txcharisk)
) ),
Record.connect(self.gtx.source, self.source), self.source.stb.eq(self.gtx.source.stb),
self.ctrl.rxdata.eq(self.gtx.source.rxdata) self.source.payload.eq(self.gtx.source.payload),
self.gtx.source.ack.eq(self.source.ack),
self.ctrl.rxdata.eq(self.gtx.source.data)
] ]

49
lib/sata/k7sataphy/clocking.py
View file

@ -2,40 +2,34 @@ from migen.fhdl.std import *
from migen.genlib.resetsync import AsyncResetSynchronizer from migen.genlib.resetsync import AsyncResetSynchronizer
from migen.genlib.fsm import FSM, NextState from migen.genlib.fsm import FSM, NextState
from lib.sata.k7sataphy.std import *
class K7SATAPHYReconfig(Module): class K7SATAPHYReconfig(Module):
def __init__(self, channel_drp, mmcm_drp): def __init__(self, channel_drp, mmcm_drp):
self.speed = Signal(3) self.speed = Signal(3)
### ###
speed_r = Signal(3) speed_r = Signal(3)
speed_change = Signal() speed_change = Signal()
self.sync += speed_r.eq(speed) self.sync += speed_r.eq(self.speed)
self.comb += speed_change.eq(speed != speed_r) self.comb += speed_change.eq(self.speed != speed_r)
drp_sel = Signal() drp_sel = Signal()
drp = DRPBus() drp = DRPBus()
self.comb += \ self.comb += \
If(sel, If(drp_sel,
Record.connect(drp, mmcm_drp), Record.connect(drp, mmcm_drp),
).Else( ).Else(
Record.connect(drp, channel_drp) Record.connect(drp, channel_drp)
) )
fsm = FSM(reset_state="IDLE")
self.submodules += fsm
# Todo
fsm.act("IDLE",
sel.eq(0),
)
class K7SATAPHYClocking(Module): class K7SATAPHYClocking(Module):
def __init__(self, pads, gtx): def __init__(self, pads, gtx):
self.reset = Signal() self.reset = Signal()
self.transceiver_reset = Signal() self.transceiver_reset = Signal()
self.cd_sata = ClockDomain() self.clock_domains.cd_sata = ClockDomain()
self.cd_sata_tx = ClockDomain() self.clock_domains.cd_sata_tx = ClockDomain()
self.cd_sata_rx = ClockDomain() self.clock_domains.cd_sata_rx = ClockDomain()
# TX clocking # TX clocking
refclk = Signal() refclk = Signal()
@ -46,22 +40,23 @@ class K7SATAPHYClocking(Module):
) )
mmcm_reset = Signal() mmcm_reset = Signal()
mmcm_locked = Signal() mmcm_locked = Signal()
mmcm_drp = DRP() mmcm_drp = DRPBus()
mmcm_fb = Signal() mmcm_fb = Signal()
mmcm_clk_i = Signal() mmcm_clk_i = Signal()
mmcm_clk0_o = Signal() mmcm_clk0_o = Signal()
mmcm_clk1_o = Signal()
self.specials += [ self.specials += [
Instance("BUFG", i_I=refclk, o_O=mmcm_clk_i), Instance("BUFG", i_I=refclk, o_O=mmcm_clk_i),
Instance("MMCME2_ADV", Instance("MMCME2_ADV",
p_BANDWIDTH="HIGH", p_COMPENSATION="ZHOLD", i_RST=mmcm_reset, o_LOCKED=mmcm_locked, p_BANDWIDTH="HIGH", p_COMPENSATION="ZHOLD", i_RST=mmcm_reset, o_LOCKED=mmcm_locked,
# DRP # DRP
i_DCLK=mmcm_drp.clk, i_DEN=mmcm_drp.den, o_DRDY=mmcm_drp.rdy, i_DWE=mmcm_drp.we, i_DCLK=mmcm_drp.clk, i_DEN=mmcm_drp.en, o_DRDY=mmcm_drp.rdy, i_DWE=mmcm_drp.we,
i_DADDR=mmcm_drp.addr, i_DI=mmcm_drp.di, i_DO=mmcm_drp.do, i_DADDR=mmcm_drp.addr, i_DI=mmcm_drp.di, i_DO=mmcm_drp.do,
# VCO # VCO
p_REF_JITTER1=0.01, p_CLKIN1_PERIOD=5.0, p_REF_JITTER1=0.01, p_CLKIN1_PERIOD=5.0,
p_CLKFBOUT_MULT_F=8.000, CLKFBOUT_PHASE=0.000, p_DIVCLK_DIVIDE=2, p_CLKFBOUT_MULT_F=8.000, p_CLKFBOUT_PHASE=0.000, p_DIVCLK_DIVIDE=2,
i_CLKIN1=mmcm_clk_i, i_CLKFBIN=mmcm_fb, o_CLKFBOUT=mmcm_fb, i_CLKIN1=mmcm_clk_i, i_CLKFBIN=mmcm_fb, o_CLKFBOUT=mmcm_fb,
# CLK0 # CLK0
@ -85,11 +80,11 @@ class K7SATAPHYClocking(Module):
# TX buffer bypass logic # TX buffer bypass logic
self.comb += [ self.comb += [
self.txphdlyreset.eq(0), gtx.txphdlyreset.eq(0),
self.txphalignen.eq(0), gtx.txphalignen.eq(0),
self.txdlyen.eq(0), gtx.txdlyen.eq(0),
self.txphalign.eq(0), gtx.txphalign.eq(0),
self.txphinit.eq(0) gtx.txphinit.eq(0)
] ]
# once channel TX is reseted, reset TX buffer # once channel TX is reseted, reset TX buffer
@ -97,10 +92,10 @@ class K7SATAPHYClocking(Module):
self.sync += \ self.sync += \
If(gtx.txresetdone, If(gtx.txresetdone,
If(~txbuffer_reseted, If(~txbuffer_reseted,
gtx.txdlyreset.eq(1), gtx.txdlysreset.eq(1),
txbuffer_reseted.eq(1) txbuffer_reseted.eq(1)
).Else( ).Else(
gtx.txdlyreset.eq(0) gtx.txdlysreset.eq(0)
) )
) )
@ -127,10 +122,10 @@ class K7SATAPHYClocking(Module):
self.sync += \ self.sync += \
If(cdr_locked & gtx.rxresetdone, If(cdr_locked & gtx.rxresetdone,
If(~rxbuffer_reseted, If(~rxbuffer_reseted,
gtx.rxdlyreset.eq(1), gtx.rxdlysreset.eq(1),
rxbuffer_reseted.eq(1) rxbuffer_reseted.eq(1)
).Else( ).Else(
gtx.rxdlyreset.eq(0) gtx.rxdlysreset.eq(0)
) )
) )
@ -144,7 +139,7 @@ class K7SATAPHYClocking(Module):
# RX # RX
gtx.gtrxreset.eq(self.reset | self.transceiver_reset | ~gtx.cplllock), gtx.gtrxreset.eq(self.reset | self.transceiver_reset | ~gtx.cplllock),
# PLL # PLL
gtx.pllreset.eq(self.reset) gtx.cpllreset.eq(self.reset)
] ]
# SATA TX/RX clock domains # SATA TX/RX clock domains
self.specials += [ self.specials += [

48
lib/sata/k7sataphy/ctrl.py
View file

@ -1,17 +1,21 @@
from math import ceil
from migen.fhdl.std import * from migen.fhdl.std import *
from migen.genlib.resetsync import AsyncResetSynchronizer from migen.genlib.resetsync import AsyncResetSynchronizer
from migen.genlib.fsm import FSM, NextState from migen.genlib.fsm import FSM, NextState
from lib.sata.k7sataphy.std import *
# Todo: # Todo:
# rx does not use the same clock, need to resynchronize signals. # rx does not use the same clock, need to resynchronize signals.
def us(self, t, speed="SATA3", margin=True): def us(t, speed="SATA3", margin=True):
clk_freq = { clk_freq = {
"SATA3" : 300*1000000, "SATA3" : 300*1000000,
"SATA2" : 150*1000000, "SATA2" : 150*1000000,
"SATA1" : 75*1000000 "SATA1" : 75*1000000
} }
clk_period_us = 1000000/clk_freq clk_period_us = 1000000/clk_freq[speed]
if margin: if margin:
t += clk_period_us/2 t += clk_period_us/2
return ceil(t/clk_period_us) return ceil(t/clk_period_us)
@ -28,17 +32,19 @@ class K7SATAPHYHostCtrl(Module):
align_timeout = Signal() align_timeout = Signal()
align_detect = Signal() align_detect = Signal()
retry_cnt = Signal(4)
non_align_cnt = Signal(4)
txcominit = Signal() txcominit = Signal()
txcomwake = Signa() txcomwake = Signal()
fsm = FSM(reset_state="IDLE") fsm = FSM(reset_state="RESET")
self.submodules += fsm self.submodules += fsm
fsm.act("RESET", fsm.act("RESET",
txcominit.eq(1), txcominit.eq(1),
gtx.txelecidle.eq(1), gtx.txelecidle.eq(1),
If(gtx.txcomfinish & ~gtx.rxcominitdet), If(gtx.txcomfinish & ~gtx.rxcominitdet,
NextState("AWAIT_COMINIT") NextState("AWAIT_COMINIT")
) )
) )
@ -124,9 +130,9 @@ class K7SATAPHYHostCtrl(Module):
align_timeout_cnt = Signal(16) align_timeout_cnt = Signal(16)
self.sync.sata += \ self.sync.sata += \
If(fsm.ongoing("RESET"), If(fsm.ongoing("RESET"),
If(speed == 0b100, If(self.speed == 0b100,
align_timeout_cnt.eq(us(873, "SATA3")) align_timeout_cnt.eq(us(873, "SATA3"))
).Elif(speed == 0b010, ).Elif(self.speed == 0b010,
align_timeout_cnt.eq(us(873, "SATA2")) align_timeout_cnt.eq(us(873, "SATA2"))
).Else( ).Else(
align_timeout_cnt.eq(us(873, "SATA1")) align_timeout_cnt.eq(us(873, "SATA1"))
@ -136,21 +142,19 @@ class K7SATAPHYHostCtrl(Module):
) )
self.comb += align_timeout.eq(align_timeout_cnt == 0) self.comb += align_timeout.eq(align_timeout_cnt == 0)
retry_cnt = Signal(16)
self.sync.sata += \ self.sync.sata += \
If(fsm.ongoing("RESET") | fsm.ongoing("AWAIT_NO_COMINIT"), If(fsm.ongoing("RESET") | fsm.ongoing("AWAIT_NO_COMINIT"),
If(speed == 0b100, If(self.speed == 0b100,
retry_cnt.eq(us(10000, "SATA3")) retry_cnt.eq(us(10000, "SATA3"))
).Elif(speed == 0b010, ).Elif(self.speed == 0b010,
retry_cnt.eq(us(10000, "SATA2")) retry_cnt.eq(us(10000, "SATA2"))
).Else( ).Else(
retry_cnt.eq(us(10000, "SATA1")) retry_cnt.eq(us(10000, "SATA1"))
) )
).Elif(fsm.ongoing("AWAIT_COMINIT") | fsm.ongoing("AWAIT_COMWAKE") ).Elif(fsm.ongoing("AWAIT_COMINIT") | fsm.ongoing("AWAIT_COMWAKE"),
retry_cnt.eq(retry_cnt-1) retry_cnt.eq(retry_cnt-1)
) )
non_align_cnt = Signal(4)
self.sync.sata += \ self.sync.sata += \
If(fsm.ongoing("SEND_ALIGN"), If(fsm.ongoing("SEND_ALIGN"),
If(self.rxdata[7:0] == K28_5, If(self.rxdata[7:0] == K28_5,
@ -172,17 +176,18 @@ class K7SATAPHYDeviceCtrl(Module):
align_timeout = Signal() align_timeout = Signal()
align_detect = Signal() align_detect = Signal()
retry_cnt = Signal(4)
txcominit = Signal() txcominit = Signal()
txcomwake = Signa() txcomwake = Signal()
fsm = FSM(reset_state="IDLE") fsm = FSM(reset_state="RESET")
self.submodules += fsm self.submodules += fsm
fsm.act("RESET", fsm.act("RESET",
gtx.txelecidle.eq(1), gtx.txelecidle.eq(1),
If(gtx.rxcominitdet, If(gtx.rxcominitdet,
NextState("AWAIT_COMINIT") NextState("COMINIT")
) )
) )
fsm.act("COMINIT", fsm.act("COMINIT",
@ -193,7 +198,7 @@ class K7SATAPHYDeviceCtrl(Module):
) )
fsm.act("AWAIT_COMWAKE", fsm.act("AWAIT_COMWAKE",
gtx.txelecidle.eq(1), gtx.txelecidle.eq(1),
If(gtx.rxcomwake, If(gtx.rxcomwakedet,
NextState("AWAIT_NO_COMWAKE") NextState("AWAIT_NO_COMWAKE")
).Else( ).Else(
If(retry_cnt == 0, If(retry_cnt == 0,
@ -203,7 +208,7 @@ class K7SATAPHYDeviceCtrl(Module):
) )
fsm.act("AWAIT_NO_COMWAKE", fsm.act("AWAIT_NO_COMWAKE",
gtx.txelecidle.eq(1), gtx.txelecidle.eq(1),
If(~gtx.rxcomwake, If(~gtx.rxcomwakedet,
NextState("CALIBRATE") NextState("CALIBRATE")
) )
) )
@ -213,10 +218,9 @@ class K7SATAPHYDeviceCtrl(Module):
) )
fsm.act("COMWAKE", fsm.act("COMWAKE",
gtx.txelecidle.eq(1), gtx.txelecidle.eq(1),
gtx.txcomwake.eq(1),
If(gtx.txcomfinish, If(gtx.txcomfinish,
NextState("SEND_ALIGN") NextState("SEND_ALIGN")
).Elif(align_timeout,
NextState("ERROR")
) )
) )
fsm.act("SEND_ALIGN", fsm.act("SEND_ALIGN",
@ -225,7 +229,7 @@ class K7SATAPHYDeviceCtrl(Module):
self.txcharisk.eq(0b0001), self.txcharisk.eq(0b0001),
If(align_detect, If(align_detect,
NextState("READY") NextState("READY")
).Elsif(align_timeout, ).Elif(align_timeout,
NextState("ERROR") NextState("ERROR")
) )
) )
@ -255,9 +259,9 @@ class K7SATAPHYDeviceCtrl(Module):
align_timeout_cnt = Signal(16) align_timeout_cnt = Signal(16)
self.sync.sata += \ self.sync.sata += \
If(fsm.ongoing("RESET"), If(fsm.ongoing("RESET"),
If(speed == 0b100, If(self.speed == 0b100,
align_timeout_cnt.eq(us(55, "SATA3")) align_timeout_cnt.eq(us(55, "SATA3"))
).Elif(speed == 0b010, ).Elif(self.speed == 0b010,
align_timeout_cnt.eq(us(55, "SATA2")) align_timeout_cnt.eq(us(55, "SATA2"))
).Else( ).Else(
align_timeout_cnt.eq(us(55, "SATA1")) align_timeout_cnt.eq(us(55, "SATA1"))

472
lib/sata/k7sataphy/gtx.py
View file

@ -1,6 +1,7 @@
from migen.fhdl.std import * from migen.fhdl.std import *
from migen.actorlib.fifo import AsyncFIFO from migen.actorlib.fifo import AsyncFIFO
from migen.actorlib.structuring import Converter from migen.actorlib.structuring import Converter
from migen.flow.actor import Sink, Source
from lib.sata.k7sataphy.std import * from lib.sata.k7sataphy.std import *
@ -115,11 +116,11 @@ class GTXE2_CHANNEL(Module):
txout_div = div_config[default_speed] txout_div = div_config[default_speed]
cdr_config = { cdr_config = {
"SATA1" : 0x0380008BFF40100008 "SATA1" : 0x0380008BFF40100008,
"SATA2" : 0x0380008BFF40200008 "SATA2" : 0x0380008BFF40200008,
"SATA3" : 0X0380008BFF20200010 "SATA3" : 0X0380008BFF20200010
} }
rxcdr_cfg = cdr_config[start_speed] rxcdr_cfg = cdr_config[default_speed]
rxdata = Signal(16) rxdata = Signal(16)
rxcharisk = Signal(2) rxcharisk = Signal(2)
@ -127,278 +128,280 @@ class GTXE2_CHANNEL(Module):
txdata = Signal(16) txdata = Signal(16)
txcharisk = Signal(2) txcharisk = Signal(2)
self.specials += \ gtxe2_channel_parameters = {
Instance("GTXE2_CHANNEL",
# Simulation-Only Attributes # Simulation-Only Attributes
p_SIM_RECEIVER_DETECT_PASS="TRUE", "p_SIM_RECEIVER_DETECT_PASS":"TRUE",
p_SIM_TX_EIDLE_DRIVE_LEVEL="X", "p_SIM_TX_EIDLE_DRIVE_LEVEL":"X",
p_SIM_RESET_SPEEDUP="TRUE", "p_SIM_RESET_SPEEDUP":"TRUE",
p_SIM_CPLLREFCLK_SEL=0b001, "p_SIM_CPLLREFCLK_SEL":0b001,
p_SIM_VERSION="4.0", "p_SIM_VERSION":"4.0",
# RX Byte and Word Alignment Attributes # RX Byte and Word Alignment Attributes
p_ALIGN_COMMA_DOUBLE="FALSE", "p_ALIGN_COMMA_DOUBLE":"FALSE",
p_ALIGN_COMMA_ENABLE=_ones(10), "p_ALIGN_COMMA_ENABLE":ones(10),
p_ALIGN_COMMA_WORD=2, "p_ALIGN_COMMA_WORD":2,
p_ALIGN_MCOMMA_DET="TRUE", "p_ALIGN_MCOMMA_DET":"TRUE",
p_ALIGN_MCOMMA_VALUE=K28_5, "p_ALIGN_MCOMMA_VALUE":K28_5,
p_ALIGN_PCOMMA_DET="TRUE", "p_ALIGN_PCOMMA_DET":"TRUE",
p_ALIGN_PCOMMA_VALUE=~K28_5, "p_ALIGN_PCOMMA_VALUE":~K28_5,
p_SHOW_REALIGN_COMMA="FALSE", "p_SHOW_REALIGN_COMMA":"FALSE",
p_RXSLIDE_AUTO_WAIT=7, "p_RXSLIDE_AUTO_WAIT":7,
p_RXSLIDE_MODE="OFF", "p_RXSLIDE_MODE":"OFF",
p_RX_SIG_VALID_DLY=10, "p_RX_SIG_VALID_DLY":10,
# RX 8B/10B Decoder Attributes # RX 8B/10B Decoder Attributes
p_RX_DISPERR_SEQ_MATCH="TRUE", "p_RX_DISPERR_SEQ_MATCH":"TRUE",
p_DEC_MCOMMA_DETECT="TRUE", "p_DEC_MCOMMA_DETECT":"TRUE",
p_DEC_PCOMMA_DETECT="TRUE", "p_DEC_PCOMMA_DETECT":"TRUE",
p_DEC_VALID_COMMA_ONLY="FALSE", "p_DEC_VALID_COMMA_ONLY":"FALSE",
# RX Clock Correction Attributes # RX Clock Correction Attributes
p_CBCC_DATA_SOURCE_SEL="DECODED", "p_CBCC_DATA_SOURCE_SEL":"DECODED",
p_CLK_COR_SEQ_2_USE="FALSE", "p_CLK_COR_SEQ_2_USE":"FALSE",
p_CLK_COR_KEEP_IDLE="FALSE", "p_CLK_COR_KEEP_IDLE":"FALSE",
p_CLK_COR_MAX_LAT=9, "p_CLK_COR_MAX_LAT":9,
p_CLK_COR_MIN_LAT=7, "p_CLK_COR_MIN_LAT":7,
p_CLK_COR_PRECEDENCE="TRUE", "p_CLK_COR_PRECEDENCE":"TRUE",
p_CLK_COR_REPEAT_WAIT=0, "p_CLK_COR_REPEAT_WAIT":0,
p_CLK_COR_SEQ_LEN=1, "p_CLK_COR_SEQ_LEN":1,
p_CLK_COR_SEQ_1_ENABLE=_ones(4), "p_CLK_COR_SEQ_1_ENABLE":ones(4),
p_CLK_COR_SEQ_1_ENABLE=0, "p_CLK_COR_SEQ_1_ENABLE":0,
p_CLK_COR_SEQ_1_1=0, "p_CLK_COR_SEQ_1_1":0,
p_CLK_COR_SEQ_1_1=0, "p_CLK_COR_SEQ_1_1":0,
p_CLK_COR_SEQ_1_2=0, "p_CLK_COR_SEQ_1_2":0,
p_CLK_COR_SEQ_1_3=0, "p_CLK_COR_SEQ_1_3":0,
p_CLK_COR_SEQ_1_4=0, "p_CLK_COR_SEQ_1_4":0,
p_CLK_CORRECT_USE="FALSE", "p_CLK_CORRECT_USE":"FALSE",
p_CLK_COR_SEQ_2_ENABLE=_ones(4), "p_CLK_COR_SEQ_2_ENABLE":ones(4),
p_CLK_COR_SEQ_2_1=0, "p_CLK_COR_SEQ_2_1":0,
p_CLK_COR_SEQ_2_2=0, "p_CLK_COR_SEQ_2_2":0,
p_CLK_COR_SEQ_2_3=0, "p_CLK_COR_SEQ_2_3":0,
p_CLK_COR_SEQ_2_4=0, "p_CLK_COR_SEQ_2_4":0,
# RX Channel Bonding Attributes # RX Channel Bonding Attributes
p_CHAN_BOND_KEEP_ALIGN="FALSE", "p_CHAN_BOND_KEEP_ALIGN":"FALSE",
p_CHAN_BOND_MAX_SKEW=1, "p_CHAN_BOND_MAX_SKEW":1,
p_CHAN_BOND_SEQ_LEN=1, "p_CHAN_BOND_SEQ_LEN":1,
p_CHAN_BOND_SEQ_1_1=0, "p_CHAN_BOND_SEQ_1_1":0,
p_CHAN_BOND_SEQ_1_1=0, "p_CHAN_BOND_SEQ_1_1":0,
p_CHAN_BOND_SEQ_1_2=0, "p_CHAN_BOND_SEQ_1_2":0,
p_CHAN_BOND_SEQ_1_3=0, "p_CHAN_BOND_SEQ_1_3":0,
p_CHAN_BOND_SEQ_1_4=0, "p_CHAN_BOND_SEQ_1_4":0,
p_CHAN_BOND_SEQ_1_ENABLE=_ones(4), "p_CHAN_BOND_SEQ_1_ENABLE":ones(4),
p_CHAN_BOND_SEQ_2_1=0, "p_CHAN_BOND_SEQ_2_1":0,
p_CHAN_BOND_SEQ_2_2=0, "p_CHAN_BOND_SEQ_2_2":0,
p_CHAN_BOND_SEQ_2_3=0, "p_CHAN_BOND_SEQ_2_3":0,
p_CHAN_BOND_SEQ_2_4=0, "p_CHAN_BOND_SEQ_2_4":0,
p_CHAN_BOND_SEQ_2_ENABLE=_ones(4), "p_CHAN_BOND_SEQ_2_ENABLE":ones(4),
p_CHAN_BOND_SEQ_2_USE="FALSE", "p_CHAN_BOND_SEQ_2_USE":"FALSE",
p_FTS_DESKEW_SEQ_ENABLE=_ones(4), "p_FTS_DESKEW_SEQ_ENABLE":ones(4),
p_FTS_LANE_DESKEW_CFG=_ones(4), "p_FTS_LANE_DESKEW_CFG":ones(4),
p_FTS_LANE_DESKEW_EN="FALSE", "p_FTS_LANE_DESKEW_EN":"FALSE",
# RX Margin Analysis Attributes # RX Margin Analysis Attributes
p_ES_CONTROL=0, "p_ES_CONTROL":0,
p_ES_ERRDET_EN="FALSE", "p_ES_ERRDET_EN":"FALSE",
p_ES_EYE_SCAN_EN="TRUE", "p_ES_EYE_SCAN_EN":"TRUE",
p_ES_HORZ_OFFSET=0, "p_ES_HORZ_OFFSET":0,
p_ES_PMA_CFG=0, "p_ES_PMA_CFG":0,
p_ES_PRESCALE=0, "p_ES_PRESCALE":0,
p_ES_QUALIFIER=0, "p_ES_QUALIFIER":0,
p_ES_QUAL_MASK=0, "p_ES_QUAL_MASK":0,
p_ES_SDATA_MASK=0, "p_ES_SDATA_MASK":0,
p_ES_VERT_OFFSET=0, "p_ES_VERT_OFFSET":0,
# FPGA RX Interface Attributes # FPGA RX Interface Attributes
p_RX_DATA_WIDTH=20, "p_RX_DATA_WIDTH":20,
# PMA Attributes # PMA Attributes
p_OUTREFCLK_SEL_INV=0b11, "p_OUTREFCLK_SEL_INV":0b11,
p_PMA_RSV=0, "p_PMA_RSV":0,
p_PMA_RSV2=0x2050, "p_PMA_RSV2":0x2050,
p_PMA_RSV3=0, "p_PMA_RSV3":0,
p_PMA_RSV4=0, "p_PMA_RSV4":0,
p_RX_BIAS_CFG=0b100, "p_RX_BIAS_CFG":0b100,
p_DMONITOR_CFG=0xA00, "p_DMONITOR_CFG":0xA00,
p_RX_CM_SEL=0b11, "p_RX_CM_SEL":0b11,
p_RX_CM_TRIM=0b010, "p_RX_CM_TRIM":0b010,
p_RX_DEBUG_CFG=0, "p_RX_DEBUG_CFG":0,
p_RX_OS_CFG=0b10000000, "p_RX_OS_CFG":0b10000000,
p_TERM_RCAL_CFG=0, "p_TERM_RCAL_CFG":0,
p_TERM_RCAL_OVRD=0, "p_TERM_RCAL_OVRD":0,
p_TST_RSV=0, "p_TST_RSV":0,
p_RX_CLK25_DIV=6, "p_RX_CLK25_DIV":6,
p_TX_CLK25_DIV=6, "p_TX_CLK25_DIV":6,
p_UCODEER_CLR=0, "p_UCODEER_CLR":0,
# PCI Express Attributes # PCI Express Attributes
p_PCS_PCIE_EN="FALSE", "p_PCS_PCIE_EN":"FALSE",
# PCS Attributes # PCS Attributes
p_PCS_RSVD_ATTR=0, "p_PCS_RSVD_ATTR":0,
# RX Buffer Attributes # RX Buffer Attributes
p_RXBUF_ADDR_MODE="FAST", "p_RXBUF_ADDR_MODE":"FAST",
p_RXBUF_EIDLE_HI_CNT=0b1000, "p_RXBUF_EIDLE_HI_CNT":0b1000,
p_RXBUF_EIDLE_LO_CNT=0, "p_RXBUF_EIDLE_LO_CNT":0,
p_RXBUF_EN="FALSE", "p_RXBUF_EN":"FALSE",
p_RX_BUFFER_CFG=0, "p_RX_BUFFER_CFG":0,
p_RXBUF_RESET_ON_CB_CHANGE="TRUE", "p_RXBUF_RESET_ON_CB_CHANGE":"TRUE",
p_RXBUF_RESET_ON_COMMAALIGN="FALSE", "p_RXBUF_RESET_ON_COMMAALIGN":"FALSE",
p_RXBUF_RESET_ON_EIDLE="FALSE", "p_RXBUF_RESET_ON_EIDLE":"FALSE",
p_RXBUF_RESET_ON_RATE_CHANGE="TRUE", "p_RXBUF_RESET_ON_RATE_CHANGE":"TRUE",
p_RXBUFRESET_TIME=1, "p_RXBUFRESET_TIME":1,
p_RXBUF_THRESH_OVFLW=61, "p_RXBUF_THRESH_OVFLW":61,
p_RXBUF_THRESH_OVRD="FALSE", "p_RXBUF_THRESH_OVRD":"FALSE",
p_RXBUF_THRESH_UNDFLW=4, "p_RXBUF_THRESH_UNDFLW":4,
p_RXDLY_CFG=0x1f, "p_RXDLY_CFG":0x1f,
p_RXDLY_LCFG=0x30, "p_RXDLY_LCFG":0x30,
p_RXDLY_TAP_CFG=0, "p_RXDLY_TAP_CFG":0,
p_RXPH_CFG=0, "p_RXPH_CFG":0,
p_RXPHDLY_CFG=0x084820, "p_RXPHDLY_CFG":0x084820,
p_RXPH_MONITOR_SEL=0, "p_RXPH_MONITOR_SEL":0,
p_RX_XCLK_SEL="RXUSR", "p_RX_XCLK_SEL":"RXUSR",
p_RX_DDI_SEL=0, "p_RX_DDI_SEL":0,
p_RX_DEFER_RESET_BUF_EN="TRUE", "p_RX_DEFER_RESET_BUF_EN":"TRUE",
#CDR Attributes #CDR Attributes
p_RXCDR_CFG=rxcdr_cfg, "p_RXCDR_CFG":rxcdr_cfg,
p_RXCDR_FR_RESET_ON_EIDLE=0, "p_RXCDR_FR_RESET_ON_EIDLE":0,
p_RXCDR_HOLD_DURING_EIDLE=0, "p_RXCDR_HOLD_DURING_EIDLE":0,
p_RXCDR_PH_RESET_ON_EIDLE=0, "p_RXCDR_PH_RESET_ON_EIDLE":0,
p_RXCDR_LOCK_CFG=0b010101, "p_RXCDR_LOCK_CFG":0b010101,
# RX Initialization and Reset Attributes # RX Initialization and Reset Attributes
p_RXCDRFREQRESET_TIME=1, "p_RXCDRFREQRESET_TIME":1,
p_RXCDRPHRESET_TIME=1, "p_RXCDRPHRESET_TIME":1,
p_RXISCANRESET_TIME=1, "p_RXISCANRESET_TIME":1,
p_RXPCSRESET_TIME=1, "p_RXPCSRESET_TIME":1,
p_RXPMARESET_TIME=3, "p_RXPMARESET_TIME":3,
# RX OOB Signaling Attributes # RX OOB Signaling Attributes
p_RXOOB_CFG=0b0000110, "p_RXOOB_CFG":0b0000110,
# RX Gearbox Attributes # RX Gearbox Attributes
p_RXGEARBOX_EN="FALSE", "p_RXGEARBOX_EN":"FALSE",
p_GEARBOX_MODE=0, "p_GEARBOX_MODE":0,
# PRBS Detection Attribute # PRBS Detection Attribute
p_RXPRBS_ERR_LOOPBACK=0, "p_RXPRBS_ERR_LOOPBACK":0,
# Power-Down Attributes # Power-Down Attributes
p_PD_TRANS_TIME_FROM_P2=0x03c, "p_PD_TRANS_TIME_FROM_P2":0x03c,
p_PD_TRANS_TIME_NONE_P2=0x3c, "p_PD_TRANS_TIME_NONE_P2":0x3c,
p_PD_TRANS_TIME_TO_P2=0x64, "p_PD_TRANS_TIME_TO_P2":0x64,
# RX OOB Signaling Attributes # RX OOB Signaling Attributes
p_SAS_MAX_COM=64, "p_SAS_MAX_COM":64,
p_SAS_MIN_COM=36, "p_SAS_MIN_COM":36,
p_SATA_BURST_SEQ_LEN=0b0101, "p_SATA_BURST_SEQ_LEN":0b0101,
p_SATA_BURST_VAL=0b100, "p_SATA_BURST_VAL":0b100,
p_SATA_EIDLE_VAL=0b100, "p_SATA_EIDLE_VAL":0b100,
p_SATA_MAX_BURST=8, "p_SATA_MAX_BURST":8,
p_SATA_MAX_INIT=21, "p_SATA_MAX_INIT":21,
p_SATA_MAX_WAKE=7, "p_SATA_MAX_WAKE":7,
p_SATA_MIN_BURST=4, "p_SATA_MIN_BURST":4,
p_SATA_MIN_INIT=12, "p_SATA_MIN_INIT":12,
p_SATA_MIN_WAKE=4, "p_SATA_MIN_WAKE":4,
# RX Fabric Clock Output Control Attributes # RX Fabric Clock Output Control Attributes
p_TRANS_TIME_RATE=0x0e, "p_TRANS_TIME_RATE":0x0e,
# TX Buffer Attributes # TX Buffer Attributes
p_TXBUF_EN="FALSE", "p_TXBUF_EN":"FALSE",
p_TXBUF_RESET_ON_RATE_CHANGE="FALSE", "p_TXBUF_RESET_ON_RATE_CHANGE":"FALSE",
p_TXDLY_CFG=0x1f, "p_TXDLY_CFG":0x1f,
p_TXDLY_LCFG=0x030, "p_TXDLY_LCFG":0x030,
p_TXDLY_TAP_CFG=0, "p_TXDLY_TAP_CFG":0,
p_TXPH_CFG=0x0780, "p_TXPH_CFG":0x0780,
p_TXPHDLY_CFG=0x084020, "p_TXPHDLY_CFG":0x084020,
p_TXPH_MONITOR_SEL=0, "p_TXPH_MONITOR_SEL":0,
p_TX_XCLK_SEL="TXUSR", "p_TX_XCLK_SEL":"TXUSR",
# FPGA TX Interface Attributes # FPGA TX Interface Attributes
p_TX_DATA_WIDTH=20, "p_TX_DATA_WIDTH":20,
# TX Configurable Driver Attributes # TX Configurable Driver Attributes
p_TX_DEEMPH0=0, "p_TX_DEEMPH0":0,
p_TX_DEEMPH1=0, "p_TX_DEEMPH1":0,
p_TX_EIDLE_ASSERT_DELAY=0b110, "p_TX_EIDLE_ASSERT_DELAY":0b110,
p_TX_EIDLE_DEASSERT_DELAY=0b100, "p_TX_EIDLE_DEASSERT_DELAY":0b100,
p_TX_LOOPBACK_DRIVE_HIZ="FALSE", "p_TX_LOOPBACK_DRIVE_HIZ":"FALSE",
p_TX_MAINCURSOR_SEL=0, "p_TX_MAINCURSOR_SEL":0,
p_TX_DRIVE_MODE="DIRECT", "p_TX_DRIVE_MODE":"DIRECT",
p_TX_MARGIN_FULL_0=0b1001110, "p_TX_MARGIN_FULL_0":0b1001110,
p_TX_MARGIN_FULL_1=0b1001001, "p_TX_MARGIN_FULL_1":0b1001001,
p_TX_MARGIN_FULL_2=0b1000101, "p_TX_MARGIN_FULL_2":0b1000101,
p_TX_MARGIN_FULL_3=0b1000010, "p_TX_MARGIN_FULL_3":0b1000010,
p_TX_MARGIN_FULL_4=0b1000000, "p_TX_MARGIN_FULL_4":0b1000000,
p_TX_MARGIN_LOW_0=0b1000110, "p_TX_MARGIN_LOW_0":0b1000110,
p_TX_MARGIN_LOW_1=0b1000100, "p_TX_MARGIN_LOW_1":0b1000100,
p_TX_MARGIN_LOW_2=0b1000010, "p_TX_MARGIN_LOW_2":0b1000010,
p_TX_MARGIN_LOW_3=0b1000000, "p_TX_MARGIN_LOW_3":0b1000000,
p_TX_MARGIN_LOW_4=0b1000000, "p_TX_MARGIN_LOW_4":0b1000000,
# TX Gearbox Attributes # TX Gearbox Attributes
p_TXGEARBOX_EN="FALSE", "p_TXGEARBOX_EN":"FALSE",
# TX Initialization and Reset Attributes # TX Initialization and Reset Attributes
p_TXPCSRESET_TIME=1, "p_TXPCSRESET_TIME":1,
p_TXPMARESET_TIME=1, "p_TXPMARESET_TIME":1,
# TX Receiver Detection Attributes # TX Receiver Detection Attributes
p_TX_RXDETECT_CFG=0x1832, "p_TX_RXDETECT_CFG":0x1832,
p_TX_RXDETECT_REF=0b100, "p_TX_RXDETECT_REF":0b100,
# CPLL Attributes # CPLL Attributes
p_CPLL_CFG=0xBC07DC, "p_CPLL_CFG":0xBC07DC,
p_CPLL_FBDIV=4, "p_CPLL_FBDIV":4,
p_CPLL_FBDIV_45=5, "p_CPLL_FBDIV_45":5,
p_CPLL_INIT_CFG=0x00001E "p_CPLL_INIT_CFG":0x00001e,
p_CPLL_LOCK_CFG=0x01e8, "p_CPLL_LOCK_CFG":0x01e8,
p_CPLL_REFCLK_DIV=1, "p_CPLL_REFCLK_DIV":1,
p_RXOUT_DIV=rxout_div, "p_RXOUT_DIV":rxout_div,
p_TXOUT_DIV=txout_div, "p_TXOUT_DIV":txout_div,
p_SATA_CPLL_CFG="VCO_3000MHZ", "p_SATA_CPLL_CFG":"VCO_3000MHZ",
# RX Initialization and Reset Attributes # RX Initialization and Reset Attributes
p_RXDFELPMRESET_TIME=0b0001111, "p_RXDFELPMRESET_TIME":0b0001111,
# RX Equalizer Attributes # RX Equalizer Attributes
p_RXLPM_HF_CFG=0b00000011110000, "p_RXLPM_HF_CFG":0b00000011110000,
p_RXLPM_LF_CFG=0b00000011110000, "p_RXLPM_LF_CFG":0b00000011110000,
p_RX_DFE_GAIN_CFG=0b020FEA, "p_RX_DFE_GAIN_CFG":0x020fea,
p_RX_DFE_H2_CFG=0b000000000000, "p_RX_DFE_H2_CFG":0b000000000000,
p_RX_DFE_H3_CFG=0b000001000000, "p_RX_DFE_H3_CFG":0b000001000000,
p_RX_DFE_H4_CFG=0b00011110000, "p_RX_DFE_H4_CFG":0b00011110000,
p_RX_DFE_H5_CFG=0b00011100000, "p_RX_DFE_H5_CFG":0b00011100000,
p_RX_DFE_KL_CFG=0b0000011111110, "p_RX_DFE_KL_CFG":0b0000011111110,
p_RX_DFE_LPM_CFG=0x0954, "p_RX_DFE_LPM_CFG":0x0954,
p_RX_DFE_LPM_HOLD_DURING_EIDLE=1, "p_RX_DFE_LPM_HOLD_DURING_EIDLE":1,
p_RX_DFE_UT_CFG=0b10001111000000000, "p_RX_DFE_UT_CFG":0b10001111000000000,
p_RX_DFE_VP_CFG=0b00011111100000011, "p_RX_DFE_VP_CFG":0b00011111100000011,
# Power-Down Attributes # Power-Down Attributes
p_RX_CLKMUX_PD=1, "p_RX_CLKMUX_PD":1,
p_TX_CLKMUX_PD=1, "p_TX_CLKMUX_PD":1,
# FPGA RX Interface Attribute # FPGA RX Interface Attribute
p_RX_INT_DATAWIDTH=0, "p_RX_INT_DATAWIDTH":0,
# FPGA TX Interface Attribute # FPGA TX Interface Attribute
p_TX_INT_DATAWIDTH=0, "p_TX_INT_DATAWIDTH":0,
# TX Configurable Driver Attributes # TX Configurable Driver Attributes
p_TX_QPI_STATUS_EN=0, "p_TX_QPI_STATUS_EN":0,
# RX Equalizer Attributes # RX Equalizer Attributes
p_RX_DFE_KL_CFG2=0b00110011000100000001100000001100 "p_RX_DFE_KL_CFG2":0b00110011000100000001100000001100,
p_RX_DFE_XYD_CFG=0bb0000000000000, "p_RX_DFE_XYD_CFG":0b0000000000000,
# TX Configurable Driver Attributes # TX Configurable Driver Attributes
p_TX_PREDRIVER_MODE=0, "p_TX_PREDRIVER_MODE":0,
}
self.specials += \
Instance("GTXE2_CHANNEL",
# CPLL Ports # CPLL Ports
o_CPLLFBCLKLOST=self.cpllfbclklost, o_CPLLFBCLKLOST=self.cpllfbclklost,
o_CPLLLOCK=self.cplllock, o_CPLLLOCK=self.cplllock,
@ -413,7 +416,7 @@ class GTXE2_CHANNEL(Module):
i_PCSRSVDIN2=0, i_PCSRSVDIN2=0,
i_PMARSVDIN=0, i_PMARSVDIN=0,
i_PMARSVDIN2=0, i_PMARSVDIN2=0,
i_TSTIN=_ones(20), i_TSTIN=ones(20),
#o_TSTOUT=, #o_TSTOUT=,
# Channel # Channel
@ -439,10 +442,8 @@ class GTXE2_CHANNEL(Module):
# Clocking Ports # Clocking Ports
#o_GTREFCLKMONITOR=, #o_GTREFCLKMONITOR=,
i_QPLLCLK=self.qpllclk
i_QPLLCLK=self.qpllclk, i_QPLLCLK=self.qpllclk,
i_QPLLREFCLK=self.qpllrefclk, i_QPLLREFCLK=self.qpllrefclk,
i_QPLLREFCLK=self.qpllrefclk,
i_RXSYSCLKSEL=0b00, i_RXSYSCLKSEL=0b00,
i_TXSYSCLKSEL=0b00, i_TXSYSCLKSEL=0b00,
@ -457,7 +458,7 @@ class GTXE2_CHANNEL(Module):
# PCI Express Ports # PCI Express Ports
#o_PHYSTATUS=, #o_PHYSTATUS=,
i_RXRATE=self.RXRATE, i_RXRATE=self.rxrate,
#o_RXVALID=, #o_RXVALID=,
# Power-Down Ports # Power-Down Ports
@ -477,11 +478,11 @@ class GTXE2_CHANNEL(Module):
i_EYESCANTRIGGER=0, i_EYESCANTRIGGER=0,
# Receive Ports - CDR Ports # Receive Ports - CDR Ports
i_RXCDRFREQRESET=self.rxcdrfreqreset, i_RXCDRFREQRESET=0,
i_RXCDRHOLD=0, i_RXCDRHOLD=0,
o_RXCDRLOCK=self.rxcrdlock, o_RXCDRLOCK=self.rxcdrlock,
i_RXCDROVRDEN=0, i_RXCDROVRDEN=0,
i_RXCDRRESET=0, i_RXCDRRESET=self.rxcdrreset,
i_RXCDRRESETRSV=0, i_RXCDRRESETRSV=0,
# Receive Ports - Clock Correction Ports # Receive Ports - Clock Correction Ports
@ -511,10 +512,10 @@ class GTXE2_CHANNEL(Module):
# Receive Ports - RX 8B/10B Decoder Ports # Receive Ports - RX 8B/10B Decoder Ports
i_RXDISPERR=self.rxdisperr, i_RXDISPERR=self.rxdisperr,
o_RXNOTINTABLE=self.RXNOTINTABLE, o_RXNOTINTABLE=self.rxnotintable,
# Receive Ports - RX AFE # Receive Ports - RX AFE
i_GTXRXP=pads.rxp i_GTXRXP=pads.rxp,
i_GTXRXN=pads.rxn, i_GTXRXN=pads.rxn,
# Receive Ports - RX Buffer Bypass Ports # Receive Ports - RX Buffer Bypass Ports
@ -612,7 +613,7 @@ class GTXE2_CHANNEL(Module):
i_RXPMARESET=0, i_RXPMARESET=0,
# Receive Ports - RX Margin Analysis ports # Receive Ports - RX Margin Analysis ports
i_RXLPMEN=self.rxlpmen, i_RXLPMEN=0,
# Receive Ports - RX OOB Signaling ports # Receive Ports - RX OOB Signaling ports
#o_RXCOMSASDET=, #o_RXCOMSASDET=,
@ -659,14 +660,14 @@ class GTXE2_CHANNEL(Module):
i_TXQPIWEAKPUP=0, i_TXQPIWEAKPUP=0,
# TX Initialization and Reset Ports # TX Initialization and Reset Ports
i_CFGRESET=self.cfgreset, i_CFGRESET=0,
i_GTTXRESET=self.gttxreset, i_GTTXRESET=self.gttxreset,
#o_PCSRSVDOUT=, #o_PCSRSVDOUT=,
i_TXUSERRDY=self.txuserrdy, i_TXUSERRDY=self.txuserrdy,
# Transceiver Reset Mode Operation # Transceiver Reset Mode Operation
i_GTRESETSEL=self.gtresetsel, i_GTRESETSEL=0,
i_RESETOVRD=self.resetovrd, i_RESETOVRD=0,
# Transmit Ports - 8b10b Encoder Control Ports # Transmit Ports - 8b10b Encoder Control Ports
i_TXCHARDISPMODE=0, i_TXCHARDISPMODE=0,
@ -715,7 +716,7 @@ class GTXE2_CHANNEL(Module):
i_TXPISOPD=0, i_TXPISOPD=0,
# Transmit Ports - TX Data Path interface # Transmit Ports - TX Data Path interface
i_TXDATA=self.txdata, i_TXDATA=txdata,
# Transmit Ports - TX Driver and OOB signaling # Transmit Ports - TX Driver and OOB signaling
o_GTXTXP=pads.txp, o_GTXTXP=pads.txp,
@ -728,7 +729,7 @@ class GTXE2_CHANNEL(Module):
i_TXOUTCLKSEL=0b11, i_TXOUTCLKSEL=0b11,
o_TXRATEDONE=self.txratedone, o_TXRATEDONE=self.txratedone,
# Transmit Ports - TX Gearbox Ports # Transmit Ports - TX Gearbox Ports
i_TXCHARISK=self.txcharisk, i_TXCHARISK=txcharisk,
#o_TXGEARBOXREADY=, #o_TXGEARBOXREADY=,
i_TXHEADER=0, i_TXHEADER=0,
i_TXSEQUENCE=0, i_TXSEQUENCE=0,
@ -760,10 +761,13 @@ class GTXE2_CHANNEL(Module):
# Tx Configurable Driver Ports # Tx Configurable Driver Ports
#o_TXQPISENN=, #o_TXQPISENN=,
#o_TXQPISENP= #o_TXQPISENP=,
**gtxe2_channel_parameters
) )
# realign rxdata / rxcharisk # realign rxdata / rxcharisk
dw = 16
rxdata_r = Signal(dw) rxdata_r = Signal(dw)
rxcharisk_r = Signal(dw//8) rxcharisk_r = Signal(dw//8)
rxdata_aligned = Signal(dw) rxdata_aligned = Signal(dw)
@ -774,15 +778,15 @@ class GTXE2_CHANNEL(Module):
] ]
cases = {} cases = {}
cases[1<<0] = [ cases[1<<0] = [
rxdata_aligned .eq(rx_data_r[0:dw]), rxdata_aligned .eq(rxdata_r[0:dw]),
rxcharisk_aligned .eq(rx_charisk_r[0:dw//8]) rxcharisk_aligned .eq(rxcharisk_r[0:dw//8])
] ]
for i in range(1, dw//8): for i in range(1, dw//8):
cases[1<<i] = [ cases[1<<i] = [
rxdata_aligned .eq(Cat(rxdata[8*i:dw], rxdata_r[0:8*i])), rxdata_aligned .eq(Cat(rxdata[8*i:dw], rxdata_r[0:8*i])),
rxcharisk_aligned .eq(Cat(self.gtx.rxcharisk[i:dw//8], rxcharisk_r[0:i])) rxcharisk_aligned .eq(Cat(rxcharisk[i:dw//8], rxcharisk_r[0:i]))
] ]
self.comb += Case(rxcharisk_d, cases) self.comb += Case(rxcharisk_r, cases)
# convert data widths # convert data widths
@ -802,9 +806,9 @@ class GTXE2_CHANNEL(Module):
# SATA device is supposed to lock its tx frequency to its received rx frequency, so this # SATA device is supposed to lock its tx frequency to its received rx frequency, so this
# ensure that sata_rx and sata_tx clock have the same frequency with only not the same # ensure that sata_rx and sata_tx clock have the same frequency with only not the same
# phase and thus ensute the rx_fifo will never be full. # phase and thus ensute the rx_fifo will never be full.
rx_fifo = AsyncFIFO(("raw", 36), 16) rx_fifo = AsyncFIFO([("raw", 36)], 16)
self.submodules.rx_fifo = RenameClockDomains(rx_fifo, {"write": "sata_rx", "read": "sata"}) self.submodules.rx_fifo = RenameClockDomains(rx_fifo, {"write": "sata_rx", "read": "sata"})
tx_fifo = AsyncFIFO(("raw", 36), 16) tx_fifo = AsyncFIFO([("raw", 36)], 16)
self.submodules.tx_fifo = RenameClockDomains(tx_fifo, {"write": "sata", "read": "sata_tx"}) self.submodules.tx_fifo = RenameClockDomains(tx_fifo, {"write": "sata", "read": "sata_tx"})
self.comb += [ self.comb += [
Record.connect(rx_converter.source, self.rx_fifo.sink), Record.connect(rx_converter.source, self.rx_fifo.sink),
@ -820,14 +824,14 @@ class GTXE2_CHANNEL(Module):
self.comb += [ self.comb += [
self.source.stb.eq(self.rx_fifo.source.stb), self.source.stb.eq(self.rx_fifo.source.stb),
self.source.payload.data.eq(Cat(rx_fifo.source.raw[0:32], rx_fifo.source.raw[36:36+32])), self.source.payload.data.eq(Cat(rx_fifo.source.raw[0:32], rx_fifo.source.raw[36:36+32])),
self.source.payload.charisk.eq(rx_fifo.source.raw[32:36], rx_fifo.source.raw[36+32:36+36]), self.source.payload.charisk.eq(Cat(rx_fifo.source.raw[32:36], rx_fifo.source.raw[36+32:36+36])),
self.rx_fifo.source.ack.eq(self.source.ack), self.rx_fifo.source.ack.eq(self.source.ack),
] ]
self.sink = Sink(("data", 32), ("charisk", 4)]) self.sink = Sink([("data", 32), ("charisk", 4)])
self.comb += [ self.comb += [
self.tx_fifo.stb.eq(self.sink.stb), self.tx_fifo.sink.stb.eq(self.sink.stb),
self.tx_fifo.raw.eq(Cat(self.sink.data[0:16], self.sink.charisk[0:2], self.tx_fifo.sink.raw.eq(Cat(self.sink.data[0:16], self.sink.charisk[0:2],
self.sink.data[16:32], self.sink.charisk[2:4])), self.sink.data[16:32], self.sink.charisk[2:4])),
self.sink.ack.eq(self.tx_fifo.ack), self.sink.ack.eq(self.tx_fifo.sink.ack),
] ]

5
lib/sata/k7sataphy/std.py
View file

@ -1,4 +1,5 @@
from migen.fhdl.std import * from migen.fhdl.std import *
from migen.genlib.record import *
K28_5 = 0b1010000011 K28_5 = 0b1010000011
@ -21,7 +22,7 @@ SYNC_VAL = 0xB5B5957C
WTRM_VAL = 0x5858B57C WTRM_VAL = 0x5858B57C
X_RDY_VAL = 0x5757B57C X_RDY_VAL = 0x5757B57C
def _ones(width): def ones(width):
return 2**width-1 return 2**width-1
class DRPBus(Record): class DRPBus(Record):
@ -30,7 +31,7 @@ class DRPBus(Record):
("clk", 1, DIR_M_TO_S), ("clk", 1, DIR_M_TO_S),
("en", 1, DIR_M_TO_S), ("en", 1, DIR_M_TO_S),
("rdy", 1, DIR_S_TO_M), ("rdy", 1, DIR_S_TO_M),
("we", 1, DIR_M_TO_S) ("we", 1, DIR_M_TO_S),
("addr", 8, DIR_M_TO_S), ("addr", 8, DIR_M_TO_S),
("di", 16, DIR_M_TO_S), ("di", 16, DIR_M_TO_S),
("do", 16, DIR_S_TO_M) ("do", 16, DIR_S_TO_M)

12
platforms/kc705_impact.py
View file

@ -64,9 +64,17 @@ _io = [
Subsignal("rts", Pins("K23")), Subsignal("rts", Pins("K23")),
Subsignal("tx", Pins("K24")), Subsignal("tx", Pins("K24")),
Subsignal("rx", Pins("M19")), Subsignal("rx", Pins("M19")),
IOStandard("LVCMOS25")), IOStandard("LVCMOS25")
),
("sata", 0,
Subsignal("refclk_p", Pins("YYY")),
Subsignal("refclk_n", Pins("YYY")),
Subsignal("txp", Pins("YYY")),
Subsignal("txn", Pins("YYY")),
Subsignal("rxp", Pins("YYY")),
Subsignal("rxn", Pins("YYY")),
),
] ]
def Platform(*args, toolchain="vivado", **kwargs): def Platform(*args, toolchain="vivado", **kwargs):

12
platforms/kc705_xc3sprog.py
View file

@ -44,7 +44,17 @@ _io = [
Subsignal("rts", Pins("K23")), Subsignal("rts", Pins("K23")),
Subsignal("tx", Pins("K24")), Subsignal("tx", Pins("K24")),
Subsignal("rx", Pins("M19")), Subsignal("rx", Pins("M19")),
IOStandard("LVCMOS25")), IOStandard("LVCMOS25")
),
("sata", 0,
Subsignal("refclk_p", Pins("YYY")),
Subsignal("refclk_n", Pins("YYY")),
Subsignal("txp", Pins("YYY")),
Subsignal("txn", Pins("YYY")),
Subsignal("rxp", Pins("YYY")),
Subsignal("rxn", Pins("YYY")),
),
] ]
def Platform(*args, toolchain="vivado", **kwargs): def Platform(*args, toolchain="vivado", **kwargs):

3
targets/test.py
View file

@ -7,6 +7,7 @@ from migen.genlib.resetsync import AsyncResetSynchronizer
from miscope.uart2wishbone import UART2Wishbone from miscope.uart2wishbone import UART2Wishbone
from misoclib import identifier from misoclib import identifier
from lib.sata.k7sataphy import K7SATAPHY
class _CRG(Module): class _CRG(Module):
def __init__(self, platform): def __init__(self, platform):
@ -93,4 +94,6 @@ class TestDesign(UART2WB):
UART2WB.__init__(self, platform, clk_freq) UART2WB.__init__(self, platform, clk_freq)
self.submodules.crg = _CRG(platform) self.submodules.crg = _CRG(platform)
self.submodules.sataphy = K7SATAPHY(platform.request("sata"))
default_subtarget = TestDesign default_subtarget = TestDesign