Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

transport: generate sop on RX path

This commit is contained in:
Florent Kermarrec 2014-12-14 12:59:02 +01:00
parent a0cb0c6474
commit 623a3883c6
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/sata/test/command_tb.py
View File

@ -94,7 +94,7 @@ class CommandLogger(Module):
self.packet.read = selfp.sink.read self.packet.read = selfp.sink.read
self.packet.identify = selfp.sink.identify self.packet.identify = selfp.sink.identify
self.packet.sucess = selfp.sink.success self.packet.sucess = selfp.sink.success
self.paclet.failed = selfp.sink.failed self.packet.failed = selfp.sink.failed
self.packet.append(selfp.sink.data) self.packet.append(selfp.sink.data)
elif selfp.sink.stb: elif selfp.sink.stb:
self.packet.append(selfp.sink.data) self.packet.append(selfp.sink.data)

17
lib/sata/transport/__init__.py
View File

@ -149,6 +149,8 @@ class SATATransportRX(Module):
fsm = FSM(reset_state="IDLE") fsm = FSM(reset_state="IDLE")
self.submodules += fsm self.submodules += fsm
data_sop = Signal()
fsm.act("IDLE", fsm.act("IDLE",
clr_cnt.eq(1), clr_cnt.eq(1),
If(link.source.stb & link.source.sop, If(link.source.stb & link.source.sop,
@ -175,6 +177,8 @@ class SATATransportRX(Module):
) )
fsm.act("PRESENT_REG_D2H_CMD", fsm.act("PRESENT_REG_D2H_CMD",
source.stb.eq(1), source.stb.eq(1),
source.sop.eq(1),
source.eop.eq(1),
_decode_cmd(encoded_cmd, fis_reg_d2h_layout, source), _decode_cmd(encoded_cmd, fis_reg_d2h_layout, source),
If(source.ack, If(source.ack,
NextState("IDLE") NextState("IDLE")
@ -189,6 +193,8 @@ class SATATransportRX(Module):
) )
fsm.act("PRESENT_DMA_ACTIVATE_D2H_CMD", fsm.act("PRESENT_DMA_ACTIVATE_D2H_CMD",
source.stb.eq(1), source.stb.eq(1),
source.sop.eq(1),
source.eop.eq(1),
_decode_cmd(encoded_cmd, fis_dma_activate_d2h_layout, source), _decode_cmd(encoded_cmd, fis_dma_activate_d2h_layout, source),
If(source.ack, If(source.ack,
NextState("IDLE") NextState("IDLE")
@ -205,7 +211,7 @@ class SATATransportRX(Module):
data_receive.eq(1), data_receive.eq(1),
source.stb.eq(link.source.stb), source.stb.eq(link.source.stb),
_decode_cmd(encoded_cmd, fis_data_layout, source), _decode_cmd(encoded_cmd, fis_data_layout, source),
source.sop.eq(0), # XXX source.sop.eq(data_sop),
source.eop.eq(link.source.eop), source.eop.eq(link.source.eop),
source.data.eq(link.source.d), source.data.eq(link.source.d),
If(source.stb & source.eop & source.ack, If(source.stb & source.eop & source.ack,
@ -213,6 +219,15 @@ class SATATransportRX(Module):
) )
) )
self.sync += \
If(fsm.ongoing("RECEIVE_DATA_CMD"),
data_sop.eq(1)
).Elif(fsm.ongoing("PRESENT_DATA"),
If(source.stb & source.ack,
data_sop.eq(0)
)
)
cmd_cases = {} cmd_cases = {}
for i in range(cmd_ndwords): for i in range(cmd_ndwords):
cmd_cases[i] = [encoded_cmd[32*i:32*(i+1)].eq(link.source.d)] cmd_cases[i] = [encoded_cmd[32*i:32*(i+1)].eq(link.source.d)]