Merge pull request #816 from betrusted-io/chores

More cleanup
This commit is contained in:
bunnie 2026-02-13 02:20:27 +08:00 committed by GitHub
commit 4f93657958
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 0 deletions

View file

@ -29,6 +29,28 @@ fn hash_region(region: &[u8], description: &str) {
crate::println!("{}: {}", description, hex_str);
}
/// Stepping detection: attempt to modify the RRCR configuration. If bit 12 (code area protection)
/// can be flipped, then we are A0 stepping.
fn detect_stepping() -> &'static str {
use bao1x_hal::hardening::die;
let mut rram = utralib::CSR::new(utralib::utra::rrc::HW_RRC_BASE as *mut u32);
// this sets bit 12
rram.wfo(utralib::utra::rrc::SFR_RRCCR_SFR_RRCCR, bao1x_hal::rram::SECURITY_MODE);
// attempt to clear bit 12
rram.wfo(utralib::utra::rrc::SFR_RRCCR_SFR_RRCCR, bao1x_hal::rram::SECURITY_MODE & !(1 << 12));
let check_val = rram.rf(utralib::utra::rrc::SFR_RRCCR_SFR_RRCCR);
let ret = if check_val != bao1x_hal::rram::SECURITY_MODE { "A0" } else { "A1" };
// reset security mode
bollard!(die, 4);
rram.wfo(utralib::utra::rrc::SFR_RRCCR_SFR_RRCCR, bao1x_hal::rram::SECURITY_MODE);
bollard!(die, 4);
rram.wfo(utralib::utra::rrc::SFR_RRCCR_SFR_RRCCR, bao1x_hal::rram::SECURITY_MODE);
bollard!(die, 4);
rram.wfo(utralib::utra::rrc::SFR_RRCCR_SFR_RRCCR, bao1x_hal::rram::SECURITY_MODE);
bollard!(die, 4);
ret
}
pub fn audit() {
let owc = OneWayCounter::new();
let boardtype = owc.get_decoded::<BoardTypeCoding>().unwrap();
@ -36,6 +58,7 @@ pub fn audit() {
crate::println!("Boot partition is: {:?}", owc.get_decoded::<AltBootCoding>());
crate::println!("Semver is: {}", crate::version::SEMVER);
crate::println!("Description is: {}", crate::RELEASE_DESCRIPTION);
crate::println!("Stepping is: {}", detect_stepping());
let slot_mgr = bao1x_hal::acram::SlotManager::new();
let sn = slot_mgr.read(&bao1x_hal::board::SERIAL_NUMBER).unwrap();
crate::println!(

View file

@ -1,5 +1,6 @@
use core::convert::TryInto;
#[allow(unused_imports)]
use bao1x_api::{
CP_ID, IFR_CP_ID_BASE, IFR_HASH, SERIAL_NUMBER, SLOT_ELEMENT_LEN_BYTES, SlotIndex, SlotType, UUID,
};
@ -160,6 +161,7 @@ fn check_and_fix_acls(rram: &mut Reram, slot_mgr: &mut SlotManager, slot_list: &
}
}
#[cfg(feature = "print-ifr")]
fn print_slots(slot_mgr: &SlotManager, slot_list: &[SlotIndex]) {
for slot in slot_list.iter() {
let access = slot.get_access_spec();