Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/72454 )
(
1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: flashrom.c: Fix skip flag typo in read_flash() ......................................................................
flashrom.c: Fix skip flag typo in read_flash()
Only picked up by internal test infra in ChromeOS when instrumenting futility(1).
The following error was incured, ```
Starting firmware updater. Target image: images/bios-kindred.ro-12672-141-0.rw-12672-141-0.bin (RO:Google_Kindred.12672.141.0, RW/A:Google_Kindred.12672.141.0, RW/B:Google_Kindred.12672.141.0).
INFO: update_firmware: Loading current system firmware... INFO: load_system_firmware: flashrom -r <IMAGE> -p host Warning: Setting BIOS Control at 0xdc from 0x8b to 0x89 failed. New value is 0x8b. At least some flash regions are read protected. You have to use a flash layout and include only accessible regions. For write operations, you'll additionally need the --noverify-all switch. See manpage for more details. read_flash: cannot read inside Management Engine region (0x001000..0x3fffff). Read operation failed! ERROR: do_update: Cannot load system active firmware. ``` despite the appropriate flag being set within futility(1).
BUG=b:266748702 TEST=cros fw updates.
Change-Id: Ie04cd62020ca29775fc66a81d2fadd32a5aab5cd Signed-off-by: Edward O'Callaghan quasisec@google.com Reviewed-on: https://review.coreboot.org/c/flashrom/+/72454 Reviewed-by: Elyes Haouas ehaouas@noos.fr Reviewed-by: Nikolai Artemiev nartemiev@google.com Reviewed-by: Anastasia Klimchuk aklm@chromium.org Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M flashrom.c 1 file changed, 39 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Elyes Haouas: Looks good to me, approved Nikolai Artemiev: Looks good to me, but someone else must approve Anastasia Klimchuk: Looks good to me, approved
diff --git a/flashrom.c b/flashrom.c index e4f218e..3e21416 100644 --- a/flashrom.c +++ b/flashrom.c @@ -573,7 +573,7 @@ uint8_t *rbuf = buf + addr - start;
if (region.read_prot) { - if (flash->flags.skip_unwritable_regions) { + if (flash->flags.skip_unreadable_regions) { msg_gdbg("%s: cannot read inside %s region (%#08x..%#08x), " "filling (%#08x..%#08x) with erased value instead.\n", __func__, region.name, region.start, region.end - 1,