espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-29 18:27:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(spi_flash): Fix issue that bit_length is wrong on suspend chip because not judge idle correctly

Browse Source
This commit is contained in:
C.S.M
2024-07-23 14:20:45 +08:00
parent d756e6d208
commit 4b86e6424b
5 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/hal/esp32c2/include/hal/spimem_flash_ll.h
View File

@ -399,7 +399,7 @@ static inline void spimem_flash_ll_user_start(spi_mem_dev_t *dev, bool pe_ops)
*/
static inline bool spimem_flash_ll_host_idle(const spi_mem_dev_t *dev)
{
return dev->fsm.spi0_mst_st == 0;
return dev->cmd.mst_st == 0;
}
/**

2
components/hal/esp32c3/include/hal/spimem_flash_ll.h
View File

@ -401,7 +401,7 @@ static inline void spimem_flash_ll_user_start(spi_mem_dev_t *dev, bool pe_ops)
*/
static inline bool spimem_flash_ll_host_idle(const spi_mem_dev_t *dev)
{
return dev->fsm.spi0_mst_st == 0;
return dev->cmd.mst_st == 0;
}
/**

2
components/hal/esp32c61/include/hal/spimem_flash_ll.h
View File

@ -557,7 +557,7 @@ static inline void spimem_flash_ll_set_addr_bitlen(spi_mem_dev_t *dev, uint32_t
*/
static inline void spimem_flash_ll_set_extra_address(spi_mem_dev_t *dev, uint32_t extra_addr)
{
dev->cache_fctrl.cache_usr_addr_4byte = 0;
dev->cache_fctrl.usr_addr_4byte = 0;
HAL_FORCE_MODIFY_U32_REG_FIELD(dev->rd_status, wb_mode, extra_addr);
}

5
components/hal/esp32s3/include/hal/spimem_flash_ll.h
View File

@ -253,7 +253,7 @@ static inline uint32_t spimem_flash_ll_get_tsus_unit_in_cycles(spi_mem_dev_t *de
{
uint32_t tsus_unit = 0;
if (dev->sus_status.flash_pes_dly_256 == 1) {
tsus_unit = 128;
tsus_unit = 256;
} else {
tsus_unit = 4;
}
@ -404,7 +404,8 @@ static inline void spimem_flash_ll_user_start(spi_mem_dev_t *dev, bool pe_ops)
*/
static inline bool spimem_flash_ll_host_idle(const spi_mem_dev_t *dev)
{
return dev->fsm.st == 0;
// s3 has no cmd.mst_st, can use cmd.val instead
return dev->cmd.val == 0;
}
/**

5
components/spi_flash/test_apps/esp_flash/CMakeLists.txt
View File

@ -10,8 +10,3 @@ set(COMPONENTS main esptool_py)
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
project(test_esp_flash_drv)
message(STATUS "Checking memspi registers are not read-write by half-word")
include($ENV{IDF_PATH}/tools/ci/check_register_rw_half_word.cmake)
check_register_rw_half_word(SOC_MODULES "spi_mem*" "spi1_mem*"
HAL_MODULES "spimem_flash")