mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
9582cbe5b8
1. The 2nd bootloader always call `rom_spiflash_unlock()`, but never help to clear the WEL bit when exit. This may cause system unstability. This commit helps to clear WEL when flash configuration is done. **RISK:** When the app starts, it didn't have to clear the WEL before it actually write/erase. But now the very first write/erase operation should be done after a WEL clear. Though the risk is little (all the following write/erase also need to clear the WEL), we still have to test this carefully, especially for those functions used by the OTA. 2. The `rom_spiflash_unlock()` function in the patch of ESP32 may (1) trigger the QPI, (2) clear the QE or (3) fail to unlock the ISSI chips. Status register bitmap of ISSI chip and GD chip: | SR | ISSI | GD25LQ32C | | -- | ---- | --------- | | 0 | WIP | WIP | | 1 | WEL | WEL | | 2 | BP0 | BP0 | | 3 | BP1 | BP1 | | 4 | BP2 | BP2 | | 5 | BP3 | BP3 | | 6 | QE | BP4 | | 7 | SRWD | SRP0 | | 8 | | SRP1 | | 9 | | QE | | 10 | | SUS2 | | 11 | | LB1 | | 12 | | LB2 | | 13 | | LB3 | | 14 | | CMP | | 15 | | SUS1 | QE bit of other chips are at the bit 9 of the status register (i.e. bit 1 of SR2), which should be read by RDSR2 command. However, the RDSR2 (35H, Read Status 2) command for chip of other vendors happens to be the QIOEN (Enter QPI mode) command of ISSI chips. When the `rom_spiflash_unlock()` function trys to read SR2, it may trigger the QPI of ISSI chips. Moreover, when `rom_spiflash_unlock()` try to clear the BP4 bit in the status register, QE (bit 6) of ISSI chip may be cleared by accident. Or if the ISSI chip doesn't accept WRSR command with argument of two bytes (since it only have status register of one byte), it may fail to clear the other protect bits (BP0~BP3) as expected. This commit makes the `rom_spiflash_unlock()` check whether the vendor is issi. if so, `rom_spiflash_unlock()` only send RDSR to read the status register, send WRSR with only 1 byte argument, and also avoid clearing the QE bit (bit 6). 3. `rom_spiflash_unlock()` always send WRSR command to clear protection bits even when there is no protection bit active. And the execution of clearing status registers, which takes about 700us, will also happen even when there's no bits cleared. This commit skips the clearing of status register if there is no protection bits active. Also move the execute_flash_command to be a bootloader API; move implementation of spi_flash_wrap_set to the bootloader
124 lines
3.6 KiB
C
124 lines
3.6 KiB
C
// Copyright 2018 Espressif Systems (Shanghai) PTE LTD
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#include <string.h>
|
|
#include <sys/param.h>
|
|
|
|
#include "esp_spi_flash.h"
|
|
#include "soc/system_reg.h"
|
|
#include "soc/soc_memory_layout.h"
|
|
#include "esp32s2/rom/spi_flash.h"
|
|
#include "esp32s2/rom/cache.h"
|
|
#include "bootloader_flash.h"
|
|
#include "hal/spi_flash_hal.h"
|
|
#include "esp_flash.h"
|
|
#include "esp_log.h"
|
|
|
|
static const char *TAG = "spiflash_s2";
|
|
|
|
#define SPICACHE SPIMEM0
|
|
#define SPIFLASH SPIMEM1
|
|
|
|
extern void IRAM_ATTR flash_rom_init(void);
|
|
esp_rom_spiflash_result_t IRAM_ATTR spi_flash_write_encrypted_chip(size_t dest_addr, const void *src, size_t size)
|
|
{
|
|
const spi_flash_guard_funcs_t *ops = spi_flash_guard_get();
|
|
esp_rom_spiflash_result_t rc;
|
|
|
|
assert((dest_addr % 16) == 0);
|
|
assert((size % 16) == 0);
|
|
|
|
if (!esp_ptr_internal(src)) {
|
|
uint8_t block[128]; // Need to buffer in RAM as we write
|
|
while (size > 0) {
|
|
size_t next_block = MIN(size, sizeof(block));
|
|
memcpy(block, src, next_block);
|
|
|
|
esp_rom_spiflash_result_t r = spi_flash_write_encrypted_chip(dest_addr, block, next_block);
|
|
if (r != ESP_ROM_SPIFLASH_RESULT_OK) {
|
|
return r;
|
|
}
|
|
|
|
size -= next_block;
|
|
dest_addr += next_block;
|
|
src = ((uint8_t *)src) + next_block;
|
|
}
|
|
bzero(block, sizeof(block));
|
|
|
|
return ESP_ROM_SPIFLASH_RESULT_OK;
|
|
}
|
|
else { // Already in internal memory
|
|
ESP_LOGV(TAG, "calling SPI_Encrypt_Write addr 0x%x src %p size 0x%x", dest_addr, src, size);
|
|
|
|
#ifndef CONFIG_SPI_FLASH_USE_LEGACY_IMPL
|
|
/* The ROM function SPI_Encrypt_Write assumes ADDR_BITLEN is already set but new
|
|
implementation doesn't automatically set this to a usable value */
|
|
SPIFLASH.user1.usr_addr_bitlen = 23;
|
|
#endif
|
|
|
|
if (ops && ops->start) {
|
|
ops->start();
|
|
}
|
|
flash_rom_init();
|
|
rc = SPI_Encrypt_Write(dest_addr, src, size);
|
|
if (ops && ops->end) {
|
|
ops->end();
|
|
}
|
|
return rc;
|
|
}
|
|
}
|
|
|
|
esp_err_t spi_flash_wrap_set(spi_flash_wrap_mode_t mode)
|
|
{
|
|
return bootloader_flash_wrap_set(mode);
|
|
}
|
|
|
|
esp_err_t spi_flash_enable_wrap(uint32_t wrap_size)
|
|
{
|
|
switch(wrap_size) {
|
|
case 8:
|
|
return bootloader_flash_wrap_set(FLASH_WRAP_MODE_8B);
|
|
case 16:
|
|
return bootloader_flash_wrap_set(FLASH_WRAP_MODE_16B);
|
|
case 32:
|
|
return bootloader_flash_wrap_set(FLASH_WRAP_MODE_32B);
|
|
case 64:
|
|
return bootloader_flash_wrap_set(FLASH_WRAP_MODE_64B);
|
|
default:
|
|
return ESP_FAIL;
|
|
}
|
|
}
|
|
|
|
void spi_flash_disable_wrap(void)
|
|
{
|
|
bootloader_flash_wrap_set(FLASH_WRAP_MODE_DISABLE);
|
|
}
|
|
|
|
bool spi_flash_support_wrap_size(uint32_t wrap_size)
|
|
{
|
|
if (!REG_GET_BIT(SPI_MEM_CTRL_REG(0), SPI_MEM_FREAD_QIO) || !REG_GET_BIT(SPI_MEM_CTRL_REG(0), SPI_MEM_FASTRD_MODE)){
|
|
return ESP_FAIL;
|
|
}
|
|
switch(wrap_size) {
|
|
case 0:
|
|
case 8:
|
|
case 16:
|
|
case 32:
|
|
case 64:
|
|
return true;
|
|
default:
|
|
return false;
|
|
}
|
|
}
|