Skip to content

Commit

Permalink
probe: print MPU config
Browse files Browse the repository at this point in the history
  • Loading branch information
@mx-shift
mx-shift committed Jan 10, 2023
1 parent f47c9ec commit 6c2977a
Show file tree
Hide file tree
Showing 2 changed files with 222 additions and 1 deletion.
152 changes: 151 additions & 1 deletion cmd/probe/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,6 @@ fn probecmd(context: &mut humility::ExecutionContext) -> Result<()> {
}
}


if part.has_tz() {
// Temporarily force banked register accesses to Secure versions
let mut dscsr = DSCSR::read(core)?;
Expand Down Expand Up @@ -467,6 +466,157 @@ fn probecmd(context: &mut humility::ExecutionContext) -> Result<()> {
}
}

if part.has_tz() {
// Temporarily force banked register accesses to Secure versions
let mut dscsr = DSCSR::read(core)?;
dscsr.set_sbrsel(true);
dscsr.set_sbrselen(true);
dscsr.write(core)?;

{
let mpu_type = MPU_TYPE::read(core)?;
print("MPU_S_TYPE", format!("0x{:x}", mpu_type.0));

if mpu_type.dregion() > 0 {
let mpu_ctrl = MPU_CTRL::read(core)?;
humility::msg!(
"{:>12} => 0x{:8}",
"MPU_S_CTRL",
format!("{:x}", mpu_ctrl.0)
);

let mpu_mair0 = MPU_MAIR0::read(core)?;
humility::msg!(
"{:>12} => 0x{:8}",
"MPU_S_MAIR0",
format!("{:x}", mpu_mair0.0)
);

let mpu_mair1 = MPU_MAIR1::read(core)?;
humility::msg!(
"{:>12} => 0x{:8}",
"MPU_S_MAIR1",
format!("{:x}", mpu_mair1.0)
);
}

for rnr in 0..mpu_type.dregion() {
let mut mpu_rnr = MPU_RNR(0);
mpu_rnr.set_region(rnr);
mpu_rnr.write(core)?;

let mpu_rbar = MPU_RBAR::read(core)?;
humility::msg!(
"{:>12} => 0x{:8}",
format!("MPU_S_RBAR{}", rnr),
format!("{:x}", mpu_rbar.0)
);

let mpu_rlar = MPU_RLAR::read(core)?;
humility::msg!(
"{:>12} => 0x{:8}",
format!("MPU_S_RLAR{}", rnr),
format!("{:x}", mpu_rlar.0)
);
}
}

// Now switch to the Non-Secure versions
dscsr.set_sbrsel(false);
dscsr.write(core)?;

{
let mpu_type = MPU_TYPE::read(core)?;
print("MPU_NS_TYPE", format!("0x{:x}", mpu_type.0));

if mpu_type.dregion() > 0 {
let mpu_ctrl = MPU_CTRL::read(core)?;
humility::msg!(
"{:>12} => 0x{:8}",
"MPU_S_CTRL",
format!("{:x}", mpu_ctrl.0)
);

let mpu_mair0 = MPU_MAIR0::read(core)?;
humility::msg!(
"{:>12} => 0x{:8}",
"MPU_NS_MAIR0",
format!("{:x}", mpu_mair0.0)
);

let mpu_mair1 = MPU_MAIR1::read(core)?;
humility::msg!(
"{:>12} => 0x{:8}",
"MPU_NS_MAIR1",
format!("{:x}", mpu_mair1.0)
);
}

for rnr in 0..mpu_type.dregion() {
let mut mpu_rnr = MPU_RNR(0);
mpu_rnr.set_region(rnr);
mpu_rnr.write(core)?;

let mpu_rbar = MPU_RBAR::read(core)?;
humility::msg!(
"{:>12} => 0x{:8}",
format!("MPU_NS_RBAR{}", rnr),
format!("{:x}", mpu_rbar.0)
);

let mpu_rlar = MPU_RLAR::read(core)?;
humility::msg!(
"{:>12} => 0x{:8}",
format!("MPU_NS_RLAR{}", rnr),
format!("{:x}", mpu_rlar.0)
);
}
}

// Finally, switch back to current security domain versions
dscsr.set_sbrselen(false);
dscsr.write(core)?;
} else {
let mpu_type = MPU_TYPE::read(core)?;
print("MPU_TYPE", format!("0x{:x}", mpu_type.0));

if mpu_type.dregion() > 0 {
let mpu_mair0 = MPU_MAIR0::read(core)?;
humility::msg!(
"{:>12} => 0x{:8}",
"MPU_MAIR0",
format!("{:x}", mpu_mair0.0)
);

let mpu_mair1 = MPU_MAIR1::read(core)?;
humility::msg!(
"{:>12} => 0x{:8}",
"MPU_MAIR1",
format!("{:x}", mpu_mair1.0)
);
}

for rnr in 0..mpu_type.dregion() {
let mut mpu_rnr = MPU_RNR(0);
mpu_rnr.set_region(rnr);
mpu_rnr.write(core)?;

let mpu_rbar = MPU_RBAR::read(core)?;
humility::msg!(
"{:>12} => 0x{:8}",
format!("MPU_RBAR{}", rnr),
format!("{:x}", mpu_rbar.0)
);

let mpu_rlar = MPU_RLAR::read(core)?;
humility::msg!(
"{:>12} => 0x{:8}",
format!("MPU_RLAR{}", rnr),
format!("{:x}", mpu_rlar.0)
);
}
}

if !dhcsr.halted() {
core.run()?;
}
Expand Down
71 changes: 71 additions & 0 deletions humility-arch-cortex/src/debug.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,77 @@ register!(MVFR0, 0xe000_ef40,
pub simd_registers, _: 3, 0;
);

register!(MPU_TYPE, 0xe000ed90,
#[derive(Copy, Clone)]
#[allow(non_camel_case_types)]
pub struct MPU_TYPE(u32);
impl Debug;
pub dregion, _: 15, 8;
pub separate, _: 0;
);

register!(MPU_RNR, 0xe000ed98,
#[derive(Copy, Clone)]
#[allow(non_camel_case_types)]
pub struct MPU_RNR(u32);
impl Debug;
pub region, set_region: 7, 0;
);

register!(MPU_CTRL, 0xe000ed94,
#[derive(Copy, Clone)]
#[allow(non_camel_case_types)]
pub struct MPU_CTRL(u32);
impl Debug;
pub privdefena, _: 2;
pub hfnmiena, _: 1;
pub enable, _: 0;
);

register!(MPU_MAIR0, 0xe000edc0,
#[derive(Copy, Clone)]
#[allow(non_camel_case_types)]
pub struct MPU_MAIR0(u32);
impl Debug;
pub attr3, _: 31, 24;
pub attr2, _: 23, 16;
pub attr1, _: 15, 8;
pub attr0, _: 7, 0;
);

register!(MPU_MAIR1, 0xe000edc4,
#[derive(Copy, Clone)]
#[allow(non_camel_case_types)]
pub struct MPU_MAIR1(u32);
impl Debug;
pub attr7, _: 31, 24;
pub attr6, _: 23, 16;
pub attr5, _: 15, 8;
pub attr4, _: 7, 0;
);

register!(MPU_RBAR, 0xe000ed9c,
#[derive(Copy, Clone)]
#[allow(non_camel_case_types)]
pub struct MPU_RBAR(u32);
impl Debug;
pub base, _: 31, 5;
pub sh, _: 4, 3;
pub ap, _: 2, 1;
pub xn, _: 0;
);

register!(MPU_RLAR, 0xe000eda0,
#[derive(Copy, Clone)]
#[allow(non_camel_case_types)]
pub struct MPU_RLAR(u32);
impl Debug;
pub limit, _: 31, 5;
pub pxn, _: 4;
pub attr_index, _: 3, 1;
pub en, _: 0;
);

register!(SAU_TYPE, 0xe000edd4,
#[derive(Copy, Clone)]
#[allow(non_camel_case_types)]
Expand Down

0 comments on commit 6c2977a

Please sign in to comment.