probe: Print SAU config if in secure debug mode

Author: mx-shift

cmd/probe/src/lib.rs

@@ -406,7 +406,52 @@ 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 sau_type = SAU_TYPE::read(core)?;
+        print("SAU_TYPE", format!("0x{:x}", sau_type.0));
+
+        if sau_type.sregion() > 0 {
+            let sau_ctrl = SAU_CTRL::read(core)?;
+            humility::msg!(
+                "{:>12} => 0x{:8}",
+                "SAU_CTRL",
+                format!("{:x}", sau_ctrl.0)
+            );
+        }
+
+        for rnr in 0..sau_type.sregion() {
+            let mut sau_rnr = SAU_RNR(0);
+            sau_rnr.set_region(rnr);
+            sau_rnr.write(core)?;
+
+            let sau_rbar = SAU_RBAR::read(core)?;
+            humility::msg!(
+                "{:>12} => 0x{:8}",
+                format!("SAU_RBAR{}", rnr),
+                format!("{:x}", sau_rbar.0)
+            );
+
+            let sau_rlar = SAU_RLAR::read(core)?;
+            humility::msg!(
+                "{:>12} => 0x{:8}",
+                format!("SAU_RLAR{}", rnr),
+                format!("{:x}", sau_rlar.0)
+            );
+        }
+
+        // Switch back to using current security domain versions of banked
+        // registers
+        dscsr.set_sbrselen(false);
+        dscsr.write(core)?;
+
         let sfsr = SFSR::read(core)?;
         if sfsr.has_fault() {
             humility::msg!(

humility-arch-cortex/src/debug.rs

@@ -428,6 +428,16 @@ register!(DHCSR, 0xe000_edf0,
     pub halted, _: 17;
 );
 
+register!(DSCSR, 0xe000ee08,
+    #[derive(Copy, Clone)]
+    pub struct DSCSR(u32);
+    impl Debug;
+    pub cdskey, set_cdskey: 17;
+    pub cds, set_cds: 16;
+    pub sbrsel, set_sbrsel: 1;
+    pub sbrselen, set_sbrselen: 0;
+);
+
 register!(DEMCR, 0xe000_edfc,
     #[derive(Copy, Clone)]
     pub struct DEMCR(u32);
@@ -481,6 +491,49 @@ register!(MVFR0, 0xe000_ef40,
     pub simd_registers, _: 3, 0;
 );
 
+register!(SAU_TYPE, 0xe000edd4,
+    #[derive(Copy, Clone)]
+    #[allow(non_camel_case_types)]
+    pub struct SAU_TYPE(u32);
+    impl Debug;
+    pub sregion, _: 7, 0;
+);
+
+register!(SAU_RNR, 0xe000edd8,
+    #[derive(Copy, Clone)]
+    #[allow(non_camel_case_types)]
+    pub struct SAU_RNR(u32);
+    impl Debug;
+    pub region, set_region: 7, 0;
+);
+
+register!(SAU_CTRL, 0xe000edd0,
+    #[derive(Copy, Clone)]
+    #[allow(non_camel_case_types)]
+    pub struct SAU_CTRL(u32);
+    impl Debug;
+    pub allns, _: 1;
+    pub enable, _: 0;
+);
+
+register!(SAU_RBAR, 0xe000eddc,
+    #[derive(Copy, Clone)]
+    #[allow(non_camel_case_types)]
+    pub struct SAU_RBAR(u32);
+    impl Debug;
+    pub baddr, _: 31, 5;
+);
+
+register!(SAU_RLAR, 0xe000ede0,
+    #[derive(Copy, Clone)]
+    #[allow(non_camel_case_types)]
+    pub struct SAU_RLAR(u32);
+    impl Debug;
+    pub laddr, _: 31, 5;
+    pub nsc, _: 1;
+    pub enable, _: 0;
+);
+
 register!(STM32F4_DBGMCU_IDCODE, 0xe004_2000,
     #[derive(Copy, Clone)]
     #[allow(non_camel_case_types)]