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

drtio: add link layer status CSR

This commit is contained in:
Sebastien Bourdeauducq 2016-11-02 13:09:13 +08:00
parent 1ed3278783
commit bee9774bd5
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/gateware/drtio/core.py
View File

@ -60,4 +60,4 @@ class DRTIOMaster(Module):
return self.rt_controller.get_kernel_csrs() return self.rt_controller.get_kernel_csrs()
def get_csrs(self): def get_csrs(self):
return self.rt_controller.get_csrs() return self.link_layer.get_csrs() + self.rt_controller.get_csrs()

17
artiq/gateware/drtio/link_layer.py
View File

@ -3,7 +3,9 @@ from operator import xor, or_
from migen import * from migen import *
from migen.genlib.fsm import * from migen.genlib.fsm import *
from migen.genlib.cdc import MultiReg from migen.genlib.cdc import MultiReg, BusSynchronizer
from misoc.interconnect.csr import *
class Scrambler(Module): class Scrambler(Module):
@ -209,8 +211,10 @@ class LinkLayerRX(Module):
] ]
class LinkLayer(Module): class LinkLayer(Module, AutoCSR):
def __init__(self, encoder, decoders): def __init__(self, encoder, decoders):
self.link_status = CSRStatus(3)
# control signals, in rtio clock domain # control signals, in rtio clock domain
self.reset = Signal() self.reset = Signal()
self.ready = Signal() self.ready = Signal()
@ -264,18 +268,25 @@ class LinkLayer(Module):
MultiReg(rx.link_init, rx_link_init, "rtio") MultiReg(rx.link_init, rx_link_init, "rtio")
] ]
link_status = BusSynchronizer(3, "rtio", "sys")
self.submodules += link_status
self.comb += self.link_status.status.eq(link_status.o)
fsm.act("RESET_RX", fsm.act("RESET_RX",
link_status.i.eq(0),
tx.link_init.eq(1), tx.link_init.eq(1),
self.rx_reset.eq(1), self.rx_reset.eq(1),
NextState("WAIT_LOCAL_RX_READY") NextState("WAIT_LOCAL_RX_READY")
) )
fsm.act("WAIT_LOCAL_RX_READY", fsm.act("WAIT_LOCAL_RX_READY",
link_status.i.eq(1),
tx.link_init.eq(1), tx.link_init.eq(1),
If(self.rx_ready, If(self.rx_ready,
NextState("WAIT_REMOTE_RX_READY") NextState("WAIT_REMOTE_RX_READY")
) )
) )
fsm.act("WAIT_REMOTE_RX_READY", fsm.act("WAIT_REMOTE_RX_READY",
link_status.i.eq(2),
tx.link_init.eq(1), tx.link_init.eq(1),
tx.signal_rx_ready.eq(1), tx.signal_rx_ready.eq(1),
If(rx_remote_rx_ready, If(rx_remote_rx_ready,
@ -283,9 +294,11 @@ class LinkLayer(Module):
) )
) )
fsm.act("WAIT_REMOTE_LINK_UP", fsm.act("WAIT_REMOTE_LINK_UP",
link_status.i.eq(3),
If(~rx_link_init, NextState("READY")) If(~rx_link_init, NextState("READY"))
) )
fsm.act("READY", fsm.act("READY",
link_status.i.eq(4),
If(rx_link_init, NextState("RESET_RX")), If(rx_link_init, NextState("RESET_RX")),
self.ready.eq(1) self.ready.eq(1)
) )