2016-08-17 15:08:22 +00: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
|
2016-10-19 09:08:05 +00:00
|
|
|
//
|
2016-08-17 15:08:22 +00:00
|
|
|
// 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.
|
|
|
|
|
2016-09-12 10:54:45 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <assert.h>
|
2016-09-13 08:40:05 +00:00
|
|
|
#include <string.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
|
2016-08-17 15:08:22 +00:00
|
|
|
#include <freertos/FreeRTOS.h>
|
|
|
|
#include <freertos/task.h>
|
|
|
|
#include <freertos/semphr.h>
|
2019-06-06 02:57:29 +00:00
|
|
|
#if CONFIG_IDF_TARGET_ESP32
|
2019-03-14 09:29:32 +00:00
|
|
|
#include <esp32/rom/spi_flash.h>
|
|
|
|
#include <esp32/rom/cache.h>
|
2019-06-06 02:57:29 +00:00
|
|
|
#elif CONFIG_IDF_TARGET_ESP32S2BETA
|
|
|
|
#include "esp32s2beta/rom/spi_flash.h"
|
|
|
|
#include "esp32s2beta/rom/cache.h"
|
|
|
|
#endif
|
2016-09-12 10:54:45 +00:00
|
|
|
#include <soc/soc.h>
|
2016-08-17 15:08:22 +00:00
|
|
|
#include <soc/dport_reg.h>
|
2016-08-24 10:01:01 +00:00
|
|
|
#include "sdkconfig.h"
|
2016-09-12 10:54:45 +00:00
|
|
|
#include "esp_ipc.h"
|
|
|
|
#include "esp_attr.h"
|
2016-11-25 09:33:51 +00:00
|
|
|
#include "esp_intr_alloc.h"
|
2016-09-12 10:54:45 +00:00
|
|
|
#include "esp_spi_flash.h"
|
2016-09-23 00:44:45 +00:00
|
|
|
#include "esp_log.h"
|
2016-08-17 15:08:22 +00:00
|
|
|
|
2019-09-16 00:56:48 +00:00
|
|
|
static __attribute__((unused)) const char* TAG = "cache";
|
|
|
|
|
2019-09-06 07:37:55 +00:00
|
|
|
#define DPORT_CACHE_BIT(cpuid, regid) DPORT_ ## cpuid ## regid
|
|
|
|
|
|
|
|
#define DPORT_CACHE_MASK(cpuid) (DPORT_CACHE_BIT(cpuid, _CACHE_MASK_OPSDRAM) | DPORT_CACHE_BIT(cpuid, _CACHE_MASK_DROM0) | \
|
|
|
|
DPORT_CACHE_BIT(cpuid, _CACHE_MASK_DRAM1) | DPORT_CACHE_BIT(cpuid, _CACHE_MASK_IROM0) | \
|
|
|
|
DPORT_CACHE_BIT(cpuid, _CACHE_MASK_IRAM1) | DPORT_CACHE_BIT(cpuid, _CACHE_MASK_IRAM0) )
|
|
|
|
|
|
|
|
#define DPORT_CACHE_VAL(cpuid) (~(DPORT_CACHE_BIT(cpuid, _CACHE_MASK_DROM0) | \
|
|
|
|
DPORT_CACHE_BIT(cpuid, _CACHE_MASK_DRAM1) | \
|
|
|
|
DPORT_CACHE_BIT(cpuid, _CACHE_MASK_IRAM0)))
|
|
|
|
|
|
|
|
#define DPORT_CACHE_GET_VAL(cpuid) (cpuid == 0) ? DPORT_CACHE_VAL(PRO) : DPORT_CACHE_VAL(APP)
|
|
|
|
#define DPORT_CACHE_GET_MASK(cpuid) (cpuid == 0) ? DPORT_CACHE_MASK(PRO) : DPORT_CACHE_MASK(APP)
|
2016-08-24 10:01:01 +00:00
|
|
|
|
2016-09-12 10:54:45 +00:00
|
|
|
static void IRAM_ATTR spi_flash_disable_cache(uint32_t cpuid, uint32_t* saved_state);
|
|
|
|
static void IRAM_ATTR spi_flash_restore_cache(uint32_t cpuid, uint32_t saved_state);
|
2016-08-24 10:01:01 +00:00
|
|
|
|
2016-09-12 10:54:45 +00:00
|
|
|
static uint32_t s_flash_op_cache_state[2];
|
2016-08-24 10:01:01 +00:00
|
|
|
|
2016-09-12 10:54:45 +00:00
|
|
|
#ifndef CONFIG_FREERTOS_UNICORE
|
2016-08-24 10:01:01 +00:00
|
|
|
static SemaphoreHandle_t s_flash_op_mutex;
|
2016-11-08 01:02:30 +00:00
|
|
|
static volatile bool s_flash_op_can_start = false;
|
|
|
|
static volatile bool s_flash_op_complete = false;
|
2017-01-18 07:07:27 +00:00
|
|
|
#ifndef NDEBUG
|
|
|
|
static volatile int s_flash_op_cpu = -1;
|
|
|
|
#endif
|
2016-09-13 08:40:05 +00:00
|
|
|
|
2019-07-16 09:33:30 +00:00
|
|
|
void spi_flash_init_lock(void)
|
2016-10-19 09:08:05 +00:00
|
|
|
{
|
2017-11-17 04:00:16 +00:00
|
|
|
s_flash_op_mutex = xSemaphoreCreateRecursiveMutex();
|
2017-07-12 03:33:51 +00:00
|
|
|
assert(s_flash_op_mutex != NULL);
|
2016-10-19 09:08:05 +00:00
|
|
|
}
|
2016-09-13 08:40:05 +00:00
|
|
|
|
2019-07-16 09:33:30 +00:00
|
|
|
void spi_flash_op_lock(void)
|
2016-10-19 09:08:05 +00:00
|
|
|
{
|
2017-11-17 04:00:16 +00:00
|
|
|
xSemaphoreTakeRecursive(s_flash_op_mutex, portMAX_DELAY);
|
2016-10-19 09:08:05 +00:00
|
|
|
}
|
2016-08-24 10:01:01 +00:00
|
|
|
|
2019-07-16 09:33:30 +00:00
|
|
|
void spi_flash_op_unlock(void)
|
2016-10-19 09:08:05 +00:00
|
|
|
{
|
2017-11-17 04:00:16 +00:00
|
|
|
xSemaphoreGiveRecursive(s_flash_op_mutex);
|
2016-10-19 09:08:05 +00:00
|
|
|
}
|
2017-09-04 12:11:15 +00:00
|
|
|
/*
|
|
|
|
If you're going to modify this, keep in mind that while the flash caches of the pro and app
|
2019-06-06 02:57:29 +00:00
|
|
|
cpu are separate, the psram cache is *not*. If one of the CPUs returns from a flash routine
|
2017-09-04 12:11:15 +00:00
|
|
|
with its cache enabled but the other CPUs cache is not enabled yet, you will have problems
|
|
|
|
when accessing psram from the former CPU.
|
|
|
|
*/
|
2016-09-12 10:54:45 +00:00
|
|
|
|
2016-10-19 09:08:05 +00:00
|
|
|
void IRAM_ATTR spi_flash_op_block_func(void* arg)
|
2016-08-17 15:08:22 +00:00
|
|
|
{
|
2016-09-12 10:54:45 +00:00
|
|
|
// Disable scheduler on this CPU
|
|
|
|
vTaskSuspendAll();
|
2016-11-25 09:33:51 +00:00
|
|
|
// Restore interrupts that aren't located in IRAM
|
|
|
|
esp_intr_noniram_disable();
|
2016-08-24 10:01:01 +00:00
|
|
|
uint32_t cpuid = (uint32_t) arg;
|
2017-03-27 17:02:58 +00:00
|
|
|
// s_flash_op_complete flag is cleared on *this* CPU, otherwise the other
|
|
|
|
// CPU may reset the flag back to false before IPC task has a chance to check it
|
|
|
|
// (if it is preempted by an ISR taking non-trivial amount of time)
|
|
|
|
s_flash_op_complete = false;
|
2016-09-12 10:54:45 +00:00
|
|
|
s_flash_op_can_start = true;
|
|
|
|
while (!s_flash_op_complete) {
|
|
|
|
// busy loop here and wait for the other CPU to finish flash operation
|
2016-08-17 15:08:22 +00:00
|
|
|
}
|
2016-09-12 10:54:45 +00:00
|
|
|
// Flash operation is complete, re-enable cache
|
|
|
|
spi_flash_restore_cache(cpuid, s_flash_op_cache_state[cpuid]);
|
2016-11-25 09:33:51 +00:00
|
|
|
// Restore interrupts that aren't located in IRAM
|
|
|
|
esp_intr_noniram_enable();
|
2016-09-12 10:54:45 +00:00
|
|
|
// Re-enable scheduler
|
|
|
|
xTaskResumeAll();
|
2016-08-17 15:08:22 +00:00
|
|
|
}
|
|
|
|
|
2019-07-16 09:33:30 +00:00
|
|
|
void IRAM_ATTR spi_flash_disable_interrupts_caches_and_other_cpu(void)
|
2016-08-24 10:01:01 +00:00
|
|
|
{
|
2016-10-19 09:08:05 +00:00
|
|
|
spi_flash_op_lock();
|
2016-09-12 10:54:45 +00:00
|
|
|
|
2016-08-24 10:01:01 +00:00
|
|
|
const uint32_t cpuid = xPortGetCoreID();
|
2016-09-13 04:47:21 +00:00
|
|
|
const uint32_t other_cpuid = (cpuid == 0) ? 1 : 0;
|
2017-01-18 07:07:27 +00:00
|
|
|
#ifndef NDEBUG
|
|
|
|
// For sanity check later: record the CPU which has started doing flash operation
|
|
|
|
assert(s_flash_op_cpu == -1);
|
|
|
|
s_flash_op_cpu = cpuid;
|
|
|
|
#endif
|
2016-09-12 10:54:45 +00:00
|
|
|
|
|
|
|
if (xTaskGetSchedulerState() == taskSCHEDULER_NOT_STARTED) {
|
2016-09-13 04:47:21 +00:00
|
|
|
// Scheduler hasn't been started yet, it means that spi_flash API is being
|
|
|
|
// called from the 2nd stage bootloader or from user_start_cpu0, i.e. from
|
|
|
|
// PRO CPU. APP CPU is either in reset or spinning inside user_start_cpu1,
|
|
|
|
// which is in IRAM. So it is safe to disable cache for the other_cpuid here.
|
|
|
|
assert(other_cpuid == 1);
|
2016-09-12 10:54:45 +00:00
|
|
|
spi_flash_disable_cache(other_cpuid, &s_flash_op_cache_state[other_cpuid]);
|
|
|
|
} else {
|
2017-10-30 10:53:39 +00:00
|
|
|
// Temporarily raise current task priority to prevent a deadlock while
|
|
|
|
// waiting for IPC task to start on the other CPU
|
|
|
|
int old_prio = uxTaskPriorityGet(NULL);
|
|
|
|
vTaskPrioritySet(NULL, configMAX_PRIORITIES - 1);
|
2016-09-12 10:54:45 +00:00
|
|
|
// Signal to the spi_flash_op_block_task on the other CPU that we need it to
|
|
|
|
// disable cache there and block other tasks from executing.
|
|
|
|
s_flash_op_can_start = false;
|
2017-01-18 07:07:27 +00:00
|
|
|
esp_err_t ret = esp_ipc_call(other_cpuid, &spi_flash_op_block_func, (void*) other_cpuid);
|
|
|
|
assert(ret == ESP_OK);
|
2016-09-12 10:54:45 +00:00
|
|
|
while (!s_flash_op_can_start) {
|
|
|
|
// Busy loop and wait for spi_flash_op_block_func to disable cache
|
|
|
|
// on the other CPU
|
|
|
|
}
|
2017-01-18 07:07:27 +00:00
|
|
|
// Disable scheduler on the current CPU
|
2016-09-12 10:54:45 +00:00
|
|
|
vTaskSuspendAll();
|
2017-10-30 10:53:39 +00:00
|
|
|
// Can now set the priority back to the normal one
|
|
|
|
vTaskPrioritySet(NULL, old_prio);
|
2016-09-12 10:54:45 +00:00
|
|
|
// This is guaranteed to run on CPU <cpuid> because the other CPU is now
|
|
|
|
// occupied by highest priority task
|
|
|
|
assert(xPortGetCoreID() == cpuid);
|
2016-08-24 10:01:01 +00:00
|
|
|
}
|
2016-11-25 09:33:51 +00:00
|
|
|
// Kill interrupts that aren't located in IRAM
|
|
|
|
esp_intr_noniram_disable();
|
2019-06-06 02:57:29 +00:00
|
|
|
// This CPU executes this routine, with non-IRAM interrupts and the scheduler
|
2017-09-04 12:11:15 +00:00
|
|
|
// disabled. The other CPU is spinning in the spi_flash_op_block_func task, also
|
|
|
|
// with non-iram interrupts and the scheduler disabled. None of these CPUs will
|
|
|
|
// touch external RAM or flash this way, so we can safely disable caches.
|
2016-09-12 10:54:45 +00:00
|
|
|
spi_flash_disable_cache(cpuid, &s_flash_op_cache_state[cpuid]);
|
2017-09-04 12:11:15 +00:00
|
|
|
spi_flash_disable_cache(other_cpuid, &s_flash_op_cache_state[other_cpuid]);
|
2016-08-24 10:01:01 +00:00
|
|
|
}
|
|
|
|
|
2019-07-16 09:33:30 +00:00
|
|
|
void IRAM_ATTR spi_flash_enable_interrupts_caches_and_other_cpu(void)
|
2016-08-24 10:01:01 +00:00
|
|
|
{
|
2016-09-12 10:54:45 +00:00
|
|
|
const uint32_t cpuid = xPortGetCoreID();
|
2016-09-13 04:47:21 +00:00
|
|
|
const uint32_t other_cpuid = (cpuid == 0) ? 1 : 0;
|
2017-01-18 07:07:27 +00:00
|
|
|
#ifndef NDEBUG
|
|
|
|
// Sanity check: flash operation ends on the same CPU as it has started
|
|
|
|
assert(cpuid == s_flash_op_cpu);
|
2017-09-04 12:11:15 +00:00
|
|
|
// More sanity check: if scheduler isn't started, only CPU0 can call this.
|
|
|
|
assert(!(xTaskGetSchedulerState() == taskSCHEDULER_NOT_STARTED && cpuid != 0));
|
2017-01-18 07:07:27 +00:00
|
|
|
s_flash_op_cpu = -1;
|
|
|
|
#endif
|
2016-09-12 10:54:45 +00:00
|
|
|
|
2017-09-04 12:11:15 +00:00
|
|
|
// Re-enable cache on both CPUs. After this, cache (flash and external RAM) should work again.
|
2016-09-12 10:54:45 +00:00
|
|
|
spi_flash_restore_cache(cpuid, s_flash_op_cache_state[cpuid]);
|
2017-09-04 12:11:15 +00:00
|
|
|
spi_flash_restore_cache(other_cpuid, s_flash_op_cache_state[other_cpuid]);
|
2016-09-12 10:54:45 +00:00
|
|
|
|
2017-09-04 12:11:15 +00:00
|
|
|
if (xTaskGetSchedulerState() != taskSCHEDULER_NOT_STARTED) {
|
2016-09-12 10:54:45 +00:00
|
|
|
// Signal to spi_flash_op_block_task that flash operation is complete
|
|
|
|
s_flash_op_complete = true;
|
2017-01-18 07:07:27 +00:00
|
|
|
}
|
2017-09-04 12:11:15 +00:00
|
|
|
|
2017-01-18 07:07:27 +00:00
|
|
|
// Re-enable non-iram interrupts
|
|
|
|
esp_intr_noniram_enable();
|
|
|
|
|
|
|
|
// Resume tasks on the current CPU, if the scheduler has started.
|
|
|
|
// NOTE: enabling non-IRAM interrupts has to happen before this,
|
|
|
|
// because once the scheduler has started, due to preemption the
|
|
|
|
// current task can end up being moved to the other CPU.
|
|
|
|
// But esp_intr_noniram_enable has to be called on the same CPU which
|
|
|
|
// called esp_intr_noniram_disable
|
|
|
|
if (xTaskGetSchedulerState() != taskSCHEDULER_NOT_STARTED) {
|
2016-09-12 10:54:45 +00:00
|
|
|
xTaskResumeAll();
|
|
|
|
}
|
2016-08-24 10:01:01 +00:00
|
|
|
// Release API lock
|
2016-10-19 09:08:05 +00:00
|
|
|
spi_flash_op_unlock();
|
2016-08-24 10:01:01 +00:00
|
|
|
}
|
|
|
|
|
2019-07-16 09:33:30 +00:00
|
|
|
void IRAM_ATTR spi_flash_disable_interrupts_caches_and_other_cpu_no_os(void)
|
2016-12-21 23:56:23 +00:00
|
|
|
{
|
|
|
|
const uint32_t cpuid = xPortGetCoreID();
|
|
|
|
const uint32_t other_cpuid = (cpuid == 0) ? 1 : 0;
|
|
|
|
|
|
|
|
// do not care about other CPU, it was halted upon entering panic handler
|
|
|
|
spi_flash_disable_cache(other_cpuid, &s_flash_op_cache_state[other_cpuid]);
|
|
|
|
// Kill interrupts that aren't located in IRAM
|
|
|
|
esp_intr_noniram_disable();
|
|
|
|
// Disable cache on this CPU as well
|
|
|
|
spi_flash_disable_cache(cpuid, &s_flash_op_cache_state[cpuid]);
|
|
|
|
}
|
|
|
|
|
2019-07-16 09:33:30 +00:00
|
|
|
void IRAM_ATTR spi_flash_enable_interrupts_caches_no_os(void)
|
2016-12-21 23:56:23 +00:00
|
|
|
{
|
|
|
|
const uint32_t cpuid = xPortGetCoreID();
|
|
|
|
|
|
|
|
// Re-enable cache on this CPU
|
|
|
|
spi_flash_restore_cache(cpuid, s_flash_op_cache_state[cpuid]);
|
|
|
|
// Re-enable non-iram interrupts
|
|
|
|
esp_intr_noniram_enable();
|
|
|
|
}
|
|
|
|
|
2016-10-19 09:08:05 +00:00
|
|
|
#else // CONFIG_FREERTOS_UNICORE
|
2016-08-24 10:01:01 +00:00
|
|
|
|
2019-07-16 09:33:30 +00:00
|
|
|
void spi_flash_init_lock(void)
|
2016-08-24 10:01:01 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2019-07-16 09:33:30 +00:00
|
|
|
void spi_flash_op_lock(void)
|
2016-08-17 15:08:22 +00:00
|
|
|
{
|
|
|
|
vTaskSuspendAll();
|
|
|
|
}
|
|
|
|
|
2019-07-16 09:33:30 +00:00
|
|
|
void spi_flash_op_unlock(void)
|
2016-08-17 15:08:22 +00:00
|
|
|
{
|
|
|
|
xTaskResumeAll();
|
|
|
|
}
|
|
|
|
|
2016-08-24 10:01:01 +00:00
|
|
|
|
2019-07-16 09:33:30 +00:00
|
|
|
void IRAM_ATTR spi_flash_disable_interrupts_caches_and_other_cpu(void)
|
2016-09-13 07:16:36 +00:00
|
|
|
{
|
2017-11-17 04:00:51 +00:00
|
|
|
spi_flash_op_lock();
|
2017-02-21 13:57:53 +00:00
|
|
|
esp_intr_noniram_disable();
|
2016-10-19 09:08:05 +00:00
|
|
|
spi_flash_disable_cache(0, &s_flash_op_cache_state[0]);
|
2016-09-13 07:16:36 +00:00
|
|
|
}
|
|
|
|
|
2019-07-16 09:33:30 +00:00
|
|
|
void IRAM_ATTR spi_flash_enable_interrupts_caches_and_other_cpu(void)
|
2016-08-17 15:08:22 +00:00
|
|
|
{
|
2016-10-19 09:08:05 +00:00
|
|
|
spi_flash_restore_cache(0, s_flash_op_cache_state[0]);
|
2016-11-25 09:33:51 +00:00
|
|
|
esp_intr_noniram_enable();
|
2017-02-21 13:57:53 +00:00
|
|
|
spi_flash_op_unlock();
|
2016-08-17 15:08:22 +00:00
|
|
|
}
|
|
|
|
|
2019-07-16 09:33:30 +00:00
|
|
|
void IRAM_ATTR spi_flash_disable_interrupts_caches_and_other_cpu_no_os(void)
|
2016-12-21 23:56:23 +00:00
|
|
|
{
|
|
|
|
// Kill interrupts that aren't located in IRAM
|
|
|
|
esp_intr_noniram_disable();
|
|
|
|
// Disable cache on this CPU as well
|
|
|
|
spi_flash_disable_cache(0, &s_flash_op_cache_state[0]);
|
|
|
|
}
|
|
|
|
|
2019-07-16 09:33:30 +00:00
|
|
|
void IRAM_ATTR spi_flash_enable_interrupts_caches_no_os(void)
|
2016-12-21 23:56:23 +00:00
|
|
|
{
|
|
|
|
// Re-enable cache on this CPU
|
|
|
|
spi_flash_restore_cache(0, s_flash_op_cache_state[0]);
|
|
|
|
// Re-enable non-iram interrupts
|
|
|
|
esp_intr_noniram_enable();
|
|
|
|
}
|
|
|
|
|
2016-10-19 09:08:05 +00:00
|
|
|
#endif // CONFIG_FREERTOS_UNICORE
|
2016-08-17 15:08:22 +00:00
|
|
|
|
2016-10-19 09:08:05 +00:00
|
|
|
/**
|
|
|
|
* The following two functions are replacements for Cache_Read_Disable and Cache_Read_Enable
|
|
|
|
* function in ROM. They are used to work around a bug where Cache_Read_Disable requires a call to
|
|
|
|
* Cache_Flush before Cache_Read_Enable, even if cached data was not modified.
|
|
|
|
*/
|
2016-09-12 10:54:45 +00:00
|
|
|
static void IRAM_ATTR spi_flash_disable_cache(uint32_t cpuid, uint32_t* saved_state)
|
|
|
|
{
|
2019-06-06 02:57:29 +00:00
|
|
|
#if CONFIG_IDF_TARGET_ESP32
|
2016-09-12 10:54:45 +00:00
|
|
|
uint32_t ret = 0;
|
2019-09-06 07:37:55 +00:00
|
|
|
const uint32_t cache_mask = DPORT_CACHE_GET_MASK(cpuid);
|
2016-09-12 10:54:45 +00:00
|
|
|
if (cpuid == 0) {
|
2017-05-08 12:03:04 +00:00
|
|
|
ret |= DPORT_GET_PERI_REG_BITS2(DPORT_PRO_CACHE_CTRL1_REG, cache_mask, 0);
|
|
|
|
while (DPORT_GET_PERI_REG_BITS2(DPORT_PRO_DCACHE_DBUG0_REG, DPORT_PRO_CACHE_STATE, DPORT_PRO_CACHE_STATE_S) != 1) {
|
2016-09-12 10:54:45 +00:00
|
|
|
;
|
|
|
|
}
|
2017-05-08 12:03:04 +00:00
|
|
|
DPORT_SET_PERI_REG_BITS(DPORT_PRO_CACHE_CTRL_REG, 1, 0, DPORT_PRO_CACHE_ENABLE_S);
|
2019-06-06 02:57:29 +00:00
|
|
|
}
|
|
|
|
#if !CONFIG_FREERTOS_UNICORE
|
|
|
|
else {
|
2017-05-08 12:03:04 +00:00
|
|
|
ret |= DPORT_GET_PERI_REG_BITS2(DPORT_APP_CACHE_CTRL1_REG, cache_mask, 0);
|
|
|
|
while (DPORT_GET_PERI_REG_BITS2(DPORT_APP_DCACHE_DBUG0_REG, DPORT_APP_CACHE_STATE, DPORT_APP_CACHE_STATE_S) != 1) {
|
2016-09-12 10:54:45 +00:00
|
|
|
;
|
|
|
|
}
|
2017-05-08 12:03:04 +00:00
|
|
|
DPORT_SET_PERI_REG_BITS(DPORT_APP_CACHE_CTRL_REG, 1, 0, DPORT_APP_CACHE_ENABLE_S);
|
2016-09-12 10:54:45 +00:00
|
|
|
}
|
2019-06-06 02:57:29 +00:00
|
|
|
#endif
|
2016-09-12 10:54:45 +00:00
|
|
|
*saved_state = ret;
|
2019-06-06 02:57:29 +00:00
|
|
|
#elif CONFIG_IDF_TARGET_ESP32S2BETA
|
|
|
|
*saved_state = Cache_Suspend_ICache();
|
|
|
|
if (!Cache_Drom0_Using_ICache()) {
|
|
|
|
*(saved_state + 1) = Cache_Suspend_DCache();
|
|
|
|
}
|
|
|
|
#endif
|
2016-09-12 10:54:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void IRAM_ATTR spi_flash_restore_cache(uint32_t cpuid, uint32_t saved_state)
|
|
|
|
{
|
2019-06-06 02:57:29 +00:00
|
|
|
#if CONFIG_IDF_TARGET_ESP32
|
2019-09-06 07:37:55 +00:00
|
|
|
const uint32_t cache_mask = DPORT_CACHE_GET_MASK(cpuid);
|
2016-09-12 10:54:45 +00:00
|
|
|
if (cpuid == 0) {
|
2017-05-08 12:03:04 +00:00
|
|
|
DPORT_SET_PERI_REG_BITS(DPORT_PRO_CACHE_CTRL_REG, 1, 1, DPORT_PRO_CACHE_ENABLE_S);
|
|
|
|
DPORT_SET_PERI_REG_BITS(DPORT_PRO_CACHE_CTRL1_REG, cache_mask, saved_state, 0);
|
2019-06-06 02:57:29 +00:00
|
|
|
}
|
|
|
|
#if !CONFIG_FREERTOS_UNICORE
|
|
|
|
else {
|
2017-05-08 12:03:04 +00:00
|
|
|
DPORT_SET_PERI_REG_BITS(DPORT_APP_CACHE_CTRL_REG, 1, 1, DPORT_APP_CACHE_ENABLE_S);
|
|
|
|
DPORT_SET_PERI_REG_BITS(DPORT_APP_CACHE_CTRL1_REG, cache_mask, saved_state, 0);
|
2016-09-12 10:54:45 +00:00
|
|
|
}
|
2019-06-06 02:57:29 +00:00
|
|
|
#endif
|
|
|
|
#elif CONFIG_IDF_TARGET_ESP32S2BETA
|
|
|
|
Cache_Resume_ICache(saved_state);
|
|
|
|
if (!Cache_Drom0_Using_ICache()) {
|
|
|
|
Cache_Resume_DCache(s_flash_op_cache_state[1]);
|
|
|
|
}
|
|
|
|
#endif
|
2016-09-12 10:54:45 +00:00
|
|
|
}
|
2016-09-13 08:40:05 +00:00
|
|
|
|
2019-07-16 09:33:30 +00:00
|
|
|
IRAM_ATTR bool spi_flash_cache_enabled(void)
|
2017-03-02 04:21:03 +00:00
|
|
|
{
|
2019-06-06 02:57:29 +00:00
|
|
|
#if CONFIG_IDF_TARGET_ESP32
|
2017-09-18 09:26:59 +00:00
|
|
|
bool result = (DPORT_REG_GET_BIT(DPORT_PRO_CACHE_CTRL_REG, DPORT_PRO_CACHE_ENABLE) != 0);
|
2019-06-06 02:57:29 +00:00
|
|
|
#elif CONFIG_IDF_TARGET_ESP32S2BETA
|
|
|
|
bool result = (DPORT_REG_GET_BIT(DPORT_PRO_ICACHE_CTRL_REG, DPORT_PRO_ICACHE_ENABLE) != 0);
|
|
|
|
if (!Cache_Drom0_Using_ICache()) {
|
|
|
|
result = result && (DPORT_REG_GET_BIT(DPORT_PRO_DCACHE_CTRL_REG, DPORT_PRO_DCACHE_ENABLE) != 0);
|
|
|
|
}
|
|
|
|
#endif
|
2017-09-18 09:26:59 +00:00
|
|
|
#if portNUM_PROCESSORS == 2
|
|
|
|
result = result && (DPORT_REG_GET_BIT(DPORT_APP_CACHE_CTRL_REG, DPORT_APP_CACHE_ENABLE) != 0);
|
|
|
|
#endif
|
|
|
|
return result;
|
2017-03-02 04:21:03 +00:00
|
|
|
}
|
2019-06-06 02:57:29 +00:00
|
|
|
|
|
|
|
#if CONFIG_IDF_TARGET_ESP32S2BETA
|
|
|
|
IRAM_ATTR void esp_config_instruction_cache_mode(void)
|
|
|
|
{
|
|
|
|
cache_size_t cache_size;
|
|
|
|
cache_ways_t cache_ways;
|
|
|
|
cache_line_size_t cache_line_size;
|
|
|
|
|
2019-06-10 07:07:12 +00:00
|
|
|
#if CONFIG_ESP32S2_INSTRUCTION_CACHE_8KB
|
2019-06-06 02:57:29 +00:00
|
|
|
Cache_Allocate_SRAM(CACHE_MEMORY_ICACHE_LOW, CACHE_MEMORY_INVALID, CACHE_MEMORY_INVALID, CACHE_MEMORY_INVALID);
|
|
|
|
cache_size = CACHE_SIZE_8KB;
|
|
|
|
#else
|
|
|
|
Cache_Allocate_SRAM(CACHE_MEMORY_ICACHE_LOW, CACHE_MEMORY_ICACHE_HIGH, CACHE_MEMORY_INVALID, CACHE_MEMORY_INVALID);
|
|
|
|
cache_size = CACHE_SIZE_16KB;
|
|
|
|
#endif
|
2019-08-22 06:17:46 +00:00
|
|
|
#if CONFIG_ESP32S2_INSTRUCTION_CACHE_4WAYS
|
2019-06-06 02:57:29 +00:00
|
|
|
cache_ways = CACHE_4WAYS_ASSOC;
|
|
|
|
#else
|
|
|
|
cache_ways = CACHE_8WAYS_ASSOC;
|
|
|
|
#endif
|
2019-08-22 06:17:46 +00:00
|
|
|
#if CONFIG_ESP32S2_INSTRUCTION_CACHE_LINE_16B
|
2019-06-06 02:57:29 +00:00
|
|
|
cache_line_size = CACHE_LINE_SIZE_16B;
|
2019-08-22 06:17:46 +00:00
|
|
|
#elif CONFIG_ESP32S2_INSTRUCTION_CACHE_LINE_32B
|
2019-06-06 02:57:29 +00:00
|
|
|
cache_line_size = CACHE_LINE_SIZE_32B;
|
|
|
|
#else
|
|
|
|
cache_line_size = CACHE_LINE_SIZE_64B;
|
|
|
|
#endif
|
2019-08-22 06:17:46 +00:00
|
|
|
ESP_EARLY_LOGI(TAG, "Instruction cache \t: size %dKB, %dWays, cache line size %dByte", cache_size == CACHE_SIZE_8KB ? 8 : 16,cache_ways == CACHE_4WAYS_ASSOC ? 4: 8, cache_line_size == CACHE_LINE_SIZE_16B ? 16 : (cache_line_size == CACHE_LINE_SIZE_32B ? 32 : 64));
|
2019-06-06 02:57:29 +00:00
|
|
|
Cache_Suspend_ICache();
|
|
|
|
Cache_Set_ICache_Mode(cache_size, cache_ways, cache_line_size);
|
|
|
|
Cache_Invalidate_ICache_All();
|
|
|
|
Cache_Resume_ICache(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
IRAM_ATTR void esp_config_data_cache_mode(void)
|
|
|
|
{
|
|
|
|
cache_size_t cache_size;
|
|
|
|
cache_ways_t cache_ways;
|
|
|
|
cache_line_size_t cache_line_size;
|
|
|
|
|
2019-06-10 07:07:12 +00:00
|
|
|
#if CONFIG_ESP32S2_INSTRUCTION_CACHE_8KB
|
|
|
|
#if CONFIG_ESP32S2_DATA_CACHE_8KB
|
2019-06-06 02:57:29 +00:00
|
|
|
Cache_Allocate_SRAM(CACHE_MEMORY_ICACHE_LOW, CACHE_MEMORY_DCACHE_LOW, CACHE_MEMORY_INVALID, CACHE_MEMORY_INVALID);
|
|
|
|
cache_size = CACHE_SIZE_8KB;
|
|
|
|
#else
|
|
|
|
Cache_Allocate_SRAM(CACHE_MEMORY_ICACHE_LOW, CACHE_MEMORY_DCACHE_LOW, CACHE_MEMORY_DCACHE_HIGH, CACHE_MEMORY_INVALID);
|
|
|
|
cache_size = CACHE_SIZE_16KB;
|
|
|
|
#endif
|
|
|
|
#else
|
2019-06-10 07:07:12 +00:00
|
|
|
#if CONFIG_ESP32S2_DATA_CACHE_8KB
|
2019-06-06 02:57:29 +00:00
|
|
|
Cache_Allocate_SRAM(CACHE_MEMORY_ICACHE_LOW, CACHE_MEMORY_ICACHE_HIGH, CACHE_MEMORY_DCACHE_LOW, CACHE_MEMORY_INVALID);
|
|
|
|
cache_size = CACHE_SIZE_8KB;
|
|
|
|
#else
|
|
|
|
Cache_Allocate_SRAM(CACHE_MEMORY_ICACHE_LOW, CACHE_MEMORY_ICACHE_HIGH, CACHE_MEMORY_DCACHE_LOW, CACHE_MEMORY_DCACHE_HIGH);
|
|
|
|
cache_size = CACHE_SIZE_16KB;
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
2019-06-10 07:07:12 +00:00
|
|
|
#if CONFIG_ESP32S2_DATA_CACHE_4WAYS
|
2019-06-06 02:57:29 +00:00
|
|
|
cache_ways = CACHE_4WAYS_ASSOC;
|
|
|
|
#else
|
|
|
|
cache_ways = CACHE_8WAYS_ASSOC;
|
|
|
|
#endif
|
2019-06-10 07:07:12 +00:00
|
|
|
#if CONFIG_ESP32S2_DATA_CACHE_LINE_16B
|
2019-06-06 02:57:29 +00:00
|
|
|
cache_line_size = CACHE_LINE_SIZE_16B;
|
2019-06-10 07:07:12 +00:00
|
|
|
#elif CONFIG_ESP32S2_DATA_CACHE_LINE_32B
|
2019-06-06 02:57:29 +00:00
|
|
|
cache_line_size = CACHE_LINE_SIZE_32B;
|
|
|
|
#else
|
|
|
|
cache_line_size = CACHE_LINE_SIZE_64B;
|
|
|
|
#endif
|
2019-08-22 06:17:46 +00:00
|
|
|
ESP_EARLY_LOGI(TAG, "Data cache \t\t: size %dKB, %dWays, cache line size %dByte", cache_size == CACHE_SIZE_8KB ? 8 : 16, cache_ways == CACHE_4WAYS_ASSOC ? 4: 8, cache_line_size == CACHE_LINE_SIZE_16B ? 16 : (cache_line_size == CACHE_LINE_SIZE_32B ? 32 : 64));
|
2019-06-06 02:57:29 +00:00
|
|
|
Cache_Set_DCache_Mode(cache_size, cache_ways, cache_line_size);
|
|
|
|
Cache_Invalidate_DCache_All();
|
|
|
|
}
|
|
|
|
|
|
|
|
void esp_switch_rodata_to_dcache(void)
|
|
|
|
{
|
|
|
|
REG_CLR_BIT(DPORT_PRO_DCACHE_CTRL1_REG, DPORT_PRO_DCACHE_MASK_DROM0);
|
|
|
|
Cache_Drom0_Source_DCache();
|
|
|
|
MMU_Drom_ICache_Unmap();
|
|
|
|
REG_SET_BIT(DPORT_PRO_ICACHE_CTRL1_REG, DPORT_PRO_ICACHE_MASK_DROM0);
|
|
|
|
ESP_EARLY_LOGI(TAG, "Switch rodata load path to data cache.");
|
|
|
|
}
|
|
|
|
|
|
|
|
static IRAM_ATTR void esp_enable_cache_flash_wrap(bool icache, bool dcache)
|
|
|
|
{
|
|
|
|
uint32_t i_autoload, d_autoload;
|
|
|
|
if (icache) {
|
|
|
|
i_autoload = Cache_Suspend_ICache();
|
|
|
|
}
|
|
|
|
if (dcache) {
|
|
|
|
d_autoload = Cache_Suspend_DCache();
|
|
|
|
}
|
|
|
|
REG_SET_BIT(DPORT_PRO_CACHE_WRAP_AROUND_CTRL_REG, DPORT_PRO_CACHE_FLASH_WRAP_AROUND);
|
|
|
|
if (icache) {
|
|
|
|
Cache_Resume_ICache(i_autoload);
|
|
|
|
}
|
|
|
|
if (dcache) {
|
|
|
|
Cache_Resume_DCache(d_autoload);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-22 06:17:46 +00:00
|
|
|
#if CONFIG_ESP32S2_SPIRAM_SUPPORT
|
2019-06-06 02:57:29 +00:00
|
|
|
static IRAM_ATTR void esp_enable_cache_spiram_wrap(bool icache, bool dcache)
|
|
|
|
{
|
|
|
|
uint32_t i_autoload, d_autoload;
|
|
|
|
if (icache) {
|
|
|
|
i_autoload = Cache_Suspend_ICache();
|
|
|
|
}
|
|
|
|
if (dcache) {
|
|
|
|
d_autoload = Cache_Suspend_DCache();
|
|
|
|
}
|
|
|
|
REG_SET_BIT(DPORT_PRO_CACHE_WRAP_AROUND_CTRL_REG, DPORT_PRO_CACHE_SRAM_RD_WRAP_AROUND);
|
|
|
|
if (icache) {
|
|
|
|
Cache_Resume_ICache(i_autoload);
|
|
|
|
}
|
|
|
|
if (dcache) {
|
|
|
|
Cache_Resume_DCache(d_autoload);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
esp_err_t esp_enable_cache_wrap(bool icache_wrap_enable, bool dcache_wrap_enable)
|
|
|
|
{
|
|
|
|
int icache_wrap_size = 0, dcache_wrap_size = 0;
|
|
|
|
int flash_wrap_sizes[2]={-1, -1}, spiram_wrap_sizes[2]={-1, -1};
|
|
|
|
int flash_wrap_size = 0, spiram_wrap_size = 0;
|
|
|
|
int flash_count = 0, spiram_count = 0;
|
|
|
|
int i;
|
|
|
|
bool flash_spiram_wrap_together, flash_support_wrap = true, spiram_support_wrap = true;
|
|
|
|
if (icache_wrap_enable) {
|
2019-08-22 06:17:46 +00:00
|
|
|
#if CONFIG_ESP32S2_INSTRUCTION_CACHE_LINE_16B
|
2019-06-06 02:57:29 +00:00
|
|
|
icache_wrap_size = 16;
|
2019-08-22 06:17:46 +00:00
|
|
|
#elif CONFIG_ESP32S2_INSTRUCTION_CACHE_LINE_32B
|
2019-06-06 02:57:29 +00:00
|
|
|
icache_wrap_size = 32;
|
|
|
|
#else
|
|
|
|
icache_wrap_size = 64;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
if (dcache_wrap_enable) {
|
2019-08-22 06:17:46 +00:00
|
|
|
#if CONFIG_ESP32S2_DATA_CACHE_LINE_16B
|
2019-06-06 02:57:29 +00:00
|
|
|
dcache_wrap_size = 16;
|
2019-08-22 06:17:46 +00:00
|
|
|
#elif CONFIG_ESP32S2_DATA_CACHE_LINE_32B
|
2019-06-06 02:57:29 +00:00
|
|
|
dcache_wrap_size = 32;
|
|
|
|
#else
|
|
|
|
dcache_wrap_size = 64;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
uint32_t instruction_use_spiram = 0;
|
|
|
|
uint32_t rodata_use_spiram = 0;
|
2019-08-22 06:17:46 +00:00
|
|
|
#if CONFIG_SPIRAM_FETCH_INSTRUCTIONS
|
2019-06-06 02:57:29 +00:00
|
|
|
extern uint32_t esp_spiram_instruction_access_enabled();
|
|
|
|
instruction_use_spiram = esp_spiram_instruction_access_enabled();
|
|
|
|
#endif
|
2019-08-22 06:17:46 +00:00
|
|
|
#if CONFIG_SPIRAM_RODATA
|
2019-06-06 02:57:29 +00:00
|
|
|
extern uint32_t esp_spiram_rodata_access_enabled();
|
|
|
|
rodata_use_spiram = esp_spiram_rodata_access_enabled();
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (instruction_use_spiram) {
|
|
|
|
spiram_wrap_sizes[0] = icache_wrap_size;
|
|
|
|
} else {
|
|
|
|
flash_wrap_sizes[0] = icache_wrap_size;
|
|
|
|
}
|
|
|
|
if (rodata_use_spiram) {
|
|
|
|
if (Cache_Drom0_Using_ICache()) {
|
|
|
|
spiram_wrap_sizes[0] = icache_wrap_size;
|
|
|
|
} else {
|
|
|
|
spiram_wrap_sizes[1] = dcache_wrap_size;
|
|
|
|
}
|
|
|
|
#ifdef CONFIG_EXT_RODATA_SUPPORT
|
|
|
|
spiram_wrap_sizes[1] = dcache_wrap_size;
|
|
|
|
#endif
|
|
|
|
} else {
|
|
|
|
if (Cache_Drom0_Using_ICache()) {
|
|
|
|
flash_wrap_sizes[0] = icache_wrap_size;
|
|
|
|
} else {
|
|
|
|
flash_wrap_sizes[1] = dcache_wrap_size;
|
|
|
|
}
|
|
|
|
#ifdef CONFIG_EXT_RODATA_SUPPORT
|
|
|
|
flash_wrap_sizes[1] = dcache_wrap_size;
|
|
|
|
#endif
|
|
|
|
}
|
2019-08-22 06:17:46 +00:00
|
|
|
#ifdef CONFIG_ESP32S2_SPIRAM_SUPPORT
|
2019-06-06 02:57:29 +00:00
|
|
|
spiram_wrap_sizes[1] = dcache_wrap_size;
|
|
|
|
#endif
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
|
|
if (flash_wrap_sizes[i] != -1) {
|
|
|
|
flash_count++;
|
|
|
|
flash_wrap_size = flash_wrap_sizes[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
|
|
if (spiram_wrap_sizes[i] != -1) {
|
|
|
|
spiram_count++;
|
|
|
|
spiram_wrap_size = spiram_wrap_sizes[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (flash_count + spiram_count <= 2) {
|
|
|
|
flash_spiram_wrap_together = false;
|
|
|
|
} else {
|
|
|
|
flash_spiram_wrap_together = true;
|
|
|
|
}
|
2019-08-22 06:17:46 +00:00
|
|
|
ESP_EARLY_LOGI(TAG, "flash_count=%d, size=%d, spiram_count=%d, size=%d,together=%d", flash_count, flash_wrap_size, spiram_count, spiram_wrap_size, flash_spiram_wrap_together);
|
2019-06-06 02:57:29 +00:00
|
|
|
if (flash_count > 1 && flash_wrap_sizes[0] != flash_wrap_sizes[1]) {
|
|
|
|
ESP_EARLY_LOGW(TAG, "Flash wrap with different length %d and %d, abort wrap.", flash_wrap_sizes[0], flash_wrap_sizes[1]);
|
|
|
|
if (spiram_wrap_size == 0) {
|
|
|
|
return ESP_FAIL;
|
|
|
|
}
|
|
|
|
if (flash_spiram_wrap_together) {
|
|
|
|
ESP_EARLY_LOGE(TAG, "Abort spiram wrap because flash wrap length not fixed.");
|
|
|
|
return ESP_FAIL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (spiram_count > 1 && spiram_wrap_sizes[0] != spiram_wrap_sizes[1]) {
|
|
|
|
ESP_EARLY_LOGW(TAG, "SPIRAM wrap with different length %d and %d, abort wrap.", spiram_wrap_sizes[0], spiram_wrap_sizes[1]);
|
|
|
|
if (flash_wrap_size == 0) {
|
|
|
|
return ESP_FAIL;
|
|
|
|
}
|
|
|
|
if (flash_spiram_wrap_together) {
|
|
|
|
ESP_EARLY_LOGW(TAG, "Abort flash wrap because spiram wrap length not fixed.");
|
|
|
|
return ESP_FAIL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flash_spiram_wrap_together && flash_wrap_size != spiram_wrap_size) {
|
|
|
|
ESP_EARLY_LOGW(TAG, "SPIRAM has different wrap length with flash, %d and %d, abort wrap.", spiram_wrap_size, flash_wrap_size);
|
|
|
|
return ESP_FAIL;
|
|
|
|
}
|
|
|
|
|
|
|
|
extern bool spi_flash_support_wrap_size(uint32_t wrap_size);
|
|
|
|
if (!spi_flash_support_wrap_size(flash_wrap_size)) {
|
|
|
|
flash_support_wrap = false;
|
|
|
|
ESP_EARLY_LOGW(TAG, "Flash do not support wrap size %d.", flash_wrap_size);
|
|
|
|
}
|
|
|
|
|
2019-08-22 06:17:46 +00:00
|
|
|
#ifdef CONFIG_ESP32S2_SPIRAM_SUPPORT
|
2019-06-06 02:57:29 +00:00
|
|
|
extern bool psram_support_wrap_size(uint32_t wrap_size);
|
|
|
|
if (!psram_support_wrap_size(spiram_wrap_size)) {
|
|
|
|
spiram_support_wrap = false;
|
|
|
|
ESP_EARLY_LOGW(TAG, "SPIRAM do not support wrap size %d.", spiram_wrap_size);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (flash_spiram_wrap_together && !(flash_support_wrap && spiram_support_wrap)) {
|
|
|
|
ESP_EARLY_LOGW(TAG, "Flash and SPIRAM should support wrap together.");
|
|
|
|
return ESP_FAIL;
|
|
|
|
}
|
|
|
|
|
|
|
|
extern esp_err_t spi_flash_enable_wrap(uint32_t wrap_size);
|
|
|
|
if (flash_support_wrap && flash_wrap_size > 0) {
|
|
|
|
ESP_EARLY_LOGI(TAG, "Flash wrap enabled.");
|
|
|
|
spi_flash_enable_wrap(flash_wrap_size);
|
|
|
|
esp_enable_cache_flash_wrap((flash_wrap_sizes[0] > 0), (flash_wrap_sizes[1] > 0));
|
|
|
|
}
|
2019-08-22 06:17:46 +00:00
|
|
|
#if CONFIG_ESP32S2_SPIRAM_SUPPORT
|
2019-06-06 02:57:29 +00:00
|
|
|
extern esp_err_t psram_enable_wrap(uint32_t wrap_size);
|
|
|
|
if (spiram_support_wrap && spiram_wrap_size > 0) {
|
|
|
|
ESP_EARLY_LOGI(TAG, "SPIRAM wrap enabled.");
|
|
|
|
psram_enable_wrap(spiram_wrap_size);
|
|
|
|
esp_enable_cache_spiram_wrap((spiram_wrap_sizes[0] > 0), (spiram_wrap_sizes[1] > 0));
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return ESP_OK;
|
|
|
|
|
|
|
|
}
|
|
|
|
#endif
|
2019-09-16 00:56:48 +00:00
|
|
|
|
2019-09-06 07:37:55 +00:00
|
|
|
void IRAM_ATTR spi_flash_enable_cache(uint32_t cpuid)
|
|
|
|
{
|
2019-09-16 00:56:48 +00:00
|
|
|
#if CONFIG_IDF_TARGET_ESP32
|
2019-09-06 07:37:55 +00:00
|
|
|
uint32_t cache_value = DPORT_CACHE_GET_VAL(cpuid);
|
|
|
|
cache_value &= DPORT_CACHE_GET_MASK(cpuid);
|
|
|
|
|
|
|
|
// Re-enable cache on this CPU
|
|
|
|
spi_flash_restore_cache(cpuid, cache_value);
|
2019-09-16 00:56:48 +00:00
|
|
|
#else
|
|
|
|
spi_flash_restore_cache(0, 0); // TODO cache_value should be non-zero
|
|
|
|
#endif
|
2019-09-06 07:37:55 +00:00
|
|
|
}
|
2019-09-16 00:56:48 +00:00
|
|
|
|