djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

limit disable interrupts to flash calls

Browse Source
This commit is contained in:
foamyguy 2021-12-04 14:14:23 -06:00
parent 5e7c1328b0
commit fa37ee6484
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ports/raspberrypi/common-hal/nvm/ByteArray.c
View File

@ -43,31 +43,32 @@ uint32_t common_hal_nvm_bytearray_get_length(const nvm_bytearray_obj_t *self) {
} }
static void write_page(uint32_t page_addr, uint32_t offset, uint32_t len, uint8_t *bytes) { static void write_page(uint32_t page_addr, uint32_t offset, uint32_t len, uint8_t *bytes) {
// disable interrupts to prevent core hang on rp2040
common_hal_mcu_disable_interrupts();
// Write a whole page to flash, buffering it first and then erasing and rewriting it // Write a whole page to flash, buffering it first and then erasing and rewriting it
// since we can only write a whole page at a time. // since we can only write a whole page at a time.
if (offset == 0 && len == FLASH_PAGE_SIZE) { if (offset == 0 && len == FLASH_PAGE_SIZE) {
// disable interrupts to prevent core hang on rp2040
common_hal_mcu_disable_interrupts();
flash_range_program(RMV_OFFSET(page_addr), bytes, FLASH_PAGE_SIZE); flash_range_program(RMV_OFFSET(page_addr), bytes, FLASH_PAGE_SIZE);
common_hal_mcu_enable_interrupts();
} else { } else {
uint8_t buffer[FLASH_PAGE_SIZE]; uint8_t buffer[FLASH_PAGE_SIZE];
memcpy(buffer, (uint8_t *)page_addr, FLASH_PAGE_SIZE); memcpy(buffer, (uint8_t *)page_addr, FLASH_PAGE_SIZE);
memcpy(buffer + offset, bytes, len); memcpy(buffer + offset, bytes, len);
common_hal_mcu_disable_interrupts();
flash_range_program(RMV_OFFSET(page_addr), buffer, FLASH_PAGE_SIZE); flash_range_program(RMV_OFFSET(page_addr), buffer, FLASH_PAGE_SIZE);
common_hal_mcu_enable_interrupts();
} }
common_hal_mcu_enable_interrupts();
} }
static void erase_and_write_sector(uint32_t address, uint32_t len, uint8_t *bytes) { static void erase_and_write_sector(uint32_t address, uint32_t len, uint8_t *bytes) {
// disable interrupts to prevent core hang on rp2040
common_hal_mcu_disable_interrupts();
// Write a whole sector to flash, buffering it first and then erasing and rewriting it // Write a whole sector to flash, buffering it first and then erasing and rewriting it
// since we can only erase a whole sector at a time. // since we can only erase a whole sector at a time.
uint8_t buffer[FLASH_SECTOR_SIZE]; uint8_t buffer[FLASH_SECTOR_SIZE];
memcpy(buffer, (uint8_t *)CIRCUITPY_INTERNAL_NVM_START_ADDR, FLASH_SECTOR_SIZE); memcpy(buffer, (uint8_t *)CIRCUITPY_INTERNAL_NVM_START_ADDR, FLASH_SECTOR_SIZE);
memcpy(buffer + address, bytes, len); memcpy(buffer + address, bytes, len);
// disable interrupts to prevent core hang on rp2040
common_hal_mcu_disable_interrupts();
flash_range_erase(RMV_OFFSET(CIRCUITPY_INTERNAL_NVM_START_ADDR), FLASH_SECTOR_SIZE); flash_range_erase(RMV_OFFSET(CIRCUITPY_INTERNAL_NVM_START_ADDR), FLASH_SECTOR_SIZE);
flash_range_program(RMV_OFFSET(CIRCUITPY_INTERNAL_NVM_START_ADDR), buffer, FLASH_SECTOR_SIZE); flash_range_program(RMV_OFFSET(CIRCUITPY_INTERNAL_NVM_START_ADDR), buffer, FLASH_SECTOR_SIZE);
common_hal_mcu_enable_interrupts(); common_hal_mcu_enable_interrupts();