handle case where PART_UPDATE_ENDFLAGS % WOLFBOOT_SECTOR_SIZE == 0 #351
Conversation
This file contains 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
dgarske
requested changes
Aug 21, 2023
|
|
||
| /* if PART_UPDATE_ENDFLAGS stradles a sector, (all non FLAGS_HOME builds) | ||
| * align it to the correct sector */ | ||
| if (PART_UPDATE_ENDFLAGS % WOLFBOOT_SECTOR_SIZE == 0) |
There was a problem hiding this comment.
590 -> lastSector = 0x60050000
596 -> lastSector = 0x6004f000```
Looks good. Why did we not see this issue previously? Are we missing some test cases?
There was a problem hiding this comment.
I think it's because nvm_select_fresh_sector defaults to selecting 0 when both sectors are empty and without this PR it was reading the swap sector and then writing to sector 0 so sector 0 had a non-erased byte and was correctly selected the next time around
| @@ -589,6 +589,11 @@ void RAMFUNCTION wolfBoot_update_trigger(void) | |||
| #if defined(NVM_FLASH_WRITEONCE) || defined(WOLFBOOT_FLAGS_INVERT) | |||
| uintptr_t lastSector = PART_UPDATE_ENDFLAGS - | |||
| (PART_UPDATE_ENDFLAGS % WOLFBOOT_SECTOR_SIZE); | |||
|
|
|||
| /* if PART_UPDATE_ENDFLAGS stradles a sector, (all non FLAGS_HOME builds) | |||
There was a problem hiding this comment.
Could this be gated on #ifndef FLAGS_HOME?
dgarske
approved these changes
Aug 22, 2023
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.
ZD 16472