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

stm32/flash: Update flash_get_sector_info to return -1 on invalid addr. 

So the caller can tell when an invalid address is used and can take
appropriate action.
This commit is contained in:
Andrew Leech 2020-06-30 16:33:32 +10:00 committed by Damien George
parent 8bbaa20227
commit 40006813c3
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/stm32/flash.c
View File

@ -151,7 +151,7 @@ bool flash_is_valid_addr(uint32_t addr) {
return flash_layout[0].base_address <= addr && addr < end_of_flash; return flash_layout[0].base_address <= addr && addr < end_of_flash;
} }
uint32_t flash_get_sector_info(uint32_t addr, uint32_t *start_addr, uint32_t *size) { int32_t flash_get_sector_info(uint32_t addr, uint32_t *start_addr, uint32_t *size) {
if (addr >= flash_layout[0].base_address) { if (addr >= flash_layout[0].base_address) {
uint32_t sector_index = 0; uint32_t sector_index = 0;
for (int i = 0; i < MP_ARRAY_SIZE(flash_layout); ++i) { for (int i = 0; i < MP_ARRAY_SIZE(flash_layout); ++i) {
@ -172,7 +172,7 @@ uint32_t flash_get_sector_info(uint32_t addr, uint32_t *start_addr, uint32_t *si
} }
} }
} }
return 0; return -1;
} }
int flash_erase(uint32_t flash_dest, uint32_t num_word32) { int flash_erase(uint32_t flash_dest, uint32_t num_word32) {

2
ports/stm32/flash.h
View File

@ -27,7 +27,7 @@
#define MICROPY_INCLUDED_STM32_FLASH_H #define MICROPY_INCLUDED_STM32_FLASH_H
bool flash_is_valid_addr(uint32_t addr); bool flash_is_valid_addr(uint32_t addr);
uint32_t flash_get_sector_info(uint32_t addr, uint32_t *start_addr, uint32_t *size); int32_t flash_get_sector_info(uint32_t addr, uint32_t *start_addr, uint32_t *size);
int flash_erase(uint32_t flash_dest, uint32_t num_word32); int flash_erase(uint32_t flash_dest, uint32_t num_word32);
int flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32); int flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32);

4
ports/stm32/flashbdev.c
View File

@ -181,7 +181,7 @@ int32_t flash_bdev_ioctl(uint32_t op, uint32_t arg) {
static uint8_t *flash_cache_get_addr_for_write(uint32_t flash_addr) { static uint8_t *flash_cache_get_addr_for_write(uint32_t flash_addr) {
uint32_t flash_sector_start; uint32_t flash_sector_start;
uint32_t flash_sector_size; uint32_t flash_sector_size;
uint32_t flash_sector_id = flash_get_sector_info(flash_addr, &flash_sector_start, &flash_sector_size); int32_t flash_sector_id = flash_get_sector_info(flash_addr, &flash_sector_start, &flash_sector_size);
if (flash_sector_size > FLASH_SECTOR_SIZE_MAX) { if (flash_sector_size > FLASH_SECTOR_SIZE_MAX) {
flash_sector_size = FLASH_SECTOR_SIZE_MAX; flash_sector_size = FLASH_SECTOR_SIZE_MAX;
} }
@ -201,7 +201,7 @@ static uint8_t *flash_cache_get_addr_for_write(uint32_t flash_addr) {
static uint8_t *flash_cache_get_addr_for_read(uint32_t flash_addr) { static uint8_t *flash_cache_get_addr_for_read(uint32_t flash_addr) {
uint32_t flash_sector_start; uint32_t flash_sector_start;
uint32_t flash_sector_size; uint32_t flash_sector_size;
uint32_t flash_sector_id = flash_get_sector_info(flash_addr, &flash_sector_start, &flash_sector_size); int32_t flash_sector_id = flash_get_sector_info(flash_addr, &flash_sector_start, &flash_sector_size);
if (flash_cache_sector_id == flash_sector_id) { if (flash_cache_sector_id == flash_sector_id) {
// in cache, copy from there // in cache, copy from there
return (uint8_t *)CACHE_MEM_START_ADDR + flash_addr - flash_sector_start; return (uint8_t *)CACHE_MEM_START_ADDR + flash_addr - flash_sector_start;

23
ports/stm32/mboot/main.c
View File

@ -476,25 +476,27 @@ static int mboot_flash_mass_erase(void) {
static int mboot_flash_page_erase(uint32_t addr, uint32_t *next_addr) { static int mboot_flash_page_erase(uint32_t addr, uint32_t *next_addr) {
uint32_t sector_size = 0; uint32_t sector_size = 0;
uint32_t sector = flash_get_sector_info(addr, NULL, &sector_size); uint32_t sector_start = 0;
if (sector == 0) { int32_t sector = flash_get_sector_info(addr, &sector_start, &sector_size);
// Don't allow to erase the sector with this bootloader in it if (sector <= 0) {
// Don't allow to erase the sector with this bootloader in it, or invalid sectors
dfu_context.status = DFU_STATUS_ERROR_ADDRESS; dfu_context.status = DFU_STATUS_ERROR_ADDRESS;
dfu_context.error = MBOOT_ERROR_STR_OVERWRITE_BOOTLOADER_IDX; dfu_context.error = (sector == 0) ? MBOOT_ERROR_STR_OVERWRITE_BOOTLOADER_IDX
: MBOOT_ERROR_STR_INVALID_ADDRESS_IDX;
return -1; return -1;
} }
*next_addr = addr + sector_size; *next_addr = sector_start + sector_size;
// Erase the flash page. // Erase the flash page.
int ret = flash_erase(addr, sector_size / sizeof(uint32_t)); int ret = flash_erase(sector_start, sector_size / sizeof(uint32_t));
if (ret != 0) { if (ret != 0) {
return ret; return ret;
} }
// Check the erase set bits to 1, at least for the first 256 bytes // Check the erase set bits to 1, at least for the first 256 bytes
for (int i = 0; i < 64; ++i) { for (int i = 0; i < 64; ++i) {
if (((volatile uint32_t*)addr)[i] != 0xffffffff) { if (((volatile uint32_t*)sector_start)[i] != 0xffffffff) {
return -2; return -2;
} }
} }
@ -503,11 +505,12 @@ static int mboot_flash_page_erase(uint32_t addr, uint32_t *next_addr) {
} }
static int mboot_flash_write(uint32_t addr, const uint8_t *src8, size_t len) { static int mboot_flash_write(uint32_t addr, const uint8_t *src8, size_t len) {
uint32_t sector = flash_get_sector_info(addr, NULL, NULL); int32_t sector = flash_get_sector_info(addr, NULL, NULL);
if (sector == 0) { if (sector <= 0) {
// Don't allow to write the sector with this bootloader in it // Don't allow to write the sector with this bootloader in it
dfu_context.status = DFU_STATUS_ERROR_ADDRESS; dfu_context.status = DFU_STATUS_ERROR_ADDRESS;
dfu_context.error = MBOOT_ERROR_STR_OVERWRITE_BOOTLOADER_IDX; dfu_context.error = (sector == 0) ? MBOOT_ERROR_STR_OVERWRITE_BOOTLOADER_IDX
: MBOOT_ERROR_STR_INVALID_ADDRESS_IDX;
return -1; return -1;
} }