sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

esp32s3: make textheap return i-bus address consistently

Browse Source 
Perform I-D translation for extram as well.

Also, use macros from soc.h.
This commit is contained in:
YAMAMOTO Takashi 2024-05-13 20:42:14 +09:00 committed by Xiang Xiao
parent a7961a3d48
commit 3a4560ed40
1 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
arch/xtensa/src/esp32s3/esp32s3_textheap.c
View File

@ -45,7 +45,7 @@
#error "No suitable heap available. Enable ESP32S3_RTC_HEAP." #error "No suitable heap available. Enable ESP32S3_RTC_HEAP."
#endif #endif
#define D_I_BUS_OFFSET 0x6f0000 #define EXTRAM_D_I_BUS_OFFSET 0x6000000
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
@ -92,7 +92,19 @@ void *up_textheap_memalign(size_t align, size_t size)
* can access it from the Instruction bus. * can access it from the Instruction bus.
*/ */
ret += D_I_BUS_OFFSET; uintptr_t addr = (uintptr_t)ret;
if (SOC_DIRAM_DRAM_LOW <= addr && addr <= SOC_DIRAM_DRAM_HIGH)
{
addr = MAP_DRAM_TO_IRAM(addr);
}
else
{
/* extram */
addr += EXTRAM_D_I_BUS_OFFSET;
}
ret = (void *)addr;
} }
} }
@ -122,7 +134,19 @@ void up_textheap_free(void *p)
else else
#endif #endif
{ {
p -= D_I_BUS_OFFSET; uintptr_t addr = (uintptr_t)p;
if (SOC_DIRAM_IRAM_LOW <= addr && addr <= SOC_DIRAM_IRAM_HIGH)
{
addr = MAP_IRAM_TO_DRAM(addr);
}
else
{
/* extram */
addr -= EXTRAM_D_I_BUS_OFFSET;
}
p = (void *)addr;
kmm_free(p); kmm_free(p);
} }
} }
@ -156,6 +180,18 @@ bool up_textheap_heapmember(void *p)
} }
#endif #endif
p -= D_I_BUS_OFFSET; uintptr_t addr = (uintptr_t)p;
if (SOC_DIRAM_IRAM_LOW <= addr && addr <= SOC_DIRAM_IRAM_HIGH)
{
addr = MAP_IRAM_TO_DRAM(addr);
}
else
{
/* extram */
addr -= EXTRAM_D_I_BUS_OFFSET;
}
p = (void *)addr;
return kmm_heapmember(p); return kmm_heapmember(p);
} }