From eabd3bab1c8ea9c272a82f4f865777b27089d820 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Thu, 26 Jan 2023 10:38:11 +1100 Subject: 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 -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 Reviewed-on: https://review.coreboot.org/c/flashrom/+/72454 Reviewed-by: Elyes Haouas Reviewed-by: Nikolai Artemiev Reviewed-by: Anastasia Klimchuk Tested-by: build bot (Jenkins) --- flashrom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flashrom.c b/flashrom.c index e4f218ec..3e214163 100644 --- a/flashrom.c +++ b/flashrom.c @@ -573,7 +573,7 @@ int read_flash(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigne 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, -- cgit v1.2.3