mirror/pico-sdk
1
0
Fork 0
mirror of https://github.com/raspberrypi/pico-sdk.git synced 2025-12-10 07:14:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disable interrupts while doing flash_op, explicit_buy, and chain_image (#1835)

Browse source 
* Disable interrupts for some rom functions

* Use flash_safe_execute

* Inline and rename helpers
This commit is contained in:
will-v-pi 2024-08-22 17:29:35 +01:00 • committed by GitHub
parent eba6adb4e1
commit 4a272778cd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 56 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/rp2_common/pico_bootrom/CMakeLists.txt
View file

@ -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)

60
src/rp2_common/pico_bootrom/include/pico/bootrom.h
View file

@ -20,6 +20,7 @@
#ifndef __ASSEMBLER__
#include <string.h>
#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;
} rom_helper_flash_op_params_t;
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);
}
/*!
* \brief Perform a flash read, erase, or program operation
* \ingroup pico_bootrom
@ -582,12 +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;
int rc = func(flags, addr, size_bytes, buf);
int rc = 0;
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(rom_helper_flash_op, &params, UINT32_MAX);
bootrom_release_lock(BOOTROM_LOCK_FLASH_OP);
return rc;
if (flash_rc != PICO_OK) {
return flash_rc;
} else {
return rc;
}
}
/*!
@ -809,11 +835,25 @@ 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;
}
typedef struct {
uint8_t *buffer;
uint32_t buffer_size;
int *res;
} rom_helper_explicit_buy_params_t;
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);
}
// todo SECURE only
/*!
* \brief Buy an image
@ -841,8 +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);
return func(buffer, buffer_size);
int rc = 0;
rom_helper_explicit_buy_params_t params = {
.buffer = buffer,
.buffer_size = buffer_size,
.res = &rc
};
int flash_rc = flash_safe_execute(rom_helper_explicit_buy, &params, UINT32_MAX);
if (flash_rc != PICO_OK) {
return flash_rc;
} else {
return rc;
}
}
#ifndef __riscv