2016-10-19 05:08:05 -04:00
|
|
|
// Copyright 2015-2016 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 <stdlib.h>
|
|
|
|
#include <assert.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdio.h>
|
2016-12-09 12:29:31 -05:00
|
|
|
#include <sys/param.h> // For MIN/MAX(a, b)
|
2016-10-19 05:08:05 -04:00
|
|
|
|
|
|
|
#include <freertos/FreeRTOS.h>
|
|
|
|
#include <freertos/task.h>
|
|
|
|
#include <freertos/semphr.h>
|
|
|
|
#include <soc/soc.h>
|
|
|
|
#include <soc/dport_reg.h>
|
global: move the soc component out of the common list
This MR removes the common dependency from every IDF components to the SOC component.
Currently, in the ``idf_functions.cmake`` script, we include the header path of SOC component by default for all components.
But for better code organization (or maybe also benifits to the compiling speed), we may remove the dependency to SOC components for most components except the driver and kernel related components.
In CMAKE, we have two kinds of header visibilities (set by include path visibility):
(Assume component A --(depends on)--> B, B is the current component)
1. public (``COMPONENT_ADD_INCLUDEDIRS``): means this path is visible to other depending components (A) (visible to A and B)
2. private (``COMPONENT_PRIV_INCLUDEDIRS``): means this path is only visible to source files inside the component (visible to B only)
and we have two kinds of depending ways:
(Assume component A --(depends on)--> B --(depends on)--> C, B is the current component)
1. public (```COMPONENT_REQUIRES```): means B can access to public include path of C. All other components rely on you (A) will also be available for the public headers. (visible to A, B)
2. private (``COMPONENT_PRIV_REQUIRES``): means B can access to public include path of C, but don't propagate this relation to other components (A). (visible to B)
1. remove the common requirement in ``idf_functions.cmake``, this makes the SOC components invisible to all other components by default.
2. if a component (for example, DRIVER) really needs the dependency to SOC, add a private dependency to SOC for it.
3. some other components that don't really depends on the SOC may still meet some errors saying "can't find header soc/...", this is because it's depended component (DRIVER) incorrectly include the header of SOC in its public headers. Moving all this kind of #include into source files, or private headers
4. Fix the include requirements for some file which miss sufficient #include directives. (Previously they include some headers by the long long long header include link)
This is a breaking change. Previous code may depends on the long include chain.
You may need to include the following headers for some files after this commit:
- soc/soc.h
- soc/soc_memory_layout.h
- driver/gpio.h
- esp_sleep.h
The major broken include chain includes:
1. esp_system.h no longer includes esp_sleep.h. The latter includes driver/gpio.h and driver/touch_pad.h.
2. ets_sys.h no longer includes soc/soc.h
3. freertos/portmacro.h no longer includes soc/soc_memory_layout.h
some peripheral headers no longer includes their hw related headers, e.g. rom/gpio.h no longer includes soc/gpio_pins.h and soc/gpio_reg.h
BREAKING CHANGE
2019-04-03 01:17:38 -04:00
|
|
|
#include <soc/soc_memory_layout.h>
|
2016-10-19 05:08:05 -04:00
|
|
|
#include "sdkconfig.h"
|
|
|
|
#include "esp_attr.h"
|
|
|
|
#include "esp_spi_flash.h"
|
|
|
|
#include "esp_log.h"
|
2020-09-03 06:17:24 -04:00
|
|
|
#include "esp_private/system_internal.h"
|
2019-06-05 22:57:29 -04:00
|
|
|
#if CONFIG_IDF_TARGET_ESP32
|
2019-12-26 02:25:24 -05:00
|
|
|
#include "esp32/rom/spi_flash.h"
|
|
|
|
#include "esp32/rom/cache.h"
|
2019-03-18 03:46:15 -04:00
|
|
|
#include "esp32/clk.h"
|
2020-01-16 22:47:08 -05:00
|
|
|
#elif CONFIG_IDF_TARGET_ESP32S2
|
|
|
|
#include "esp32s2/rom/spi_flash.h"
|
|
|
|
#include "esp32s2/rom/cache.h"
|
|
|
|
#include "esp32s2/clk.h"
|
2020-07-29 01:13:51 -04:00
|
|
|
#elif CONFIG_IDF_TARGET_ESP32S3
|
|
|
|
#include "esp32s3/rom/spi_flash.h"
|
|
|
|
#include "esp32s3/rom/cache.h"
|
|
|
|
#include "esp32s3/clk.h"
|
2019-06-05 22:57:29 -04:00
|
|
|
#endif
|
2017-10-25 03:22:30 -04:00
|
|
|
#include "esp_flash_partitions.h"
|
2016-10-19 05:08:05 -04:00
|
|
|
#include "cache_utils.h"
|
2019-01-08 05:29:25 -05:00
|
|
|
#include "esp_flash.h"
|
2019-10-22 23:28:53 -04:00
|
|
|
#include "esp_attr.h"
|
|
|
|
|
2020-04-16 07:31:13 -04:00
|
|
|
esp_rom_spiflash_result_t IRAM_ATTR spi_flash_write_encrypted_chip(size_t dest_addr, const void *src, size_t size);
|
2016-10-19 05:08:05 -04:00
|
|
|
|
2016-11-24 00:58:36 -05:00
|
|
|
/* bytes erased by SPIEraseBlock() ROM function */
|
2016-12-08 22:18:58 -05:00
|
|
|
#define BLOCK_ERASE_SIZE 65536
|
2016-11-24 00:58:36 -05:00
|
|
|
|
2017-03-21 23:48:33 -04:00
|
|
|
/* Limit number of bytes written/read in a single SPI operation,
|
|
|
|
as these operations disable all higher priority tasks from running.
|
|
|
|
*/
|
2020-06-04 05:21:34 -04:00
|
|
|
#ifdef CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE
|
|
|
|
#define MAX_WRITE_CHUNK CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE
|
|
|
|
#else
|
2017-03-21 23:48:33 -04:00
|
|
|
#define MAX_WRITE_CHUNK 8192
|
2020-06-04 05:21:34 -04:00
|
|
|
#endif // CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE
|
|
|
|
|
2017-03-21 23:48:33 -04:00
|
|
|
#define MAX_READ_CHUNK 16384
|
|
|
|
|
2017-10-06 00:38:01 -04:00
|
|
|
static const char *TAG __attribute__((unused)) = "spi_flash";
|
|
|
|
|
2016-10-19 05:08:05 -04:00
|
|
|
#if CONFIG_SPI_FLASH_ENABLE_COUNTERS
|
|
|
|
static spi_flash_counters_t s_flash_stats;
|
|
|
|
|
|
|
|
#define COUNTER_START() uint32_t ts_begin = xthal_get_ccount()
|
|
|
|
#define COUNTER_STOP(counter) \
|
|
|
|
do{ \
|
|
|
|
s_flash_stats.counter.count++; \
|
2017-09-22 11:09:16 -04:00
|
|
|
s_flash_stats.counter.time += (xthal_get_ccount() - ts_begin) / (esp_clk_cpu_freq() / 1000000); \
|
2016-10-19 05:08:05 -04:00
|
|
|
} while(0)
|
|
|
|
|
|
|
|
#define COUNTER_ADD_BYTES(counter, size) \
|
|
|
|
do { \
|
|
|
|
s_flash_stats.counter.bytes += size; \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
#else
|
|
|
|
#define COUNTER_START()
|
|
|
|
#define COUNTER_STOP(counter)
|
|
|
|
#define COUNTER_ADD_BYTES(counter, size)
|
|
|
|
|
|
|
|
#endif //CONFIG_SPI_FLASH_ENABLE_COUNTERS
|
|
|
|
|
2017-03-09 02:29:00 -05:00
|
|
|
static esp_err_t spi_flash_translate_rc(esp_rom_spiflash_result_t rc);
|
2018-11-12 16:26:07 -05:00
|
|
|
static bool is_safe_write_address(size_t addr, size_t size);
|
2020-05-29 15:52:48 -04:00
|
|
|
static void spi_flash_os_yield(void);
|
2016-12-21 18:56:23 -05:00
|
|
|
|
2017-01-03 14:01:40 -05:00
|
|
|
const DRAM_ATTR spi_flash_guard_funcs_t g_flash_guard_default_ops = {
|
2018-11-12 16:26:07 -05:00
|
|
|
.start = spi_flash_disable_interrupts_caches_and_other_cpu,
|
|
|
|
.end = spi_flash_enable_interrupts_caches_and_other_cpu,
|
|
|
|
.op_lock = spi_flash_op_lock,
|
|
|
|
.op_unlock = spi_flash_op_unlock,
|
2019-06-11 04:45:26 -04:00
|
|
|
#if !CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED
|
2020-05-29 15:52:48 -04:00
|
|
|
.is_safe_write_address = is_safe_write_address,
|
2018-11-12 16:26:07 -05:00
|
|
|
#endif
|
2020-05-29 15:52:48 -04:00
|
|
|
.yield = spi_flash_os_yield,
|
2016-12-21 18:56:23 -05:00
|
|
|
};
|
|
|
|
|
2017-01-03 14:01:40 -05:00
|
|
|
const DRAM_ATTR spi_flash_guard_funcs_t g_flash_guard_no_os_ops = {
|
2018-11-12 16:26:07 -05:00
|
|
|
.start = spi_flash_disable_interrupts_caches_and_other_cpu_no_os,
|
|
|
|
.end = spi_flash_enable_interrupts_caches_no_os,
|
2020-05-29 15:52:48 -04:00
|
|
|
.op_lock = NULL,
|
|
|
|
.op_unlock = NULL,
|
2019-06-11 04:45:26 -04:00
|
|
|
#if !CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED
|
2020-05-29 15:52:48 -04:00
|
|
|
.is_safe_write_address = NULL,
|
2018-11-12 16:26:07 -05:00
|
|
|
#endif
|
2020-05-29 15:52:48 -04:00
|
|
|
.yield = NULL,
|
2016-12-21 18:56:23 -05:00
|
|
|
};
|
2016-10-19 05:08:05 -04:00
|
|
|
|
2017-01-03 14:01:40 -05:00
|
|
|
static const spi_flash_guard_funcs_t *s_flash_guard_ops;
|
|
|
|
|
2019-06-11 04:45:26 -04:00
|
|
|
#ifdef CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS
|
2017-10-25 03:22:30 -04:00
|
|
|
#define UNSAFE_WRITE_ADDRESS abort()
|
|
|
|
#else
|
|
|
|
#define UNSAFE_WRITE_ADDRESS return false
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
/* CHECK_WRITE_ADDRESS macro to fail writes which land in the
|
|
|
|
bootloader, partition table, or running application region.
|
|
|
|
*/
|
2019-06-11 04:45:26 -04:00
|
|
|
#if CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED
|
2017-10-25 03:22:30 -04:00
|
|
|
#define CHECK_WRITE_ADDRESS(ADDR, SIZE)
|
|
|
|
#else /* FAILS or ABORTS */
|
|
|
|
#define CHECK_WRITE_ADDRESS(ADDR, SIZE) do { \
|
2018-11-12 16:26:07 -05:00
|
|
|
if (s_flash_guard_ops && s_flash_guard_ops->is_safe_write_address && !s_flash_guard_ops->is_safe_write_address(ADDR, SIZE)) { \
|
2017-10-25 03:22:30 -04:00
|
|
|
return ESP_ERR_INVALID_ARG; \
|
|
|
|
} \
|
|
|
|
} while(0)
|
2019-06-11 04:45:26 -04:00
|
|
|
#endif // CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED
|
2017-10-25 03:22:30 -04:00
|
|
|
|
|
|
|
static __attribute__((unused)) bool is_safe_write_address(size_t addr, size_t size)
|
|
|
|
{
|
2019-01-08 05:29:25 -05:00
|
|
|
if (!esp_partition_main_flash_region_safe(addr, size)) {
|
2017-10-25 03:22:30 -04:00
|
|
|
UNSAFE_WRITE_ADDRESS;
|
|
|
|
}
|
2019-01-08 05:29:25 -05:00
|
|
|
return true;
|
2017-10-25 03:22:30 -04:00
|
|
|
}
|
|
|
|
|
2019-07-16 05:33:30 -04:00
|
|
|
void spi_flash_init(void)
|
2016-10-19 05:08:05 -04:00
|
|
|
{
|
|
|
|
spi_flash_init_lock();
|
|
|
|
#if CONFIG_SPI_FLASH_ENABLE_COUNTERS
|
|
|
|
spi_flash_reset_counters();
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2017-03-09 02:29:00 -05:00
|
|
|
void IRAM_ATTR spi_flash_guard_set(const spi_flash_guard_funcs_t *funcs)
|
2017-01-03 14:01:40 -05:00
|
|
|
{
|
|
|
|
s_flash_guard_ops = funcs;
|
|
|
|
}
|
|
|
|
|
2019-07-16 05:33:30 -04:00
|
|
|
const spi_flash_guard_funcs_t *IRAM_ATTR spi_flash_guard_get(void)
|
2017-11-16 23:00:51 -05:00
|
|
|
{
|
|
|
|
return s_flash_guard_ops;
|
|
|
|
}
|
|
|
|
|
2019-07-16 05:33:30 -04:00
|
|
|
size_t IRAM_ATTR spi_flash_get_chip_size(void)
|
2016-10-21 05:28:50 -04:00
|
|
|
{
|
|
|
|
return g_rom_flashchip.chip_size;
|
|
|
|
}
|
|
|
|
|
2019-07-16 05:33:30 -04:00
|
|
|
static inline void IRAM_ATTR spi_flash_guard_start(void)
|
2017-01-10 06:48:47 -05:00
|
|
|
{
|
2017-01-19 12:24:55 -05:00
|
|
|
if (s_flash_guard_ops && s_flash_guard_ops->start) {
|
2017-01-10 06:48:47 -05:00
|
|
|
s_flash_guard_ops->start();
|
2017-01-16 11:42:55 -05:00
|
|
|
}
|
2017-01-10 06:48:47 -05:00
|
|
|
}
|
|
|
|
|
2019-07-16 05:33:30 -04:00
|
|
|
static inline void IRAM_ATTR spi_flash_guard_end(void)
|
2017-01-10 06:48:47 -05:00
|
|
|
{
|
2017-01-19 12:24:55 -05:00
|
|
|
if (s_flash_guard_ops && s_flash_guard_ops->end) {
|
2017-01-10 06:48:47 -05:00
|
|
|
s_flash_guard_ops->end();
|
2017-01-16 11:42:55 -05:00
|
|
|
}
|
2017-01-10 06:48:47 -05:00
|
|
|
}
|
|
|
|
|
2019-07-16 05:33:30 -04:00
|
|
|
static inline void IRAM_ATTR spi_flash_guard_op_lock(void)
|
2017-01-19 12:24:55 -05:00
|
|
|
{
|
|
|
|
if (s_flash_guard_ops && s_flash_guard_ops->op_lock) {
|
|
|
|
s_flash_guard_ops->op_lock();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-07-16 05:33:30 -04:00
|
|
|
static inline void IRAM_ATTR spi_flash_guard_op_unlock(void)
|
2017-01-19 12:24:55 -05:00
|
|
|
{
|
|
|
|
if (s_flash_guard_ops && s_flash_guard_ops->op_unlock) {
|
|
|
|
s_flash_guard_ops->op_unlock();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-29 15:52:48 -04:00
|
|
|
static void IRAM_ATTR spi_flash_os_yield(void)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_SPI_FLASH_YIELD_DURING_ERASE
|
|
|
|
vTaskDelay(CONFIG_SPI_FLASH_ERASE_YIELD_TICKS);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2019-01-08 05:29:25 -05:00
|
|
|
#ifdef CONFIG_SPI_FLASH_USE_LEGACY_IMPL
|
2019-07-16 05:33:30 -04:00
|
|
|
static esp_rom_spiflash_result_t IRAM_ATTR spi_flash_unlock(void)
|
2017-03-21 23:48:33 -04:00
|
|
|
{
|
|
|
|
static bool unlocked = false;
|
|
|
|
if (!unlocked) {
|
|
|
|
spi_flash_guard_start();
|
2017-03-09 02:29:00 -05:00
|
|
|
esp_rom_spiflash_result_t rc = esp_rom_spiflash_unlock();
|
2017-03-21 23:48:33 -04:00
|
|
|
spi_flash_guard_end();
|
2017-03-09 02:29:00 -05:00
|
|
|
if (rc != ESP_ROM_SPIFLASH_RESULT_OK) {
|
2017-03-21 23:48:33 -04:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
unlocked = true;
|
|
|
|
}
|
2017-03-09 02:29:00 -05:00
|
|
|
return ESP_ROM_SPIFLASH_RESULT_OK;
|
2017-03-21 23:48:33 -04:00
|
|
|
}
|
2019-01-08 05:29:25 -05:00
|
|
|
#else
|
2019-07-16 05:33:30 -04:00
|
|
|
static esp_rom_spiflash_result_t IRAM_ATTR spi_flash_unlock(void)
|
2019-01-08 05:29:25 -05:00
|
|
|
{
|
|
|
|
esp_err_t err = esp_flash_set_chip_write_protect(NULL, false);
|
|
|
|
if (err != ESP_OK) {
|
|
|
|
return ESP_ROM_SPIFLASH_RESULT_ERR;
|
|
|
|
}
|
|
|
|
return ESP_ROM_SPIFLASH_RESULT_OK;
|
|
|
|
}
|
2019-08-23 00:37:55 -04:00
|
|
|
#endif // CONFIG_SPI_FLASH_USE_LEGACY_IMPL
|
2017-03-21 23:48:33 -04:00
|
|
|
|
2016-10-21 05:28:50 -04:00
|
|
|
esp_err_t IRAM_ATTR spi_flash_erase_sector(size_t sec)
|
2016-10-19 05:08:05 -04:00
|
|
|
{
|
2017-10-25 03:22:30 -04:00
|
|
|
CHECK_WRITE_ADDRESS(sec * SPI_FLASH_SEC_SIZE, SPI_FLASH_SEC_SIZE);
|
2016-10-21 05:28:50 -04:00
|
|
|
return spi_flash_erase_range(sec * SPI_FLASH_SEC_SIZE, SPI_FLASH_SEC_SIZE);
|
|
|
|
}
|
|
|
|
|
2019-01-08 05:29:25 -05:00
|
|
|
#ifdef CONFIG_SPI_FLASH_USE_LEGACY_IMPL
|
|
|
|
//deprecated, only used in compatible mode
|
2019-06-19 09:26:02 -04:00
|
|
|
esp_err_t IRAM_ATTR spi_flash_erase_range(size_t start_addr, size_t size)
|
2016-10-21 05:28:50 -04:00
|
|
|
{
|
2017-10-25 03:22:30 -04:00
|
|
|
CHECK_WRITE_ADDRESS(start_addr, size);
|
2016-10-21 05:28:50 -04:00
|
|
|
if (start_addr % SPI_FLASH_SEC_SIZE != 0) {
|
|
|
|
return ESP_ERR_INVALID_ARG;
|
|
|
|
}
|
|
|
|
if (size % SPI_FLASH_SEC_SIZE != 0) {
|
|
|
|
return ESP_ERR_INVALID_SIZE;
|
|
|
|
}
|
|
|
|
if (size + start_addr > spi_flash_get_chip_size()) {
|
|
|
|
return ESP_ERR_INVALID_SIZE;
|
|
|
|
}
|
|
|
|
size_t start = start_addr / SPI_FLASH_SEC_SIZE;
|
|
|
|
size_t end = start + size / SPI_FLASH_SEC_SIZE;
|
2016-11-24 00:58:36 -05:00
|
|
|
const size_t sectors_per_block = BLOCK_ERASE_SIZE / SPI_FLASH_SEC_SIZE;
|
2016-10-19 05:08:05 -04:00
|
|
|
COUNTER_START();
|
2017-03-09 02:29:00 -05:00
|
|
|
esp_rom_spiflash_result_t rc;
|
|
|
|
rc = spi_flash_unlock();
|
|
|
|
if (rc == ESP_ROM_SPIFLASH_RESULT_OK) {
|
2020-04-02 02:27:33 -04:00
|
|
|
#ifdef CONFIG_SPI_FLASH_YIELD_DURING_ERASE
|
|
|
|
int64_t no_yield_time_us = 0;
|
|
|
|
#endif
|
2017-03-09 02:29:00 -05:00
|
|
|
for (size_t sector = start; sector != end && rc == ESP_ROM_SPIFLASH_RESULT_OK; ) {
|
2020-04-02 02:27:33 -04:00
|
|
|
#ifdef CONFIG_SPI_FLASH_YIELD_DURING_ERASE
|
2020-09-03 06:17:24 -04:00
|
|
|
int64_t start_time_us = esp_system_get_time();
|
2020-04-02 02:27:33 -04:00
|
|
|
#endif
|
2017-03-21 23:48:33 -04:00
|
|
|
spi_flash_guard_start();
|
2020-04-23 14:09:15 -04:00
|
|
|
#ifndef CONFIG_SPI_FLASH_BYPASS_BLOCK_ERASE
|
2018-08-27 12:24:20 -04:00
|
|
|
if (sector % sectors_per_block == 0 && end - sector >= sectors_per_block) {
|
2017-03-09 02:29:00 -05:00
|
|
|
rc = esp_rom_spiflash_erase_block(sector / sectors_per_block);
|
2016-10-21 05:28:50 -04:00
|
|
|
sector += sectors_per_block;
|
|
|
|
COUNTER_ADD_BYTES(erase, sectors_per_block * SPI_FLASH_SEC_SIZE);
|
2020-04-23 14:09:15 -04:00
|
|
|
} else
|
|
|
|
#endif
|
|
|
|
{
|
2017-03-09 02:29:00 -05:00
|
|
|
rc = esp_rom_spiflash_erase_sector(sector);
|
2016-10-21 05:28:50 -04:00
|
|
|
++sector;
|
|
|
|
COUNTER_ADD_BYTES(erase, SPI_FLASH_SEC_SIZE);
|
|
|
|
}
|
2017-03-21 23:48:33 -04:00
|
|
|
spi_flash_guard_end();
|
2020-04-02 02:27:33 -04:00
|
|
|
#ifdef CONFIG_SPI_FLASH_YIELD_DURING_ERASE
|
2020-09-03 06:17:24 -04:00
|
|
|
no_yield_time_us += (esp_system_get_time() - start_time_us);
|
2020-04-02 02:27:33 -04:00
|
|
|
if (no_yield_time_us / 1000 >= CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS) {
|
|
|
|
no_yield_time_us = 0;
|
2020-05-29 15:52:48 -04:00
|
|
|
if (s_flash_guard_ops && s_flash_guard_ops->yield) {
|
|
|
|
s_flash_guard_ops->yield();
|
|
|
|
}
|
2020-04-02 02:27:33 -04:00
|
|
|
}
|
|
|
|
#endif
|
2016-10-21 05:28:50 -04:00
|
|
|
}
|
2016-10-19 05:08:05 -04:00
|
|
|
}
|
|
|
|
COUNTER_STOP(erase);
|
2019-03-08 00:30:49 -05:00
|
|
|
|
|
|
|
spi_flash_guard_start();
|
|
|
|
spi_flash_check_and_flush_cache(start_addr, size);
|
|
|
|
spi_flash_guard_end();
|
|
|
|
|
2016-10-19 05:08:05 -04:00
|
|
|
return spi_flash_translate_rc(rc);
|
|
|
|
}
|
|
|
|
|
2017-10-06 00:38:01 -04:00
|
|
|
/* Wrapper around esp_rom_spiflash_write() that verifies data as written if CONFIG_SPI_FLASH_VERIFY_WRITE is set.
|
|
|
|
|
|
|
|
If CONFIG_SPI_FLASH_VERIFY_WRITE is not set, this is esp_rom_spiflash_write().
|
|
|
|
*/
|
|
|
|
static IRAM_ATTR esp_rom_spiflash_result_t spi_flash_write_inner(uint32_t target, const uint32_t *src_addr, int32_t len)
|
|
|
|
{
|
|
|
|
#ifndef CONFIG_SPI_FLASH_VERIFY_WRITE
|
|
|
|
return esp_rom_spiflash_write(target, src_addr, len);
|
|
|
|
#else // CONFIG_SPI_FLASH_VERIFY_WRITE
|
|
|
|
esp_rom_spiflash_result_t res = ESP_ROM_SPIFLASH_RESULT_OK;
|
|
|
|
assert(len % sizeof(uint32_t) == 0);
|
|
|
|
|
|
|
|
uint32_t before_buf[ESP_ROM_SPIFLASH_BUFF_BYTE_READ_NUM / sizeof(uint32_t)];
|
|
|
|
uint32_t after_buf[ESP_ROM_SPIFLASH_BUFF_BYTE_READ_NUM / sizeof(uint32_t)];
|
2019-10-22 23:28:53 -04:00
|
|
|
uint32_t *expected_buf = before_buf;
|
2017-10-06 00:38:01 -04:00
|
|
|
int32_t remaining = len;
|
|
|
|
for(int i = 0; i < len; i += sizeof(before_buf)) {
|
|
|
|
int i_w = i / sizeof(uint32_t); // index in words (i is an index in bytes)
|
|
|
|
int32_t read_len = MIN(sizeof(before_buf), remaining);
|
|
|
|
|
|
|
|
// Read "before" contents from flash
|
|
|
|
res = esp_rom_spiflash_read(target + i, before_buf, read_len);
|
|
|
|
if (res != ESP_ROM_SPIFLASH_RESULT_OK) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2017-11-28 22:26:57 -05:00
|
|
|
for (int r = 0; r < read_len; r += sizeof(uint32_t)) {
|
|
|
|
int r_w = r / sizeof(uint32_t); // index in words (r is index in bytes)
|
|
|
|
|
|
|
|
uint32_t write = src_addr[i_w + r_w];
|
|
|
|
uint32_t before = before_buf[r_w];
|
2019-10-22 23:28:53 -04:00
|
|
|
uint32_t expected = write & before;
|
|
|
|
#ifdef CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE
|
2017-11-28 22:26:57 -05:00
|
|
|
if ((before & write) != write) {
|
|
|
|
spi_flash_guard_end();
|
|
|
|
ESP_LOGW(TAG, "Write at offset 0x%x requests 0x%08x but will write 0x%08x -> 0x%08x",
|
|
|
|
target + i + r, write, before, before & write);
|
|
|
|
spi_flash_guard_start();
|
|
|
|
}
|
|
|
|
#endif
|
2019-10-22 23:28:53 -04:00
|
|
|
expected_buf[r_w] = expected;
|
|
|
|
}
|
2017-11-28 22:26:57 -05:00
|
|
|
|
2017-10-06 00:38:01 -04:00
|
|
|
res = esp_rom_spiflash_write(target + i, &src_addr[i_w], read_len);
|
|
|
|
if (res != ESP_ROM_SPIFLASH_RESULT_OK) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
res = esp_rom_spiflash_read(target + i, after_buf, read_len);
|
|
|
|
if (res != ESP_ROM_SPIFLASH_RESULT_OK) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int r = 0; r < read_len; r += sizeof(uint32_t)) {
|
|
|
|
int r_w = r / sizeof(uint32_t); // index in words (r is index in bytes)
|
|
|
|
|
2019-10-22 23:28:53 -04:00
|
|
|
uint32_t expected = expected_buf[r_w];
|
2017-10-06 00:38:01 -04:00
|
|
|
uint32_t actual = after_buf[r_w];
|
|
|
|
if (expected != actual) {
|
|
|
|
#ifdef CONFIG_SPI_FLASH_LOG_FAILED_WRITE
|
|
|
|
spi_flash_guard_end();
|
|
|
|
ESP_LOGE(TAG, "Bad write at offset 0x%x expected 0x%08x readback 0x%08x", target + i + r, expected, actual);
|
|
|
|
spi_flash_guard_start();
|
|
|
|
#endif
|
|
|
|
res = ESP_ROM_SPIFLASH_RESULT_ERR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (res != ESP_ROM_SPIFLASH_RESULT_OK) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
remaining -= read_len;
|
|
|
|
}
|
|
|
|
return res;
|
|
|
|
#endif // CONFIG_SPI_FLASH_VERIFY_WRITE
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-12-09 12:29:31 -05:00
|
|
|
esp_err_t IRAM_ATTR spi_flash_write(size_t dst, const void *srcv, size_t size)
|
2016-10-19 05:08:05 -04:00
|
|
|
{
|
2017-10-25 03:22:30 -04:00
|
|
|
CHECK_WRITE_ADDRESS(dst, size);
|
2016-10-21 05:28:50 -04:00
|
|
|
// Out of bound writes are checked in ROM code, but we can give better
|
|
|
|
// error code here
|
2016-12-09 12:29:31 -05:00
|
|
|
if (dst + size > g_rom_flashchip.chip_size) {
|
2016-10-21 05:28:50 -04:00
|
|
|
return ESP_ERR_INVALID_SIZE;
|
|
|
|
}
|
2016-12-09 12:29:31 -05:00
|
|
|
if (size == 0) {
|
|
|
|
return ESP_OK;
|
|
|
|
}
|
2016-11-28 00:53:03 -05:00
|
|
|
|
2017-03-09 02:29:00 -05:00
|
|
|
esp_rom_spiflash_result_t rc = ESP_ROM_SPIFLASH_RESULT_OK;
|
2016-12-09 12:29:31 -05:00
|
|
|
COUNTER_START();
|
2017-06-09 03:17:37 -04:00
|
|
|
const uint8_t *srcc = (const uint8_t *) srcv;
|
2016-12-09 12:29:31 -05:00
|
|
|
/*
|
|
|
|
* Large operations are split into (up to) 3 parts:
|
|
|
|
* - Left padding: 4 bytes up to the first 4-byte aligned destination offset.
|
|
|
|
* - Middle part
|
|
|
|
* - Right padding: 4 bytes from the last 4-byte aligned offset covered.
|
|
|
|
*/
|
|
|
|
size_t left_off = dst & ~3U;
|
|
|
|
size_t left_size = MIN(((dst + 3) & ~3U) - dst, size);
|
|
|
|
size_t mid_off = left_size;
|
|
|
|
size_t mid_size = (size - left_size) & ~3U;
|
|
|
|
size_t right_off = left_size + mid_size;
|
|
|
|
size_t right_size = size - mid_size - left_size;
|
2017-06-09 03:17:37 -04:00
|
|
|
|
2016-12-09 12:29:31 -05:00
|
|
|
rc = spi_flash_unlock();
|
2017-03-09 02:29:00 -05:00
|
|
|
if (rc != ESP_ROM_SPIFLASH_RESULT_OK) {
|
2016-12-09 12:29:31 -05:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (left_size > 0) {
|
|
|
|
uint32_t t = 0xffffffff;
|
|
|
|
memcpy(((uint8_t *) &t) + (dst - left_off), srcc, left_size);
|
2017-01-10 06:48:47 -05:00
|
|
|
spi_flash_guard_start();
|
2017-10-06 00:38:01 -04:00
|
|
|
rc = spi_flash_write_inner(left_off, &t, 4);
|
2017-01-10 06:48:47 -05:00
|
|
|
spi_flash_guard_end();
|
2017-03-09 02:29:00 -05:00
|
|
|
if (rc != ESP_ROM_SPIFLASH_RESULT_OK) {
|
2016-12-09 12:29:31 -05:00
|
|
|
goto out;
|
2016-11-28 00:53:03 -05:00
|
|
|
}
|
2016-12-09 12:29:31 -05:00
|
|
|
COUNTER_ADD_BYTES(write, 4);
|
2016-10-19 05:08:05 -04:00
|
|
|
}
|
2016-12-09 12:29:31 -05:00
|
|
|
if (mid_size > 0) {
|
2017-03-21 23:48:33 -04:00
|
|
|
/* If src buffer is 4-byte aligned as well and is not in a region that requires cache access to be enabled, we
|
|
|
|
* can write directly without buffering in RAM. */
|
2016-12-09 12:29:31 -05:00
|
|
|
#ifdef ESP_PLATFORM
|
2017-10-18 00:21:19 -04:00
|
|
|
bool direct_write = esp_ptr_internal(srcc)
|
|
|
|
&& esp_ptr_byte_accessible(srcc)
|
|
|
|
&& ((uintptr_t) srcc + mid_off) % 4 == 0;
|
2016-12-09 12:29:31 -05:00
|
|
|
#else
|
2017-03-21 23:48:33 -04:00
|
|
|
bool direct_write = true;
|
2016-12-09 12:29:31 -05:00
|
|
|
#endif
|
2017-03-09 02:29:00 -05:00
|
|
|
while(mid_size > 0 && rc == ESP_ROM_SPIFLASH_RESULT_OK) {
|
2017-03-21 23:48:33 -04:00
|
|
|
uint32_t write_buf[8];
|
2017-06-09 03:17:37 -04:00
|
|
|
uint32_t write_size = MIN(mid_size, MAX_WRITE_CHUNK);
|
|
|
|
const uint8_t *write_src = srcc + mid_off;
|
|
|
|
if (!direct_write) {
|
|
|
|
write_size = MIN(write_size, sizeof(write_buf));
|
2017-03-21 23:48:33 -04:00
|
|
|
memcpy(write_buf, write_src, write_size);
|
2017-06-09 03:17:37 -04:00
|
|
|
write_src = (const uint8_t *)write_buf;
|
2017-03-21 23:48:33 -04:00
|
|
|
}
|
2017-01-10 06:48:47 -05:00
|
|
|
spi_flash_guard_start();
|
2017-10-06 00:38:01 -04:00
|
|
|
rc = spi_flash_write_inner(dst + mid_off, (const uint32_t *) write_src, write_size);
|
2017-01-10 06:48:47 -05:00
|
|
|
spi_flash_guard_end();
|
2017-03-21 23:48:33 -04:00
|
|
|
COUNTER_ADD_BYTES(write, write_size);
|
|
|
|
mid_size -= write_size;
|
|
|
|
mid_off += write_size;
|
|
|
|
}
|
2017-03-09 02:29:00 -05:00
|
|
|
if (rc != ESP_ROM_SPIFLASH_RESULT_OK) {
|
2017-03-21 23:48:33 -04:00
|
|
|
goto out;
|
2016-11-28 00:53:03 -05:00
|
|
|
}
|
2016-12-09 12:29:31 -05:00
|
|
|
}
|
2017-03-21 23:48:33 -04:00
|
|
|
|
2016-12-09 12:29:31 -05:00
|
|
|
if (right_size > 0) {
|
|
|
|
uint32_t t = 0xffffffff;
|
|
|
|
memcpy(&t, srcc + right_off, right_size);
|
2017-01-10 06:48:47 -05:00
|
|
|
spi_flash_guard_start();
|
2017-10-06 00:38:01 -04:00
|
|
|
rc = spi_flash_write_inner(dst + right_off, &t, 4);
|
2017-01-10 06:48:47 -05:00
|
|
|
spi_flash_guard_end();
|
2017-03-09 02:29:00 -05:00
|
|
|
if (rc != ESP_ROM_SPIFLASH_RESULT_OK) {
|
2016-12-09 12:29:31 -05:00
|
|
|
goto out;
|
2016-11-28 00:53:03 -05:00
|
|
|
}
|
2016-12-09 12:29:31 -05:00
|
|
|
COUNTER_ADD_BYTES(write, 4);
|
|
|
|
}
|
|
|
|
out:
|
|
|
|
COUNTER_STOP(write);
|
2017-01-04 23:51:02 -05:00
|
|
|
|
2019-03-08 00:30:49 -05:00
|
|
|
spi_flash_guard_start();
|
|
|
|
spi_flash_check_and_flush_cache(dst, size);
|
|
|
|
spi_flash_guard_end();
|
2017-01-04 23:51:02 -05:00
|
|
|
|
2016-12-09 12:29:31 -05:00
|
|
|
return spi_flash_translate_rc(rc);
|
2016-10-19 05:08:05 -04:00
|
|
|
}
|
2019-08-23 00:37:55 -04:00
|
|
|
#endif // CONFIG_SPI_FLASH_USE_LEGACY_IMPL
|
2016-10-19 05:08:05 -04:00
|
|
|
|
2019-10-22 23:28:53 -04:00
|
|
|
|
2016-11-11 01:00:34 -05:00
|
|
|
esp_err_t IRAM_ATTR spi_flash_write_encrypted(size_t dest_addr, const void *src, size_t size)
|
|
|
|
{
|
2019-10-22 23:28:53 -04:00
|
|
|
esp_err_t err = ESP_OK;
|
2017-10-25 03:22:30 -04:00
|
|
|
CHECK_WRITE_ADDRESS(dest_addr, size);
|
2017-01-04 01:53:15 -05:00
|
|
|
if ((dest_addr % 16) != 0) {
|
2016-11-11 01:00:34 -05:00
|
|
|
return ESP_ERR_INVALID_ARG;
|
|
|
|
}
|
2017-01-04 01:53:15 -05:00
|
|
|
if ((size % 16) != 0) {
|
2016-11-11 01:00:34 -05:00
|
|
|
return ESP_ERR_INVALID_SIZE;
|
|
|
|
}
|
2017-01-04 01:53:15 -05:00
|
|
|
|
2016-11-11 01:00:34 -05:00
|
|
|
COUNTER_START();
|
2019-10-22 23:28:53 -04:00
|
|
|
esp_rom_spiflash_result_t rc = spi_flash_unlock();
|
|
|
|
err = spi_flash_translate_rc(rc);
|
|
|
|
if (err != ESP_OK) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef CONFIG_SPI_FLASH_VERIFY_WRITE
|
2020-04-16 07:31:13 -04:00
|
|
|
err = spi_flash_write_encrypted_chip(dest_addr, src, size);
|
2019-10-22 23:28:53 -04:00
|
|
|
COUNTER_ADD_BYTES(write, size);
|
|
|
|
spi_flash_guard_start();
|
|
|
|
spi_flash_check_and_flush_cache(dest_addr, size);
|
|
|
|
spi_flash_guard_end();
|
|
|
|
#else
|
|
|
|
const uint32_t* src_w = (const uint32_t*)src;
|
|
|
|
uint32_t read_buf[ESP_ROM_SPIFLASH_BUFF_BYTE_READ_NUM / sizeof(uint32_t)];
|
|
|
|
int32_t remaining = size;
|
|
|
|
for(int i = 0; i < size; i += sizeof(read_buf)) {
|
|
|
|
int i_w = i / sizeof(uint32_t); // index in words (i is an index in bytes)
|
|
|
|
int32_t read_len = MIN(sizeof(read_buf), remaining);
|
|
|
|
|
|
|
|
// Read "before" contents from flash
|
|
|
|
esp_err_t err = spi_flash_read(dest_addr + i, read_buf, read_len);
|
|
|
|
if (err != ESP_OK) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE
|
|
|
|
//The written data cannot be predicted, so warning is shown if any of the bits is not 1.
|
|
|
|
for (int r = 0; r < read_len; r += sizeof(uint32_t)) {
|
|
|
|
uint32_t before = read_buf[r / sizeof(uint32_t)];
|
|
|
|
if (before != 0xFFFFFFFF) {
|
|
|
|
ESP_LOGW(TAG, "Encrypted write at offset 0x%x but not erased (0x%08x)",
|
|
|
|
dest_addr + i + r, before);
|
2017-01-04 01:53:15 -05:00
|
|
|
}
|
2019-10-22 23:28:53 -04:00
|
|
|
}
|
|
|
|
#endif
|
2017-01-04 01:53:15 -05:00
|
|
|
|
2020-04-16 07:31:13 -04:00
|
|
|
err = spi_flash_write_encrypted_chip(dest_addr + i, src + i, read_len);
|
2019-10-22 23:28:53 -04:00
|
|
|
if (err != ESP_OK) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
COUNTER_ADD_BYTES(write, size);
|
|
|
|
|
|
|
|
spi_flash_guard_start();
|
|
|
|
spi_flash_check_and_flush_cache(dest_addr, size);
|
|
|
|
spi_flash_guard_end();
|
|
|
|
|
|
|
|
err = spi_flash_read_encrypted(dest_addr + i, read_buf, read_len);
|
|
|
|
if (err != ESP_OK) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int r = 0; r < read_len; r += sizeof(uint32_t)) {
|
|
|
|
int r_w = r / sizeof(uint32_t); // index in words (r is index in bytes)
|
|
|
|
|
|
|
|
uint32_t expected = src_w[i_w + r_w];
|
|
|
|
uint32_t actual = read_buf[r_w];
|
|
|
|
if (expected != actual) {
|
|
|
|
#ifdef CONFIG_SPI_FLASH_LOG_FAILED_WRITE
|
|
|
|
ESP_LOGE(TAG, "Bad write at offset 0x%x expected 0x%08x readback 0x%08x", dest_addr + i + r, expected, actual);
|
|
|
|
#endif
|
|
|
|
err = ESP_FAIL;
|
2016-11-11 01:00:34 -05:00
|
|
|
}
|
|
|
|
}
|
2019-10-22 23:28:53 -04:00
|
|
|
if (err != ESP_OK) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
remaining -= read_len;
|
2016-11-11 01:00:34 -05:00
|
|
|
}
|
2019-10-22 23:28:53 -04:00
|
|
|
#endif // CONFIG_SPI_FLASH_VERIFY_WRITE
|
2017-01-04 23:51:02 -05:00
|
|
|
|
2019-10-22 23:28:53 -04:00
|
|
|
fail:
|
2017-01-04 23:51:02 -05:00
|
|
|
|
2019-10-22 23:28:53 -04:00
|
|
|
COUNTER_STOP(write);
|
|
|
|
return err;
|
2016-11-11 01:00:34 -05:00
|
|
|
}
|
|
|
|
|
2019-10-22 23:28:53 -04:00
|
|
|
|
2019-01-08 05:29:25 -05:00
|
|
|
#ifdef CONFIG_SPI_FLASH_USE_LEGACY_IMPL
|
2016-12-09 12:29:31 -05:00
|
|
|
esp_err_t IRAM_ATTR spi_flash_read(size_t src, void *dstv, size_t size)
|
2016-10-19 05:08:05 -04:00
|
|
|
{
|
2016-10-21 05:28:50 -04:00
|
|
|
// Out of bound reads are checked in ROM code, but we can give better
|
|
|
|
// error code here
|
2016-12-09 12:29:31 -05:00
|
|
|
if (src + size > g_rom_flashchip.chip_size) {
|
2016-10-21 05:28:50 -04:00
|
|
|
return ESP_ERR_INVALID_SIZE;
|
|
|
|
}
|
2016-12-09 12:29:31 -05:00
|
|
|
if (size == 0) {
|
|
|
|
return ESP_OK;
|
|
|
|
}
|
|
|
|
|
2017-03-09 02:29:00 -05:00
|
|
|
esp_rom_spiflash_result_t rc = ESP_ROM_SPIFLASH_RESULT_OK;
|
2016-10-19 05:08:05 -04:00
|
|
|
COUNTER_START();
|
2017-01-10 06:48:47 -05:00
|
|
|
spi_flash_guard_start();
|
2016-12-09 12:29:31 -05:00
|
|
|
/* To simplify boundary checks below, we handle small reads separately. */
|
|
|
|
if (size < 16) {
|
|
|
|
uint32_t t[6]; /* Enough for 16 bytes + 4 on either side for padding. */
|
|
|
|
uint32_t read_src = src & ~3U;
|
|
|
|
uint32_t left_off = src & 3U;
|
|
|
|
uint32_t read_size = (left_off + size + 3) & ~3U;
|
2017-03-09 02:29:00 -05:00
|
|
|
rc = esp_rom_spiflash_read(read_src, t, read_size);
|
|
|
|
if (rc != ESP_ROM_SPIFLASH_RESULT_OK) {
|
2016-12-09 12:29:31 -05:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
COUNTER_ADD_BYTES(read, read_size);
|
2019-10-19 02:56:43 -04:00
|
|
|
#ifdef ESP_PLATFORM
|
|
|
|
if (esp_ptr_external_ram(dstv)) {
|
|
|
|
spi_flash_guard_end();
|
|
|
|
memcpy(dstv, ((uint8_t *) t) + left_off, size);
|
|
|
|
spi_flash_guard_start();
|
|
|
|
} else {
|
|
|
|
memcpy(dstv, ((uint8_t *) t) + left_off, size);
|
|
|
|
}
|
|
|
|
#else
|
2017-06-09 03:17:37 -04:00
|
|
|
memcpy(dstv, ((uint8_t *) t) + left_off, size);
|
2019-10-19 02:56:43 -04:00
|
|
|
#endif
|
2016-12-09 12:29:31 -05:00
|
|
|
goto out;
|
|
|
|
}
|
2017-06-09 03:17:37 -04:00
|
|
|
uint8_t *dstc = (uint8_t *) dstv;
|
2016-12-09 12:29:31 -05:00
|
|
|
intptr_t dsti = (intptr_t) dstc;
|
|
|
|
/*
|
|
|
|
* Large operations are split into (up to) 3 parts:
|
|
|
|
* - The middle part: from the first 4-aligned position in src to the first
|
|
|
|
* 4-aligned position in dst.
|
|
|
|
*/
|
|
|
|
size_t src_mid_off = (src % 4 == 0 ? 0 : 4 - (src % 4));
|
|
|
|
size_t dst_mid_off = (dsti % 4 == 0 ? 0 : 4 - (dsti % 4));
|
|
|
|
size_t mid_size = (size - MAX(src_mid_off, dst_mid_off)) & ~3U;
|
|
|
|
/*
|
|
|
|
* - Once the middle part is in place, src_mid_off bytes from the preceding
|
|
|
|
* 4-aligned source location are added on the left.
|
|
|
|
*/
|
|
|
|
size_t pad_left_src = src & ~3U;
|
|
|
|
size_t pad_left_size = src_mid_off;
|
|
|
|
/*
|
|
|
|
* - Finally, the right part is added: from the end of the middle part to
|
|
|
|
* the end. Depending on the alignment of source and destination, this may
|
|
|
|
* be a 4 or 8 byte read from pad_right_src.
|
|
|
|
*/
|
|
|
|
size_t pad_right_src = (src + pad_left_size + mid_size) & ~3U;
|
|
|
|
size_t pad_right_off = (pad_right_src - src);
|
|
|
|
size_t pad_right_size = (size - pad_right_off);
|
2017-10-18 00:21:19 -04:00
|
|
|
|
|
|
|
#ifdef ESP_PLATFORM
|
|
|
|
bool direct_read = esp_ptr_internal(dstc)
|
|
|
|
&& esp_ptr_byte_accessible(dstc)
|
|
|
|
&& ((uintptr_t) dstc + dst_mid_off) % 4 == 0;
|
|
|
|
#else
|
|
|
|
bool direct_read = true;
|
|
|
|
#endif
|
2016-12-09 12:29:31 -05:00
|
|
|
if (mid_size > 0) {
|
2017-03-21 23:48:33 -04:00
|
|
|
uint32_t mid_remaining = mid_size;
|
|
|
|
uint32_t mid_read = 0;
|
|
|
|
while (mid_remaining > 0) {
|
|
|
|
uint32_t read_size = MIN(mid_remaining, MAX_READ_CHUNK);
|
2017-10-18 00:21:19 -04:00
|
|
|
uint32_t read_buf[8];
|
|
|
|
uint8_t *read_dst_final = dstc + dst_mid_off + mid_read;
|
|
|
|
uint8_t *read_dst = read_dst_final;
|
|
|
|
if (!direct_read) {
|
|
|
|
read_size = MIN(read_size, sizeof(read_buf));
|
|
|
|
read_dst = (uint8_t *) read_buf;
|
|
|
|
}
|
|
|
|
rc = esp_rom_spiflash_read(src + src_mid_off + mid_read,
|
|
|
|
(uint32_t *) read_dst, read_size);
|
2017-03-09 02:29:00 -05:00
|
|
|
if (rc != ESP_ROM_SPIFLASH_RESULT_OK) {
|
2017-03-21 23:48:33 -04:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
mid_remaining -= read_size;
|
|
|
|
mid_read += read_size;
|
2017-10-18 00:21:19 -04:00
|
|
|
if (!direct_read) {
|
|
|
|
spi_flash_guard_end();
|
|
|
|
memcpy(read_dst_final, read_buf, read_size);
|
|
|
|
spi_flash_guard_start();
|
|
|
|
} else if (mid_remaining > 0) {
|
2017-03-21 23:48:33 -04:00
|
|
|
/* Drop guard momentarily, allows other tasks to preempt */
|
|
|
|
spi_flash_guard_end();
|
|
|
|
spi_flash_guard_start();
|
|
|
|
}
|
2016-12-09 12:29:31 -05:00
|
|
|
}
|
|
|
|
COUNTER_ADD_BYTES(read, mid_size);
|
|
|
|
/*
|
|
|
|
* If offsets in src and dst are different, perform an in-place shift
|
|
|
|
* to put destination data into its final position.
|
|
|
|
* Note that the shift can be left (src_mid_off < dst_mid_off) or right.
|
|
|
|
*/
|
|
|
|
if (src_mid_off != dst_mid_off) {
|
2017-10-18 00:21:19 -04:00
|
|
|
if (!direct_read) {
|
|
|
|
spi_flash_guard_end();
|
|
|
|
}
|
2016-12-09 12:29:31 -05:00
|
|
|
memmove(dstc + src_mid_off, dstc + dst_mid_off, mid_size);
|
2017-10-18 00:21:19 -04:00
|
|
|
if (!direct_read) {
|
|
|
|
spi_flash_guard_start();
|
|
|
|
}
|
2016-12-09 12:29:31 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (pad_left_size > 0) {
|
|
|
|
uint32_t t;
|
2017-03-09 02:29:00 -05:00
|
|
|
rc = esp_rom_spiflash_read(pad_left_src, &t, 4);
|
|
|
|
if (rc != ESP_ROM_SPIFLASH_RESULT_OK) {
|
2016-12-09 12:29:31 -05:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
COUNTER_ADD_BYTES(read, 4);
|
2017-10-18 00:21:19 -04:00
|
|
|
if (!direct_read) {
|
|
|
|
spi_flash_guard_end();
|
|
|
|
}
|
2016-12-09 12:29:31 -05:00
|
|
|
memcpy(dstc, ((uint8_t *) &t) + (4 - pad_left_size), pad_left_size);
|
2017-10-18 00:21:19 -04:00
|
|
|
if (!direct_read) {
|
|
|
|
spi_flash_guard_start();
|
|
|
|
}
|
2016-12-09 12:29:31 -05:00
|
|
|
}
|
|
|
|
if (pad_right_size > 0) {
|
|
|
|
uint32_t t[2];
|
|
|
|
int32_t read_size = (pad_right_size <= 4 ? 4 : 8);
|
2017-03-09 02:29:00 -05:00
|
|
|
rc = esp_rom_spiflash_read(pad_right_src, t, read_size);
|
|
|
|
if (rc != ESP_ROM_SPIFLASH_RESULT_OK) {
|
2016-12-09 12:29:31 -05:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
COUNTER_ADD_BYTES(read, read_size);
|
2017-10-18 00:21:19 -04:00
|
|
|
if (!direct_read) {
|
|
|
|
spi_flash_guard_end();
|
|
|
|
}
|
2016-12-09 12:29:31 -05:00
|
|
|
memcpy(dstc + pad_right_off, t, pad_right_size);
|
2017-10-18 00:21:19 -04:00
|
|
|
if (!direct_read) {
|
|
|
|
spi_flash_guard_start();
|
|
|
|
}
|
2016-12-09 12:29:31 -05:00
|
|
|
}
|
|
|
|
out:
|
2017-01-10 06:48:47 -05:00
|
|
|
spi_flash_guard_end();
|
2016-10-19 05:08:05 -04:00
|
|
|
COUNTER_STOP(read);
|
|
|
|
return spi_flash_translate_rc(rc);
|
|
|
|
}
|
2019-01-08 05:29:25 -05:00
|
|
|
#endif
|
2016-10-19 05:08:05 -04:00
|
|
|
|
2017-01-04 01:37:15 -05:00
|
|
|
esp_err_t IRAM_ATTR spi_flash_read_encrypted(size_t src, void *dstv, size_t size)
|
|
|
|
{
|
|
|
|
if (src + size > g_rom_flashchip.chip_size) {
|
|
|
|
return ESP_ERR_INVALID_SIZE;
|
|
|
|
}
|
|
|
|
if (size == 0) {
|
|
|
|
return ESP_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
esp_err_t err;
|
|
|
|
const uint8_t *map;
|
|
|
|
spi_flash_mmap_handle_t map_handle;
|
2017-03-09 02:29:00 -05:00
|
|
|
size_t map_src = src & ~(SPI_FLASH_MMU_PAGE_SIZE - 1);
|
2017-01-04 01:37:15 -05:00
|
|
|
size_t map_size = size + (src - map_src);
|
|
|
|
|
|
|
|
err = spi_flash_mmap(map_src, map_size, SPI_FLASH_MMAP_DATA, (const void **)&map, &map_handle);
|
|
|
|
if (err != ESP_OK) {
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
memcpy(dstv, map + (src - map_src), size);
|
|
|
|
spi_flash_munmap(map_handle);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2017-03-09 02:29:00 -05:00
|
|
|
static esp_err_t IRAM_ATTR spi_flash_translate_rc(esp_rom_spiflash_result_t rc)
|
2016-10-19 05:08:05 -04:00
|
|
|
{
|
|
|
|
switch (rc) {
|
2017-03-09 02:29:00 -05:00
|
|
|
case ESP_ROM_SPIFLASH_RESULT_OK:
|
2016-10-19 05:08:05 -04:00
|
|
|
return ESP_OK;
|
2017-03-09 02:29:00 -05:00
|
|
|
case ESP_ROM_SPIFLASH_RESULT_TIMEOUT:
|
2016-10-19 05:08:05 -04:00
|
|
|
return ESP_ERR_FLASH_OP_TIMEOUT;
|
2017-03-09 02:29:00 -05:00
|
|
|
case ESP_ROM_SPIFLASH_RESULT_ERR:
|
2016-10-19 05:08:05 -04:00
|
|
|
default:
|
|
|
|
return ESP_ERR_FLASH_OP_FAIL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#if CONFIG_SPI_FLASH_ENABLE_COUNTERS
|
|
|
|
|
2017-03-09 02:29:00 -05:00
|
|
|
static inline void dump_counter(spi_flash_counter_t *counter, const char *name)
|
2016-10-19 05:08:05 -04:00
|
|
|
{
|
2017-03-21 23:50:05 -04:00
|
|
|
ESP_LOGI(TAG, "%s count=%8d time=%8dus bytes=%8d\n", name,
|
2016-12-09 12:29:31 -05:00
|
|
|
counter->count, counter->time, counter->bytes);
|
2016-10-19 05:08:05 -04:00
|
|
|
}
|
|
|
|
|
2019-07-16 05:33:30 -04:00
|
|
|
const spi_flash_counters_t *spi_flash_get_counters(void)
|
2016-10-19 05:08:05 -04:00
|
|
|
{
|
|
|
|
return &s_flash_stats;
|
|
|
|
}
|
|
|
|
|
2019-07-16 05:33:30 -04:00
|
|
|
void spi_flash_reset_counters(void)
|
2016-10-19 05:08:05 -04:00
|
|
|
{
|
|
|
|
memset(&s_flash_stats, 0, sizeof(s_flash_stats));
|
|
|
|
}
|
|
|
|
|
2019-07-16 05:33:30 -04:00
|
|
|
void spi_flash_dump_counters(void)
|
2016-10-19 05:08:05 -04:00
|
|
|
{
|
|
|
|
dump_counter(&s_flash_stats.read, "read ");
|
|
|
|
dump_counter(&s_flash_stats.write, "write");
|
|
|
|
dump_counter(&s_flash_stats.erase, "erase");
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif //CONFIG_SPI_FLASH_ENABLE_COUNTERS
|
2019-08-08 01:28:10 -04:00
|
|
|
|
bootloader: fix the WRSR format for ISSI flash chips
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
2020-03-12 06:20:31 -04:00
|
|
|
|
2020-07-29 01:13:51 -04:00
|
|
|
#if defined(CONFIG_SPI_FLASH_USE_LEGACY_IMPL) && (defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3))
|
2020-01-16 22:47:08 -05:00
|
|
|
// TODO esp32s2: Remove once ESP32S2 has new SPI Flash API support
|
2019-08-08 01:28:10 -04:00
|
|
|
esp_flash_t *esp_flash_default_chip = NULL;
|
|
|
|
#endif
|