[nrf noup] Handle pending slot requests #3429
Open
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
This was referenced Oct 27, 2025
tomchy
force-pushed
the
bugfix/mcuboot/NCSDK-NONE_Confirm_requests
branch
from
0fdcade to
f56418e
Compare
ahasztag
approved these changes
Oct 28, 2025
tomchy
force-pushed
the
bugfix/mcuboot/NCSDK-NONE_Confirm_requests
branch
from
f56418e to
56fbf75
Compare
nvlsianpu
approved these changes
Oct 29, 2025
|
|
||
| if (rcs == 0 && rca == 0 && img_mgmt_vercmp(&aver, &sver) < 0) { | ||
| if (rcs == 0 && rca == 0 && (img_mgmt_vercmp(&aver, &sver) < 0) || | ||
| (img_mgmt_vercmp(&aver, &sver) == 0 && (active_slot > query_slot))) { |
There was a problem hiding this comment.
Added/modified comments to justify this logic.
tomchy
force-pushed
the
bugfix/mcuboot/NCSDK-NONE_Confirm_requests
branch
2 times, most recently
from
269e2df to
b58bb6c
Compare
If slots have equal version, but a secondary slot is the active one, the next boot will switch to the primary slot. Expose this through SMP commands by marking the primary slot as pending. Upstream PR #: 98441 Signed-off-by: Tomasz Chyrowicz <[email protected]>
Interpret pending active slot requests while calculating the expected next slot to boot. Signed-off-by: Tomasz Chyrowicz <[email protected]>
tomchy
force-pushed
the
bugfix/mcuboot/NCSDK-NONE_Confirm_requests
branch
from
b58bb6c to
9fac199
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Interpret pending active slot requests while calculating the expected next slot to boot.
Ref: NCSDK-35821