orchestrator: Say start, not arm, outside the watchdogs - #540
Merged
Merged
Conversation
BootWatch::arm becomes BootWatch::start and Phase::Armed becomes Phase::Started. The trait doc already said "starts a fresh attempt", so the name now says what the method does. Arm stays where a deadline is involved: the boot and commit watchdogs, the timer, and BootWatchdogs in the server. It also stays in the i2c, i3c, usart and sgpiom drivers, which are not ours. The rest is prose. The trial-boot record is set pending, matching set_trial_pending and is_pending on the trait. The SPI write filter is enabled, which is what the register does. The GPIO boot monitor cannot clear the latch. Assisted-by: Claude
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
BootWatch::armbecomesBootWatch::start, andPhase::Armedin the walk adapter becomesPhase::Started. The trait doc already said "starts a fresh attempt", so the name now matches it. 26 call sites, mechanical.Arm stays wherever a deadline is involved: the boot and commit watchdogs,
services/orchestrator/timer,BootWatchdogsin the server, and the watchdog sections of the design docs.It also stays in the i2c, i3c, usart and sgpiom drivers. Those are not ours to rename, though for the record the AST1060 datasheet does not use "arm" in the interrupt sense either: it says enable, and the register is
int_en.The rest is prose. The trial-boot record is set pending, which matches
set_trial_pendingandis_pendingon the trait. The SPI write filter is enabled, which is what the register does. The GPIO boot monitor cannot clear the latch.This touches
driver.rs, so #513 will conflict when it rebases. #513 needs a port to the merged free-function shape anyway; this lands on the base first and #513 rebases onto it.