From ca1307c5551249386ce8065db2cc65eacd33f3f4 Mon Sep 17 00:00:00 2001 From: William Vinnicombe Date: Fri, 16 Aug 2024 14:46:24 +0100 Subject: [PATCH 1/3] Disable interrupts for some rom functions --- .../pico_bootrom/include/pico/bootrom.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/rp2_common/pico_bootrom/include/pico/bootrom.h b/src/rp2_common/pico_bootrom/include/pico/bootrom.h index b55e0988a8..8f0c1f3973 100644 --- a/src/rp2_common/pico_bootrom/include/pico/bootrom.h +++ b/src/rp2_common/pico_bootrom/include/pico/bootrom.h @@ -585,7 +585,14 @@ static inline int rom_flash_op(cflash_flags_t flags, uintptr_t addr, uint32_t si rom_flash_op_fn func = (rom_flash_op_fn) rom_func_lookup_inline(ROM_FUNC_FLASH_OP); if (!bootrom_try_acquire_lock(BOOTROM_LOCK_FLASH_OP)) return BOOTROM_ERROR_LOCK_REQUIRED; +#if !PICO_NO_FLASH + // Flash binary must disable interrupts before accessing flash + uint32_t interrupt_flags = save_and_disable_interrupts(); +#endif int rc = func(flags, addr, size_bytes, buf); +#if !PICO_NO_FLASH + restore_interrupts_from_disabled(interrupt_flags); +#endif bootrom_release_lock(BOOTROM_LOCK_FLASH_OP); return rc; } @@ -809,7 +816,9 @@ static inline intptr_t rom_flash_runtime_to_storage_addr(uintptr_t flash_runtime static inline int rom_chain_image(uint8_t *workarea_base, uint32_t workarea_size, uint32_t region_base, uint32_t region_size) { rom_chain_image_fn func = (rom_chain_image_fn) rom_func_lookup_inline(ROM_FUNC_CHAIN_IMAGE); bootrom_release_lock(BOOTROM_LOCK_ENABLE); + uint32_t interrupt_flags = save_and_disable_interrupts(); int rc = func(workarea_base, workarea_size, region_base, region_size); + restore_interrupts_from_disabled(interrupt_flags); bootrom_acquire_lock_blocking(BOOTROM_LOCK_ENABLE); return rc; } @@ -842,7 +851,15 @@ static inline int rom_chain_image(uint8_t *workarea_base, uint32_t workarea_size */ static inline int rom_explicit_buy(uint8_t *buffer, uint32_t buffer_size) { rom_explicit_buy_fn func = (rom_explicit_buy_fn) rom_func_lookup_inline(ROM_FUNC_EXPLICIT_BUY); - return func(buffer, buffer_size); +#if !PICO_NO_FLASH + // Flash binary must disable interrupts, in case a flash erase is required + uint32_t interrupt_flags = save_and_disable_interrupts(); +#endif + int rc = func(buffer, buffer_size); +#if !PICO_NO_FLASH + restore_interrupts_from_disabled(interrupt_flags); +#endif + return rc; } #ifndef __riscv From 1c7cbf19c9c237dea6f851dfdba89d0b71103d76 Mon Sep 17 00:00:00 2001 From: William Vinnicombe Date: Mon, 19 Aug 2024 13:50:29 +0100 Subject: [PATCH 2/3] Use flash_safe_execute --- src/rp2_common/pico_bootrom/CMakeLists.txt | 2 +- .../pico_bootrom/include/pico/bootrom.h | 73 ++++++++++++++----- 2 files changed, 54 insertions(+), 21 deletions(-) diff --git a/src/rp2_common/pico_bootrom/CMakeLists.txt b/src/rp2_common/pico_bootrom/CMakeLists.txt index 0648098b9c..17c610c8b1 100644 --- a/src/rp2_common/pico_bootrom/CMakeLists.txt +++ b/src/rp2_common/pico_bootrom/CMakeLists.txt @@ -9,4 +9,4 @@ target_sources(pico_bootrom INTERFACE ) target_link_libraries(pico_bootrom_headers INTERFACE boot_picoboot_headers) -pico_mirrored_target_link_libraries(pico_bootrom INTERFACE pico_base hardware_boot_lock) +pico_mirrored_target_link_libraries(pico_bootrom INTERFACE pico_base hardware_boot_lock pico_flash) diff --git a/src/rp2_common/pico_bootrom/include/pico/bootrom.h b/src/rp2_common/pico_bootrom/include/pico/bootrom.h index 8f0c1f3973..2734d32908 100644 --- a/src/rp2_common/pico_bootrom/include/pico/bootrom.h +++ b/src/rp2_common/pico_bootrom/include/pico/bootrom.h @@ -20,6 +20,7 @@ #ifndef __ASSEMBLER__ #include #include "pico/bootrom/lock.h" +#include "pico/flash.h" // ROM FUNCTION SIGNATURES #if PICO_RP2040 @@ -542,6 +543,20 @@ static inline void rom_flash_select_xip_read_mode(bootrom_xip_mode_t mode, uint8 func(mode, clkdiv); } +typedef struct { + cflash_flags_t flags; + uintptr_t addr; + uint32_t size_bytes; + uint8_t *buf; + int *res; +} flash_op_params_t; + +static void flash_op_helper(void *param) { + const flash_op_params_t *op = (const flash_op_params_t *)param; + rom_flash_op_fn func = (rom_flash_op_fn) rom_func_lookup_inline(ROM_FUNC_FLASH_OP); + *(op->res) = func(op->flags, op->addr, op->size_bytes, op->buf); +} + /*! * \brief Perform a flash read, erase, or program operation * \ingroup pico_bootrom @@ -582,19 +597,23 @@ static inline void rom_flash_select_xip_read_mode(bootrom_xip_mode_t mode, uint8 * \param buf contains data to be written to flash, for program operations, and data read back from flash, for read operations */ static inline int rom_flash_op(cflash_flags_t flags, uintptr_t addr, uint32_t size_bytes, uint8_t *buf) { - rom_flash_op_fn func = (rom_flash_op_fn) rom_func_lookup_inline(ROM_FUNC_FLASH_OP); if (!bootrom_try_acquire_lock(BOOTROM_LOCK_FLASH_OP)) return BOOTROM_ERROR_LOCK_REQUIRED; -#if !PICO_NO_FLASH - // Flash binary must disable interrupts before accessing flash - uint32_t interrupt_flags = save_and_disable_interrupts(); -#endif - int rc = func(flags, addr, size_bytes, buf); -#if !PICO_NO_FLASH - restore_interrupts_from_disabled(interrupt_flags); -#endif + int rc = 0; + flash_op_params_t params = { + .flags = flags, + .addr = addr, + .size_bytes = size_bytes, + .buf = buf, + .res = &rc + }; + int flash_rc = flash_safe_execute(flash_op_helper, ¶ms, UINT32_MAX); bootrom_release_lock(BOOTROM_LOCK_FLASH_OP); - return rc; + if (flash_rc != PICO_OK) { + return flash_rc; + } else { + return rc; + } } /*! @@ -823,6 +842,18 @@ static inline int rom_chain_image(uint8_t *workarea_base, uint32_t workarea_size return rc; } +typedef struct { + uint8_t *buffer; + uint32_t buffer_size; + int *res; +} buy_params_t; + +static void buy_helper(void *param) { + const buy_params_t *op = (const buy_params_t *)param; + rom_explicit_buy_fn func = (rom_explicit_buy_fn) rom_func_lookup_inline(ROM_FUNC_EXPLICIT_BUY); + *(op->res) = func(op->buffer, op->buffer_size); +} + // todo SECURE only /*! * \brief Buy an image @@ -850,16 +881,18 @@ static inline int rom_chain_image(uint8_t *workarea_base, uint32_t workarea_size * \param buffer_size size of scratch space */ static inline int rom_explicit_buy(uint8_t *buffer, uint32_t buffer_size) { - rom_explicit_buy_fn func = (rom_explicit_buy_fn) rom_func_lookup_inline(ROM_FUNC_EXPLICIT_BUY); -#if !PICO_NO_FLASH - // Flash binary must disable interrupts, in case a flash erase is required - uint32_t interrupt_flags = save_and_disable_interrupts(); -#endif - int rc = func(buffer, buffer_size); -#if !PICO_NO_FLASH - restore_interrupts_from_disabled(interrupt_flags); -#endif - return rc; + int rc = 0; + buy_params_t params = { + .buffer = buffer, + .buffer_size = buffer_size, + .res = &rc + }; + int flash_rc = flash_safe_execute(buy_helper, ¶ms, UINT32_MAX); + if (flash_rc != PICO_OK) { + return flash_rc; + } else { + return rc; + } } #ifndef __riscv From 4634bb970b55fe352eec8d361b23a9a2c870def5 Mon Sep 17 00:00:00 2001 From: William Vinnicombe Date: Tue, 20 Aug 2024 19:25:17 +0100 Subject: [PATCH 3/3] Inline and rename helpers --- .../pico_bootrom/include/pico/bootrom.h | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/rp2_common/pico_bootrom/include/pico/bootrom.h b/src/rp2_common/pico_bootrom/include/pico/bootrom.h index 2734d32908..dd646ba87f 100644 --- a/src/rp2_common/pico_bootrom/include/pico/bootrom.h +++ b/src/rp2_common/pico_bootrom/include/pico/bootrom.h @@ -549,10 +549,10 @@ typedef struct { uint32_t size_bytes; uint8_t *buf; int *res; -} flash_op_params_t; +} rom_helper_flash_op_params_t; -static void flash_op_helper(void *param) { - const flash_op_params_t *op = (const flash_op_params_t *)param; +static inline void rom_helper_flash_op(void *param) { + const rom_helper_flash_op_params_t *op = (const rom_helper_flash_op_params_t *)param; rom_flash_op_fn func = (rom_flash_op_fn) rom_func_lookup_inline(ROM_FUNC_FLASH_OP); *(op->res) = func(op->flags, op->addr, op->size_bytes, op->buf); } @@ -600,14 +600,14 @@ static inline int rom_flash_op(cflash_flags_t flags, uintptr_t addr, uint32_t si if (!bootrom_try_acquire_lock(BOOTROM_LOCK_FLASH_OP)) return BOOTROM_ERROR_LOCK_REQUIRED; int rc = 0; - flash_op_params_t params = { + rom_helper_flash_op_params_t params = { .flags = flags, .addr = addr, .size_bytes = size_bytes, .buf = buf, .res = &rc }; - int flash_rc = flash_safe_execute(flash_op_helper, ¶ms, UINT32_MAX); + int flash_rc = flash_safe_execute(rom_helper_flash_op, ¶ms, UINT32_MAX); bootrom_release_lock(BOOTROM_LOCK_FLASH_OP); if (flash_rc != PICO_OK) { return flash_rc; @@ -846,10 +846,10 @@ typedef struct { uint8_t *buffer; uint32_t buffer_size; int *res; -} buy_params_t; +} rom_helper_explicit_buy_params_t; -static void buy_helper(void *param) { - const buy_params_t *op = (const buy_params_t *)param; +static inline void rom_helper_explicit_buy(void *param) { + const rom_helper_explicit_buy_params_t *op = (const rom_helper_explicit_buy_params_t *)param; rom_explicit_buy_fn func = (rom_explicit_buy_fn) rom_func_lookup_inline(ROM_FUNC_EXPLICIT_BUY); *(op->res) = func(op->buffer, op->buffer_size); } @@ -882,12 +882,12 @@ static void buy_helper(void *param) { */ static inline int rom_explicit_buy(uint8_t *buffer, uint32_t buffer_size) { int rc = 0; - buy_params_t params = { + rom_helper_explicit_buy_params_t params = { .buffer = buffer, .buffer_size = buffer_size, .res = &rc }; - int flash_rc = flash_safe_execute(buy_helper, ¶ms, UINT32_MAX); + int flash_rc = flash_safe_execute(rom_helper_explicit_buy, ¶ms, UINT32_MAX); if (flash_rc != PICO_OK) { return flash_rc; } else {