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

gateware/serwb: generate wishbone error if link loose ready in the middle of a transaction

This commit is contained in:
Florent Kermarrec 2017-08-29 16:41:29 +02:00
parent 60ad36e7d6
commit 7d7f6be7ce
1 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
artiq/gateware/serwb/etherbone.py
View File

@ -667,33 +667,43 @@ class EtherboneWishboneSlave(Module):
) )
) )
fsm.act("SEND_WRITE", fsm.act("SEND_WRITE",
source.stb.eq(1), If(~self.ready,
source.eop.eq(1), NextState("SEND_ERROR")
source.base_addr[2:].eq(bus.adr), ).Else(
source.count.eq(1), source.stb.eq(1),
source.be.eq(bus.sel), source.eop.eq(1),
source.we.eq(1), source.base_addr[2:].eq(bus.adr),
source.data.eq(bus.dat_w), source.count.eq(1),
If(source.stb & source.ack, source.be.eq(bus.sel),
bus.ack.eq(1), source.we.eq(1),
NextState("IDLE") source.data.eq(bus.dat_w),
If(source.stb & source.ack,
bus.ack.eq(1),
NextState("IDLE")
)
) )
) )
fsm.act("SEND_READ", fsm.act("SEND_READ",
source.stb.eq(1), If(~self.ready,
source.eop.eq(1), NextState("SEND_ERROR")
source.base_addr.eq(0), ).Else(
source.count.eq(1), source.stb.eq(1),
source.be.eq(bus.sel), source.eop.eq(1),
source.we.eq(0), source.base_addr.eq(0),
source.data[2:].eq(bus.adr), source.count.eq(1),
If(source.stb & source.ack, source.be.eq(bus.sel),
NextState("WAIT_READ") source.we.eq(0),
source.data[2:].eq(bus.adr),
If(source.stb & source.ack,
NextState("WAIT_READ")
)
) )
) )
fsm.act("WAIT_READ", fsm.act("WAIT_READ",
sink.ack.eq(1), sink.ack.eq(1),
If(sink.stb & sink.we, If(~self.ready,
NextState("SEND_ERROR")
).Elif(sink.stb & sink.we,
bus.ack.eq(1), bus.ack.eq(1),
bus.dat_r.eq(sink.data), bus.dat_r.eq(sink.data),
NextState("IDLE") NextState("IDLE")