Revert "[opentitantool] Refuse downgrading HyperDebug firmware" #25934
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
jesultra
added
SW:opentitantool
CherryPick:earlgrey_es_sival
|
What's the rationale of making the change? |
nbdd0121
approved these changes
Jan 18, 2025
There was a problem hiding this comment.
The change LGTM and I think it probably makes sense to use exact version, although I think
- before/after merging this change, keep HyperDebug firmware in sync (we haven't done so already I think)
- In the PR body and commit message, articulate the rationale of making this change.
This reverts commit 7a0134a, such that opentitantool no longer requires the `--force` switch in order to downgrade firmware with `opentitantool transport update-firmware`. Instead, opentitantool will be back to the original behavior of overwriting firmware in any case when the version number does not match exactly. The original reason for not downgrading was that our branches had diverged, such that they had different firmware versions, resulting in CI machines constantly upgrading/downgrading as CI runs from different branches were scheduled. PR lowRISC#25917, however introduced a faulty HyperDebug firmware with never version number, which is now on a number of CI machines, and will not be downgraded automatically, with the result that "innocent" other PRs will have CI failures. I think it is clear that we should avoid such excessive flashing by keeping the HyperDebug firmware version in sync between branches. (We do not need to keep all of opentitantool logic in sync, just the built-in firmware version.) For now, in order to avoid CI failures, we should merge this PR, and accept some upgrading/downgrading. Change-Id: I57739777ab3d86fa7e0375834cf9140e8e6ac984 Signed-off-by: Jes B. Klinke <[email protected]>
jesultra
force-pushed
the
hyperdebug_downgrade
branch
from
6339bbe to
2667a3a
Compare
|
I have updated the commit and PR descriptions to mention that PR #25917 introduced flawed HyperDebug firmware with newer version number, which is a problem as once it has run on CI, those machines will retain the newer buggy version, causing CI failures for other unrelated PRs, unless this PR is merged. |
|
Successfully created backport PR for |
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin integrated_dev
git worktree add -d .worktree/backport-25934-to-integrated_dev origin/integrated_dev
cd .worktree/backport-25934-to-integrated_dev
git switch --create backport-25934-to-integrated_dev
git cherry-pick -x 2667a3a2469bfbd78ddeab2a021bf79e700e83d1 |
|
Successfully created backport PR for |
github-actions
bot
added
the
Manually CherryPick
|
integrated_dev isn't active so doesn't need backporting |
nbdd0121
removed
Manually CherryPick
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.
This reverts commit 7a0134a, such that opentitantool no longer requires the
--forceswitch in order to downgrade firmware withopentitantool transport update-firmware. Instead, opentitantool will be back to the original behavior of overwriting firmware in any case when the version number does not match exactly.The original reason for not downgrading was that our branches had diverged, such that they had different firmware versions, resulting in CI machines constantly upgrading/downgrading as CI runs from different branches were scheduled.
PR #25917, however introduced a faulty HyperDebug firmware with never version number, which is now on a number of CI machines, and will not be downgraded automatically, with the result that "innocent" other PRs will have CI failures.
I think it is clear that we should avoid such excessive flashing by keeping the HyperDebug firmware version in sync between branches. (We do not need to keep all of opentitantool logic in sync, just the built-in firmware version.) For now, in order to avoid CI failures, we should merge this PR, and accept some upgrading/downgrading.