Skip to content

Use the SDK XIP cache clean method #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 17 commits into
base: feature/psram
Choose a base branch
from
Open

Use the SDK XIP cache clean method #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f6d4a93
ports/rp2: PSRAM support.
Gadgetoid Aug 6, 2024
57b3e84
ports/rp2: PSRAM: Fix RP2040/Pico build.
Gadgetoid Aug 9, 2024
39a2f36
ports/rp2: Re-init PSRAM on CPU freq change.
Gadgetoid Aug 9, 2024
3ea9dd0
ports/rp2: Make split-heap optional.
Gadgetoid Aug 9, 2024
8f83844
ports/rp2: Compute QMI timing based on system clock.
MichaelBell Aug 11, 2024
18e7d01
ports/rp2: Fix garbage collection with large heap.
MichaelBell Aug 11, 2024
96270b2
ports/rp2: Remove flash timing control from PSRAM.
MichaelBell Aug 11, 2024
96da587
ports/rp2: Set flash divisor appropriately.
MichaelBell Aug 11, 2024
e328d4c
ports/rp2: Reset flash timing before PSRAM timing.
MichaelBell Aug 15, 2024
1585553
ports/rp2: Move PSRAM init earlier in startup.
Gadgetoid Sep 30, 2024
7d3b7d6
ports/rp2: Invalidate cache after clean to prevent hangs.
MichaelBell Oct 23, 2024
b8227a3
ports/rp2: Better fix to cache cleaning.
MichaelBell Oct 28, 2024
2024d5b
ports/rp2: Further PSRAM setup tweaks.
MichaelBell Oct 13, 2024
be7e81c
ports/rp2: Enable split heap by default.
Gadgetoid Dec 5, 2024
3a7019c
ports/rp2: Raise GC stack size for PSRAM.
Gadgetoid Dec 5, 2024
912ae3f
ports/rp2: PSRAM linker script.
MichaelBell Nov 17, 2024
b69224d
ports/rp2: Use cache clean from pico-sdk.
MichaelBell Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion ports/rp2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,18 @@ elseif(PICO_RISCV)
)
endif()

if(MICROPY_HW_ENABLE_PSRAM)
list(APPEND MICROPY_SOURCE_PORT
rp2_psram.c
)
list(APPEND PICO_SDK_COMPONENTS
hardware_xip_cache
)
target_compile_definitions(${MICROPY_TARGET} PRIVATE
MICROPY_HW_ENABLE_PSRAM=1
)
endif()

# Use our custom pico_float_micropython float implementation. This is needed for two reasons:
# - to fix inf handling in pico-sdk's __wrap___aeabi_fadd();
# - so we can use our own libm functions, to fix inaccuracies in the pico-sdk versions.
Expand Down Expand Up @@ -591,7 +603,11 @@ if (PICO_ON_DEVICE AND NOT PICO_NO_FLASH AND NOT PICO_COPY_TO_RAM)
if(PICO_RP2040)
pico_set_linker_script(${MICROPY_TARGET} ${CMAKE_CURRENT_LIST_DIR}/memmap_mp_rp2040.ld)
elseif(PICO_RP2350)
pico_set_linker_script(${MICROPY_TARGET} ${CMAKE_CURRENT_LIST_DIR}/memmap_mp_rp2350.ld)
if (MICROPY_HW_ENABLE_PSRAM)
pico_set_linker_script(${MICROPY_TARGET} ${CMAKE_CURRENT_LIST_DIR}/memmap_mp_rp2350_psram.ld)
else()
pico_set_linker_script(${MICROPY_TARGET} ${CMAKE_CURRENT_LIST_DIR}/memmap_mp_rp2350.ld)
endif()
endif()
endif()

Expand Down
29 changes: 29 additions & 0 deletions ports/rp2/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@

#include <stdio.h>

#include "rp2_psram.h"
#include "rp2_flash.h"
#include "py/compile.h"
#include "py/cstack.h"
#include "py/runtime.h"
Expand Down Expand Up @@ -68,6 +70,7 @@

extern uint8_t __StackTop, __StackBottom;
extern uint8_t __GcHeapStart, __GcHeapEnd;
extern uint8_t __PsramGcHeapStart, __PsramGcHeapEnd;

// Embed version info in the binary in machine readable form
bi_decl(bi_program_version_string(MICROPY_GIT_TAG));
Expand All @@ -93,6 +96,13 @@ int main(int argc, char **argv) {
// Hook for setting up anything that needs to be super early in the bootup process.
MICROPY_BOARD_STARTUP();

// Set the flash divisor to an appropriate value
rp2_flash_set_timing();

#if defined(MICROPY_HW_PSRAM_CS_PIN) && MICROPY_HW_ENABLE_PSRAM
size_t psram_size = psram_init(MICROPY_HW_PSRAM_CS_PIN);
#endif

#if MICROPY_HW_ENABLE_UART_REPL
bi_decl(bi_program_feature("UART REPL"))
setup_default_uart();
Expand Down Expand Up @@ -120,7 +130,26 @@ int main(int argc, char **argv) {

// Initialise stack extents and GC heap.
mp_cstack_init_with_top(&__StackTop, &__StackTop - &__StackBottom);

#if defined(MICROPY_HW_PSRAM_CS_PIN) && MICROPY_HW_ENABLE_PSRAM
if (psram_size) {
// Linker script assumes a 2MB PSRAM, increase the size accordingly.
size_t psram_additional_size = 0;
if (psram_size > 2 * 1024 * 1024) {
psram_additional_size = psram_size - 2 * 1024 * 1024;
}
#if MICROPY_GC_SPLIT_HEAP
gc_init(&__GcHeapStart, &__GcHeapEnd);
gc_add(&__PsramGcHeapStart, &__PsramGcHeapEnd + psram_additional_size);
#else
gc_init(&__PsramGcHeapStart, &__PsramGcHeapEnd + psram_additional_size);
#endif
} else {
gc_init(&__GcHeapStart, &__GcHeapEnd);
}
#else
gc_init(&__GcHeapStart, &__GcHeapEnd);
#endif

#if MICROPY_PY_LWIP
// lwIP doesn't allow to reinitialise itself by subsequent calls to this function
Expand Down
Loading