From a897d82324992cea1b2bbfb891f0b0486793d14b Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sun, 31 Dec 2017 11:27:43 +0800
Subject: [PATCH] ad9154: retry initialization (#727)

---
 artiq/firmware/libboard_artiq/ad9154.rs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/artiq/firmware/libboard_artiq/ad9154.rs b/artiq/firmware/libboard_artiq/ad9154.rs
index 5d2f4c057..c06a2197d 100644
--- a/artiq/firmware/libboard_artiq/ad9154.rs
+++ b/artiq/firmware/libboard_artiq/ad9154.rs
@@ -473,6 +473,17 @@ fn dac_cfg(dacno: u8) -> Result<(), &'static str> {
     Ok(())
 }
 
+fn dac_cfg_retry(dacno: u8) -> Result<(), &'static str> {
+    for i in 0..99 {
+        let outcome = dac_cfg(dacno);
+        match outcome {
+            Ok(_) => return outcome,
+            Err(e) => warn!("AD9154-{} config attempt #{} failed ({}), retrying", dacno, i, e)
+        }
+    }
+    dac_cfg(dacno)
+}
+
 pub fn init() -> Result<(), &'static str> {
     // Release the JESD clock domain reset late, as we need to
     // set up clock chips before.
@@ -481,7 +492,7 @@ pub fn init() -> Result<(), &'static str> {
     for dacno in 0..csr::AD9154.len() {
         let dacno = dacno as u8;
         debug!("setting up AD9154-{} DAC...", dacno);
-        dac_cfg(dacno)?;
+        dac_cfg_retry(dacno)?;
     }
     Ok(())
 }