update clock/voltage mapping in baremetal

baremetal does kick itself up into a higher performance mode
than the bootloader
This commit is contained in:
bunnie 2025-10-19 01:05:36 +08:00
parent 7383bd5356
commit 9b5ef52e9c

View file

@ -72,10 +72,9 @@ pub fn early_init() {
} }
} }
// set the clock - should toggle us up to 800MHz FCLK mode. // set the clock
let perclk = unsafe { init_clock_asic(SYSTEM_CLOCK_FREQUENCY) }; let fclk = SYSTEM_CLOCK_FREQUENCY;
let perclk = unsafe { init_clock_asic(fclk) };
crate::println!("scratch page: {:x}, heap start: {:x}", SCRATCH_PAGE, HEAP_START);
// setup heap alloc // setup heap alloc
setup_alloc(); setup_alloc();
@ -99,6 +98,8 @@ pub fn early_init() {
bao1x_hal::board::setup_kb_pins(&iox); bao1x_hal::board::setup_kb_pins(&iox);
bao1x_hal::board::setup_oled_power_pin(&iox); bao1x_hal::board::setup_oled_power_pin(&iox);
bao1x_hal::board::setup_trng_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() { 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); ao_sysctrl.wo(utra::ao_sysctrl::SFR_PMUTRM1CSR, 0x2);
cgu.wo(sysctrl::SFR_IPCARIPFLOW, 0x57); cgu.wo(sysctrl::SFR_IPCARIPFLOW, 0x57);
crate::platform::delay_at_sysfreq(20, 48_000_000); crate::platform::delay_at_sysfreq(20, 48_000_000);
} else { } else if freq_hz > 350_000_000 {
crate::println!("setting vdd85 to 0.81v"); crate::println!("setting vdd85 to 0.81v");
let mut ao_sysctrl = CSR::new(utralib::HW_AO_SYSCTRL_BASE as *mut u32); 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_PMUTRM0CSR, 0x08421290);
ao_sysctrl.wo(utra::ao_sysctrl::SFR_PMUTRM1CSR, 0x2); ao_sysctrl.wo(utra::ao_sysctrl::SFR_PMUTRM1CSR, 0x2);
cgu.wo(sysctrl::SFR_IPCARIPFLOW, 0x57); cgu.wo(sysctrl::SFR_IPCARIPFLOW, 0x57);
crate::platform::delay_at_sysfreq(20, 48_000_000); 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"); crate::println!("...done");