ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TDBStore: Fix potential alignment issue in default addresses 

When 10 pages is larger than 2 sectors, align the selected size
down to be an even multiple of the sector size, to ensure that
the allocated space divides cleanly in half for garbage collection.
pull/11629/head
Kyle Kearney 2019-10-29 16:25:32 -07:00
parent 7cd4d11a8a
commit 9d414316da
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
features/storage/kvstore/tdbstore/TDBStore.cpp
View File

@ -1439,7 +1439,8 @@ int TDBStore::get_default_flash_addresses(bd_addr_t *start_address, bd_size_t *s
} }
// Let's work from end of the flash backwards // Let's work from end of the flash backwards
bd_addr_t curr_addr = flash.get_flash_start() + flash.get_flash_size(); bd_addr_t end_of_flash = flash.get_flash_start() + flash.get_flash_size();
bd_addr_t curr_addr = end_of_flash;
bd_size_t sector_space = 0; bd_size_t sector_space = 0;
for (int i = STORE_SECTORS; i; i--) { for (int i = STORE_SECTORS; i; i--) {
@ -1453,7 +1454,9 @@ int TDBStore::get_default_flash_addresses(bd_addr_t *start_address, bd_size_t *s
*size = sector_space; *size = sector_space;
} else { } else {
curr_addr -= page_space; curr_addr -= page_space;
*size = page_space; // Align to 2 sector boundary so that garbage collection works properly
curr_addr = align_down(curr_addr, 2 * flash.get_sector_size(curr_addr));
*size = end_of_flash - curr_addr;
} }
// Store- and application-sectors mustn't overlap // Store- and application-sectors mustn't overlap