From 9b5ef52e9c194cff7c9e44f03713909ed92e1091 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 19 Oct 2025 01:05:36 +0800 Subject: [PATCH] update clock/voltage mapping in baremetal baremetal does kick itself up into a higher performance mode than the bootloader --- baremetal/src/platform/bao1x/bao1x.rs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/baremetal/src/platform/bao1x/bao1x.rs b/baremetal/src/platform/bao1x/bao1x.rs index 94037efe2..d783e04ca 100644 --- a/baremetal/src/platform/bao1x/bao1x.rs +++ b/baremetal/src/platform/bao1x/bao1x.rs @@ -72,10 +72,9 @@ pub fn early_init() { } } - // set the clock - should toggle us up to 800MHz FCLK mode. - let perclk = unsafe { init_clock_asic(SYSTEM_CLOCK_FREQUENCY) }; - - crate::println!("scratch page: {:x}, heap start: {:x}", SCRATCH_PAGE, HEAP_START); + // set the clock + let fclk = SYSTEM_CLOCK_FREQUENCY; + let perclk = unsafe { init_clock_asic(fclk) }; // setup heap alloc setup_alloc(); @@ -99,6 +98,8 @@ pub fn early_init() { bao1x_hal::board::setup_kb_pins(&iox); bao1x_hal::board::setup_oled_power_pin(&iox); bao1x_hal::board::setup_trng_power_pin(&iox); + crate::println!("scratch page: {:x}, heap start: {:x}", SCRATCH_PAGE, HEAP_START); + crate::println!("CPU freq: {} MHz", SYSTEM_CLOCK_FREQUENCY / 2); } pub fn setup_timer() { @@ -304,13 +305,20 @@ pub unsafe fn init_clock_asic(freq_hz: u32) -> u32 { ao_sysctrl.wo(utra::ao_sysctrl::SFR_PMUTRM1CSR, 0x2); cgu.wo(sysctrl::SFR_IPCARIPFLOW, 0x57); crate::platform::delay_at_sysfreq(20, 48_000_000); - } else { + } else if freq_hz > 350_000_000 { crate::println!("setting vdd85 to 0.81v"); let mut ao_sysctrl = CSR::new(utralib::HW_AO_SYSCTRL_BASE as *mut u32); ao_sysctrl.wo(utra::ao_sysctrl::SFR_PMUTRM0CSR, 0x08421290); ao_sysctrl.wo(utra::ao_sysctrl::SFR_PMUTRM1CSR, 0x2); cgu.wo(sysctrl::SFR_IPCARIPFLOW, 0x57); crate::platform::delay_at_sysfreq(20, 48_000_000); + } else { + crate::println!("setting vdd85 to 0.72v"); + let mut ao_sysctrl = CSR::new(utralib::HW_AO_SYSCTRL_BASE as *mut u32); + ao_sysctrl.wo(utra::ao_sysctrl::SFR_PMUTRM0CSR, 0x08420420); + ao_sysctrl.wo(utra::ao_sysctrl::SFR_PMUTRM1CSR, 0x2); + cgu.wo(sysctrl::SFR_IPCARIPFLOW, 0x57); + crate::platform::delay_at_sysfreq(20, 48_000_000); } crate::println!("...done");