mirror of
				https://github.com/espressif/esp-idf.git
				synced 2025-10-31 04:59:55 +00:00 
			
		
		
		
	 793382107f
			
		
	
	793382107f
	
	
	
		
			
			In esp32c2 and esp32c61 memory_layout.c files, the config used to allow MALLOC_CAP_EXEC was CONFIG_ESP_SYSTEM_MEMPROT_FEATURE when CONFIG_ESP_SYSTEM_PMP_IDRAM_SPLIT should be used. Closes https://github.com/espressif/esp-idf/issues/14836
		
			
				
	
	
		
			87 lines
		
	
	
		
			3.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			87 lines
		
	
	
		
			3.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO LTD
 | |
|  *
 | |
|  * SPDX-License-Identifier: Apache-2.0
 | |
|  */
 | |
| #ifndef BOOTLOADER_BUILD
 | |
| 
 | |
| #include <stdint.h>
 | |
| #include <stdlib.h>
 | |
| #include "esp_attr.h"
 | |
| #include "sdkconfig.h"
 | |
| #include "soc/soc.h"
 | |
| #include "soc/soc_memory_layout.h"
 | |
| #include "esp_heap_caps.h"
 | |
| 
 | |
| /**
 | |
|  * @brief Memory type descriptors. These describe the capabilities of a type of memory in the SoC.
 | |
|  * Each type of memory map consists of one or more regions in the address space.
 | |
|  * Each type contains an array of prioritized capabilities.
 | |
|  * Types with later entries are only taken if earlier ones can't fulfill the memory request.
 | |
|  *
 | |
|  * - For a normal malloc (MALLOC_CAP_DEFAULT), give away the DRAM-only memory first, then pass off any dual-use IRAM regions, finally eat into the application memory.
 | |
|  * - For a malloc where 32-bit-aligned-only access is okay, first allocate IRAM, then DRAM, finally application IRAM.
 | |
|  * - Application mallocs (PIDx) will allocate IRAM first, if possible, then DRAM.
 | |
|  * - Most other malloc caps only fit in one region anyway.
 | |
|  *
 | |
|  */
 | |
| 
 | |
| /* Index of memory in `soc_memory_types[]` */
 | |
| enum {
 | |
|     SOC_MEMORY_TYPE_RAM = 0,
 | |
|     SOC_MEMORY_TYPE_NUM,
 | |
| };
 | |
| 
 | |
| #ifdef CONFIG_ESP_SYSTEM_PMP_IDRAM_SPLIT
 | |
| #define ESP32C2_MEM_COMMON_CAPS (MALLOC_CAP_DEFAULT | MALLOC_CAP_DMA | MALLOC_CAP_8BIT | MALLOC_CAP_INTERNAL | MALLOC_CAP_32BIT)
 | |
| #else
 | |
| #define ESP32C2_MEM_COMMON_CAPS (MALLOC_CAP_DEFAULT | MALLOC_CAP_DMA | MALLOC_CAP_8BIT | MALLOC_CAP_INTERNAL | MALLOC_CAP_32BIT | MALLOC_CAP_EXEC)
 | |
| #endif
 | |
| 
 | |
| const soc_memory_type_desc_t soc_memory_types[SOC_MEMORY_TYPE_NUM] = {
 | |
|     // Type 0: DRAM which has an alias on the I-port
 | |
|     [SOC_MEMORY_TYPE_RAM] = { "RAM", { ESP32C2_MEM_COMMON_CAPS, 0, 0 }},
 | |
| };
 | |
| 
 | |
| const size_t soc_memory_type_count = sizeof(soc_memory_types) / sizeof(soc_memory_type_desc_t);
 | |
| 
 | |
| /**
 | |
|  * @brief Region descriptors. These describe all regions of memory available, and map them to a type in the above type.
 | |
|  *
 | |
|  * @note Because of requirements in the coalescing code which merges adjacent regions,
 | |
|  *       this list should always be sorted from low to high by start address.
 | |
|  *
 | |
|  */
 | |
| 
 | |
| /**
 | |
|  * Register the shared buffer area of the last memory block into the heap during heap initialization
 | |
|  */
 | |
| #define APP_USABLE_DRAM_END           (SOC_ROM_STACK_START - SOC_ROM_STACK_SIZE)
 | |
| 
 | |
| const soc_memory_region_t soc_memory_regions[] = {
 | |
|     { 0x3FCA0000,           0x10000,                                   SOC_MEMORY_TYPE_RAM,    0x40380000, false},                          //D/IRAM level1
 | |
|     { 0x3FCB0000,           0x10000,                                   SOC_MEMORY_TYPE_RAM,    0x40390000, false},                          //D/IRAM level2
 | |
|     { 0x3FCC0000,           (APP_USABLE_DRAM_END-0x3FCC0000),          SOC_MEMORY_TYPE_RAM,    0x403A0000, false},                          //D/IRAM level3
 | |
|     { APP_USABLE_DRAM_END,  (SOC_DIRAM_DRAM_HIGH-APP_USABLE_DRAM_END), SOC_MEMORY_TYPE_RAM,    MAP_DRAM_TO_IRAM(APP_USABLE_DRAM_END), true} //D/IRAM level3 (ROM reserved area)
 | |
| };
 | |
| 
 | |
| const size_t soc_memory_region_count = sizeof(soc_memory_regions) / sizeof(soc_memory_region_t);
 | |
| 
 | |
| extern int _data_start, _heap_start, _iram_start, _iram_end;
 | |
| 
 | |
| /**
 | |
|  * Reserved memory regions.
 | |
|  * These are removed from the soc_memory_regions array when heaps are created.
 | |
|  *
 | |
|  */
 | |
| 
 | |
| // Static data region. DRAM used by data+bss and possibly rodata
 | |
| SOC_RESERVE_MEMORY_REGION((intptr_t)&_data_start, (intptr_t)&_heap_start, dram_data);
 | |
| 
 | |
| // Target has a big D/IRAM region, the part used by code is reserved
 | |
| // The address of the D/I bus are in the same order, directly shift IRAM address to get reserved DRAM address
 | |
| #define I_D_OFFSET (SOC_DIRAM_IRAM_LOW - SOC_DIRAM_DRAM_LOW)
 | |
| SOC_RESERVE_MEMORY_REGION((intptr_t)&_iram_start - I_D_OFFSET, (intptr_t)&_iram_end - I_D_OFFSET, iram_code);
 | |
| 
 | |
| #endif // BOOTLOADER_BUILD
 |