NVStore: fix area calculation function #9445
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@davidsaada, thank you for your changes. |
dannybenor
reviewed
Jan 21, 2019
| sector_map[num_sectors++] = flash_addr; | ||
| if (user_config) { | ||
| flash_addr = flash_start_addr; | ||
| while (left_size) { |
There was a problem hiding this comment.
while (left_size) does not seems safe. Maybe int left_size = flash_size; and while (left_size>0)?
There was a problem hiding this comment.
Can do, though:
- Will probably need a few casts as all the rest of the variables are of
size_ttypes. - The scenario you're afraid of is pretty erroneous: It can only happen if the flash driver exposes a flash size which is not a sum of its own sectors.
|
Hi
No, I'm sorry...
|
Ugh... Will work with you offline on this. |
68cefcd to
e6ed079
Compare
|
Pushed a fix to the tests, as it seems that this change worsened the state of test in low memory boards. |
e6ed079 to
8d2bb17
Compare
Don't allocate the sector map array in this function, as it was buggy and redundant. Separate user config vs. automatic allocation cases instead (which was essentially the case anyway). In addition, fix tests to get over failures in low end boards
8d2bb17 to
765b483
Compare
|
Thanks @jeromecoutant for verifying that. Description and commit message modified. |
dannybenor
approved these changes
Jan 24, 2019
|
Maybe we can start CI ? :-) |
|
CI started |
cmonr
approved these changes
Jan 30, 2019
Test run: SUCCESSSummary: 12 of 12 test jobs passed |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
NVStore includes a function (
calc_validate_area_params) that either calculates or validates the addresses and sizes of both areas. This function allocates a sector map array used in both calculation/validation of areas. While this generally worked, it had a few problems: First of all, it allocated and deallocated the sector map inside the function, while a more efficient code wouldn't need it. Second, it had a potential bug - number of of entries in the array was calculated according to the first sector size, but in case of a variant sector size, with a large first sector, the array size could have been smaller than required (this probably will never happen, but it's still a bug).This PR removes the allocation and usage of sector map array. Instead it traverses the flash sectors on the fly (forwards in the validation case, backwards in the calculation case).
In addition, fix tests to get over failures in low end boards.
Tested with K64F (both default and user configured), K82F, K66F, NUCLEO_F429ZI and UBLOX_EVK_ODIN_W2.
Resolves #8513.
Pull request type
Reviewers
@jeromecoutant