diff --git a/artiq/firmware/libboard_artiq/serwb.rs b/artiq/firmware/libboard_artiq/serwb.rs
index 69b9f9676..c31fa8eeb 100644
--- a/artiq/firmware/libboard_artiq/serwb.rs
+++ b/artiq/firmware/libboard_artiq/serwb.rs
@@ -1,11 +1,36 @@
 use board::csr;
 
+unsafe fn debug_print(rtm: bool) {
+    debug!("AMC serwb settings:");
+    debug!("  delay_min_found: {}", csr::serwb_phy_amc::control_delay_min_found_read());
+    debug!("  delay_min: {}", csr::serwb_phy_amc::control_delay_min_read());
+    debug!("  delay_max_found: {}", csr::serwb_phy_amc::control_delay_max_found_read());
+    debug!("  delay_max: {}", csr::serwb_phy_amc::control_delay_max_read());
+    debug!("  delay: {}", csr::serwb_phy_amc::control_delay_read());
+    debug!("  bitslip: {}", csr::serwb_phy_amc::control_bitslip_read());
+    debug!("  ready: {}", csr::serwb_phy_amc::control_ready_read());
+    debug!("  error: {}", csr::serwb_phy_amc::control_error_read());
+
+    if rtm {
+        debug!("RTM serwb settings:");
+        debug!("  delay_min_found: {}", csr::serwb_phy_rtm::control_delay_min_found_read());
+        debug!("  delay_min: {}", csr::serwb_phy_rtm::control_delay_min_read());
+        debug!("  delay_max_found: {}", csr::serwb_phy_rtm::control_delay_max_found_read());
+        debug!("  delay_max: {}", csr::serwb_phy_rtm::control_delay_max_read());
+        debug!("  delay: {}", csr::serwb_phy_rtm::control_delay_read());
+        debug!("  bitslip: {}", csr::serwb_phy_rtm::control_bitslip_read());
+        debug!("  ready: {}", csr::serwb_phy_rtm::control_ready_read());
+        debug!("  error: {}", csr::serwb_phy_rtm::control_error_read());
+    }
+}
+
 pub fn wait_init() {
     info!("waiting for AMC/RTM serwb bridge to be ready...");
     unsafe {
         csr::serwb_phy_amc::control_reset_write(1);
         while csr::serwb_phy_amc::control_ready_read() == 0 {
             if csr::serwb_phy_amc::control_error_read() == 1 {
+                debug_print(false);
                 warn!("AMC/RTM serwb bridge initialization failed, retrying.");
                 csr::serwb_phy_amc::control_reset_write(1);
             }
@@ -23,24 +48,6 @@ pub fn wait_init() {
     }
 
     unsafe {
-        debug!("AMC serwb settings:");
-        debug!("  delay_min_found: {}", csr::serwb_phy_amc::control_delay_min_found_read());
-        debug!("  delay_min: {}", csr::serwb_phy_amc::control_delay_min_read());
-        debug!("  delay_max_found: {}", csr::serwb_phy_amc::control_delay_max_found_read());
-        debug!("  delay_max: {}", csr::serwb_phy_amc::control_delay_max_read());
-        debug!("  delay: {}", csr::serwb_phy_amc::control_delay_read());
-        debug!("  bitslip: {}", csr::serwb_phy_amc::control_bitslip_read());
-        debug!("  ready: {}", csr::serwb_phy_amc::control_ready_read());
-        debug!("  error: {}", csr::serwb_phy_amc::control_error_read());
-
-        debug!("RTM serwb settings:");
-        debug!("  delay_min_found: {}", csr::serwb_phy_rtm::control_delay_min_found_read());
-        debug!("  delay_min: {}", csr::serwb_phy_rtm::control_delay_min_read());
-        debug!("  delay_max_found: {}", csr::serwb_phy_rtm::control_delay_max_found_read());
-        debug!("  delay_max: {}", csr::serwb_phy_rtm::control_delay_max_read());
-        debug!("  delay: {}", csr::serwb_phy_rtm::control_delay_read());
-        debug!("  bitslip: {}", csr::serwb_phy_rtm::control_bitslip_read());
-        debug!("  ready: {}", csr::serwb_phy_rtm::control_ready_read());
-        debug!("  error: {}", csr::serwb_phy_rtm::control_error_read());
+        debug_print(true);
     }
 }