From 110d39936d914fe27711c68744a97e3e4815bc63 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 21 Sep 2025 21:52:24 +0800 Subject: [PATCH] convert loader to use autostatics --- loader/src/main.rs | 4 --- loader/src/platform/bao1x/bao1x.rs | 51 +++++++++++++++++++++--------- loader/src/platform/bao1x/link.x | 3 +- 3 files changed, 37 insertions(+), 21 deletions(-) diff --git a/loader/src/main.rs b/loader/src/main.rs index 95bfc3bbe..b60e06d3d 100644 --- a/loader/src/main.rs +++ b/loader/src/main.rs @@ -142,16 +142,12 @@ pub enum IniType { /// This function is safe to call exactly once. #[export_name = "rust_entry"] pub unsafe extern "C" fn rust_entry(signed_buffer: *const usize, signature: u32) -> ! { - #[cfg(all(feature = "bao1x", not(feature = "verilator-only")))] let perclk_freq = crate::platform::early_init(); // sets up PLLs so we're not running at 16MHz... // need to make this "official" for bao1x, the feature flag combo below works around some simulation // config conflicts. #[cfg(all(feature = "verilator-only", not(feature = "bao1x-mpw")))] platform::coreuser_config(); - #[cfg(not(all(feature = "bao1x", not(feature = "verilator-only"))))] - let perclk_freq = 0; - #[cfg(all(feature = "bao1x", feature = "updates"))] crate::platform::process_update(perclk_freq); diff --git a/loader/src/platform/bao1x/bao1x.rs b/loader/src/platform/bao1x/bao1x.rs index 7e53c6d37..85fc0f6d1 100644 --- a/loader/src/platform/bao1x/bao1x.rs +++ b/loader/src/platform/bao1x/bao1x.rs @@ -66,9 +66,6 @@ static ALLOCATOR: linked_list_allocator::LockedHeap = linked_list_allocator::Loc */ // Define the .data region - bootstrap baremetal using these hard-coded parameters. -const DATA_ORIGIN: usize = 0x61000000; -const DATA_SIZE_BYTES: usize = 0x6000; -const DATA_INIT: [(usize, u32); 3] = [(0x0, 0x2), (0x558, 0x1), (0x55d, 0x1)]; pub const RAM_SIZE: usize = utralib::generated::HW_SRAM_MEM_LEN; pub const RAM_BASE: usize = utralib::generated::HW_SRAM_MEM; pub const FLASH_BASE: usize = utralib::generated::HW_RERAM_MEM; @@ -94,8 +91,43 @@ pub fn delay(quantum: usize) { } } -#[cfg(all(feature = "bao1x", not(feature = "verilator-only")))] pub fn early_init() -> u32 { + // For the loader, the statics structure is located just after the signature block + const STATICS_LOC: usize = FLASH_BASE + 0x1000; + + // safety: this data structure is pre-loaded by the image loader and is guaranteed to + // only have representable, valid values that are aligned according to the repr(C) spec + let statics_in_rom: &bao1x_api::StaticsInRom = + unsafe { (STATICS_LOC as *const bao1x_api::StaticsInRom).as_ref().unwrap() }; + assert!(statics_in_rom.version == bao1x_api::STATICS_IN_ROM_VERSION, "Can't find valid statics table"); + + // Clear .data, .bss, .stack, .heap regions & setup .data values + // Safety: only safe if the values computed by the loader are correct. + // Question: this happens before we setup any clocks, timing, etc. I think the CPU is running + // in a "slow enough" state that these writes should happen, but this may need to be re-ordered + // in particular with respect to SRAM trimming if there are boot issues discovered in the field. + unsafe { + let data_ptr = statics_in_rom.data_origin as *mut u32; + for i in 0..statics_in_rom.data_size_bytes as usize / size_of::() { + data_ptr.add(i).write_volatile(0); + } + for &(offset, data) in &statics_in_rom.poke_table[..statics_in_rom.valid_pokes as usize] { + data_ptr.add(offset as usize).write_volatile(data); + } + } + + #[cfg(not(feature = "verilator-only"))] + let ret = early_init_hw(); + + // return a fake clock result + #[cfg(feature = "verilator-only")] + let ret = 100_000_000; + + ret +} + +#[cfg(all(feature = "bao1x", not(feature = "verilator-only")))] +pub fn early_init_hw() -> u32 { let daric_cgu = sysctrl::HW_SYSCTRL_BASE as *mut u32; let mut ao_sysctrl = CSR::new(utra::ao_sysctrl::HW_AO_SYSCTRL_BASE as *mut u32); @@ -103,17 +135,6 @@ pub fn early_init() -> u32 { let fr = ao_sysctrl.r(utra::ao_sysctrl::SFR_AOFR); ao_sysctrl.wo(utra::ao_sysctrl::SFR_AOFR, fr); - // Clear .data, .bss, .stack, .heap regions & setup .data values - unsafe { - let data_ptr = DATA_ORIGIN as *mut u32; - for i in 0..DATA_SIZE_BYTES / size_of::() { - data_ptr.add(i).write_volatile(0); - } - for (offset, data) in DATA_INIT { - data_ptr.add(offset).write_volatile(data); - } - } - unsafe { // this block is mandatory in all cases to get clocks set into some consistent, expected mode { diff --git a/loader/src/platform/bao1x/link.x b/loader/src/platform/bao1x/link.x index a13eff03c..4ef2510b7 100644 --- a/loader/src/platform/bao1x/link.x +++ b/loader/src/platform/bao1x/link.x @@ -1,9 +1,8 @@ MEMORY { - /* we are using an unsigned loader, so the offset is not 1k offset */ /* if the font location is adjusted, this needs to be updated in libs/blitstr2 codegen templates.go FONT_BASE value */ FONTS : ORIGIN = 0x60040000, LENGTH = 128k - FLASH : ORIGIN = 0x60001000, LENGTH = 252k + FLASH : ORIGIN = 0x60001100, LENGTH = 252k - 256 RAM : ORIGIN = 0x61000000, LENGTH = 2M }