From 208ad8fbfcf639ca8876b50686665a3c8817dabe Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Fri, 5 Jan 2024 23:49:10 +0100 Subject: stm32/flash: add support for f1. --- .vscode/settings.json | 8 ++- embassy-stm32/Cargo.toml | 4 +- embassy-stm32/src/flash/f0.rs | 4 +- embassy-stm32/src/flash/f1f3.rs | 110 ++++++++++++++++++++++++++++++++++++++++ embassy-stm32/src/flash/f3.rs | 102 ------------------------------------- embassy-stm32/src/flash/f4.rs | 4 +- embassy-stm32/src/flash/f7.rs | 4 +- embassy-stm32/src/flash/g.rs | 4 +- embassy-stm32/src/flash/h7.rs | 8 +-- embassy-stm32/src/flash/l.rs | 12 ++--- embassy-stm32/src/flash/mod.rs | 6 +-- 11 files changed, 140 insertions(+), 126 deletions(-) create mode 100644 embassy-stm32/src/flash/f1f3.rs delete mode 100644 embassy-stm32/src/flash/f3.rs diff --git a/.vscode/settings.json b/.vscode/settings.json index a5b23175a..46d26562c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -15,10 +15,16 @@ //"rust-analyzer.cargo.target": "thumbv7m-none-eabi", "rust-analyzer.cargo.target": "thumbv7em-none-eabi", //"rust-analyzer.cargo.target": "thumbv8m.main-none-eabihf", + "rust-analyzer.cargo.features": [ + "stm32f103c8", + "time-driver-any", + "unstable-pac", + "exti", + ], "rust-analyzer.linkedProjects": [ // Uncomment ONE line for the chip you want to work on. // This makes rust-analyzer work on the example crate and all its dependencies. - "examples/stm32l4/Cargo.toml", + "embassy-stm32/Cargo.toml", // "examples/nrf52840-rtic/Cargo.toml", // "examples/nrf5340/Cargo.toml", // "examples/nrf-rtos-trace/Cargo.toml", diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml index 844a55cf8..88faf569a 100644 --- a/embassy-stm32/Cargo.toml +++ b/embassy-stm32/Cargo.toml @@ -57,7 +57,7 @@ futures = { version = "0.3.17", default-features = false, features = ["async-awa rand_core = "0.6.3" sdio-host = "0.5.0" critical-section = "1.1" -stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-f9f48b067be92fa9ea9dbdce0e85b5d0eb989790" } +stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-d5096244fa0b7992454a894a2aeaa369ae674222" } vcell = "0.1.3" bxcan = "0.7.0" nb = "1.0.0" @@ -75,7 +75,7 @@ critical-section = { version = "1.1", features = ["std"] } [build-dependencies] proc-macro2 = "1.0.36" quote = "1.0.15" -stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-f9f48b067be92fa9ea9dbdce0e85b5d0eb989790", default-features = false, features = ["metadata"]} +stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-d5096244fa0b7992454a894a2aeaa369ae674222", default-features = false, features = ["metadata"]} [features] diff --git a/embassy-stm32/src/flash/f0.rs b/embassy-stm32/src/flash/f0.rs index c0a8d7022..e0c76e6b2 100644 --- a/embassy-stm32/src/flash/f0.rs +++ b/embassy-stm32/src/flash/f0.rs @@ -20,8 +20,8 @@ pub(crate) unsafe fn lock() { pub(crate) unsafe fn unlock() { if pac::FLASH.cr().read().lock() { - pac::FLASH.keyr().write(|w| w.set_fkeyr(0x4567_0123)); - pac::FLASH.keyr().write(|w| w.set_fkeyr(0xCDEF_89AB)); + pac::FLASH.keyr().write_value(0x4567_0123); + pac::FLASH.keyr().write_value(0xCDEF_89AB); } } diff --git a/embassy-stm32/src/flash/f1f3.rs b/embassy-stm32/src/flash/f1f3.rs new file mode 100644 index 000000000..e7790369a --- /dev/null +++ b/embassy-stm32/src/flash/f1f3.rs @@ -0,0 +1,110 @@ +use core::convert::TryInto; +use core::ptr::write_volatile; +use core::sync::atomic::{fence, Ordering}; + +use super::{FlashRegion, FlashSector, FLASH_REGIONS, WRITE_SIZE}; +use crate::flash::Error; +use crate::pac; + +pub(crate) const fn is_default_layout() -> bool { + true +} + +pub(crate) const fn get_flash_regions() -> &'static [&'static FlashRegion] { + &FLASH_REGIONS +} + +pub(crate) unsafe fn lock() { + pac::FLASH.cr().modify(|w| w.set_lock(true)); +} + +pub(crate) unsafe fn unlock() { + if pac::FLASH.cr().read().lock() { + pac::FLASH.keyr().write_value(0x4567_0123); + pac::FLASH.keyr().write_value(0xCDEF_89AB); + } +} + +pub(crate) unsafe fn enable_blocking_write() { + assert_eq!(0, WRITE_SIZE % 2); + + pac::FLASH.cr().write(|w| w.set_pg(true)); +} + +pub(crate) unsafe fn disable_blocking_write() { + pac::FLASH.cr().write(|w| w.set_pg(false)); +} + +pub(crate) unsafe fn blocking_write(start_address: u32, buf: &[u8; WRITE_SIZE]) -> Result<(), Error> { + let mut address = start_address; + for chunk in buf.chunks(2) { + write_volatile(address as *mut u16, u16::from_le_bytes(chunk.try_into().unwrap())); + address += chunk.len() as u32; + + // prevents parallelism errors + fence(Ordering::SeqCst); + } + + wait_ready_blocking() +} + +pub(crate) unsafe fn blocking_erase_sector(sector: &FlashSector) -> Result<(), Error> { + pac::FLASH.cr().modify(|w| { + w.set_per(true); + }); + + pac::FLASH.ar().write(|w| w.set_far(sector.start)); + + pac::FLASH.cr().modify(|w| { + w.set_strt(true); + }); + + // Wait for at least one clock cycle before reading the + // BSY bit, because there is a one-cycle delay between + // setting the STRT bit and the BSY bit being asserted + // by hardware. See STM32F105xx, STM32F107xx device errata, + // section 2.2.8 + #[cfg(stm32f1)] + pac::FLASH.cr().read(); + + let mut ret: Result<(), Error> = wait_ready_blocking(); + + if !pac::FLASH.sr().read().eop() { + trace!("FLASH: EOP not set"); + ret = Err(Error::Prog); + } else { + pac::FLASH.sr().write(|w| w.set_eop(true)); + } + + pac::FLASH.cr().modify(|w| w.set_per(false)); + + clear_all_err(); + if ret.is_err() { + return ret; + } + Ok(()) +} + +pub(crate) unsafe fn clear_all_err() { + // read and write back the same value. + // This clears all "write 1 to clear" bits. + pac::FLASH.sr().modify(|_| {}); +} + +unsafe fn wait_ready_blocking() -> Result<(), Error> { + loop { + let sr = pac::FLASH.sr().read(); + + if !sr.bsy() { + if sr.wrprterr() { + return Err(Error::Protected); + } + + if sr.pgerr() { + return Err(Error::Seq); + } + + return Ok(()); + } + } +} diff --git a/embassy-stm32/src/flash/f3.rs b/embassy-stm32/src/flash/f3.rs deleted file mode 100644 index 817ccef4d..000000000 --- a/embassy-stm32/src/flash/f3.rs +++ /dev/null @@ -1,102 +0,0 @@ -use core::convert::TryInto; -use core::ptr::write_volatile; -use core::sync::atomic::{fence, Ordering}; - -use super::{FlashRegion, FlashSector, FLASH_REGIONS, WRITE_SIZE}; -use crate::flash::Error; -use crate::pac; - -pub(crate) const fn is_default_layout() -> bool { - true -} - -pub(crate) const fn get_flash_regions() -> &'static [&'static FlashRegion] { - &FLASH_REGIONS -} - -pub(crate) unsafe fn lock() { - pac::FLASH.cr().modify(|w| w.set_lock(true)); -} - -pub(crate) unsafe fn unlock() { - if pac::FLASH.cr().read().lock() { - pac::FLASH.keyr().write(|w| w.set_fkeyr(0x4567_0123)); - pac::FLASH.keyr().write(|w| w.set_fkeyr(0xCDEF_89AB)); - } -} - -pub(crate) unsafe fn enable_blocking_write() { - assert_eq!(0, WRITE_SIZE % 2); - - pac::FLASH.cr().write(|w| w.set_pg(true)); -} - -pub(crate) unsafe fn disable_blocking_write() { - pac::FLASH.cr().write(|w| w.set_pg(false)); -} - -pub(crate) unsafe fn blocking_write(start_address: u32, buf: &[u8; WRITE_SIZE]) -> Result<(), Error> { - let mut address = start_address; - for chunk in buf.chunks(2) { - write_volatile(address as *mut u16, u16::from_le_bytes(chunk.try_into().unwrap())); - address += chunk.len() as u32; - - // prevents parallelism errors - fence(Ordering::SeqCst); - } - - wait_ready_blocking() -} - -pub(crate) unsafe fn blocking_erase_sector(sector: &FlashSector) -> Result<(), Error> { - pac::FLASH.cr().modify(|w| { - w.set_per(true); - }); - - pac::FLASH.ar().write(|w| w.set_far(sector.start)); - - pac::FLASH.cr().modify(|w| { - w.set_strt(true); - }); - - let mut ret: Result<(), Error> = wait_ready_blocking(); - - if !pac::FLASH.sr().read().eop() { - trace!("FLASH: EOP not set"); - ret = Err(Error::Prog); - } else { - pac::FLASH.sr().write(|w| w.set_eop(true)); - } - - pac::FLASH.cr().modify(|w| w.set_per(false)); - - clear_all_err(); - if ret.is_err() { - return ret; - } - Ok(()) -} - -pub(crate) unsafe fn clear_all_err() { - // read and write back the same value. - // This clears all "write 1 to clear" bits. - pac::FLASH.sr().modify(|_| {}); -} - -unsafe fn wait_ready_blocking() -> Result<(), Error> { - loop { - let sr = pac::FLASH.sr().read(); - - if !sr.bsy() { - if sr.wrprterr() { - return Err(Error::Protected); - } - - if sr.pgerr() { - return Err(Error::Seq); - } - - return Ok(()); - } - } -} diff --git a/embassy-stm32/src/flash/f4.rs b/embassy-stm32/src/flash/f4.rs index 2671dfb04..57447bea5 100644 --- a/embassy-stm32/src/flash/f4.rs +++ b/embassy-stm32/src/flash/f4.rs @@ -227,8 +227,8 @@ pub(crate) unsafe fn lock() { pub(crate) unsafe fn unlock() { if pac::FLASH.cr().read().lock() { - pac::FLASH.keyr().write(|w| w.set_key(0x45670123)); - pac::FLASH.keyr().write(|w| w.set_key(0xCDEF89AB)); + pac::FLASH.keyr().write_value(0x4567_0123); + pac::FLASH.keyr().write_value(0xCDEF_89AB); } } diff --git a/embassy-stm32/src/flash/f7.rs b/embassy-stm32/src/flash/f7.rs index 6b3e66ac6..0f512bbc4 100644 --- a/embassy-stm32/src/flash/f7.rs +++ b/embassy-stm32/src/flash/f7.rs @@ -20,8 +20,8 @@ pub(crate) unsafe fn lock() { pub(crate) unsafe fn unlock() { if pac::FLASH.cr().read().lock() { - pac::FLASH.keyr().write(|w| w.set_key(0x4567_0123)); - pac::FLASH.keyr().write(|w| w.set_key(0xCDEF_89AB)); + pac::FLASH.keyr().write_value(0x4567_0123); + pac::FLASH.keyr().write_value(0xCDEF_89AB); } } diff --git a/embassy-stm32/src/flash/g.rs b/embassy-stm32/src/flash/g.rs index d97b4a932..b69c4343b 100644 --- a/embassy-stm32/src/flash/g.rs +++ b/embassy-stm32/src/flash/g.rs @@ -25,8 +25,8 @@ pub(crate) unsafe fn unlock() { // Unlock flash if pac::FLASH.cr().read().lock() { - pac::FLASH.keyr().write(|w| w.set_keyr(0x4567_0123)); - pac::FLASH.keyr().write(|w| w.set_keyr(0xCDEF_89AB)); + pac::FLASH.keyr().write_value(0x4567_0123); + pac::FLASH.keyr().write_value(0xCDEF_89AB); } } diff --git a/embassy-stm32/src/flash/h7.rs b/embassy-stm32/src/flash/h7.rs index 65d163d29..ae395d568 100644 --- a/embassy-stm32/src/flash/h7.rs +++ b/embassy-stm32/src/flash/h7.rs @@ -27,13 +27,13 @@ pub(crate) unsafe fn lock() { pub(crate) unsafe fn unlock() { if pac::FLASH.bank(0).cr().read().lock() { - pac::FLASH.bank(0).keyr().write(|w| w.set_keyr(0x4567_0123)); - pac::FLASH.bank(0).keyr().write(|w| w.set_keyr(0xCDEF_89AB)); + pac::FLASH.bank(0).keyr().write_value(0x4567_0123); + pac::FLASH.bank(0).keyr().write_value(0xCDEF_89AB); } if is_dual_bank() { if pac::FLASH.bank(1).cr().read().lock() { - pac::FLASH.bank(1).keyr().write(|w| w.set_keyr(0x4567_0123)); - pac::FLASH.bank(1).keyr().write(|w| w.set_keyr(0xCDEF_89AB)); + pac::FLASH.bank(1).keyr().write_value(0x4567_0123); + pac::FLASH.bank(1).keyr().write_value(0xCDEF_89AB); } } } diff --git a/embassy-stm32/src/flash/l.rs b/embassy-stm32/src/flash/l.rs index 0b332dc61..b14224bff 100644 --- a/embassy-stm32/src/flash/l.rs +++ b/embassy-stm32/src/flash/l.rs @@ -29,21 +29,21 @@ pub(crate) unsafe fn unlock() { #[cfg(any(flash_wl, flash_wb, flash_l4))] { if pac::FLASH.cr().read().lock() { - pac::FLASH.keyr().write(|w| w.set_keyr(0x4567_0123)); - pac::FLASH.keyr().write(|w| w.set_keyr(0xCDEF_89AB)); + pac::FLASH.keyr().write_value(0x4567_0123); + pac::FLASH.keyr().write_value(0xCDEF_89AB); } } #[cfg(any(flash_l0, flash_l1))] { if pac::FLASH.pecr().read().pelock() { - pac::FLASH.pekeyr().write(|w| w.set_pekeyr(0x89ABCDEF)); - pac::FLASH.pekeyr().write(|w| w.set_pekeyr(0x02030405)); + pac::FLASH.pekeyr().write_value(0x89AB_CDEF); + pac::FLASH.pekeyr().write_value(0x0203_0405); } if pac::FLASH.pecr().read().prglock() { - pac::FLASH.prgkeyr().write(|w| w.set_prgkeyr(0x8C9DAEBF)); - pac::FLASH.prgkeyr().write(|w| w.set_prgkeyr(0x13141516)); + pac::FLASH.prgkeyr().write_value(0x8C9D_AEBF); + pac::FLASH.prgkeyr().write_value(0x1314_1516); } } } diff --git a/embassy-stm32/src/flash/mod.rs b/embassy-stm32/src/flash/mod.rs index cbf5c25b2..47232f4a4 100644 --- a/embassy-stm32/src/flash/mod.rs +++ b/embassy-stm32/src/flash/mod.rs @@ -95,7 +95,7 @@ pub enum FlashBank { #[cfg_attr(any(flash_l0, flash_l1, flash_l4, flash_wl, flash_wb), path = "l.rs")] #[cfg_attr(flash_f0, path = "f0.rs")] -#[cfg_attr(flash_f3, path = "f3.rs")] +#[cfg_attr(any(flash_f1, flash_f3), path = "f1f3.rs")] #[cfg_attr(flash_f4, path = "f4.rs")] #[cfg_attr(flash_f7, path = "f7.rs")] #[cfg_attr(any(flash_g0, flash_g4), path = "g.rs")] @@ -103,8 +103,8 @@ pub enum FlashBank { #[cfg_attr(flash_h7ab, path = "h7.rs")] #[cfg_attr( not(any( - flash_l0, flash_l1, flash_l4, flash_wl, flash_wb, flash_f0, flash_f3, flash_f4, flash_f7, flash_g0, flash_g4, - flash_h7, flash_h7ab + flash_l0, flash_l1, flash_l4, flash_wl, flash_wb, flash_f0, flash_f1, flash_f3, flash_f4, flash_f7, flash_g0, + flash_g4, flash_h7, flash_h7ab )), path = "other.rs" )] -- cgit