From: Florent Kermarrec Date: Sun, 14 Dec 2014 11:59:02 +0000 (+0100) Subject: transport: generate sop on RX path X-Git-Tag: 24jan2021_ls180~2572^2~128 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=623a3883c60e6a033a703e9ed4bf6584f149e698;p=litex.git transport: generate sop on RX path --- diff --git a/lib/sata/test/command_tb.py b/lib/sata/test/command_tb.py index a3f22cc7..00a7aafc 100644 --- a/lib/sata/test/command_tb.py +++ b/lib/sata/test/command_tb.py @@ -94,7 +94,7 @@ class CommandLogger(Module): self.packet.read = selfp.sink.read self.packet.identify = selfp.sink.identify self.packet.sucess = selfp.sink.success - self.paclet.failed = selfp.sink.failed + self.packet.failed = selfp.sink.failed self.packet.append(selfp.sink.data) elif selfp.sink.stb: self.packet.append(selfp.sink.data) diff --git a/lib/sata/transport/__init__.py b/lib/sata/transport/__init__.py index f5fae114..62e2d4a3 100644 --- a/lib/sata/transport/__init__.py +++ b/lib/sata/transport/__init__.py @@ -149,6 +149,8 @@ class SATATransportRX(Module): fsm = FSM(reset_state="IDLE") self.submodules += fsm + data_sop = Signal() + fsm.act("IDLE", clr_cnt.eq(1), If(link.source.stb & link.source.sop, @@ -175,6 +177,8 @@ class SATATransportRX(Module): ) fsm.act("PRESENT_REG_D2H_CMD", source.stb.eq(1), + source.sop.eq(1), + source.eop.eq(1), _decode_cmd(encoded_cmd, fis_reg_d2h_layout, source), If(source.ack, NextState("IDLE") @@ -189,6 +193,8 @@ class SATATransportRX(Module): ) fsm.act("PRESENT_DMA_ACTIVATE_D2H_CMD", source.stb.eq(1), + source.sop.eq(1), + source.eop.eq(1), _decode_cmd(encoded_cmd, fis_dma_activate_d2h_layout, source), If(source.ack, NextState("IDLE") @@ -205,7 +211,7 @@ class SATATransportRX(Module): data_receive.eq(1), source.stb.eq(link.source.stb), _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.data.eq(link.source.d), 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 = {} for i in range(cmd_ndwords): cmd_cases[i] = [encoded_cmd[32*i:32*(i+1)].eq(link.source.d)]