swlink: timing: Update routines for stm32f103 flash

Author: ALTracer

src/platforms/common/stm32/timing_stm32.c

@@ -200,11 +200,16 @@ __attribute__((weak)) void platform_ospeed_update(const uint32_t frequency)
 #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 */
+#elif defined(GD32F1)
+/* Values for GD32F103 at 72 MHz */
 #define USED_SWD_CYCLES_NODELAY 14
 #define USED_SWD_CYCLES         30
 #define CYCLES_PER_CNT          14
+#elif defined(STM32F1)
+/* Values for STM32F103 at 72 MHz */
+#define USED_SWD_CYCLES_NODELAY 16
+#define USED_SWD_CYCLES         34
+#define CYCLES_PER_CNT          17
 #elif defined(STM32F0)
 /* Values for STM32F072 at 48 MHz */
 #define USED_SWD_CYCLES_NODELAY 24

src/platforms/swlink/platform.c

@@ -236,13 +236,19 @@ static void swdptap_linereset_measured(bool no_delay)
 	/* for robustness, we use 60 HIGH cycles and 4 idle cycles */
 	swd_proc.seq_out(0xffffffffU, 32U);
 	swd_proc.seq_out(0x0fffffffU, 32U);
+	swd_proc.seq_out(0xffffffffU, 32U);
+	swd_proc.seq_out(0x0fffffffU, 32U);
+	swd_proc.seq_out(0xffffffffU, 32U);
+	swd_proc.seq_out(0x0fffffffU, 32U);
+	swd_proc.seq_out(0xffffffffU, 32U);
+	swd_proc.seq_out(0x0fffffffU, 32U);
 	const uint32_t ts_post = dwt_read_cycle_counter();
 	const uint32_t cycles_spent = ts_post - ts_pre;
 	/* Subtract the overhead of function calls */
-	const uint32_t fncall_corr = no_delay ? (88U) : (140U);
-	/* Split the *64 into 16*4 for 216-240MHz clocks to not overflow a uint32_t */
-	const uint32_t freq_measured = rcc_ahb_frequency * 16U / (cycles_spent - fncall_corr) * 4U;
-	gdb_outf("Estimating %lu Hz (%lu cycles - %ld corr)\n", freq_measured, cycles_spent, fncall_corr);
+	const uint32_t fncall_corr = no_delay ? (243U) : (133U);
+	/* Split the 64*4 into 16*16 for 216-240MHz clocks to not overflow a uint32_t */
+	const uint32_t freq_measured = rcc_ahb_frequency * 16U / (cycles_spent - fncall_corr) * 16U;
+	gdb_outf("Estimated %7lu Hz (%5lu cycles - %ld corr)\n", freq_measured, cycles_spent, fncall_corr);
 }
 
 static bool cmd_swdptap_calibration(target_s *target, int argc, const char **argv)