From ff8f8fec2d2cb60db767920781445a93b039034e Mon Sep 17 00:00:00 2001
From: Jan Niehusmann <jan@gondor.com>
Date: Wed, 19 Jul 2023 08:12:47 +0000
Subject: [PATCH] Fix calculation of MPU RBAR value

See https://github.com/raspberrypi/pico-sdk/issues/993 for an
explanation why the old code happens to work in practice, due to the
reset value of the register.

Thanks to @9names for mentioning this issue in the pico-sdk repo.

Fixes #641
---
 rp2040-hal/src/multicore.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rp2040-hal/src/multicore.rs b/rp2040-hal/src/multicore.rs
index 46a5d4b4e..30d1fd5fe 100644
--- a/rp2040-hal/src/multicore.rs
+++ b/rp2040-hal/src/multicore.rs
@@ -67,7 +67,8 @@ fn install_stack_guard(stack_limit: *mut usize) {
     let subregion_select = 0xff ^ (1 << ((addr >> 5) & 7));
     unsafe {
         core.MPU.ctrl.write(5); // enable mpu with background default map
-        core.MPU.rbar.write((addr & !0xff) | 0x8);
+        const RBAR_VALID: u32 = 0x10;
+        core.MPU.rbar.write((addr & !0xff) | RBAR_VALID);
         core.MPU.rasr.write(
             1 // enable region
                | (0x7 << 1) // size 2^(7 + 1) = 256