firmware_RollbackFirmware: Don't tie expected recovery reason to board
I'm planning to submit a vboot2 change that will change the emitted
recovery reason for firmware version rollbacks from the generic
RO_INVALID_RW (0x3) to the more precise RW_FW_ROLLBACK (0x17).
firmware_RollbackFirmware is currently hardcoded to expect the former
for vboot2 boards and the latter for anything else except Mario, Alex
and ZGB.
Unfortunately, due to the way FAFT works with branches, even CQ-DEPEND
won't stop this change from causing all kinds of stupid problems for
people trying to verify older firmware. The difference between the two
numbers is really just not important enough to care in this case. Let us
simply switch this test to unconditionally accept both in the same way
firmware_CorruptBothFwSigAB and firmware_CorruptBothFwBodyAB already do
to avoid wasting other people's time debugging non-issues.
BUG=None
TEST=Ran firmware_RollbackFirmware on a Jerry.
Change-Id: Ia170ecc82fb5243e1960e6f1f43a951a97037333
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/248400
Reviewed-by: Yusuf Mohsinally <mohsinally@chromium.org>
diff --git a/server/site_tests/firmware_RollbackFirmware/firmware_RollbackFirmware.py b/server/site_tests/firmware_RollbackFirmware/firmware_RollbackFirmware.py
index 23e4c36..deab235 100644
--- a/server/site_tests/firmware_RollbackFirmware/firmware_RollbackFirmware.py
+++ b/server/site_tests/firmware_RollbackFirmware/firmware_RollbackFirmware.py
@@ -30,15 +30,6 @@
super(firmware_RollbackFirmware, self).cleanup()
def run_once(self, dev_mode=False):
- # Recovery reason RW_FW_ROLLBACK available after Alex/ZGB.
- if self.faft_client.system.get_platform_name() in (
- 'Mario', 'Alex', 'ZGB'):
- recovery_reason = vboot.RECOVERY_REASON['RO_INVALID_RW']
- elif self.fw_vboot2:
- recovery_reason = vboot.RECOVERY_REASON['RO_INVALID_RW']
- else:
- recovery_reason = vboot.RECOVERY_REASON['RW_FW_ROLLBACK']
-
logging.info("Rollback firmware A.")
self.check_state((self.checkers.fw_tries_checker, 'A'))
self.faft_client.bios.move_version_backward('a')
@@ -55,7 +46,9 @@
logging.info("Expected recovery boot and restores firmware A and B.")
self.check_state((self.checkers.crossystem_checker, {
'mainfw_type': 'recovery',
- 'recovery_reason': recovery_reason,
+ 'recovery_reason': (
+ vboot.RECOVERY_REASON['RO_INVALID_RW'],
+ vboot.RECOVERY_REASON['RW_FW_ROLLBACK']),
}))
self.faft_client.bios.move_version_forward(('a', 'b'))
self.reboot_warm()
