diff options
| author | Nikolai Artemiev <nartemiev@google.com> | 2022-01-14 17:09:20 +1100 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-01-18 22:50:49 +0000 |
| commit | 3654f9f96d150de9af3597d860c6eb2138ab8e6d (patch) | |
| tree | c8854aae9814c28bd041dee5c3f7cb8d61d38897 | |
| parent | 4445b42c8d3d9c924e1a0d3326499eb6f7e93955 (diff) | |
| download | vboot-3654f9f96d150de9af3597d860c6eb2138ab8e6d.tar.gz | |
Revert "vboot_reference/futility: set layout when using region"
This reverts commit 91ffb514310bbc1fff166a049d9a40d11850f31.
Changing the write path in futility to use libflashrom had the side
effect of skipping the code in cli_classic that created a powerd lock
file. This could result in powerd suspending during a firmware update,
corrupting the RW firmware.
Revert back to subprocessing flashrom for M98.
BUG=b:214485250
BRANCH=release-R98-14388.B
TEST=emerge-grunt vboot_reference
TEST=flashed grunt DUT with R98-14388.30.0 test image, deployed \
vboot_reference with reverts
TEST=ran `futility --force -i image.bin`, monitored processes \
with `ps -ef | grep flashrom` verified that flashrom ran as \
a separate process for read/wp-status/write ops
TEST=verified /run/lock/power_override/flashrom.lock was created \
during update
TEST=ran `futility --force -i image.bin --wp=0`, verified only RW \
sections A/B were written
TEST=ran `futility --force -i image.bin`, waited for write to start, \
sent restart msg with: `dbus-send --type=method_call --system \
--dest=org.chromium.PowerManager /org/chromium/PowerManager \
org.chromium.PowerManager.RequestRestart`, verified restart was \
deferred until firmware write finished
Signed-off-by: Nikolai Artemiev <nartemiev@google.com>
Change-Id: I6231564a6708033c5bd7919dbf963d44e63c73cb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3388973
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
| -rw-r--r-- | futility/updater_utils.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/futility/updater_utils.c b/futility/updater_utils.c index 3c7b3730..039788a2 100644 --- a/futility/updater_utils.c +++ b/futility/updater_utils.c @@ -709,7 +709,6 @@ static int host_flashrom_write(const struct firmware_image *image, r = -1; goto err_cleanup; } - flashrom_layout_set(flashctx, layout); } flashrom_flag_set(flashctx, FLASHROM_FLAG_VERIFY_WHOLE_CHIP, true); |