From 174c51f09707b8a475382071f99e0d9c44f93ab7 Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Thu, 19 Aug 2021 23:51:53 +0200
Subject: [PATCH] stm32/metapac: check GPIO RCC regs are always found.

---
 embassy-stm32/src/rcc/f0/mod.rs | 12 ------------
 embassy-stm32/src/rcc/l0/mod.rs | 10 ----------
 stm32-data                      |  2 +-
 stm32-metapac-gen/src/lib.rs    | 18 +++++++++---------
 4 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/embassy-stm32/src/rcc/f0/mod.rs b/embassy-stm32/src/rcc/f0/mod.rs
index ec6474e8..916ed39f 100644
--- a/embassy-stm32/src/rcc/f0/mod.rs
+++ b/embassy-stm32/src/rcc/f0/mod.rs
@@ -202,18 +202,6 @@ impl<'d> Rcc<'d> {
 }
 
 pub unsafe fn init(config: Config) {
-    RCC.ahbenr().modify(|w| {
-        w.set_iopaen(true);
-        w.set_iopben(true);
-        w.set_iopcen(true);
-        w.set_iopden(true);
-
-        #[cfg(rcc_f0)]
-        w.set_iopeen(true);
-
-        w.set_iopfen(true);
-    });
-
     let rcc = Rcc::new(<peripherals::RCC as embassy::util::Steal>::steal(), config);
     let clocks = rcc.freeze();
     set_freqs(clocks);
diff --git a/embassy-stm32/src/rcc/l0/mod.rs b/embassy-stm32/src/rcc/l0/mod.rs
index 1c3b314b..e65faaa2 100644
--- a/embassy-stm32/src/rcc/l0/mod.rs
+++ b/embassy-stm32/src/rcc/l0/mod.rs
@@ -377,16 +377,6 @@ impl RccExt for RCC {
 pub struct HSI48(());
 
 pub unsafe fn init(config: Config) {
-    let rcc = pac::RCC;
-    rcc.iopenr().write(|w| {
-        w.set_iopaen(true);
-        w.set_iopben(true);
-        w.set_iopcen(true);
-        w.set_iopden(true);
-        w.set_iopeen(true);
-        w.set_iophen(true);
-    });
-
     let r = <peripherals::RCC as embassy::util::Steal>::steal();
     let clocks = r.freeze(config);
     set_freqs(clocks);
diff --git a/stm32-data b/stm32-data
index d3c03a41..12be5f3d 160000
--- a/stm32-data
+++ b/stm32-data
@@ -1 +1 @@
-Subproject commit d3c03a41de925d07e26a5f6157eb85307692a651
+Subproject commit 12be5f3da4ba38850d94ab865d2b920bd936300b
diff --git a/stm32-metapac-gen/src/lib.rs b/stm32-metapac-gen/src/lib.rs
index 2f940544..8646accf 100644
--- a/stm32-metapac-gen/src/lib.rs
+++ b/stm32-metapac-gen/src/lib.rs
@@ -117,11 +117,7 @@ impl BlockInfo {
     }
 }
 
-fn find_reg_for_field<'c>(
-    rcc: &'c ir::IR,
-    reg_regex: &str,
-    field_name: &str,
-) -> Option<(&'c str, &'c str)> {
+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 {
@@ -426,16 +422,16 @@ pub fn gen(options: Options) {
 
                 // 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_for_field(&rcc, "^.+ENR\\d*$", &format!("{}EN", name));
-                let mut rst = find_reg_for_field(&rcc, "^.+RSTR\\d*$", &format!("{}RST", name));
+                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_for_field(
+                    en = find_reg(
                         &rcc,
                         "^.+ENR\\d*$",
                         &format!("{}EN", &name[..name.len() - 1]),
                     );
-                    rst = find_reg_for_field(
+                    rst = find_reg(
                         &rcc,
                         "^.+RSTR\\d*$",
                         &format!("{}RST", &name[..name.len() - 1]),
@@ -500,6 +496,10 @@ pub fn gen(options: Options) {
             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();