M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

drtio: simple fixes

This commit is contained in:
Sebastien Bourdeauducq 2016-10-24 23:10:15 +08:00
parent c39987b617
commit 029e0d95b7
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@ from types import SimpleNamespace
from migen import * from migen import *
from artiq.gateware.drtio import link_layer, rt_packets, iot, bus_interface from artiq.gateware.drtio import link_layer, rt_packets, iot, rt_controller
class DRTIOSatellite(Module): class DRTIOSatellite(Module):

25
artiq/gateware/drtio/rt_controller.py
View File

@ -1,4 +1,5 @@
from migen import * from migen import *
from migen.genlib.cdc import MultiReg
from misoc.interconnect.csr import * from misoc.interconnect.csr import *
@ -40,15 +41,15 @@ class RTController(Module):
self.sync += If(self.kcsrs.counter_update.re, self.sync += If(self.kcsrs.counter_update.re,
self.kcsrs.counter.status.eq(self.counter.value_sys)) self.kcsrs.counter.status.eq(self.counter.value_sys))
tsc_correction = Signal(64) tsc_correction = Signal(64)
self.specials += MultiReg(self.tsc_correction.storage, tsc_correction) self.specials += MultiReg(self.kcsrs.tsc_correction.storage, tsc_correction)
self.comb += [ self.comb += [
rt_packets.tsc_value.eq( rt_packets.tsc_value.eq(
self.counter.value_rtio + tsc_correction), self.counter.value_rtio + tsc_correction),
self.set_time.value.eq(rt_packets.set_time_stb) self.kcsrs.set_time.r.eq(rt_packets.set_time_stb)
] ]
self.sync += [ self.sync += [
If(rt_packets.set_time_ack, rt_packets.set_time_stb.eq(0)), If(rt_packets.set_time_ack, rt_packets.set_time_stb.eq(0)),
If(self.set_time_stb.re, rt_packets.set_time_stb.eq(1)) If(self.kcsrs.set_time.re, rt_packets.set_time_stb.eq(1))
] ]
fifo_spaces_mem = Memory(16, channel_count) fifo_spaces_mem = Memory(16, channel_count)
@ -62,14 +63,14 @@ class RTController(Module):
self.comb += [ self.comb += [
fifo_spaces.adr.eq(self.kcsrs.chan_sel.storage), fifo_spaces.adr.eq(self.kcsrs.chan_sel.storage),
last_timestamps.adr.eq(self.kcsrs.chan_sel.storage), last_timestamps.adr.eq(self.kcsrs.chan_sel.storage),
last_timestamps.dat_w.eq(self.kcsrs.timestamp.storage), last_timestamps.dat_w.eq(self.kcsrs.o_timestamp.storage),
rt_packets.write_channel.eq(self.kcsrs.chan_sel.storage), rt_packets.write_channel.eq(self.kcsrs.chan_sel.storage),
rt_packets.write_address.eq(self.kcsrs.o_address.storage), rt_packets.write_address.eq(self.kcsrs.o_address.storage),
rt_packets.write_data.eq(self.kcsrs.o_data.storage), rt_packets.write_data.eq(self.kcsrs.o_data.storage),
If(rt_packets_fifo_request, If(rt_packets_fifo_request,
rt_packets.write_timestamp.eq(0xffff000000000000) rt_packets.write_timestamp.eq(0xffff000000000000)
).Else( ).Else(
rt_packets.write_timestamp.eq(self.o_timestamp.storage) rt_packets.write_timestamp.eq(self.kcsrs.o_timestamp.storage)
) )
] ]
@ -85,21 +86,21 @@ class RTController(Module):
underflow_set = Signal() underflow_set = Signal()
self.sync += [ self.sync += [
If(self.kcsrs.o_underflow_reset.re, status_underflow.eq(0)), If(self.kcsrs.o_underflow_reset.re, status_underflow.eq(0)),
If(self.kcsrs.o_sequence_error_reset, status_sequence_error.eq(0)), If(self.kcsrs.o_sequence_error_reset.re, status_sequence_error.eq(0)),
If(underflow_set, status_underflow.eq(1)), If(underflow_set, status_underflow.eq(1)),
If(sequence_error_set, status_sequence_error.eq(1)), If(sequence_error_set, status_sequence_error.eq(1)),
] ]
# TODO: collision, replace, busy # TODO: collision, replace, busy
cond_sequence_error = self.o_timestamp.storage < last_timestamps.dat_r cond_sequence_error = self.kcsrs.o_timestamp.storage < last_timestamps.dat_r
cond_underflow = (self.o_timestamp.storage - self.kcsrs.underflow_margin.storage cond_underflow = (self.kcsrs.o_timestamp.storage - self.kcsrs.underflow_margin.storage
< self.counter.value_sys) < self.counter.value_sys)
cond_fifo_emptied = ((last_timestamps.dat_r cond_fifo_emptied = ((last_timestamps.dat_r
< self.counter.value_sys - self.kcsrs.underflow_margin.storage) < self.counter.value_sys - self.kcsrs.underflow_margin.storage)
& (last_timestamps.dat_r != 0)) & (last_timestamps.dat_r != 0))
fsm.act("IDLE", fsm.act("IDLE",
If(self.o_we.re, If(self.kcsrs.o_we.re,
If(cond_sequence_error, If(cond_sequence_error,
sequence_error_set.eq(1) sequence_error_set.eq(1)
).Elif(cond_underflow, ).Elif(cond_underflow,
@ -108,7 +109,7 @@ class RTController(Module):
NextState("WRITE") NextState("WRITE")
) )
), ),
If(self.get_fifo_space.re, If(self.kcsrs.get_fifo_space.re,
NextState("GET_FIFO_SPACE") NextState("GET_FIFO_SPACE")
) )
) )
@ -142,9 +143,9 @@ class RTController(Module):
status_wait.eq(1), status_wait.eq(1),
fifo_spaces.dat_w.eq(rt_packets.fifo_space), fifo_spaces.dat_w.eq(rt_packets.fifo_space),
fifo_spaces.we.eq(1), fifo_spaces.we.eq(1),
fifo_space_not_ack.eq(1), rt_packets.fifo_space_not_ack.eq(1),
If(rt_packets.fifo_space_not, If(rt_packets.fifo_space_not,
If(rt_packets.fifo_spaces > 0, If(rt_packets.fifo_space > 0,
NextState("IDLE") NextState("IDLE")
).Else( ).Else(
NextState("GET_FIFO_SPACE") NextState("GET_FIFO_SPACE")

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

@ -418,7 +418,7 @@ class RTPacketMaster(Module):
wfifo.din.eq(Cat(self.write_timestamp, self.write_channel, wfifo.din.eq(Cat(self.write_timestamp, self.write_channel,
self.write_address, self.write_data)), self.write_address, self.write_data)),
Cat(write_timestamp, write_channel, Cat(write_timestamp, write_channel,
write_address, write_data).eq(fifo.dout) write_address, write_data).eq(wfifo.dout)
] ]
fifo_space_not = Signal() fifo_space_not = Signal()