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

sfdp_iterate_next_largest_erase_type: fix size check and add alignment check

pull/13947/head
Lingkai Dong 2020-11-23 13:57:22 +00:00
parent f2278567d0
commit 52627dbc59
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/source/SFDP.cpp
View File

@ -403,12 +403,17 @@ int sfdp_iterate_next_largest_erase_type(uint8_t &bitfield,
int largest_erase_type = 0;
int idx;
unsigned int erase_size;
for (idx = 3; idx >= 0; idx--) {
if (bitfield & type_mask) {
largest_erase_type = idx;
if ((size > (int)(smptbl.erase_type_size_arr[largest_erase_type])) &&
((smptbl.region_high_boundary[region] - offset)
> (uint64_t)(smptbl.erase_type_size_arr[largest_erase_type]))) {
erase_size = smptbl.erase_type_size_arr[largest_erase_type];
// Criteria:
// * offset is aligned to the type's erase size
// * erase size is no larger than the requested size,
// * erase range does not exceed the region boundary
if ((offset % erase_size == 0) && (size >= erase_size) &&
(offset + erase_size - 1 <= smptbl.region_high_boundary[region])) {
break;
} else {
bitfield &= ~type_mask;