espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-10-23 01:47:33 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/fix_a_potential_flash_hang' into 'release/v3.4'

Browse Source 
fix(flash): fixed a potential system hang issue on fm25q16a

See merge request sdk/ESP8266_RTOS_SDK!1701
This commit is contained in:
Dong Heng
2024-11-20 15:41:37 +08:00
parent 734ed61155 f3aaa5831e
commit cb1c6c8e62
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/spi_flash/src/patch/common.c
View File

@@ -106,6 +106,7 @@ void FLASH_PATCH_TEXT_ATTR spi_exit(spi_state_t *state)
Cache_Read_Enable_2(); Cache_Read_Enable_2();
vPortExitCritical(); vPortExitCritical();
patch_delay(1);
} }
static void FLASH_PATCH_TEXT_ATTR spi_trans_block(bool write_mode, static void FLASH_PATCH_TEXT_ATTR spi_trans_block(bool write_mode,

4
components/spi_flash/src/patch/fm25q16a.c
View File

@@ -237,7 +237,7 @@ static void FLASH_PATCH_TEXT_ATTR fm_cam_read_pre(void)
static void FLASH_PATCH_TEXT_ATTR fm_soft_reset() static void FLASH_PATCH_TEXT_ATTR fm_soft_reset()
{ {
fm_send_spi_cmd(0x66, 1*8, 0, 0, NULL, 0, NULL, 0, 0); fm_send_spi_cmd(0x66, 1*8, 0, 0, NULL, 0, NULL, 0, 0);
// ets_delay_us(100); // patch_delay(1);
fm_send_spi_cmd(0x99, 1*8, 0, 0, NULL, 0, NULL, 0, 0); fm_send_spi_cmd(0x99, 1*8, 0, 0, NULL, 0, NULL, 0, 0);
} }
@@ -378,7 +378,7 @@ static bool FLASH_PATCH_TEXT_ATTR fm_cam_erase_and_fix(uint8_t (*buf)[32])
} }
if (memcmp(cam_check, buf[line], 32) != 0) { if (memcmp(cam_check, buf[line], 32) != 0) {
ERROR(FLASH_PATCH_STR("CAM BUF[%d] check error\n"), line); ERROR(FLASH_PATCH_STR("CAM BUF[%d] check error\n"), line);
ets_delay_us(50000); patch_delay(50);
return false; return false;
} }
} }