From 41e37ebabe6583f75d22c0b6d49eef81453f6cdb Mon Sep 17 00:00:00 2001 From: "Michael (XIAO Xufeng)" Date: Tue, 24 Dec 2019 16:41:00 +0800 Subject: [PATCH 1/3] ci: decrease the performance threshold for sdio throughput --- components/idf_test/include/idf_performance.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/idf_test/include/idf_performance.h b/components/idf_test/include/idf_performance.h index 55c523e376..bf16528e13 100644 --- a/components/idf_test/include/idf_performance.h +++ b/components/idf_test/include/idf_performance.h @@ -38,8 +38,8 @@ #define IDF_PERFORMANCE_MAX_ISR_ENTER_CYCLES 290 #define IDF_PERFORMANCE_MAX_ISR_EXIT_CYCLES 565 -#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_MBSEC_TOHOST_4BIT 13000 -#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_MBSEC_FRHOST_4BIT 13000 +#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_MBSEC_TOHOST_4BIT 12500 +#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_MBSEC_FRHOST_4BIT 12500 #define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_MBSEC_TOHOST_1BIT 4000 #define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_MBSEC_FRHOST_1BIT 4000 #define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_MBSEC_TOHOST_SPI 1000 From 72cf67cba396ca3d93965bff8254340b5f3ae5e2 Mon Sep 17 00:00:00 2001 From: "Michael (XIAO Xufeng)" Date: Tue, 24 Dec 2019 16:44:05 +0800 Subject: [PATCH 2/3] sdio_slave_hal: fix the TAG non-static issue (MINOR CHANGE) --- components/soc/src/hal/sdio_slave_hal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/soc/src/hal/sdio_slave_hal.c b/components/soc/src/hal/sdio_slave_hal.c index 5b4464846b..f54a7f08fb 100644 --- a/components/soc/src/hal/sdio_slave_hal.c +++ b/components/soc/src/hal/sdio_slave_hal.c @@ -29,7 +29,7 @@ return ret_val;\ } }while (0) -const char TAG[] = "SDIO_HAL"; +static const char TAG[] = "SDIO_HAL"; static esp_err_t init_send_queue(sdio_slave_context_t *hal); From 2ffe0aca12230a1cd45d2415cf92a25383601e5e Mon Sep 17 00:00:00 2001 From: "Michael (XIAO Xufeng)" Date: Tue, 24 Dec 2019 16:45:12 +0800 Subject: [PATCH 3/3] esp_flash: increase the timeout for block erase --- components/spi_flash/spi_flash_chip_generic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/spi_flash/spi_flash_chip_generic.c b/components/spi_flash/spi_flash_chip_generic.c index c072b93374..2def8b54b5 100644 --- a/components/spi_flash/spi_flash_chip_generic.c +++ b/components/spi_flash/spi_flash_chip_generic.c @@ -21,8 +21,8 @@ static const char TAG[] = "chip_generic"; #define SPI_FLASH_GENERIC_CHIP_ERASE_TIMEOUT 4000 -#define SPI_FLASH_GENERIC_SECTOR_ERASE_TIMEOUT 500 -#define SPI_FLASH_GENERIC_BLOCK_ERASE_TIMEOUT 1000 +#define SPI_FLASH_GENERIC_SECTOR_ERASE_TIMEOUT 500 //according to GD25Q127 + 100ms +#define SPI_FLASH_GENERIC_BLOCK_ERASE_TIMEOUT 1300 //according to GD25Q127 + 100ms #define DEFAULT_IDLE_TIMEOUT 200 #define DEFAULT_PAGE_PROGRAM_TIMEOUT 500