From 0791b9e2e446aa64ac479f5f831665d369f4aff5 Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Mon, 29 Sep 2014 17:12:02 +0200
Subject: [PATCH] sim working

---
 lib/sata/k7sataphy/ctrl.py | 20 +++++++++++++-------
 lib/sata/k7sataphy/gtx.py  |  2 +-
 targets/test.py            |  8 ++++++++
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/lib/sata/k7sataphy/ctrl.py b/lib/sata/k7sataphy/ctrl.py
index 07b541bd..983980a1 100644
--- a/lib/sata/k7sataphy/ctrl.py
+++ b/lib/sata/k7sataphy/ctrl.py
@@ -83,9 +83,14 @@ class K7SATAPHYHostCtrl(Module):
 		fsm.act("AWAIT_NO_COMWAKE",
 			gtx.txelecidle.eq(1),
 			If(~gtx.rxcomwakedet,
-				NextState("AWAIT_ALIGN")
+				NextState("RESET_CRG")
 			)
 		)
+		fsm.act("RESET_CRG",
+			gtx.txelecidle.eq(0),
+			crg.reset.eq(1),
+			NextState("AWAIT_ALIGN")
+		)
 		fsm.act("AWAIT_ALIGN",
 			gtx.txelecidle.eq(0),
 			gtx.rxalign.eq(1),
@@ -99,14 +104,12 @@ class K7SATAPHYHostCtrl(Module):
 			gtx.txelecidle.eq(0),
 			self.txdata.eq(ALIGN_VAL),
 			self.txcharisk.eq(0b0001),
-			If(non_align_cnt == 3,
+			If(non_align_cnt == 15,
 				NextState("READY")
 			)
 		)
 		fsm.act("READY",
 			gtx.txelecidle.eq(0),
-			self.txdata.eq(SYNC_VAL),
-			self.txcharisk.eq(0b0001),
 			If(gtx.rxelecidle,
 				NextState("RESET")
 			),
@@ -210,9 +213,14 @@ class K7SATAPHYDeviceCtrl(Module):
 			gtx.txelecidle.eq(1),
 			gtx.txcomwake.eq(1),
 			If(gtx.txcomfinish,
-				NextState("SEND_ALIGN")
+				NextState("RESET_CRG")
 			)
 		)
+		fsm.act("RESET_CRG",
+			gtx.txelecidle.eq(0),
+			crg.reset.eq(1),
+			NextState("SEND_ALIGN")
+		)
 		fsm.act("SEND_ALIGN",
 			gtx.txelecidle.eq(0),
 			gtx.rxalign.eq(1),
@@ -225,8 +233,6 @@ class K7SATAPHYDeviceCtrl(Module):
 			)
 		)
 		fsm.act("READY",
-			self.txdata.eq(SYNC_VAL),
-			self.txcharisk.eq(0b0001),
 			gtx.txelecidle.eq(0),
 			NextState("READY"),
 			If(gtx.rxelecidle,
diff --git a/lib/sata/k7sataphy/gtx.py b/lib/sata/k7sataphy/gtx.py
index f3071392..b2eed8d2 100644
--- a/lib/sata/k7sataphy/gtx.py
+++ b/lib/sata/k7sataphy/gtx.py
@@ -239,7 +239,7 @@ class K7SATAPHYGTX(Module):
 					"p_RX_DISPERR_SEQ_MATCH":"TRUE",
 					"p_DEC_MCOMMA_DETECT":"TRUE",
 					"p_DEC_PCOMMA_DETECT":"TRUE",
-					"p_DEC_VALID_COMMA_ONLY":"FALSE",
+					"p_DEC_VALID_COMMA_ONLY":"TRUE",
 
 				# RX Clock Correction Attributes
 					"p_CBCC_DATA_SOURCE_SEL":"DECODED",
diff --git a/targets/test.py b/targets/test.py
index 28b97cbf..2af3bde3 100644
--- a/targets/test.py
+++ b/targets/test.py
@@ -95,6 +95,14 @@ class TestDesign(UART2WB):
 		self.submodules.crg = _CRG(platform)
 
 		self.submodules.sataphy_host = K7SATAPHY(platform.request("sata_host"), clk_freq, host=True)
+		self.comb += [
+			self.sataphy_host.sink.stb.eq(1),
+			self.sataphy_host.sink.d.eq(0x12345678)
+		]
 		self.submodules.sataphy_device = K7SATAPHY(platform.request("sata_device"), clk_freq, host=False)
+		self.comb += [
+			self.sataphy_device.sink.stb.eq(1),
+			self.sataphy_device.sink.d.eq(0x12345678)
+		]
 
 default_subtarget = TestDesign
-- 
2.30.2