alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-19 14:26:01 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

spiram: Fix corrupting 1 kB of noinit data in spiram in 2T mode (IDFGH-11231)

Browse Source 
The function psram_2t_mode_check() in esp_psram_impl_quad.c
overwrites the first kilobyte of every megabyte with 0xff upon startup
which may overwrite noinit data which should be preserved over reboots.

This patch fixes this by saving/restoring the tested memory.

The test size has been reduced from 4*1024 bytes to 4*512 bytes just
to keep the stack usage of the fuction within resonable limits
(was 2048 bytes, now 1536 bytes).
This commit is contained in:
Johannes Overmann 2023-10-13 12:23:33 +02:00
parent 8fc8f3f479
commit 7b187b6ee3
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
components/esp_psram/esp32/esp_psram_impl_quad.c
View File

@ -668,32 +668,45 @@ static esp_err_t IRAM_ATTR psram_2t_mode_enable(psram_spi_num_t spi_num)
return ESP_OK; return ESP_OK;
} }
#define CHECK_DATA_LEN (1024) #define CHECK_DATA_LEN (512) // Needs 1.5 kB of stack.
#define CHECK_ADDR_STEP (0x100000) #define CHECK_ADDR_STEP (0x100000)
#define SIZE_32MBIT (0x400000) #define SIZE_32MBIT (0x400000)
#define SIZE_64MBIT (0x800000) #define SIZE_64MBIT (0x800000)
static esp_err_t psram_2t_mode_check(psram_spi_num_t spi_num) static esp_err_t psram_2t_mode_check(psram_spi_num_t spi_num)
{ {
uint8_t w_check_data[CHECK_DATA_LEN] = {0}; // Save and restore used RAM to keep noinit data intact.
uint8_t r_check_data[CHECK_DATA_LEN] = {0}; uint8_t check_data[CHECK_DATA_LEN];
uint8_t saved_data_lo[CHECK_DATA_LEN];
uint8_t saved_data_hi[CHECK_DATA_LEN];
for (uint32_t addr = 0; addr < SIZE_32MBIT; addr += CHECK_ADDR_STEP) { for (uint32_t addr=0; addr<SIZE_32MBIT; addr+=CHECK_ADDR_STEP) {
spi_user_psram_write(spi_num, addr, (uint32_t *)w_check_data, CHECK_DATA_LEN);
}
memset(w_check_data, 0xff, sizeof(w_check_data)); // Save low and high bank.
spi_user_psram_read(spi_num, addr, (uint32_t *)saved_data_lo, CHECK_DATA_LEN);
spi_user_psram_read(spi_num, addr + SIZE_32MBIT, (uint32_t *)saved_data_hi, CHECK_DATA_LEN);
for (uint32_t addr = SIZE_32MBIT; addr < SIZE_64MBIT; addr += CHECK_ADDR_STEP) { // Write 0x00 to low bank.
spi_user_psram_write(spi_num, addr, (uint32_t *)w_check_data, CHECK_DATA_LEN); memset(check_data, 0x00, sizeof(check_data));
} spi_user_psram_write(spi_num, addr, (uint32_t *)check_data, CHECK_DATA_LEN);
for (uint32_t addr = 0; addr < SIZE_32MBIT; addr += CHECK_ADDR_STEP) { // Write 0xff to high bank.
spi_user_psram_read(spi_num, addr, (uint32_t *)r_check_data, CHECK_DATA_LEN); memset(check_data, 0xff, sizeof(check_data));
for (uint32_t j = 0; j < CHECK_DATA_LEN; j++) { spi_user_psram_write(spi_num, addr + SIZE_32MBIT, (uint32_t *)check_data, CHECK_DATA_LEN);
if (r_check_data[j] != 0xff) {
return ESP_FAIL; // Check low bank for 0xff.
} int error = 0;
spi_user_psram_read(spi_num, addr, (uint32_t *)check_data, CHECK_DATA_LEN);
for (uint32_t j=0; j<CHECK_DATA_LEN; j++) {
error += check_data[j] != 0xff;
}
// Restore saved memory.
spi_user_psram_write(spi_num, addr, (uint32_t *)saved_data_lo, CHECK_DATA_LEN);
spi_user_psram_write(spi_num, addr + SIZE_32MBIT, (uint32_t *)saved_data_hi, CHECK_DATA_LEN);
if (error) {
return ESP_FAIL;
} }
} }