Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(spm): rename scp (scratchpad) to spm (scratchpad memory)

Browse Source
This commit is contained in:
armando
2026-03-19 16:27:44 +08:00
parent 01942e4eef
commit 604772875c
26 changed files with 120 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_hw_support/dma/dma2d.c
+2 -2
View File
@@ -710,8 +710,8 @@ esp_err_t dma2d_set_desc_addr(dma2d_channel_handle_t dma2d_chan, intptr_t desc_b
{
esp_err_t ret = ESP_OK;
ESP_GOTO_ON_FALSE_ISR(dma2d_chan && desc_base_addr, ESP_ERR_INVALID_ARG, err, TAG, "invalid argument");
// 2D-DMA descriptor addr needs 8-byte alignment and not in SCP (addr not in SCP is IDF restriction)
ESP_GOTO_ON_FALSE_ISR((desc_base_addr & 0x7) == 0 && !esp_ptr_in_scp((void *)desc_base_addr), ESP_ERR_INVALID_ARG, err, TAG, "invalid argument");
// 2D-DMA descriptor addr needs 8-byte alignment and not in SPM (addr not in SPM is IDF restriction)
ESP_GOTO_ON_FALSE_ISR((desc_base_addr & 0x7) == 0 && !esp_ptr_in_spm((void *)desc_base_addr), ESP_ERR_INVALID_ARG, err, TAG, "invalid argument");
dma2d_group_t *group = dma2d_chan->group;
int channel_id = dma2d_chan->channel_id;
components/esp_hw_support/esp_memory_utils.c
+2 -2
View File
@@ -52,8 +52,8 @@ bool esp_ptr_byte_accessible(const void *p)
intptr_t ip = (intptr_t) p;
bool r;
r = (ip >= SOC_BYTE_ACCESSIBLE_LOW && ip < SOC_BYTE_ACCESSIBLE_HIGH);
#if SOC_MEM_SCP_SUPPORTED
r |= esp_ptr_in_scp(p);
#if SOC_MEM_SPM_SUPPORTED
r |= esp_ptr_in_spm(p);
#endif
#if CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP
/* For ESP32 case, RTC fast memory is accessible to PRO cpu only and hence
components/esp_hw_support/include/esp_memory_utils.h
+12 -12
View File
@@ -196,31 +196,31 @@ inline static void * esp_ptr_diram_iram_to_dram(const void *p) {
#endif
}
#if SOC_MEM_SCP_SUPPORTED
#if SOC_MEM_SPM_SUPPORTED
/**
* @brief Check if the pointer is in TCM (SCP)
* @brief Check if the pointer is in TCM (SPM)
*
* @param p pointer
*
* @return true: is in TCM (SCP); false: not in TCM (SCP)
* @return true: is in TCM (SPM); false: not in TCM (SPM)
*/
__attribute__((always_inline, deprecated("esp_ptr_in_tcm is deprecated, please use esp_ptr_in_scp instead")))
__attribute__((always_inline, deprecated("esp_ptr_in_tcm is deprecated, please use esp_ptr_in_spm instead")))
inline static bool esp_ptr_in_tcm(const void *p) {
return ((intptr_t)p >= SOC_SCP_LOW && (intptr_t)p < SOC_SCP_HIGH);
return ((intptr_t)p >= SOC_SPM_LOW && (intptr_t)p < SOC_SPM_HIGH);
}
/**
* @brief Check if the pointer is in SCP
* @brief Check if the pointer is in SPM
*
* @param p pointer
*
* @return true: is in SCP; false: not in SCP
* @return true: is in SPM; false: not in SPM
*/
__attribute__((always_inline))
inline static bool esp_ptr_in_scp(const void *p) {
return ((intptr_t)p >= SOC_SCP_LOW && (intptr_t)p < SOC_SCP_HIGH);
inline static bool esp_ptr_in_spm(const void *p) {
return ((intptr_t)p >= SOC_SPM_LOW && (intptr_t)p < SOC_SPM_HIGH);
}
#endif //#if SOC_MEM_SCP_SUPPORTED
#endif //#if SOC_MEM_SPM_SUPPORTED
/** End of common functions to be kept in sync with bootloader_memory_utils.h **/
/** Add app-specific functions below **/
@@ -290,8 +290,8 @@ inline static bool esp_ptr_internal(const void *p) {
bool r;
r = ((intptr_t)p >= SOC_MEM_INTERNAL_LOW && (intptr_t)p < SOC_MEM_INTERNAL_HIGH);
#if SOC_MEM_SCP_SUPPORTED
r |= esp_ptr_in_scp(p);
#if SOC_MEM_SPM_SUPPORTED
r |= esp_ptr_in_spm(p);
#endif
#if SOC_RTC_SLOW_MEM_SUPPORTED
components/esp_hw_support/lowpower/port/esp32p4/sleep_cpu_asm.S
+2 -2
View File
@@ -14,7 +14,7 @@
#define MTVT (0x307)
#define MINTTHRESH (0x347)
.section .scp.data,"aw"
.section .spm.data,"aw"
.global rv_core_critical_regs_frame
.type rv_core_critical_regs_frame,@object
.align 4
@@ -33,7 +33,7 @@ rv_core_critical_regs_frame:
--------------------------------------------------------------------------------
*/
.section .scp.text,"ax"
.section .spm.text,"ax"
.global rv_core_critical_regs_save
.type rv_core_critical_regs_save,@function
.align 4
components/esp_hw_support/lowpower/port/esp32p4/sleep_fpu_asm.S
+1 -1
View File
@@ -8,7 +8,7 @@
#include "freertos/FreeRTOSConfig.h"
#include "sdkconfig.h"
.section .tcm.text,"ax"
.section .spm.text,"ax"
.global rv_core_fpu_save
.type rv_core_fpu_save,@function
.align 4
components/esp_hw_support/port/esp32p4/cpu_region_protect.c
+4 -4
View File
@@ -47,12 +47,12 @@ static void esp_cpu_configure_invalid_regions(void)
// 0. Gap at bottom of address space
PMA_RESET_AND_ENTRY_SET_NAPOT(0, 0, SOC_CPU_SUBSYSTEM_LOW, PMA_NAPOT | PMA_NONE);
// 1. Gap between CPU subsystem region & HP SCP
// 1. Gap between CPU subsystem region & HP SPM
PMA_RESET_AND_ENTRY_SET_TOR(1, SOC_CPU_SUBSYSTEM_HIGH, PMA_NONE);
PMA_RESET_AND_ENTRY_SET_TOR(2, SOC_SCP_LOW, PMA_TOR | PMA_NONE);
PMA_RESET_AND_ENTRY_SET_TOR(2, SOC_SPM_LOW, PMA_TOR | PMA_NONE);
// 2. Gap between HP SCP and CPU Peripherals
PMA_RESET_AND_ENTRY_SET_TOR(3, SOC_SCP_HIGH, PMA_NONE);
// 2. Gap between HP SPM and CPU Peripherals
PMA_RESET_AND_ENTRY_SET_TOR(3, SOC_SPM_HIGH, PMA_NONE);
PMA_RESET_AND_ENTRY_SET_TOR(4, CPU_PERIPH_LOW, PMA_TOR | PMA_NONE);
// 3. Gap between CPU Peripherals and I_Cache