From 7f22531869d5c0c0d2212859c0abcd1e340c924c Mon Sep 17 00:00:00 2001
From: ALTracer <11005378+ALTracer@users.noreply.github.com>
Date: Sat, 12 Oct 2024 14:04:43 +0300
Subject: [PATCH] common/stm32/timing: Treat _no_delay frequency specially

* Current _clk_delay strategy is better approximated by a proportional law,
  but _no_delay does not fit into that nicely.
* Also update delay macros with values obtained from calibration.
---
 src/platforms/common/stm32/timing_stm32.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/platforms/common/stm32/timing_stm32.c b/src/platforms/common/stm32/timing_stm32.c
index 67688f0196c..f4ef0a67159 100644
--- a/src/platforms/common/stm32/timing_stm32.c
+++ b/src/platforms/common/stm32/timing_stm32.c
@@ -146,9 +146,26 @@ uint32_t platform_time_ms(void)
  * per delay loop count with 2 delay loops per clock
  */
 
+#if defined(STM32F4)
+/* Values for STM32F411 at 96 MHz */
+#define USED_SWD_CYCLES_NODELAY 12
+#define USED_SWD_CYCLES         24
+#define CYCLES_PER_CNT          12
+#elif defined(STM32F1)
 /* Values for STM32F103 at 72 MHz */
+#define USED_SWD_CYCLES_NODELAY 14
+#define USED_SWD_CYCLES         30
+#define CYCLES_PER_CNT          14
+#elif defined(STM32F0)
+/* Values for STM32F072 at 48 MHz */
+#define USED_SWD_CYCLES_NODELAY 24
+#define USED_SWD_CYCLES         30
+#define CYCLES_PER_CNT          17
+#else
+/* Inherit defaults for other platforms (F3, F7) */
 #define USED_SWD_CYCLES 22
 #define CYCLES_PER_CNT  10
+#endif
 
 void platform_max_frequency_set(const uint32_t frequency)
 {
@@ -200,8 +217,10 @@ uint32_t platform_max_frequency_get(void)
 	const uint32_t ratio = (target_clk_divider * BITBANG_DIVIDER_FACTOR) + BITBANG_DIVIDER_OFFSET;
 	return rcc_ahb_frequency / ratio;
 #else
+	if (target_clk_divider == UINT32_MAX)
+		return rcc_ahb_frequency / USED_SWD_CYCLES_NODELAY;
 	uint32_t result = rcc_ahb_frequency;
-	result /= USED_SWD_CYCLES + CYCLES_PER_CNT * target_clk_divider;
+	result /= USED_SWD_CYCLES + CYCLES_PER_CNT * target_clk_divider * 2U;
 	return result;
 #endif
 }