esp32 flasher: Fixes reading of flash chip ID after attach operation

gerekon · gerekon · commit 0c2b1d44816f · 2018-09-18T06:17:18.000+03:00
Closes #52. This commit fixes the problem with programming ESP-WROOM-32 modules with 16MB flash. It can happen that after calling esp_rom_spiflash_attach flash remains busy for some time. So when flasher stub reads flash chip ID just after attach operation it gets 0xFF value. This fix makes flash stub waiting for flash to be ready before reading it's ID. Also it fixes situation when OpenOCD hangs up during onboard algorithm execution with one CPU beeing stalled and its DSR does not indicate that it is stopped (other CPU in exception handler).
diff --git a/contrib/loaders/flash/esp32/stub_flasher.c b/contrib/loaders/flash/esp32/stub_flasher.c
@@ -482,11 +482,26 @@ static uint32_t stub_flash_exec_usr_cmd(uint32_t cmd)
     return status_value;
 }
 
+static void stub_flash_spi_wait_ready()
+{
+    uint32_t status_value = ESP_ROM_SPIFLASH_BUSY_FLAG;
+
+    while (ESP_ROM_SPIFLASH_BUSY_FLAG == (status_value & ESP_ROM_SPIFLASH_BUSY_FLAG)) {
+        WRITE_PERI_REG(PERIPHS_SPI_FLASH_STATUS, 0);       // clear regisrter
+        WRITE_PERI_REG(PERIPHS_SPI_FLASH_CMD, SPI_FLASH_RDSR);
+        while (READ_PERI_REG(PERIPHS_SPI_FLASH_CMD) != 0);
+        status_value = READ_PERI_REG(PERIPHS_SPI_FLASH_STATUS) & (g_rom_spiflash_chip.status_mask);
+    }
+}
+
 static uint32_t stub_flash_spi_cmd_run(uint32_t cmd, uint8_t data_bits[], uint32_t data_bits_num, uint32_t read_bits_num)
 {
     uint32_t old_spi_usr = READ_PERI_REG(PERIPHS_SPI_FLASH_USRREG);
     uint32_t old_spi_usr2 = READ_PERI_REG(PERIPHS_SPI_FLASH_USRREG2);
     uint32_t flags = SPI_USR_COMMAND;
+
+    stub_flash_spi_wait_ready();
+
     if (read_bits_num > 0) {
         flags |= SPI_USR_MISO;
         WRITE_PERI_REG(PERIPHS_SPI_MISO_DLEN_REG, read_bits_num - 1);
@@ -763,6 +778,15 @@ static int stub_flash_handler(int cmd, va_list ap)
 
     esp_rom_spiflash_attach(spiconfig, 0);
     uint32_t flash_size = stub_flash_get_size();
+    if (flash_size == 0) {
+        STUB_LOGE("Failed to get flash size!\n");
+        ret = cmd == ESP32_STUB_CMD_FLASH_SIZE ? 0 : ESP32_STUB_ERR_FAIL;
+        goto _flash_end;
+    }
+    if (cmd == ESP32_STUB_CMD_FLASH_SIZE) {
+        ret = flash_size;
+        goto _flash_end;
+    }
     esp_rom_spiflash_config_param(g_rom_flashchip.device_id, flash_size,
                                   ESP32_FLASH_BLOCK_SIZE, ESP32_FLASH_SECTOR_SIZE, ESP32_FLASH_PAGE_SIZE, ESP32_FLASH_STATUS_MASK);
 
@@ -786,9 +810,6 @@ static int stub_flash_handler(int cmd, va_list ap)
     case ESP32_STUB_CMD_FLASH_WRITE:
         ret = stub_flash_write(arg1, arg2, arg3, arg4);
         break;
-    case ESP32_STUB_CMD_FLASH_SIZE:
-        ret = stub_flash_get_size();
-        break;
     case ESP32_STUB_CMD_FLASH_MAP_GET:
         ret = stub_flash_get_map(arg1, arg2);
         break;
diff --git a/contrib/loaders/flash/esp32/stub_flasher_code.inc b/contrib/loaders/flash/esp32/stub_flasher_code.inc
diff --git a/contrib/loaders/flash/esp32/stub_flasher_data.inc b/contrib/loaders/flash/esp32/stub_flasher_data.inc
@@ -1,5 +1,5 @@
-  0xaf, 0x09, 0x09, 0x40, 0xa7, 0x0a, 0x09, 0x40, 0x8e, 0x0a, 0x09, 0x40,
-  0x98, 0x0a, 0x09, 0x40, 0xee, 0x0b, 0x09, 0x40, 0xf6, 0x0b, 0x09, 0x40,
-  0x03, 0x0c, 0x09, 0x40, 0x7a, 0x0c, 0x09, 0x40, 0x00, 0x00, 0x04, 0x00,
+  0x0a, 0x0a, 0x09, 0x40, 0x07, 0x0b, 0x09, 0x40, 0xe8, 0x0a, 0x09, 0x40,
+  0xf8, 0x0a, 0x09, 0x40, 0x34, 0x0d, 0x09, 0x40, 0x4b, 0x0c, 0x09, 0x40,
+  0x55, 0x0c, 0x09, 0x40, 0xca, 0x0c, 0x09, 0x40, 0x00, 0x00, 0x04, 0x00,
   0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x20, 0x00,
   0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01
diff --git a/contrib/loaders/flash/esp32/stub_flasher_image.h b/contrib/loaders/flash/esp32/stub_flasher_image.h
@@ -1,5 +1,5 @@
 #define ESP32_STUB_BSS_SIZE 0x0000040UL
 
-#define ESP32_STUB_ENTRY_ADDR 0x04009085cUL
+#define ESP32_STUB_ENTRY_ADDR 0x04009089cUL
 
 //#define ESP32_STUB_BUILD_IDF_REV 0905aa010
diff --git a/src/flash/nor/esp32.c b/src/flash/nor/esp32.c
@@ -247,13 +247,13 @@ static uint32_t esp32_get_size(struct flash_bank *bank)
 	int ret = esp32_init_flasher_image(&flasher_image);
 	if (ret != ERROR_OK) {
 		LOG_ERROR("Faied to init flasher image (%d)!", ret);
-		return ret;
+		return 0;
 	}
 	ret = esp32_run_func_image(bank->target, &run, &flasher_image, 1, ESP32_STUB_CMD_FLASH_SIZE);
 	image_close(&flasher_image.image);
 	if (ret != ERROR_OK) {
 		LOG_ERROR("Faied to run flasher stub (%d)!", ret);
-		return ret;
+		return 0;
 	}
 	size = run.ret_code;
 	if (size == 0) {
diff --git a/src/target/esp32.c b/src/target/esp32.c
@@ -1625,7 +1625,9 @@ static int xtensa_poll(struct target *target)
 		bool algo_stopped = false;
 		if (target->state == TARGET_DEBUG_RUNNING) {
 			if (cores_num == ESP32_CPU_COUNT) {
-				algo_stopped = (dsr[0] & OCDDSR_STOPPED) && (dsr[1] & OCDDSR_STOPPED);
+				/* algo can be run on any CPU while other one can be stalled by SW run on target, in this case OCDDSR_STOPPED will not be set for other CPU;
+				 situation when target is in TARGET_DEBUG_RUNNING and both CPUs are stalled is impossible (one must run algo). */
+				algo_stopped = (dsr[0] & (OCDDSR_STOPPED|OCDDSR_RUNSTALLSAMPLE)) && (dsr[1] & (OCDDSR_STOPPED|OCDDSR_RUNSTALLSAMPLE));
 			} else {
 				algo_stopped = (dsr[0] & OCDDSR_STOPPED);
 			}
@@ -2156,8 +2158,7 @@ static int esp32_algo_run(struct target *target, struct esp32_algo_image *image,
 			&run->priv.stub.ainfo);
 	if (retval != ERROR_OK) {
 		LOG_ERROR("Faied to wait algorithm (%d)!", retval);
-		target_halt(target);
-		target_wait_state(target, TARGET_HALTED, ESP32_TARGET_STATE_TMO);
+		// target has been forced to stop in target_wait_algorithm()
 	}
 #if ESP32_STUB_STACK_DEBUG
 	retval = esp32_stub_check_stack(target, run->priv.stub.stack_addr - run->stack_size, run->stack_size, ESP32_STUB_STACK_DEBUG);
diff --git a/testing/esp/debug_backend.py b/testing/esp/debug_backend.py
@@ -34,7 +34,6 @@ def start(toolch, oocd_path, oocd_tcl_dir, oocd_cfg_files):
         raise e
 
 def stop():
-    # _gdb_inst.disconnect()
     _oocd_inst.stop()
     _oocd_inst.join()
 
@@ -300,9 +299,9 @@ def target_reset(self, action='halt'):
     def target_download(self):
         raise NotImplementedError('target_download')
 
-    def target_program(self, file_name, off, actions='verify'):
+    def target_program(self, file_name, off, actions='verify', tmo=30):
         # actions can be any or both of 'verify reset'
-        self.monitor_run('program_esp32 %s %s 0x%x' % (file_name, actions, off), 30)
+        self.monitor_run('program_esp32 %s %s 0x%x' % (file_name, actions, off), tmo)
 
     def exec_file_set(self, file_path):
         # -file-exec-and-symbols file
diff --git a/testing/esp/test_flasher.py b/testing/esp/test_flasher.py
@@ -34,13 +34,13 @@ def test_big_binary(self):
         for i in range(size):
             fbin.write(os.urandom(1024))
         fbin.close()
-        self.gdb.monitor_run('program_esp32 %s 0x%x' % (fname1, ESP32_APP_FLASH_OFF + ESP32_APP_FLASH_SZ), tmo=40)
-        # since we can not get result from OpenOCD (output parsing seems not tp be good idea), 
-        # we nee to read written flash and compare data manually
+        self.gdb.target_program(fname1, ESP32_APP_FLASH_OFF + ESP32_APP_FLASH_SZ, actions='', tmo=130)
+        # since we can not get result from OpenOCD (output parsing seems not to be good idea),
+        # we need to read written flash and compare data manually
         fhnd,fname2 = tempfile.mkstemp()
         fbin = os.fdopen(fhnd, 'wb')
         fbin.close()
-        self.gdb.monitor_run('flash read_bank 0 %s 0x%x %d' % (fname2, ESP32_APP_FLASH_OFF + ESP32_APP_FLASH_SZ, size*1024), tmo=30)
+        self.gdb.monitor_run('flash read_bank 0 %s 0x%x %d' % (fname2, ESP32_APP_FLASH_OFF + ESP32_APP_FLASH_SZ, size*1024), tmo=120)
         self.assertTrue(filecmp.cmp(fname1, fname2))
 
 
