From 052cae9df784acb7457890586a6fee1b7c82a489 Mon Sep 17 00:00:00 2001
From: mwojcik <mw@m-labs.hk>
Date: Fri, 2 Sep 2022 15:10:56 +0800
Subject: [PATCH] rtio_clocking: panic at RTIO failed to lock

---
 src/runtime/src/main.rs          |  2 +-
 src/runtime/src/rtio_clocking.rs | 33 +++++++++-----------------------
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/src/runtime/src/main.rs b/src/runtime/src/main.rs
index f065088..3433f85 100644
--- a/src/runtime/src/main.rs
+++ b/src/runtime/src/main.rs
@@ -122,7 +122,7 @@ pub fn main_core0() {
     };
     task::spawn(report_async_rtio_errors());
 
-    rtio_clocking::init(&mut timer, &cfg).expect("Could not set up RTIO PLL");
+    rtio_clocking::init(&mut timer, &cfg);
 
     comms::main(timer, cfg);
 
diff --git a/src/runtime/src/rtio_clocking.rs b/src/runtime/src/rtio_clocking.rs
index 61a50e1..97bcc5e 100644
--- a/src/runtime/src/rtio_clocking.rs
+++ b/src/runtime/src/rtio_clocking.rs
@@ -1,4 +1,4 @@
-use log::{info, warn, error};
+use log::{info, warn};
 use libboard_zynq::timer::GlobalTimer;
 use embedded_hal::blocking::delay::DelayMs;
 use libconfig::Config;
@@ -9,7 +9,6 @@ use libboard_zynq::i2c::I2c;
 use crate::i2c;
 #[cfg(has_si5324)]
 use libboard_artiq::si5324;
-
 #[derive(Debug, PartialEq, Copy, Clone)]
 #[allow(non_camel_case_types)]
 pub enum RtioClock {
@@ -22,7 +21,6 @@ pub enum RtioClock {
     Ext0_Synth0_100to125,
     Ext0_Synth0_125to125,
 }
-
 #[allow(unreachable_code)]
 fn get_rtio_clock_cfg(cfg: &Config) -> RtioClock {
     let mut res = RtioClock::Default;
@@ -65,9 +63,7 @@ fn get_rtio_clock_cfg(cfg: &Config) -> RtioClock {
     }
     res
 }
-
-
-fn init_rtio(timer: &mut GlobalTimer, _clk: RtioClock) -> Result<(), &'static str> {
+fn init_rtio(timer: &mut GlobalTimer, _clk: RtioClock) {
     #[cfg(has_rtio_crg_clock_sel)]
     let clock_sel = match _clk {
         RtioClock::Ext0_Bypass => { 
@@ -83,7 +79,6 @@ fn init_rtio(timer: &mut GlobalTimer, _clk: RtioClock) -> Result<(), &'static st
             0
         }
     };
-
     unsafe {
         pl::csr::rtio_crg::pll_reset_write(1);
         #[cfg(has_rtio_crg_clock_sel)]
@@ -95,17 +90,12 @@ fn init_rtio(timer: &mut GlobalTimer, _clk: RtioClock) -> Result<(), &'static st
     if locked {
         info!("RTIO PLL locked");
     } else {
-        error!("RTIO PLL failed to lock");
-        return Err("RTIO PLL failed to lock");
+        panic!("RTIO PLL failed to lock");
     }
-
     unsafe {
         pl::csr::rtio_core::reset_phy_write(1);
     }
-
-    Ok(())
 }
-
 #[cfg(has_drtio)]
 fn init_drtio(timer: &mut GlobalTimer)
 {
@@ -117,9 +107,8 @@ fn init_drtio(timer: &mut GlobalTimer)
         pl::csr::drtio_transceiver::txenable_write(0xffffffffu32 as _);
     }
 }
-
 #[cfg(has_si5324)]
-fn setup_si5324(i2c: &mut I2c, timer: &mut GlobalTimer, clk: RtioClock) -> Result<(), &'static str> {
+fn setup_si5324(i2c: &mut I2c, timer: &mut GlobalTimer, clk: RtioClock) {
     let (si5324_settings, si5324_ref_input) = match clk {
         RtioClock::Ext0_Synth0_10to125 => { // 125 MHz output from 10 MHz CLKINx reference, 504 Hz BW
             info!("using 10MHz reference to make 125MHz RTIO clock with PLL");
@@ -234,24 +223,20 @@ fn setup_si5324(i2c: &mut I2c, timer: &mut GlobalTimer, clk: RtioClock) -> Resul
             )
         }
     };
-    si5324::setup(i2c, &si5324_settings, si5324_ref_input, timer)
+    si5324::setup(i2c, &si5324_settings, si5324_ref_input, timer).expect("cannot initialize Si5324");
 }
-
-pub fn init(timer: &mut GlobalTimer, cfg: &Config) -> Result<(), &'static str> {
-
+pub fn init(timer: &mut GlobalTimer, cfg: &Config) {
     let clk = get_rtio_clock_cfg(cfg);
     #[cfg(has_si5324)]
     {
         let i2c = unsafe { (&mut i2c::I2C_BUS).as_mut().unwrap() };
         let si5324_ext_input = si5324::Input::Ckin1;
         match clk {
-            RtioClock::Ext0_Bypass => si5324::bypass(i2c, si5324_ext_input, timer),
+            RtioClock::Ext0_Bypass => si5324::bypass(i2c, si5324_ext_input, timer).expect("cannot bypass Si5324"),
             _ => setup_si5324(i2c, timer, clk),
-        }?;
+        }
     }
     #[cfg(has_drtio)]
     init_drtio(timer);
-    init_rtio(timer, clk)?;
-
-    Ok(())
+    init_rtio(timer, clk);
 }
\ No newline at end of file