Update stm32-data: rcc regs info comes from yamls now.

8 files changed, 75 insertions, 148 deletions

diff --git a/embassy-stm32/src/can/bxcan.rs b/embassy-stm32/src/can/bxcan.rs
index cc057b092..3c8c27308 100644
--- a/embassy-stm32/src/can/bxcan.rs
+++ b/embassy-stm32/src/can/bxcan.rs
@@ -103,7 +103,7 @@ crate::pac::peripherals!(
 
 crate::pac::peripherals!(
     (can, CAN) => {
-        unsafe impl bxcan::FilterOwner for peripherals::$inst {
+        unsafe impl bxcan::FilterOwner for peripherals::CAN {
             const NUM_FILTER_BANKS: u8 = 14;
         }
     };
@@ -144,4 +144,10 @@ crate::pac::peripheral_pins!(
     ($inst:ident, can, CAN, $pin:ident, RX, $af:expr) => {
         impl_pin!($inst, $pin, RxPin, $af);
     };
+    ($inst:ident, can, CAN, $pin:ident, TX) => {
+        impl_pin!($inst, $pin, TxPin, 0);
+    };
+    ($inst:ident, can, CAN, $pin:ident, RX) => {
+        impl_pin!($inst, $pin, RxPin, 0);
+    };
 );
diff --git a/embassy-stm32/src/dma/dmamux.rs b/embassy-stm32/src/dma/dmamux.rs
index 14218d56a..83dcff4e8 100644
--- a/embassy-stm32/src/dma/dmamux.rs
+++ b/embassy-stm32/src/dma/dmamux.rs
@@ -49,16 +49,11 @@ pac::dma_channels! {
 
 /// safety: must be called only once
 pub(crate) unsafe fn init() {
-    pac::peripherals! {
-        (dmamux, $peri:ident) => {
-            {
-                pac::peripheral_rcc! {
-                    ($peri, $clock:ident, $en_reg:ident, $rst_reg:ident, $en_fn:ident, $rst_fn:ident) => {
-                        use crate::rcc::sealed::RccPeripheral;
-                        crate::peripherals::$peri::enable()
-                    };
-                }
-            }
+    crate::pac::peripheral_rcc! {
+        ($name:ident, dmamux, DMAMUX, $clock:ident, ($reg:ident, $field:ident, $set_field:ident), $rst:tt) => {
+            crate::pac::RCC.$reg().modify(|reg| {
+                reg.$set_field(true);
+            });
         };
     }
 }
diff --git a/embassy-stm32/src/gpio.rs b/embassy-stm32/src/gpio.rs
index 246cdb041..49a109847 100644
--- a/embassy-stm32/src/gpio.rs
+++ b/embassy-stm32/src/gpio.rs
@@ -601,14 +601,10 @@ crate::pac::pins!(
 );
 
 pub(crate) unsafe fn init() {
-    crate::pac::gpio_rcc! {
-        ($en_reg:ident) => {
-            crate::pac::RCC.$en_reg().modify(|reg| {
-                crate::pac::gpio_rcc! {
-                    ($name:ident, $clock:ident, $en_reg, $rst_reg:ident, $en_fn:ident, $rst_fn:ident) => {
-                        reg.$en_fn(true);
-                    };
-                }
+    crate::pac::peripheral_rcc! {
+        ($name:ident, gpio, GPIO, $clock:ident, ($reg:ident, $field:ident, $set_field:ident), $rst:tt) => {
+            crate::pac::RCC.$reg().modify(|reg| {
+                reg.$set_field(true);
             });
         };
     }
diff --git a/embassy-stm32/src/rcc/mod.rs b/embassy-stm32/src/rcc/mod.rs
index b926eb8ce..9883543df 100644
--- a/embassy-stm32/src/rcc/mod.rs
+++ b/embassy-stm32/src/rcc/mod.rs
@@ -120,35 +120,33 @@ pub(crate) mod sealed {
 pub trait RccPeripheral: sealed::RccPeripheral + 'static {}
 
 crate::pac::peripheral_rcc!(
-    ($inst:ident, $clk:ident, $enable:ident, $reset:ident, $perien:ident, $perirst:ident) => {
+    ($inst:ident, gpio, GPIO, $clk:ident, $en:tt, $rst:tt) => {};
+    ($inst:ident, $module:ident, $block:ident, $clk:ident, ($en_reg:ident, $en_field:ident, $en_set_field:ident), ($rst_reg:ident, $rst_field:ident, $rst_set_field:ident)) => {
         impl sealed::RccPeripheral for peripherals::$inst {
             fn frequency() -> crate::time::Hertz {
                 critical_section::with(|_| {
-                    unsafe {
-                        let freqs = get_freqs();
-                        freqs.$clk
-                    }
+                    unsafe { get_freqs().$clk }
                 })
             }
             fn enable() {
                 critical_section::with(|_| {
                     unsafe {
-                        crate::pac::RCC.$enable().modify(|w| w.$perien(true));
+                        crate::pac::RCC.$en_reg().modify(|w| w.$en_set_field(true));
                     }
                 })
             }
             fn disable() {
                 critical_section::with(|_| {
                     unsafe {
-                        crate::pac::RCC.$enable().modify(|w| w.$perien(false));
+                        crate::pac::RCC.$en_reg().modify(|w| w.$en_set_field(false));
                     }
                 })
             }
             fn reset() {
                 critical_section::with(|_| {
                     unsafe {
-                        crate::pac::RCC.$reset().modify(|w| w.$perirst(true));
-                        crate::pac::RCC.$reset().modify(|w| w.$perirst(false));
+                        crate::pac::RCC.$rst_reg().modify(|w| w.$rst_set_field(true));
+                        crate::pac::RCC.$rst_reg().modify(|w| w.$rst_set_field(false));
                     }
                 })
             }
@@ -156,27 +154,24 @@ crate::pac::peripheral_rcc!(
 
         impl RccPeripheral for peripherals::$inst {}
     };
-    ($inst:ident, $clk:ident, $enable:ident, $perien:ident) => {
+    ($inst:ident, $module:ident, $block:ident, $clk:ident, ($en_reg:ident, $en_field:ident, $en_set_field:ident), _) => {
         impl sealed::RccPeripheral for peripherals::$inst {
             fn frequency() -> crate::time::Hertz {
                 critical_section::with(|_| {
-                    unsafe {
-                        let freqs = get_freqs();
-                        freqs.$clk
-                    }
+                    unsafe { get_freqs().$clk }
                 })
             }
             fn enable() {
                 critical_section::with(|_| {
                     unsafe {
-                        crate::pac::RCC.$enable().modify(|w| w.$perien(true));
+                        crate::pac::RCC.$en_reg().modify(|w| w.$en_set_field(true));
                     }
                 })
             }
             fn disable() {
                 critical_section::with(|_| {
                     unsafe {
-                        crate::pac::RCC.$enable().modify(|w| w.$perien(false));
+                        crate::pac::RCC.$en_reg().modify(|w| w.$en_set_field(false));
                     }
                 })
             }
diff --git a/stm32-data b/stm32-data
-Subproject e60ce40e6f9d29e9a8b45ea7b9118e0d55b3092
+Subproject ec3fb03dc0325e62ed55ac2dd949b412f3f864e
diff --git a/stm32-metapac-gen/src/data.rs b/stm32-metapac-gen/src/data.rs
index deaf09d3e..baeb8c83f 100644
--- a/stm32-metapac-gen/src/data.rs
+++ b/stm32-metapac-gen/src/data.rs
@@ -42,11 +42,9 @@ pub struct Package {
 pub struct Peripheral {
     pub address: u64,
     #[serde(default)]
-    pub kind: Option<String>,
-    #[serde(default)]
     pub block: Option<String>,
     #[serde(default)]
-    pub clock: Option<String>,
+    pub rcc: Option<PeripheralRcc>,
     #[serde(default)]
     pub pins: Vec<Pin>,
     #[serde(default)]
@@ -56,6 +54,26 @@ pub struct Peripheral {
 }
 
 #[derive(Debug, Eq, PartialEq, Clone, Deserialize)]
+pub struct PeripheralRcc {
+    pub clock: String,
+    pub registers: PeripheralRccRegisters,
+}
+
+#[derive(Debug, Eq, PartialEq, Clone, Deserialize)]
+pub struct PeripheralRccRegisters {
+    #[serde(default)]
+    pub enable: Option<PeripheralRccRegister>,
+    #[serde(default)]
+    pub reset: Option<PeripheralRccRegister>,
+}
+
+#[derive(Debug, Eq, PartialEq, Clone, Deserialize)]
+pub struct PeripheralRccRegister {
+    pub register: String,
+    pub field: String,
+}
+
+#[derive(Debug, Eq, PartialEq, Clone, Deserialize)]
 pub struct Pin {
     pub pin: String,
     pub signal: String,
diff --git a/stm32-metapac-gen/src/lib.rs b/stm32-metapac-gen/src/lib.rs
index 9fe3be55c..3a8f81119 100644
--- a/stm32-metapac-gen/src/lib.rs
+++ b/stm32-metapac-gen/src/lib.rs
@@ -1,5 +1,4 @@
 use chiptool::generate::CommonModule;
-use chiptool::ir::IR;
 use proc_macro2::TokenStream;
 use regex::Regex;
 use std::collections::{BTreeMap, HashMap, HashSet};
@@ -17,24 +16,6 @@ use chiptool::{generate, ir, transform};
 mod data;
 use data::*;
 
-fn find_reg<'c>(rcc: &'c ir::IR, reg_regex: &str, field_name: &str) -> Option<(&'c str, &'c str)> {
-    let reg_regex = Regex::new(reg_regex).unwrap();
-
-    for (name, fieldset) in &rcc.fieldsets {
-        // Workaround for some families that prefix register aliases with C1_, which does
-        // not help matching for clock name.
-        if !name.starts_with("C1") && !name.starts_with("C2") && reg_regex.is_match(name) {
-            for field in &fieldset.fields {
-                if field_name == field.name {
-                    return Some((name.as_str(), field.name.as_str()));
-                }
-            }
-        }
-    }
-
-    None
-}
-
 fn make_peripheral_counts(out: &mut String, data: &BTreeMap<String, u8>) {
     write!(
         out,
@@ -130,21 +111,6 @@ pub fn gen_chip(
         }
     });
 
-    // Load RCC register for chip
-    let (_, rcc) = core
-        .peripherals
-        .iter()
-        .find(|(name, _)| name == &"RCC")
-        .expect("RCC peripheral missing");
-
-    let rcc_block = rcc.block.as_ref().expect("RCC peripheral has no block");
-    let bi = BlockInfo::parse(&rcc_block);
-    let rcc_reg_path = options
-        .data_dir
-        .join("registers")
-        .join(&format!("{}_{}.yaml", bi.module, bi.version));
-    let rcc: IR = serde_yaml::from_reader(File::open(rcc_reg_path).unwrap()).unwrap();
-
     let mut peripheral_versions: BTreeMap<String, String> = BTreeMap::new();
     let mut pin_table: Vec<Vec<String>> = Vec::new();
     let mut interrupt_table: Vec<Vec<String>> = Vec::new();
@@ -156,8 +122,6 @@ pub fn gen_chip(
     let mut peripheral_counts: BTreeMap<String, u8> = BTreeMap::new();
     let mut dma_channel_counts: BTreeMap<String, u8> = BTreeMap::new();
     let mut dbgmcu_table: Vec<Vec<String>> = Vec::new();
-    let mut gpio_rcc_table: Vec<Vec<String>> = Vec::new();
-    let mut gpio_regs: HashSet<String> = HashSet::new();
 
     let gpio_base = core.peripherals.get(&"GPIOA".to_string()).unwrap().address as u32;
     let gpio_stride = 0x400;
@@ -290,88 +254,38 @@ pub fn gen_chip(
                 _ => {}
             }
 
-            // Workaround for clock registers being split on some chip families. Assume fields are
-            // named after peripheral and look for first field matching and use that register.
-            let mut en = find_reg(&rcc, "^.+ENR\\d*$", &format!("{}EN", name));
-            let mut rst = find_reg(&rcc, "^.+RSTR\\d*$", &format!("{}RST", name));
-
-            if en.is_none() && name.ends_with("1") {
-                en = find_reg(
-                    &rcc,
-                    "^.+ENR\\d*$",
-                    &format!("{}EN", &name[..name.len() - 1]),
-                );
-                rst = find_reg(
-                    &rcc,
-                    "^.+RSTR\\d*$",
-                    &format!("{}RST", &name[..name.len() - 1]),
-                );
-            }
-
-            match (en, rst) {
-                (Some((enable_reg, enable_field)), reset_reg_field) => {
-                    let clock = match &p.clock {
-                        Some(clock) => clock.as_str(),
-                        None => {
-                            // No clock was specified, derive the clock name from the enable register name.
-                            // N.B. STM32G0 has only one APB bus but split ENR registers
-                            // (e.g. APBENR1).
-                            Regex::new("([A-Z]+\\d*)ENR\\d*")
-                                .unwrap()
-                                .captures(enable_reg)
-                                .unwrap()
-                                .get(1)
-                                .unwrap()
-                                .as_str()
-                        }
-                    };
-
-                    let clock = if name.starts_with("TIM") {
-                        format!("{}_tim", clock.to_ascii_lowercase())
-                    } else {
-                        clock.to_ascii_lowercase()
-                    };
-
-                    let mut row = Vec::with_capacity(6);
-                    row.push(name.clone());
-                    row.push(clock);
-                    row.push(enable_reg.to_ascii_lowercase());
-
-                    if let Some((reset_reg, reset_field)) = reset_reg_field {
-                        row.push(reset_reg.to_ascii_lowercase());
-                        row.push(format!("set_{}", enable_field.to_ascii_lowercase()));
-                        row.push(format!("set_{}", reset_field.to_ascii_lowercase()));
-                    } else {
-                        row.push(format!("set_{}", enable_field.to_ascii_lowercase()));
-                    }
+            if let Some(rcc) = &p.rcc {
+                let mut clock = rcc.clock.to_ascii_lowercase();
+                if name.starts_with("TIM") {
+                    clock = format!("{}_tim", clock)
+                }
 
-                    if !name.starts_with("GPIO") {
-                        peripheral_rcc_table.push(row);
+                let mut row = Vec::new();
+                row.push(name.clone());
+                row.push(bi.module.clone());
+                row.push(bi.block.clone());
+                row.push(clock);
+
+                for reg in [&rcc.registers.enable, &rcc.registers.reset] {
+                    if let Some(reg) = reg {
+                        row.push(format!(
+                            "({}, {}, set_{})",
+                            reg.register.to_ascii_lowercase(),
+                            reg.field.to_ascii_lowercase(),
+                            reg.field.to_ascii_lowercase()
+                        ));
                     } else {
-                        gpio_rcc_table.push(row);
-                        gpio_regs.insert(enable_reg.to_ascii_lowercase());
+                        row.push("_".to_string())
                     }
                 }
-                (None, Some(_)) => {
-                    println!("Unable to find enable register for {}", name)
-                }
-                (None, None) => {
-                    println!("Unable to find enable and reset register for {}", name)
-                }
+
+                peripheral_rcc_table.push(row);
             }
         }
 
         dev.peripherals.push(ir_peri);
     }
 
-    for reg in gpio_regs {
-        gpio_rcc_table.push(vec![reg]);
-    }
-
-    // We should always find GPIO RCC regs. If not, it means something
-    // is broken and GPIO won't work because it's not enabled.
-    assert!(!gpio_rcc_table.is_empty());
-
     for (id, channel_info) in &core.dma_channels {
         let mut row = Vec::new();
         let dma_peri = core.peripherals.get(&channel_info.dma).unwrap();
@@ -502,7 +416,6 @@ pub fn gen_chip(
         &peripheral_dma_channels_table,
     );
     make_table(&mut data, "peripheral_rcc", &peripheral_rcc_table);
-    make_table(&mut data, "gpio_rcc", &gpio_rcc_table);
     make_table(&mut data, "dma_channels", &dma_channels_table);
     make_table(&mut data, "dbgmcu", &dbgmcu_table);
     make_peripheral_counts(&mut data, &peripheral_counts);
@@ -547,6 +460,8 @@ pub fn gen(options: Options) {
     let mut chip_core_names: Vec<String> = Vec::new();
 
     for chip_name in &options.chips {
+        println!("Generating {}...", chip_name);
+
         let chip = load_chip(&options, chip_name);
         for (core_index, core) in chip.cores.iter().enumerate() {
             let chip_core_name = match chip.cores.len() {
diff --git a/stm32-metapac-gen/src/main.rs b/stm32-metapac-gen/src/main.rs
index c4ea77145..5ed751f1e 100644
--- a/stm32-metapac-gen/src/main.rs
+++ b/stm32-metapac-gen/src/main.rs
@@ -8,7 +8,7 @@ fn main() {
 
     let args: Vec<String> = args().collect();
 
-    let chips = match &args[..] {
+    let mut chips = match &args[..] {
         [_, chip] => {
             vec![chip.clone()]
         }
@@ -24,6 +24,8 @@ fn main() {
         _ => panic!("usage: stm32-metapac-gen [chip?]"),
     };
 
+    chips.sort();
+
     gen(Options {
         out_dir,
         data_dir,