From 949917cc9cc3a4b4d8e3fcd3d1083792d2245064 Mon Sep 17 00:00:00 2001
From: Harry Ho <hh@m-labs.hk>
Date: Wed, 15 Dec 2021 17:52:37 +0800
Subject: [PATCH] jdcg: fix missing JESD reset & JDAC re-init

---
 artiq/firmware/satman/jdcg.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/artiq/firmware/satman/jdcg.rs b/artiq/firmware/satman/jdcg.rs
index 64204a149..98d35b653 100644
--- a/artiq/firmware/satman/jdcg.rs
+++ b/artiq/firmware/satman/jdcg.rs
@@ -140,7 +140,7 @@ pub mod jdac {
 pub mod jesd204sync {
     use board_misoc::{csr, clock, config};
 
-    use super::jdac;
+    use super::{jdac, jesd};
     use super::super::jdac_common;
 
     const HMC7043_ANALOG_DELAY_RANGE: u8 = 24;
@@ -423,6 +423,8 @@ pub mod jesd204sync {
                 }
                 warn!("SYSREF test failed, retrying...");
                 jdac::basic_request(0, jdac_common::DDMTD_INIT, 0)?;
+                jesd::reset(false);
+                let _ = jdac::init();
             } else { break }
         }