From d30ef2f197ab6749f418a04322cbe7e45cf145b1 Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 8 May 2026 03:12:47 +0800 Subject: [PATCH] debug/fix frequency changes into and out of WFI I am now confident that the FCLK frequency is correct going into WFI. --- libs/bao1x-hal/src/bio.rs | 10 ++++++++-- libs/bao1x-hal/src/bio_hw.rs | 8 ++++++-- libs/bao1x-hal/src/clocks.rs | 4 +++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/libs/bao1x-hal/src/bio.rs b/libs/bao1x-hal/src/bio.rs index 40dbce042..0979eeda7 100644 --- a/libs/bao1x-hal/src/bio.rs +++ b/libs/bao1x-hal/src/bio.rs @@ -134,10 +134,16 @@ impl<'a> BioApi<'a> for Bio { } } - fn prep_freq_change(&mut self) { + fn prep_freq_change(&mut self, into_wfi: bool) { send_message( self.conn, - Message::new_blocking_scalar(BioOp::PrepFreqChange.to_usize().unwrap(), 0, 0, 0, 0), + Message::new_blocking_scalar( + BioOp::PrepFreqChange.to_usize().unwrap(), + if into_wfi { 1 } else { 0 }, + 0, + 0, + 0, + ), ) .ok(); } diff --git a/libs/bao1x-hal/src/bio_hw.rs b/libs/bao1x-hal/src/bio_hw.rs index d6c4fc69d..5b4889316 100644 --- a/libs/bao1x-hal/src/bio_hw.rs +++ b/libs/bao1x-hal/src/bio_hw.rs @@ -405,10 +405,12 @@ impl BioSharedState { // mask in the core that is now listening to the clock let existing_extclk = self.bio.rf(bio_bdma::SFR_EXTCLOCK_USE_EXTCLK); self.bio.rmwf(bio_bdma::SFR_EXTCLOCK_USE_EXTCLK, (1 << core as u32) | existing_extclk); - crate::println!("core: {:?} - extclock {:x}", core, self.bio.r(bio_bdma::SFR_EXTCLOCK)); + // crate::println!("core: {:?} - extclock {:x}", core, self.bio.r(bio_bdma::SFR_EXTCLOCK)); return None; } }; + #[cfg(feature = "std")] + log::debug!("config: {:?}, int {}, fraq {}, actual {}", config, div_int, div_frac, actual_freq); let sfr_value = (div_int as u32) << 16 | (div_frac as u32) << 8; match core { BioCore::Core0 => { @@ -494,6 +496,8 @@ impl<'a> BioApi<'a> for BioSharedState { fn update_bio_freq(&mut self, freq: u32) -> u32 { let prev_freq = self.fclk_freq_hz; self.fclk_freq_hz = freq; + #[cfg(feature = "std")] + log::debug!("new freq: {}, old freq: {}", freq, prev_freq); for (i, config) in self.core_config.clone().iter().enumerate() { if let Some(config) = config { self.apply_config(config, i.into()); @@ -502,7 +506,7 @@ impl<'a> BioApi<'a> for BioSharedState { prev_freq } - fn prep_freq_change(&mut self) { + fn prep_freq_change(&mut self, _wfi: bool) { // at the hw level, there's nothing to do; a handler at the `std` level is invoked instead } diff --git a/libs/bao1x-hal/src/clocks.rs b/libs/bao1x-hal/src/clocks.rs index c4b3da1e3..686d0246e 100644 --- a/libs/bao1x-hal/src/clocks.rs +++ b/libs/bao1x-hal/src/clocks.rs @@ -637,7 +637,9 @@ impl ClockManagerImpl { self.sysctrl.wo(utra::sysctrl::SFR_CGUSET, 0x32); wfi_debug("internal osc"); // don't divide fclk -- allows BIO to keep operating at 48MHz rate - self.sysctrl.wo(utra::sysctrl::SFR_CGUFD_CFGFDCR_0_4_0, 0x0700_01ff); + self.sysctrl.wo(utra::sysctrl::SFR_CGUFD_CFGFDCR_0_4_0, 0x0000_ffff); + self.sysctrl.wo(utra::sysctrl::SFR_CGUFD_CFGFDCR_0_4_0, 0x0000_ffff); + self.sysctrl.wo(utra::sysctrl::SFR_CGUSET, 0x32); // lower core voltage to 0.7v self.ao_sysctrl.wo(utra::ao_sysctrl::SFR_PMUTRM0CSR, 0x08420002);