From 207996eb680d86a50e6201b56cdf4a2e6963ca90 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Mon, 29 May 2023 10:25:55 +0200 Subject: [PATCH 1/2] fix(soc): correct SOC_IROM_MASK_HIGH for esp32s3 Fixes corrupted backtraces on S3 when a function is in ROM. Closes https://github.com/espressif/esp-idf/issues/11512 --- components/soc/esp32s3/include/soc/soc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/soc/esp32s3/include/soc/soc.h b/components/soc/esp32s3/include/soc/soc.h index d38d452d69..3c5c623b93 100644 --- a/components/soc/esp32s3/include/soc/soc.h +++ b/components/soc/esp32s3/include/soc/soc.h @@ -186,7 +186,7 @@ #define SOC_EXTRAM_DATA_LOW 0x3C000000 #define SOC_EXTRAM_DATA_HIGH 0x3E000000 #define SOC_IROM_MASK_LOW 0x40000000 -#define SOC_IROM_MASK_HIGH 0x4001A100 +#define SOC_IROM_MASK_HIGH 0x40060000 #define SOC_EXTRAM_DATA_SIZE (SOC_EXTRAM_DATA_HIGH - SOC_EXTRAM_DATA_LOW) #define SOC_MAX_CONTIGUOUS_RAM_SIZE (SOC_EXTRAM_DATA_HIGH - SOC_EXTRAM_DATA_LOW) ///< Largest span of contiguous memory (DRAM or IRAM) in the address space From 3fd384893258a22356b808440156b0a120ec2f44 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 13 Jun 2023 11:17:22 +0200 Subject: [PATCH 2/2] fix(soc): update SOC_IROM_MASK_HIGH for esp32 for consistency --- components/soc/esp32/include/soc/soc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/soc/esp32/include/soc/soc.h b/components/soc/esp32/include/soc/soc.h index d0640ac6cf..02bdc4ead8 100644 --- a/components/soc/esp32/include/soc/soc.h +++ b/components/soc/esp32/include/soc/soc.h @@ -175,7 +175,7 @@ #define SOC_IROM_LOW 0x400D0000 #define SOC_IROM_HIGH 0x40400000 #define SOC_IROM_MASK_LOW 0x40000000 -#define SOC_IROM_MASK_HIGH 0x40064F00 +#define SOC_IROM_MASK_HIGH 0x40070000 #define SOC_CACHE_PRO_LOW 0x40070000 #define SOC_CACHE_PRO_HIGH 0x40078000 #define SOC_CACHE_APP_LOW 0x40078000