Merge pull request adafruit#9962 from snkYmkrct/Stm32H7-fix

tannewt · web-flow · commit ce84b7d608e5 · 2025-01-16T09:52:01.000-08:00
Possible fix for stm32H7 crashes
diff --git a/ports/stm/Makefile b/ports/stm/Makefile
@@ -48,8 +48,8 @@ CFLAGS += $(OPTIMIZATION_FLAGS)
 # Add -ftree-vrp optimization and checking to all builds. It's not enabled for -Os by default.
 CFLAGS += -ftree-vrp
 
-# MCU Series is defined by the HAL package and doesn't need to be specified here
-C_DEFS = -D$(MCU_PACKAGE) -DUSE_HAL_DRIVER -DUSE_FULL_LL_DRIVER -D$(MCU_VARIANT)
+# STM32 MCU series must be defined. See supervisor/linker.h
+C_DEFS = -D$(MCU_PACKAGE) -DUSE_HAL_DRIVER -DUSE_FULL_LL_DRIVER -D$(MCU_VARIANT) -DSTM32$(MCU_SERIES)
 
 CFLAGS += $(INC) -Werror -Wall -std=gnu11 -fshort-enums $(BASE_CFLAGS) $(C_DEFS) $(CFLAGS_MOD) $(COPT) -nostdlib -nostartfiles
 
diff --git a/ports/stm/supervisor/port.c b/ports/stm/supervisor/port.c
@@ -284,8 +284,9 @@ uint32_t *port_heap_get_bottom(void) {
     return &_ld_heap_start;
 }
 
+// heap memory can be set in SRAM and stack can be set in DTCM
 uint32_t *port_heap_get_top(void) {
-    return port_stack_get_limit();
+    return &_ld_heap_end;
 }
 
 uint32_t *port_stack_get_limit(void) {
diff --git a/supervisor/linker.h b/supervisor/linker.h
@@ -8,11 +8,16 @@
 
 #pragma once
 
-#if defined(IMXRT1XXX) || defined(FOMU) || defined(STM32H7) || defined(RASPBERRYPI)
+#if defined(IMXRT1XXX) || defined(FOMU) || defined(RASPBERRYPI)
 #define PLACE_IN_DTCM_DATA(name) name __attribute__((section(".dtcm_data." #name)))
 #define PLACE_IN_DTCM_BSS(name) name __attribute__((section(".dtcm_bss." #name)))
 // Don't inline ITCM functions because that may pull them out of ITCM into other sections.
 #define PLACE_IN_ITCM(name) __attribute__((section(".itcm." #name), noinline, aligned(4))) name
+#elif defined(STM32H7)
+#define PLACE_IN_DTCM_DATA(name) name __attribute__((section(".dtcm_data." #name)))
+#define PLACE_IN_DTCM_BSS(name) name __attribute__((section(".dtcm_bss." #name)))
+// using ITCM on the H7 generates hard fault exception
+#define PLACE_IN_ITCM(name) name
 #else
 #define PLACE_IN_DTCM_DATA(name) name
 #define PLACE_IN_DTCM_BSS(name) name

Original file line number	Diff line number	Diff line change
`@@ -284,8 +284,9 @@ uint32_t *port_heap_get_bottom(void) {`
`284`	`284`	`return &_ld_heap_start;`
`285`	`285`	`}`
`286`	`286`
	`287`	`+// heap memory can be set in SRAM and stack can be set in DTCM`
`287`	`288`	`uint32_t *port_heap_get_top(void) {`
`288`		`- return port_stack_get_limit();`
	`289`	`+ return &_ld_heap_end;`
`289`	`290`	`}`
`290`	`291`
`291`	`292`	`uint32_t *port_stack_get_limit(void) {`