feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'fix/flash_idle_judge' into 'master'

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

See merge request espressif/esp-idf!32282
This commit is contained in:
C.S.M
2024-07-31 15:12:30 +08:00
parent 2667b31d0a 69950910cb
commit f4ca7bfc48
3 changed files with 5 additions and 4 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

@@ -398,7 +398,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) 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

@@ -400,7 +400,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) 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;
} }
/** /**

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; uint32_t tsus_unit = 0;
if (dev->sus_status.flash_pes_dly_256 == 1) { if (dev->sus_status.flash_pes_dly_256 == 1) {
tsus_unit = 128; tsus_unit = 256;
} else { } else {
tsus_unit = 4; tsus_unit = 4;
} }
@@ -403,7 +403,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) 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;
} }
/** /**