itsscb/esp-hal
1
0
Fork 0
mirror of https://github.com/esp-rs/esp-hal.git synced 2025-10-02 06:40:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

ESP32-S3: Fix PSRAM start address calculation (#2880)

Browse Source 
* ESP32-S3: Fix PSRAM start address calculation

* Change code for clarity

* Explain

* Link to esp-idf docs
This commit is contained in:
Björn Quentin 2025-01-14 09:57:05 +01:00 committed by GitHub
parent 0bf6e4606b
commit 8fb9fbddd5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
esp-hal/src/soc/esp32s3/psram.rs
View File

@ -169,15 +169,21 @@ pub(crate) fn init_psram(config: PsramConfig) {
const DR_REG_MMU_TABLE: u32 = 0x600C5000; const DR_REG_MMU_TABLE: u32 = 0x600C5000;
// calculate the PSRAM start address to map // calculate the PSRAM start address to map
let mut start = EXTMEM_ORIGIN; // the linker scripts can produce a gap between mapped IROM and DROM segments
// bigger than a flash page - i.e. we will see an unmapped memory slot
// start from the end and find the last mapped flash page
//
// More general information about the MMU can be found here:
// https://docs.espressif.com/projects/esp-idf/en/stable/esp32s3/api-reference/system/mm.html#introduction
let mmu_table_ptr = DR_REG_MMU_TABLE as *const u32; let mmu_table_ptr = DR_REG_MMU_TABLE as *const u32;
for i in 0..FLASH_MMU_TABLE_SIZE { let mut mapped_pages = 0;
for i in (0..FLASH_MMU_TABLE_SIZE).rev() {
if mmu_table_ptr.add(i).read_volatile() != MMU_INVALID { if mmu_table_ptr.add(i).read_volatile() != MMU_INVALID {
start += MMU_PAGE_SIZE; mapped_pages = (i + 1) as u32;
} else {
break; break;
} }
} }
let start = EXTMEM_ORIGIN + (MMU_PAGE_SIZE * mapped_pages);
debug!("PSRAM start address = {:x}", start); debug!("PSRAM start address = {:x}", start);
// Configure the mode of instruction cache : cache size, cache line size. // Configure the mode of instruction cache : cache size, cache line size.
@ -187,7 +193,7 @@ pub(crate) fn init_psram(config: PsramConfig) {
CONFIG_ESP32S3_INSTRUCTION_CACHE_LINE_SIZE, CONFIG_ESP32S3_INSTRUCTION_CACHE_LINE_SIZE,
); );
// If we need use SPIRAM, we should use data cache.Connfigure the mode of data : // If we need use SPIRAM, we should use data cache.Configure the mode of data :
// cache size, cache line size. // cache size, cache line size.
Cache_Suspend_DCache(); Cache_Suspend_DCache();