Edition 2024.

7 files changed, 24 insertions, 23 deletions

diff --git a/embassy-rp/Cargo.toml b/embassy-rp/Cargo.toml
index f6b0900f2..9ad4b47a3 100644
--- a/embassy-rp/Cargo.toml
+++ b/embassy-rp/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "embassy-rp"
 version = "0.8.0"
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 description = "Embassy Hardware Abstraction Layer (HAL) for the Raspberry Pi RP2040 or RP235x microcontroller"
 keywords = ["embedded", "async", "rp235x", "rp2040", "embedded-hal"]
@@ -104,7 +104,7 @@ boot2-w25x10cl = []
 ## Have embassy-rp not provide the boot2 so you can use your own.
 ## Place your own in the ".boot2" section like:
 ## ```
-## #[link_section = ".boot2"]
+## #[unsafe(link_section = ".boot2")]
 ## #[used]
 ## static BOOT2: [u8; 256] = [0; 256]; // Provide your own with e.g. include_bytes!
 ## ```
@@ -127,7 +127,7 @@ imagedef-nonsecure-exe = []
 ## ```ignore
 ## use embassy_rp::block::ImageDef;
 ##
-## #[link_section = ".start_block"]
+## #[unsafe(link_section = ".start_block")]
 ## #[used]
 ## static IMAGE_DEF: ImageDef = ImageDef::secure_exe(); // Update this with your own implementation.
 ## ```
diff --git a/embassy-rp/src/bootsel.rs b/embassy-rp/src/bootsel.rs
index 14f9e46aa..5f0bac248 100644
--- a/embassy-rp/src/bootsel.rs
+++ b/embassy-rp/src/bootsel.rs
@@ -36,7 +36,7 @@ mod ram_helpers {
     /// This function must live in ram. It uses inline asm to avoid any
     /// potential calls to ABI functions that might be in flash.
     #[inline(never)]
-    #[link_section = ".data.ram_func"]
+    #[unsafe(link_section = ".data.ram_func")]
     #[cfg(target_arch = "arm")]
     pub unsafe fn read_cs_status() -> GpioStatus {
         let result: u32;
diff --git a/embassy-rp/src/flash.rs b/embassy-rp/src/flash.rs
index 8c809090e..6b5eda0a3 100644
--- a/embassy-rp/src/flash.rs
+++ b/embassy-rp/src/flash.rs
@@ -627,7 +627,7 @@ mod ram_helpers {
     /// Length of data must be a multiple of 4096
     /// addr must be aligned to 4096
     #[inline(never)]
-    #[link_section = ".data.ram_func"]
+    #[unsafe(link_section = ".data.ram_func")]
     #[cfg(feature = "rp2040")]
     unsafe fn write_flash_inner(addr: u32, len: u32, data: Option<&[u8]>, ptrs: *const FlashFunctionPointers) {
         #[cfg(target_arch = "arm")]
@@ -692,7 +692,7 @@ mod ram_helpers {
     /// Length of data must be a multiple of 4096
     /// addr must be aligned to 4096
     #[inline(never)]
-    #[link_section = ".data.ram_func"]
+    #[unsafe(link_section = ".data.ram_func")]
     #[cfg(feature = "_rp235x")]
     unsafe fn write_flash_inner(addr: u32, len: u32, data: Option<&[u8]>, ptrs: *const FlashFunctionPointers) {
         let data = data.map(|d| d.as_ptr()).unwrap_or(core::ptr::null());
@@ -811,7 +811,7 @@ mod ram_helpers {
     ///
     /// Credit: taken from `rp2040-flash` (also licensed Apache+MIT)
     #[inline(never)]
-    #[link_section = ".data.ram_func"]
+    #[unsafe(link_section = ".data.ram_func")]
     #[cfg(feature = "rp2040")]
     unsafe fn read_flash_inner(cmd: FlashCommand, ptrs: *const FlashFunctionPointers) {
         #[cfg(target_arch = "arm")]
diff --git a/embassy-rp/src/intrinsics.rs b/embassy-rp/src/intrinsics.rs
index 69d5d92de..aed8a3227 100644
--- a/embassy-rp/src/intrinsics.rs
+++ b/embassy-rp/src/intrinsics.rs
@@ -223,7 +223,7 @@ macro_rules! intrinsics {
 
         #[cfg(all(target_arch = "arm", feature = "intrinsics"))]
         mod $name {
-            #[no_mangle]
+            #[unsafe(no_mangle)]
             $(#[$($attr)*])*
             pub extern $abi fn $name( $($argname: $ty),* ) -> $ret {
                 super::$name($($argname),*)
@@ -257,7 +257,7 @@ macro_rules! intrinsics {
 
         #[cfg(all(target_arch = "arm", feature = "intrinsics"))]
         mod $name {
-            #[no_mangle]
+            #[unsafe(no_mangle)]
             $(#[$($attr)*])*
             pub unsafe extern $abi fn $name( $($argname: $ty),* ) -> $ret {
                 super::$name($($argname),*)
@@ -392,7 +392,7 @@ macro_rules! division_function {
         );
 
         #[cfg(target_arch = "arm")]
-        extern "aapcs" {
+        unsafe extern "aapcs" {
             // Connect a local name to global symbol above through FFI.
             #[link_name = concat!("_erphal_", stringify!($name)) ]
             fn $name(n: $argty, d: $argty) -> u64;
diff --git a/embassy-rp/src/lib.rs b/embassy-rp/src/lib.rs
index d03ba1fef..4cb1a0912 100644
--- a/embassy-rp/src/lib.rs
+++ b/embassy-rp/src/lib.rs
@@ -1,5 +1,7 @@
 #![no_std]
 #![allow(async_fn_in_trait)]
+#![allow(unsafe_op_in_unsafe_fn)]
+#![allow(unused_unsafe)]
 #![doc = include_str!("../README.md")]
 #![warn(missing_docs)]
 
@@ -190,7 +192,7 @@ macro_rules! bind_interrupts {
 
         $(
             #[allow(non_snake_case)]
-            #[no_mangle]
+            #[unsafe(no_mangle)]
             $(#[cfg($cond_irq)])?
             unsafe extern "C" fn $irq() {
                 unsafe {
@@ -446,13 +448,13 @@ macro_rules! select_bootloader {
     ( $( $feature:literal => $loader:ident, )+ default => $default:ident ) => {
         $(
             #[cfg(feature = $feature)]
-            #[link_section = ".boot2"]
+            #[unsafe(link_section = ".boot2")]
             #[used]
             static BOOT2: [u8; 256] = rp2040_boot2::$loader;
         )*
 
         #[cfg(not(any( $( feature = $feature),* )))]
-        #[link_section = ".boot2"]
+        #[unsafe(link_section = ".boot2")]
         #[used]
         static BOOT2: [u8; 256] = rp2040_boot2::$default;
     }
@@ -475,13 +477,13 @@ macro_rules! select_imagedef {
     ( $( $feature:literal => $imagedef:ident, )+ default => $default:ident ) => {
         $(
             #[cfg(feature = $feature)]
-            #[link_section = ".start_block"]
+            #[unsafe(link_section = ".start_block")]
             #[used]
             static IMAGE_DEF: crate::block::ImageDef = crate::block::ImageDef::$imagedef();
         )*
 
         #[cfg(not(any( $( feature = $feature),* )))]
-        #[link_section = ".start_block"]
+        #[unsafe(link_section = ".start_block")]
         #[used]
         static IMAGE_DEF: crate::block::ImageDef = crate::block::ImageDef::$default();
     }
@@ -528,7 +530,7 @@ select_imagedef! {
 /// }
 /// ```
 pub fn install_core0_stack_guard() -> Result<(), ()> {
-    extern "C" {
+    unsafe extern "C" {
         static mut _stack_end: usize;
     }
     unsafe { install_stack_guard(core::ptr::addr_of_mut!(_stack_end)) }
diff --git a/embassy-rp/src/multicore.rs b/embassy-rp/src/multicore.rs
index adedc98ad..c305513ca 100644
--- a/embassy-rp/src/multicore.rs
+++ b/embassy-rp/src/multicore.rs
@@ -14,6 +14,7 @@
 //! use embassy_rp::multicore::Stack;
 //! use static_cell::StaticCell;
 //! use embassy_executor::Executor;
+//! use core::ptr::addr_of_mut;
 //!
 //! static mut CORE1_STACK: Stack<4096> = Stack::new();
 //! static EXECUTOR0: StaticCell<Executor> = StaticCell::new();
@@ -36,7 +37,7 @@
 //! fn main() -> ! {
 //!     let p = embassy_rp::init(Default::default());
 //!
-//!     embassy_rp::multicore::spawn_core1(p.CORE1, unsafe { &mut CORE1_STACK }, move || {
+//!     embassy_rp::multicore::spawn_core1(p.CORE1, unsafe { &mut *addr_of_mut!(CORE1_STACK) }, move || {
 //!         let executor1 = EXECUTOR1.init(Executor::new());
 //!         executor1.run(|spawner| spawner.spawn(core1_task().unwrap()));
 //!     });
@@ -110,7 +111,6 @@ impl<const SIZE: usize> Stack<SIZE> {
 
 #[cfg(all(feature = "rt", feature = "rp2040"))]
 #[interrupt]
-#[link_section = ".data.ram_func"]
 unsafe fn SIO_IRQ_PROC1() {
     let sio = pac::SIO;
     // Clear IRQ
@@ -135,7 +135,6 @@ unsafe fn SIO_IRQ_PROC1() {
 
 #[cfg(all(feature = "rt", feature = "_rp235x"))]
 #[interrupt]
-#[link_section = ".data.ram_func"]
 unsafe fn SIO_IRQ_FIFO() {
     let sio = pac::SIO;
     // Clear IRQ
diff --git a/embassy-rp/src/psram.rs b/embassy-rp/src/psram.rs
index ae43dd5aa..22eb1ed25 100644
--- a/embassy-rp/src/psram.rs
+++ b/embassy-rp/src/psram.rs
@@ -251,7 +251,7 @@ impl<'d> Psram<'d> {
     }
 
     /// Verify APS6404L PSRAM device matches expected configuration.
-    #[link_section = ".data.ram_func"]
+    #[unsafe(link_section = ".data.ram_func")]
     #[inline(never)]
     fn verify_aps6404l(qmi: &pac::qmi::Qmi, expected_size: usize) -> Result<(), Error> {
         // APS6404L-specific constants
@@ -306,7 +306,7 @@ impl<'d> Psram<'d> {
         Ok(())
     }
 
-    #[link_section = ".data.ram_func"]
+    #[unsafe(link_section = ".data.ram_func")]
     #[inline(never)]
     unsafe fn read_aps6404l_kgd_eid(qmi: &pac::qmi::Qmi) -> (u32, u32) {
         const RESET_ENABLE_CMD: u8 = 0xf5;
@@ -435,7 +435,7 @@ impl<'d> Psram<'d> {
     }
 
     /// Initialize PSRAM with proper timing.
-    #[link_section = ".data.ram_func"]
+    #[unsafe(link_section = ".data.ram_func")]
     #[inline(never)]
     fn init_psram(qmi: &pac::qmi::Qmi, xip_ctrl: &pac::xip_ctrl::XipCtrl, config: &Config) -> Result<(), Error> {
         // Set PSRAM timing for APS6404
@@ -610,7 +610,7 @@ impl<'d> Psram<'d> {
         Ok(())
     }
 
-    #[link_section = ".data.ram_func"]
+    #[unsafe(link_section = ".data.ram_func")]
     #[inline(never)]
     unsafe fn direct_csr_send_init_command(config: &Config, init_cmd: u8) {
         #[cfg(target_arch = "arm")]