From f7aba6b570858b0c2c8f3fcc2bab17a02b2da6fe Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 7 Mar 2018 10:05:05 +0800
Subject: [PATCH] siphaser: fix phase_shift_done CSR

---
 artiq/gateware/drtio/si_phaser.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/artiq/gateware/drtio/si_phaser.py b/artiq/gateware/drtio/si_phaser.py
index b4681615b..13c61d81e 100644
--- a/artiq/gateware/drtio/si_phaser.py
+++ b/artiq/gateware/drtio/si_phaser.py
@@ -10,7 +10,7 @@ class SiPhaser7Series(Module, AutoCSR):
     def __init__(self, si5324_clkin, si5324_clkout_fabric):
         self.switch_clocks = CSRStorage()
         self.phase_shift = CSR()
-        self.phase_shift_done = CSRStatus()
+        self.phase_shift_done = CSRStatus(reset=1)
         self.sample_result = CSRStatus()
 
         # 125MHz system clock to 150MHz. VCO @ 625MHz.
@@ -37,6 +37,7 @@ class SiPhaser7Series(Module, AutoCSR):
         # non-determinstic skew of Si5324.
         mmcm_ps_fb = Signal()
         mmcm_ps_output = Signal()
+        mmcm_ps_psdone = Signal()
         self.specials += \
             Instance("MMCME2_ADV",
                 p_CLKIN1_PERIOD=1e9/150e6,
@@ -56,8 +57,12 @@ class SiPhaser7Series(Module, AutoCSR):
                 i_PSCLK=ClockSignal(),
                 i_PSEN=self.phase_shift.re,
                 i_PSINCDEC=self.phase_shift.r,
-                o_PSDONE=self.phase_shift_done.status,
+                o_PSDONE=mmcm_ps_psdone,
             )
+        self.sync += [
+            If(self.phase_shift.re, self.phase_shift_done.status.eq(0)),
+            If(mmcm_ps_psdone, self.phase_shift_done.status.eq(1))
+        ]
 
         si5324_clkin_se = Signal()
         self.specials += [