contrib/loaders: add stub stack usage amount to the chip image headers

contrib/loaders/flash/espressif/esp32/Makefile

@@ -16,6 +16,7 @@ STUB_CHIP_ARCH_PATH := $(STUB_COMMON_PATH)/$(STUB_ARCH)
 STUB_OBJ_DEPS := sdkconfig.h
 STUB_LD_SCRIPT := stub.ld
 STUB_IDF_BIN_LD_SCRIPT := stub.ld
+STUB_STACK_SIZE := 512
 STUB_CHIP := esp32
 
 SRCS := $(IDF_PATH)/components/app_trace/port/$(STUB_ARCH)/port.c \

contrib/loaders/flash/espressif/esp32/stub_flasher_image.h

@@ -154,6 +154,8 @@
 #define ESP_STUB_FLASH_WITH_LOG_LOG_ADDR 0x03ffe538cUL
 #define ESP_STUB_FLASH_WITH_LOG_LOG_SIZE 4100UL
 
+#define ESP_STUB_STACK_SIZE 512
+
 #include <stdint.h>
 
 static const uint8_t s_esp_flasher_stub_flash_read_code[] = {

contrib/loaders/flash/espressif/esp32c2/Makefile

@@ -16,6 +16,7 @@ STUB_CHIP_ARCH_PATH := $(STUB_COMMON_PATH)/$(STUB_ARCH)
 STUB_OBJ_DEPS := sdkconfig.h
 STUB_LD_SCRIPT := stub.ld
 STUB_IDF_BIN_LD_SCRIPT := stub.ld
+STUB_STACK_SIZE := 512
 STUB_CHIP := esp32c2
 
 SRCS := $(IDF_PATH)/components/esp_hw_support/port/esp32c2/rtc_clk_init.c \

contrib/loaders/flash/espressif/esp32c2/stub_flasher_image.h

@@ -154,6 +154,8 @@
 #define ESP_STUB_FLASH_WITH_LOG_LOG_ADDR 0x03fca5438UL
 #define ESP_STUB_FLASH_WITH_LOG_LOG_SIZE 4100UL
 
+#define ESP_STUB_STACK_SIZE 512
+
 #include <stdint.h>
 
 static const uint8_t s_esp_flasher_stub_flash_read_code[] = {
@@ -242,5 +244,5 @@ static const uint8_t s_esp_flasher_stub_flash_with_log_data[] = {
 };
 
 /*
-#define esp32c2_STUB_BUILD_IDF_REV 12aca9d83c
+#define esp32c2_STUB_BUILD_IDF_REV fe1355eac4
 */

contrib/loaders/flash/espressif/esp32c3/Makefile

@@ -16,6 +16,7 @@ STUB_CHIP_ARCH_PATH := $(STUB_COMMON_PATH)/$(STUB_ARCH)
 STUB_OBJ_DEPS := sdkconfig.h
 STUB_LD_SCRIPT := stub.ld
 STUB_IDF_BIN_LD_SCRIPT := stub.ld
+STUB_STACK_SIZE := 512
 STUB_CHIP := esp32c3
 
 SRCS := $(IDF_PATH)/components/esp_hw_support/port/esp32c3/rtc_clk_init.c \

contrib/loaders/flash/espressif/esp32c3/stub_flasher_image.h

@@ -154,6 +154,8 @@
 #define ESP_STUB_FLASH_WITH_LOG_LOG_ADDR 0x03fc85440UL
 #define ESP_STUB_FLASH_WITH_LOG_LOG_SIZE 4100UL
 
+#define ESP_STUB_STACK_SIZE 512
+
 #include <stdint.h>
 
 static const uint8_t s_esp_flasher_stub_flash_read_code[] = {

contrib/loaders/flash/espressif/esp32c6/Makefile

@@ -16,6 +16,7 @@ STUB_CHIP_ARCH_PATH := $(STUB_COMMON_PATH)/$(STUB_ARCH)
 STUB_OBJ_DEPS := sdkconfig.h
 STUB_LD_SCRIPT := stub.ld
 STUB_IDF_BIN_LD_SCRIPT := stub_idf_bin.ld
+STUB_STACK_SIZE := 512
 STUB_CHIP := esp32c6
 
 SRCS := $(IDF_PATH)/components/esp_hw_support/port/esp32c6/rtc_clk_init.c \

contrib/loaders/flash/espressif/esp32c6/stub_flasher_image.h

@@ -154,6 +154,8 @@
 #define ESP_STUB_FLASH_WITH_LOG_LOG_ADDR 0x0408053a8UL
 #define ESP_STUB_FLASH_WITH_LOG_LOG_SIZE 4100UL
 
+#define ESP_STUB_STACK_SIZE 512
+
 #include <stdint.h>
 
 static const uint8_t s_esp_flasher_stub_flash_read_code[] = {
@@ -242,5 +244,5 @@ static const uint8_t s_esp_flasher_stub_flash_with_log_data[] = {
 };
 
 /*
-#define esp32c6_STUB_BUILD_IDF_REV 12aca9d83c
+#define esp32c6_STUB_BUILD_IDF_REV fe1355eac4
 */

contrib/loaders/flash/espressif/esp32h2/Makefile

@@ -16,6 +16,7 @@ STUB_CHIP_ARCH_PATH := $(STUB_COMMON_PATH)/$(STUB_ARCH)
 STUB_OBJ_DEPS := sdkconfig.h
 STUB_LD_SCRIPT := stub.ld
 STUB_IDF_BIN_LD_SCRIPT := stub_idf_bin.ld
+STUB_STACK_SIZE := 512
 STUB_CHIP := esp32h2
 
 SRCS := $(IDF_PATH)/components/esp_hw_support/port/esp32h2/rtc_clk_init.c \

contrib/loaders/flash/espressif/esp32h2/stub_flasher_image.h

@@ -154,6 +154,8 @@
 #define ESP_STUB_FLASH_WITH_LOG_LOG_ADDR 0x04080539cUL
 #define ESP_STUB_FLASH_WITH_LOG_LOG_SIZE 4100UL
 
+#define ESP_STUB_STACK_SIZE 512
+
 #include <stdint.h>
 
 static const uint8_t s_esp_flasher_stub_flash_read_code[] = {
@@ -242,5 +244,5 @@ static const uint8_t s_esp_flasher_stub_flash_with_log_data[] = {
 };
 
 /*
-#define esp32h2_STUB_BUILD_IDF_REV 12aca9d83c
+#define esp32h2_STUB_BUILD_IDF_REV fe1355eac4
 */

contrib/loaders/flash/espressif/esp32p4/Makefile

@@ -16,6 +16,7 @@ STUB_CHIP_ARCH_PATH := $(STUB_COMMON_PATH)/$(STUB_ARCH)
 STUB_OBJ_DEPS := sdkconfig.h
 STUB_LD_SCRIPT := stub.ld
 STUB_IDF_BIN_LD_SCRIPT := stub.ld
+STUB_STACK_SIZE := 512
 STUB_CHIP := esp32p4
 
 SRCS := $(IDF_PATH)/components/esp_hw_support/port/esp32p4/rtc_clk_init.c \

contrib/loaders/flash/espressif/esp32p4/stub_flasher_image.h

@@ -154,6 +154,8 @@
 #define ESP_STUB_FLASH_WITH_LOG_LOG_ADDR 0x08ff051dcUL
 #define ESP_STUB_FLASH_WITH_LOG_LOG_SIZE 4100UL
 
+#define ESP_STUB_STACK_SIZE 512
+
 #include <stdint.h>
 
 static const uint8_t s_esp_flasher_stub_flash_read_code[] = {
@@ -242,5 +244,5 @@ static const uint8_t s_esp_flasher_stub_flash_with_log_data[] = {
 };
 
 /*
-#define esp32p4_STUB_BUILD_IDF_REV 12aca9d83c
+#define esp32p4_STUB_BUILD_IDF_REV fe1355eac4
 */

contrib/loaders/flash/espressif/esp32s2/Makefile

@@ -16,6 +16,7 @@ STUB_CHIP_ARCH_PATH := $(STUB_COMMON_PATH)/$(STUB_ARCH)
 STUB_OBJ_DEPS := sdkconfig.h
 STUB_LD_SCRIPT := stub.ld
 STUB_IDF_BIN_LD_SCRIPT := stub.ld
+STUB_STACK_SIZE := 512
 STUB_CHIP := esp32s2
 
 SRCS := $(IDF_PATH)/components/app_trace/port/$(STUB_ARCH)/port.c \

contrib/loaders/flash/espressif/esp32s2/stub_flasher_image.h

@@ -154,6 +154,8 @@
 #define ESP_STUB_FLASH_WITH_LOG_LOG_ADDR 0x03ffbd224UL
 #define ESP_STUB_FLASH_WITH_LOG_LOG_SIZE 4100UL
 
+#define ESP_STUB_STACK_SIZE 512
+
 #include <stdint.h>
 
 static const uint8_t s_esp_flasher_stub_flash_read_code[] = {

contrib/loaders/flash/espressif/esp32s3/Makefile

@@ -16,6 +16,7 @@ STUB_CHIP_ARCH_PATH := $(STUB_COMMON_PATH)/$(STUB_ARCH)
 STUB_OBJ_DEPS := sdkconfig.h
 STUB_LD_SCRIPT := stub.ld
 STUB_IDF_BIN_LD_SCRIPT := stub.ld
+STUB_STACK_SIZE := 768
 STUB_CHIP := esp32s3
 
 SRCS := $(IDF_PATH)/components/app_trace/port/$(STUB_ARCH)/port.c \

contrib/loaders/flash/espressif/esp32s3/stub_flasher_image.h

@@ -154,6 +154,8 @@
 #define ESP_STUB_FLASH_WITH_LOG_LOG_ADDR 0x03fca12d0UL
 #define ESP_STUB_FLASH_WITH_LOG_LOG_SIZE 4100UL
 
+#define ESP_STUB_STACK_SIZE 768
+
 #include <stdint.h>
 
 static const uint8_t s_esp_flasher_stub_flash_read_code[] = {

contrib/loaders/flash/espressif/stub_common.mk

@@ -183,6 +183,9 @@ $(STUB_IMAGE_HDR): $(ELF_OUTPUTS)
  $(READELF) -s $(ELF_FILE) | fgrep s_stub_log_buff | awk 'NR==1 {print ($$3 "UL"); exit} END {if (NR==0) print "0UL"}' >> $(STUB_IMAGE_HDR) ; \
  printf "\n" >> $(STUB_IMAGE_HDR) ; \
  )
+
+ $(Q) printf "#define ESP_STUB_STACK_SIZE $(STUB_STACK_SIZE)\n\n" >> $(STUB_IMAGE_HDR)
+
  $(Q) printf "#include <stdint.h>\n\n" >> $(STUB_IMAGE_HDR)
  $(Q) $(foreach cmd, $(COMMANDS), \
  printf "static const uint8_t s_esp_flasher_stub_$(cmd)_code[] = {\n" >> $(STUB_IMAGE_HDR) ; \
@@ -205,7 +208,7 @@ $(STUB_IDF_IMAGE_HDR): $(ELF_OUTPUTS)
  $(eval ELF_FILE = $(STUB_$(CMD_NAME)_ELF))
  $(Q) printf "#define OPENOCD_STUB_BSS_SIZE 0x0" >> $(STUB_IDF_IMAGE_HDR)
  $(Q) $(READELF) -S $(ELF_FILE) | fgrep .bss | awk 'NR==1 {print ($$7 "UL"); exit} END {if (NR==0) print "0UL"}' >> $(STUB_IDF_IMAGE_HDR)
- $(Q) printf "#define OPENOCD_STUB_STACK_SIZE 512\n" >> $(STUB_IDF_IMAGE_HDR)
+ $(Q) printf "#define OPENOCD_STUB_STACK_SIZE $(STUB_STACK_SIZE)\n" >> $(STUB_IDF_IMAGE_HDR)
  $(Q) printf "#define OPENOCD_STUB_PARAM_SIZE 512\n" >> $(STUB_IDF_IMAGE_HDR)
  $(Q) printf "#define OPENOCD_STUB_BP_SECTOR_SIZE 4096\n" >> $(STUB_IDF_IMAGE_HDR)
 

contrib/loaders/flash/espressif/stub_flasher.h

@@ -42,7 +42,7 @@
 
 /* exported to let openocd know for stack allocation */
 #define ESP_STUB_UNZIP_BUFF_SIZE 32768
-#define ESP_STUB_IFLATOR_SIZE 11000
+#define ESP_STUB_IFLATOR_SIZE 11520
 #define ESP_STUB_RDWR_BUFF_SIZE 32768
 
 /* stub runtime options */

src/flash/nor/esp_flash.c

@@ -296,7 +296,8 @@ int esp_algo_flash_blank_check(struct flash_bank *bank)
  struct esp_flash_bank *esp_info = bank->driver_priv;
  struct esp_algorithm_run_data run;
  const struct esp_flasher_stub_config *stub_cfg = esp_info->get_stub(bank, ESP_STUB_CMD_FLASH_ERASE_CHECK);
- const uint32_t stack_size = 512 + stub_cfg->stack_additional_sz;
+ const uint32_t stack_size = esp_info->stub_log_enabled ?
+ stub_cfg->stack_default_sz * 2 : stub_cfg->stack_default_sz;
 
  if (bank->target->state != TARGET_HALTED) {
  LOG_ERROR("Target not halted!");
@@ -307,7 +308,7 @@ int esp_algo_flash_blank_check(struct flash_bank *bank)
  if (ret != ERROR_OK)
  return ret;
 
- run.stack_size = esp_info->stub_log_enabled ? stack_size * 2 : stack_size;
+ run.stack_size = stack_size;
  struct mem_param mp;
  init_mem_param(&mp, 3 /*3rd usr arg*/, bank->num_sectors /*size in bytes*/, PARAM_IN);
  run.mem_args.params = ∓
@@ -344,13 +345,14 @@ static int esp_algo_flash_get_mappings(struct flash_bank *bank,
 {
  struct esp_algorithm_run_data run;
  const struct esp_flasher_stub_config *stub_cfg = esp_info->get_stub(bank, ESP_STUB_CMD_FLASH_MAP_GET);
- const uint32_t stack_size = 512 + stub_cfg->stack_additional_sz;
+ const uint32_t stack_size = esp_info->stub_log_enabled ?
+ stub_cfg->stack_default_sz * 2 : stub_cfg->stack_default_sz;
 
  int ret = esp_algo_flasher_algorithm_init(&run, esp_info->stub_hw, stub_cfg);
  if (ret != ERROR_OK)
  return ret;
 
- run.stack_size = esp_info->stub_log_enabled ? stack_size * 2 : stack_size;
+ run.stack_size = stack_size;
  run.check_preloaded_binary = esp_info->stub_log_enabled ? false : esp_info->check_preloaded_binary;
 
  struct mem_param mp;
@@ -429,7 +431,8 @@ int esp_algo_flash_erase(struct flash_bank *bank, unsigned int first, unsigned i
  struct esp_flash_bank *esp_info = bank->driver_priv;
  struct esp_algorithm_run_data run;
  const struct esp_flasher_stub_config *stub_cfg = esp_info->get_stub(bank, ESP_STUB_CMD_FLASH_READ);
- const uint32_t stack_size = 512 + stub_cfg->stack_additional_sz;
+ const uint32_t stack_size = esp_info->stub_log_enabled ?
+ stub_cfg->stack_default_sz * 2 : stub_cfg->stack_default_sz;
 
  if (bank->target->state != TARGET_HALTED) {
  LOG_ERROR("Target not halted");
@@ -445,7 +448,7 @@ int esp_algo_flash_erase(struct flash_bank *bank, unsigned int first, unsigned i
  if (ret != ERROR_OK)
  return ret;
 
- run.stack_size = esp_info->stub_log_enabled ? stack_size * 2 : stack_size;
+ run.stack_size = stack_size;
  run.timeout_ms = ESP_FLASH_ERASE_TMO;
  ret = esp_info->run_func_image(bank->target,
  &run,
@@ -699,7 +702,8 @@ int esp_algo_flash_write(struct flash_bank *bank, const uint8_t *buffer,
  esp_info->compression ? ESP_STUB_CMD_FLASH_WRITE_DEFLATED : ESP_STUB_CMD_FLASH_WRITE);
  uint8_t *compressed_buff = NULL;
  uint32_t compressed_len = 0;
- uint32_t stack_size = 1300 + ESP_STUB_UNZIP_BUFF_SIZE;
+ uint32_t stack_size = esp_info->stub_log_enabled ?
+ stub_cfg->stack_default_sz * 2 : stub_cfg->stack_default_sz;
 
  if (offset & 0x3UL) {
  LOG_ERROR("Unaligned offset!");
@@ -748,7 +752,7 @@ int esp_algo_flash_write(struct flash_bank *bank, const uint8_t *buffer,
  stack_size += ESP_STUB_IFLATOR_SIZE;
  }
 
- run.stack_size = stack_size + stub_cfg->stack_additional_sz + stub_cfg->stack_data_pool_sz;
+ run.stack_size = stack_size + ESP_STUB_UNZIP_BUFF_SIZE + stub_cfg->stack_data_pool_sz;
  run.usr_func = esp_algo_flash_rw_do;
  run.usr_func_arg = &wr_state;
  run.usr_func_init = (esp_algorithm_usr_func_init_t)esp_algo_flash_write_state_init;
@@ -882,6 +886,8 @@ int esp_algo_flash_read(struct flash_bank *bank, uint8_t *buffer,
  struct esp_algorithm_run_data run;
  struct esp_flash_read_state rd_state;
  const struct esp_flasher_stub_config *stub_cfg = esp_info->get_stub(bank, ESP_STUB_CMD_FLASH_READ);
+ const uint32_t stack_size = esp_info->stub_log_enabled ?
+ stub_cfg->stack_default_sz * 2 : stub_cfg->stack_default_sz;
 
  if (offset & 0x3UL) {
  LOG_ERROR("Unaligned offset!");
@@ -911,7 +917,7 @@ int esp_algo_flash_read(struct flash_bank *bank, uint8_t *buffer,
  return ret;
  }
 
- run.stack_size = 1024 + stub_cfg->stack_additional_sz + stub_cfg->stack_data_pool_sz;
+ run.stack_size = stack_size + stub_cfg->stack_data_pool_sz;
  run.usr_func_init = (esp_algorithm_usr_func_init_t)esp_algo_flash_read_state_init;
  run.usr_func = esp_algo_flash_rw_do;
  run.usr_func_arg = &rd_state;
@@ -1160,7 +1166,8 @@ int esp_algo_flash_breakpoint_add(struct target *target, struct esp_flash_breakp
  struct mem_param mp[2]; /* in and out */
  const size_t size_bp_inst = sizeof(sw_bp->bp_flash_addr);
  const struct esp_flasher_stub_config *stub_cfg = esp_info->get_stub(bank, ESP_STUB_CMD_FLASH_BP_SET);
- const uint32_t stack_size = 512 + stub_cfg->stack_additional_sz;
+ const uint32_t stack_size = esp_info->stub_log_enabled ?
+ stub_cfg->stack_default_sz * 2 : stub_cfg->stack_default_sz;
 
  op_state.esp_info = esp_info;
  op_state.sw_bp = sw_bp;
@@ -1173,7 +1180,7 @@ int esp_algo_flash_breakpoint_add(struct target *target, struct esp_flash_breakp
  if (ret != ERROR_OK)
  return ret;
 
- run.stack_size = esp_info->stub_log_enabled ? stack_size * 2 : stack_size;
+ run.stack_size = stack_size;
  run.usr_func_arg = &op_state;
  run.usr_func_init = (esp_algorithm_usr_func_init_t)esp_algo_flash_bp_op_state_init;
  run.usr_func_done = (esp_algorithm_usr_func_done_t)esp_algo_flash_bp_op_state_cleanup;
@@ -1245,7 +1252,8 @@ int esp_algo_flash_breakpoint_remove(struct target *target, struct esp_flash_bre
  struct mem_param mp[2]; /* out and out */
  const size_t size_bp_inst = sizeof(struct esp_flash_stub_bp_instructions);
  const struct esp_flasher_stub_config *stub_cfg = esp_info->get_stub(bank, ESP_STUB_CMD_FLASH_BP_CLEAR);
- const uint32_t stack_size = 512 + stub_cfg->stack_additional_sz;
+ const uint32_t stack_size = esp_info->stub_log_enabled ?
+ stub_cfg->stack_default_sz * 2 : stub_cfg->stack_default_sz;
 
  int ret = esp_algo_flasher_algorithm_init(&run, esp_info->stub_hw, stub_cfg);
  if (ret != ERROR_OK)
@@ -1256,7 +1264,7 @@ int esp_algo_flash_breakpoint_remove(struct target *target, struct esp_flash_bre
  op_state.num_bps = num_bps;
  op_state.target_buf = NULL;
 
- run.stack_size = esp_info->stub_log_enabled ? stack_size * 2 : stack_size;
+ run.stack_size = stack_size;
  run.usr_func_arg = &op_state;
  run.usr_func_init = (esp_algorithm_usr_func_init_t)esp_algo_flash_bp_op_state_init;
  run.usr_func_done = (esp_algorithm_usr_func_done_t)esp_algo_flash_bp_op_state_cleanup;
@@ -1324,6 +1332,8 @@ static int esp_algo_flash_calc_hash(struct flash_bank *bank, uint8_t *hash,
  struct esp_flash_bank *esp_info = bank->driver_priv;
  struct esp_algorithm_run_data run;
  const struct esp_flasher_stub_config *stub_cfg = esp_info->get_stub(bank, ESP_STUB_CMD_FLASH_CALC_HASH);
+ const uint32_t stack_size = esp_info->stub_log_enabled ?
+ stub_cfg->stack_default_sz * 2 : stub_cfg->stack_default_sz;
 
  if (offset & 0x3UL) {
  LOG_ERROR("Unaligned offset!");
@@ -1339,7 +1349,7 @@ static int esp_algo_flash_calc_hash(struct flash_bank *bank, uint8_t *hash,
  if (ret != ERROR_OK)
  return ret;
 
- run.stack_size = 1024 + ESP_STUB_RDWR_BUFF_SIZE;
+ run.stack_size = stack_size + ESP_STUB_RDWR_BUFF_SIZE;
 
  struct mem_param mp;
  init_mem_param(&mp,
@@ -1384,7 +1394,8 @@ static int esp_algo_flash_boost_clock_freq(struct flash_bank *bank, int boost)
  struct esp_algorithm_run_data run;
  int new_cpu_freq = -1; /* set to max level */
  const struct esp_flasher_stub_config *stub_cfg = esp_info->get_stub(bank, ESP_STUB_CMD_FLASH_CLOCK_CONFIGURE);
- const uint32_t stack_size = 512 + stub_cfg->stack_additional_sz;
+ const uint32_t stack_size = esp_info->stub_log_enabled ?
+ stub_cfg->stack_default_sz * 2 : stub_cfg->stack_default_sz;
 
  int ret = esp_algo_flasher_algorithm_init(&run, esp_info->stub_hw, stub_cfg);
  if (ret != ERROR_OK)
@@ -1394,7 +1405,7 @@ static int esp_algo_flash_boost_clock_freq(struct flash_bank *bank, int boost)
  if (boost == 0)
  new_cpu_freq = esp_info->old_cpu_freq;
 
- run.stack_size = esp_info->stub_log_enabled ? stack_size * 2 : stack_size;
+ run.stack_size = stack_size;
  ret = esp_info->run_func_image(bank->target,
  &run,
  2,

src/flash/nor/esp_flash.h

@@ -52,7 +52,7 @@ struct esp_flasher_stub_config {
  uint32_t bss_sz;
  uint32_t first_user_reg_param;
  target_addr_t apptrace_ctrl_addr;
- uint32_t stack_additional_sz; /* target based additional stack needs */
+ uint32_t stack_default_sz; /* chip based default stack usage amount */
  uint32_t stack_data_pool_sz;
  target_addr_t log_buff_addr;
  uint32_t log_buff_size; /* current_log_len + len(buff) */