- flashrom-gerrit - mail.coreboot.org

Change in flashrom[stable]: ich_descriptors_tool: Fix an off-by-one
by Nico Huber (Code Review) 30 Sep '17

30 Sep '17

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/21799 Change subject: ich_descriptors_tool: Fix an off-by-one ...................................................................... ich_descriptors_tool: Fix an off-by-one Original-Change-Id: I008abd78c7c42bf3f17e68c192cd79dd427c5cb5 Original-Reviewed-on: https://review.coreboot.org/19045 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Change-Id: If494234e9529d83564c21799bf8ea424ae633667 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- M util/ich_descriptors_tool/ich_descriptors_tool.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/99/21799/1 diff --git a/util/ich_descriptors_tool/ich_descriptors_tool.c b/util/ich_descriptors_tool/ich_descriptors_tool.c index 0da27d2..250abf0 100644 --- a/util/ich_descriptors_tool/ich_descriptors_tool.c +++ b/util/ich_descriptors_tool/ich_descriptors_tool.c @@ -230,7 +230,7 @@ prettyprint_ich_descriptors(cs, &desc); pMAC = (uint8_t *) &buf[ICH_FREG_BASE(desc.region.reg3_base) >> 2]; - if (len >= ICH_FREG_BASE(desc.region.reg3_base) + 5 && pMAC[0] != 0xff) + if (len >= ICH_FREG_BASE(desc.region.reg3_base) + 6 && pMAC[0] != 0xff) printf("The MAC address might be at offset 0x%x: " "%02x:%02x:%02x:%02x:%02x:%02x\n", ICH_FREG_BASE(desc.region.reg3_base), -- To view, visit https://review.coreboot.org/21799 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: stable Gerrit-MessageType: newchange Gerrit-Change-Id: If494234e9529d83564c21799bf8ea424ae633667 Gerrit-Change-Number: 21799 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

Change in flashrom[stable]: flashchips: Add untested Winbond W25Q128.W
by Nico Huber (Code Review) 30 Sep '17

30 Sep '17

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/21798 Change subject: flashchips: Add untested Winbond W25Q128.W ...................................................................... flashchips: Add untested Winbond W25Q128.W Only difference to its sibling W25Q128.V seems to be the supply voltage. Original-Change-Id: I34ce7f1bdd0d2fb1b065031e5a689bb16ffc70db Original-Reviewed-on: https://review.coreboot.org/19436 Original-Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Original-Reviewed-by: David Hendricks <david.hendricks(a)gmail.com> Change-Id: Ie4f996698b0807ec3e97c8dec3fcd4e3c16557c2 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M flashchips.c M flashchips.h 2 files changed, 41 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/98/21798/1 diff --git a/flashchips.c b/flashchips.c index 40b6b8e..7ef361b 100644 --- a/flashchips.c +++ b/flashchips.c @@ -14825,6 +14825,46 @@ { .vendor = "Winbond", + .name = "W25Q128.W", + .bustype = BUS_SPI, + .manufacture_id = WINBOND_NEX_ID, + .model_id = WINBOND_NEX_W25Q128_W, + .total_size = 16384, + .page_size = 256, + /* supports SFDP */ + /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44, read ID 0x4B */ + .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, + .tested = TEST_UNTESTED, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {4 * 1024, 4096} }, + .block_erase = spi_block_erase_20, + }, { + .eraseblocks = { {32 * 1024, 512} }, + .block_erase = spi_block_erase_52, + }, { + .eraseblocks = { {64 * 1024, 256} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {16 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_60, + }, { + .eraseblocks = { {16 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ + .unlock = spi_disable_blockprotect, + .write = spi_chip_write_256, + .read = spi_chip_read, + .voltage = {1650, 1950}, + }, + + { + .vendor = "Winbond", .name = "W25X10", .bustype = BUS_SPI, .manufacture_id = WINBOND_NEX_ID, diff --git a/flashchips.h b/flashchips.h index 9ffb30f..28a155d 100644 --- a/flashchips.h +++ b/flashchips.h @@ -906,7 +906,7 @@ #define WINBOND_NEX_W25Q16_W 0x6015 /* W25Q16DW */ #define WINBOND_NEX_W25Q32_W 0x6016 /* W25Q32DW; W25Q32FV in QPI mode */ #define WINBOND_NEX_W25Q64_W 0x6017 /* W25Q64DW; W25Q64FV in QPI mode */ -#define WINBOND_NEX_W25Q128_W 0x6018 /* (No W version known) W25Q128FV in QPI mode */ +#define WINBOND_NEX_W25Q128_W 0x6018 /* W25Q128FW; W25Q128FV in QPI mode */ #define WINBOND_ID 0xDA /* Winbond */ #define WINBOND_W19B160BB 0x49 -- To view, visit https://review.coreboot.org/21798 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: stable Gerrit-MessageType: newchange Gerrit-Change-Id: Ie4f996698b0807ec3e97c8dec3fcd4e3c16557c2 Gerrit-Change-Number: 21798 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

Change in flashrom[stable]: util: Add CH341a to z60_flashrom.rules
by build bot (Jenkins) (Code Review) 30 Sep '17

30 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21778 ) Change subject: util: Add CH341a to z60_flashrom.rules ...................................................................... Patch Set 1: Verified-1 Build Failed https://qa.coreboot.org/job/flashrom-customrules/574/ : FAILURE https://qa.coreboot.org/job/flashrom_gerrit/518/ : SUCCESS -- To view, visit https://review.coreboot.org/21778 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: stable Gerrit-MessageType: comment Gerrit-Change-Id: Id1ceebbf406f81a28bd6dae44acd6e569e0c834c Gerrit-Change-Number: 21778 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sat, 30 Sep 2017 20:48:30 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[stable]: Whitelist Roda/RV11 laptop
by Nico Huber (Code Review) 30 Sep '17

30 Sep '17

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/21797 Change subject: Whitelist Roda/RV11 laptop ...................................................................... Whitelist Roda/RV11 laptop Original-Change-Id: I036c1f8cb914c8e3cca9d17eb221b582d7414ae9 Original-Reviewed-on: https://review.coreboot.org/18739 Original-Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Original-Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Change-Id: I03e711894b00eca11abcf2eca7512b833550679d Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- M board_enable.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/97/21797/1 diff --git a/board_enable.c b/board_enable.c index c85bd15..b6e17ef 100644 --- a/board_enable.c +++ b/board_enable.c @@ -2458,6 +2458,7 @@ {0x10DE, 0x0360, 0x1462, 0x7250, 0x10DE, 0x0368, 0x1462, 0x7250, NULL, NULL, NULL, P3, "MSI", "MS-7250 (K9N SLI)", 0, OK, nvidia_mcp_gpio2_raise}, {0x1011, 0x0019, 0xaa55, 0xaa55, 0x8086, 0x7190, 0, 0, NULL, NULL, NULL, P3, "Nokia", "IP530", 0, OK, fdc37b787_gpio50_raise_3f0}, {0x8086, 0x3B30, 0x1025, 0x0379, 0x8086, 0x3B09, 0x1025, 0x0379, "^EasyNote LM85$", NULL, NULL, P2, "Packard Bell","EasyNote LM85", 0, OK, p2_whitelist_laptop}, + {0x8086, 0x0154, 0x8086, 0x0154, 0x8086, 0x1e55, 0x8086, 0x1e55, "RV11$", "Roda", "Lizard RV11", P2, "Roda", "RV11", 0, OK, p2_whitelist_laptop}, {0x8086, 0x24d3, 0x144d, 0xb025, 0x8086, 0x1050, 0x144d, 0xb025, NULL, NULL, NULL, P3, "Samsung", "Polaris 32", 0, OK, intel_ich_gpio21_raise}, {0x1106, 0x3099, 0, 0, 0x1106, 0x3074, 0, 0, NULL, "shuttle", "ak31", P3, "Shuttle", "AK31", 0, OK, w836xx_memw_enable_2e}, {0x1106, 0x3104, 0x1297, 0xa238, 0x1106, 0x3059, 0x1297, 0xc063, NULL, NULL, NULL, P3, "Shuttle", "AK38N", 256, OK, NULL}, -- To view, visit https://review.coreboot.org/21797 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: stable Gerrit-MessageType: newchange Gerrit-Change-Id: I03e711894b00eca11abcf2eca7512b833550679d Gerrit-Change-Number: 21797 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

Change in flashrom[stable]: Fix linking with libpayload
by Nico Huber (Code Review) 30 Sep '17

30 Sep '17

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/21796 Change subject: Fix linking with libpayload ...................................................................... Fix linking with libpayload o Move flashbuses_to_text() to flashrom.c, it's not a cli function. o Guard `!defined(HAVE_STRNLEN)`. This guard was introduced in 23e10b87 (Add a bunch of new/tested stuff and various small changes 24) to support older BSDs. It's probably completely broken because HAVE_STRNLEN is presumably a GNU autotools thing. But we can't fix it without retesting these older BSDs. Original-Change-Id: I561135209b819361d125eeaeef9ff886d6bae987 Original-Reviewed-on: https://review.coreboot.org/18738 Original-Reviewed-by: Philippe Mathieu-Daudé <f4bug(a)amsat.org> Original-Reviewed-by: David Hendricks <david.hendricks(a)gmail.com> Original-Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Change-Id: I3e2b886bf9cc889f01ac3a3066aa4b02f8026bfd Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- M cli_common.c M flash.h M flashrom.c M helpers.c 4 files changed, 36 insertions(+), 37 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/96/21796/1 diff --git a/cli_common.c b/cli_common.c index 71cc2dd..256f1fa 100644 --- a/cli_common.c +++ b/cli_common.c @@ -24,40 +24,6 @@ #include <string.h> #include "flash.h" -/* - * Return a string corresponding to the bustype parameter. - * Memory is obtained with malloc() and must be freed with free() by the caller. - */ -char *flashbuses_to_text(enum chipbustype bustype) -{ - char *ret = calloc(1, 1); - /* - * FIXME: Once all chipsets and flash chips have been updated, NONSPI - * will cease to exist and should be eliminated here as well. - */ - if (bustype == BUS_NONSPI) { - ret = strcat_realloc(ret, "Non-SPI, "); - } else { - if (bustype & BUS_PARALLEL) - ret = strcat_realloc(ret, "Parallel, "); - if (bustype & BUS_LPC) - ret = strcat_realloc(ret, "LPC, "); - if (bustype & BUS_FWH) - ret = strcat_realloc(ret, "FWH, "); - if (bustype & BUS_SPI) - ret = strcat_realloc(ret, "SPI, "); - if (bustype & BUS_PROG) - ret = strcat_realloc(ret, "Programmer-specific, "); - if (bustype == BUS_NONE) - ret = strcat_realloc(ret, "None, "); - } - /* Kill last comma. */ - ret[strlen(ret) - 2] = '\0'; - ret = realloc(ret, strlen(ret) + 1); - return ret; -} - - void print_chip_support_status(const struct flashchip *chip) { if (chip->feature_bits & FEATURE_OTP) { diff --git a/flash.h b/flash.h index 47c32f4..b5eb99b 100644 --- a/flash.h +++ b/flash.h @@ -264,13 +264,14 @@ #ifdef __MINGW32__ char* strtok_r(char *str, const char *delim, char **nextp); #endif -#if defined(__DJGPP__) || !defined(HAVE_STRNLEN) +#if defined(__DJGPP__) || (!defined(__LIBPAYLOAD__) && !defined(HAVE_STRNLEN)) size_t strnlen(const char *str, size_t n); #endif /* flashrom.c */ extern const char flashrom_version[]; extern const char *chip_to_probe; +char *flashbuses_to_text(enum chipbustype bustype); int map_flash(struct flashctx *flash); void unmap_flash(struct flashctx *flash); int read_memmapped(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); @@ -308,7 +309,6 @@ #define ERROR_FLASHROM_LIMIT -201 /* cli_common.c */ -char *flashbuses_to_text(enum chipbustype bustype); void print_chip_support_status(const struct flashchip *chip); /* cli_output.c */ diff --git a/flashrom.c b/flashrom.c index b7eaac8..c600efc 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1163,6 +1163,39 @@ return 0; } +/* + * Return a string corresponding to the bustype parameter. + * Memory is obtained with malloc() and must be freed with free() by the caller. + */ +char *flashbuses_to_text(enum chipbustype bustype) +{ + char *ret = calloc(1, 1); + /* + * FIXME: Once all chipsets and flash chips have been updated, NONSPI + * will cease to exist and should be eliminated here as well. + */ + if (bustype == BUS_NONSPI) { + ret = strcat_realloc(ret, "Non-SPI, "); + } else { + if (bustype & BUS_PARALLEL) + ret = strcat_realloc(ret, "Parallel, "); + if (bustype & BUS_LPC) + ret = strcat_realloc(ret, "LPC, "); + if (bustype & BUS_FWH) + ret = strcat_realloc(ret, "FWH, "); + if (bustype & BUS_SPI) + ret = strcat_realloc(ret, "SPI, "); + if (bustype & BUS_PROG) + ret = strcat_realloc(ret, "Programmer-specific, "); + if (bustype == BUS_NONE) + ret = strcat_realloc(ret, "None, "); + } + /* Kill last comma. */ + ret[strlen(ret) - 2] = '\0'; + ret = realloc(ret, strlen(ret) + 1); + return ret; +} + int probe_flash(struct registered_master *mst, int startchip, struct flashctx *flash, int force) { const struct flashchip *chip; diff --git a/helpers.c b/helpers.c index f6eae46..8bc808a 100644 --- a/helpers.c +++ b/helpers.c @@ -92,7 +92,7 @@ #endif /* There is no strnlen in DJGPP */ -#if defined(__DJGPP__) || !defined(HAVE_STRNLEN) +#if defined(__DJGPP__) || (!defined(__LIBPAYLOAD__) && !defined(HAVE_STRNLEN)) size_t strnlen(const char *str, size_t n) { size_t i; -- To view, visit https://review.coreboot.org/21796 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: stable Gerrit-MessageType: newchange Gerrit-Change-Id: I3e2b886bf9cc889f01ac3a3066aa4b02f8026bfd Gerrit-Change-Number: 21796 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

Change in flashrom[stable]: Add option to read ROM layout from IFD
by Nico Huber (Code Review) 30 Sep '17

30 Sep '17

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/21795 Change subject: Add option to read ROM layout from IFD ...................................................................... Add option to read ROM layout from IFD Add an option --ifd to read the ROM layout from an Intel Firmware Descriptor (IFD). Works the same as the -l option, if given, -i specifies the images to update. v2: o Rebased on libflashrom, use libflashrom interface. o Use functions from ich_descriptors.c. v3: o Move ich_descriptors.o to LIB_OBJS, thus build it independent of arch and programmers. o Bail out if we aren't compiled for little endian. o Update flashrom.8.tmpl. v4: o Incorporated David's comments. o Removed single-character `-d` option. v5: Changed region names to match the output of `ifdtool --layout ...` Original-Change-Id: Ifafff2bf6d5c5e62283416b3269723f81fdc0fa3 Original-Reviewed-on: https://review.coreboot.org/17953 Original-Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Original-Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Change-Id: I7d45b16c350385c09cf11e5493f50748830dd5e3 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- M Makefile M cli_classic.c M flash.h M flashrom.8.tmpl M flashrom.c M ich_descriptors.c M ich_descriptors.h M layout.c M layout.h M libflashrom.c M libflashrom.h 11 files changed, 195 insertions(+), 25 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/95/21795/1 diff --git a/Makefile b/Makefile index 55874ae..44aa24c 100644 --- a/Makefile +++ b/Makefile @@ -519,7 +519,7 @@ ############################################################################### # Library code. -LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o helpers.o +LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o helpers.o ich_descriptors.o ############################################################################### # Frontend related stuff. @@ -744,7 +744,7 @@ PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o internal.o ifeq ($(ARCH), x86) PROGRAMMER_OBJS += it87spi.o it85spi.o sb600spi.o amd_imc.o wbsio_spi.o mcp6x_spi.o -PROGRAMMER_OBJS += ichspi.o ich_descriptors.o dmi.o +PROGRAMMER_OBJS += ichspi.o dmi.o ifeq ($(CONFIG_INTERNAL_DMI), yes) FEATURE_CFLAGS += -D'CONFIG_INTERNAL_DMI=1' endif diff --git a/cli_classic.c b/cli_classic.c index 33d3e4b..4c3db4d 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -42,7 +42,7 @@ "-z|" #endif "-p <programmername>[:<parameters>] [-c <chipname>]\n" - "[-E|(-r|-w|-v) <file>] [-l <layoutfile> [-i <imagename>]...] [-n] [-N] [-f]]\n" + "[-E|(-r|-w|-v) <file>] [(-l <layoutfile>|--ifd) [-i <imagename>]...] [-n] [-N] [-f]]\n" "[-V[V[V]]] [-o <logfile>]\n\n", name); printf(" -h | --help print this help text\n" @@ -57,6 +57,7 @@ " -n | --noverify don't auto-verify\n" " -N | --noverify-all verify included regions only (cf. -i)\n" " -l | --layout <layoutfile> read ROM layout from <layoutfile>\n" + " --ifd read layout from an Intel Firmware Descriptor\n" " -i | --image <name> only flash image <name> from flash layout\n" " -o | --output <logfile> log output to <logfile>\n" " -L | --list-supported print supported devices\n" @@ -99,12 +100,13 @@ struct flashctx *fill_flash; const char *name; int namelen, opt, i, j; - int startchip = -1, chipcount = 0, option_index = 0, force = 0; + int startchip = -1, chipcount = 0, option_index = 0, force = 0, ifd = 0; #if CONFIG_PRINT_WIKI == 1 int list_supported_wiki = 0; #endif int read_it = 0, write_it = 0, erase_it = 0, verify_it = 0; int dont_verify_it = 0, dont_verify_all = 0, list_supported = 0, operation_specified = 0; + struct flashrom_layout *layout = NULL; enum programmer prog = PROGRAMMER_INVALID; int ret = 0; @@ -120,6 +122,7 @@ {"verbose", 0, NULL, 'V'}, {"force", 0, NULL, 'f'}, {"layout", 1, NULL, 'l'}, + {"ifd", 0, NULL, 0x0100}, {"image", 1, NULL, 'i'}, {"list-supported", 0, NULL, 'L'}, {"list-supported-wiki", 0, NULL, 'z'}, @@ -220,7 +223,18 @@ "more than once. Aborting.\n"); cli_classic_abort_usage(); } + if (ifd) { + fprintf(stderr, "Error: --layout and --ifd both specified. Aborting.\n"); + cli_classic_abort_usage(); + } layoutfile = strdup(optarg); + break; + case 0x0100: + if (layoutfile) { + fprintf(stderr, "Error: --layout and --ifd both specified. Aborting.\n"); + cli_classic_abort_usage(); + } + ifd = 1; break; case 'i': tempstr = strdup(optarg); @@ -376,7 +390,7 @@ ret = 1; goto out; } - if (process_include_args()) { + if (!ifd && process_include_args(get_global_layout())) { ret = 1; goto out; } @@ -529,9 +543,15 @@ goto out_shutdown; } - if (layoutfile) - flashrom_layout_set(fill_flash, get_global_layout()); + if (layoutfile) { + layout = get_global_layout(); + } else if (ifd && (flashrom_layout_read_from_ifd(&layout, fill_flash, NULL, 0) || + process_include_args(layout))) { + ret = 1; + goto out_shutdown; + } + flashrom_layout_set(fill_flash, layout); flashrom_flag_set(fill_flash, FLASHROM_FLAG_FORCE, !!force); #if CONFIG_INTERNAL == 1 flashrom_flag_set(fill_flash, FLASHROM_FLAG_FORCE_BOARDMISMATCH, !!force_boardmismatch); @@ -553,6 +573,8 @@ else if (verify_it) ret = do_verify(fill_flash, filename); + flashrom_layout_release(layout); + out_shutdown: programmer_shutdown(); out: diff --git a/flash.h b/flash.h index 7c7ecd5..47c32f4 100644 --- a/flash.h +++ b/flash.h @@ -287,6 +287,8 @@ int selfcheck(void); int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename); int write_buf_to_file(const unsigned char *buf, unsigned long size, const char *filename); +int prepare_flash_access(struct flashctx *, bool read_it, bool write_it, bool erase_it, bool verify_it); +void finalize_flash_access(struct flashctx *); int do_read(struct flashctx *, const char *filename); int do_erase(struct flashctx *); int do_write(struct flashctx *, const char *const filename); @@ -354,7 +356,6 @@ /* layout.c */ int register_include_arg(char *name); -int process_include_args(void); int read_romlayout(const char *name); int normalize_romentries(const struct flashctx *flash); void layout_cleanup(void); diff --git a/flashrom.8.tmpl b/flashrom.8.tmpl index 34e7f02..143d76c 100644 --- a/flashrom.8.tmpl +++ b/flashrom.8.tmpl @@ -48,8 +48,8 @@ \fB\-p\fR <programmername>[:<parameters>] [\fB\-E\fR|\fB\-r\fR <file>|\fB\-w\fR <file>|\fB\-v\fR <file>] \ [\fB\-c\fR <chipname>] - [\fB\-l\fR <file> [\fB\-i\fR <image>]] [\fB\-n\fR] [\fB\-N\fR] \ -[\fB\-f\fR]] + [(\fB\-l\fR <file>|\fB\-\-ifd\fR) [\fB\-i\fR <image>]] \ +[\fB\-n\fR] [\fB\-N\fR] [\fB\-f\fR]] [\fB\-V\fR[\fBV\fR[\fBV\fR]]] [\fB-o\fR <logfile>] .SH DESCRIPTION .B flashrom @@ -195,6 +195,22 @@ .sp Overlapping sections are not supported. .TP +.B "\-\-ifd" +Read ROM layout from Intel Firmware Descriptor. +.sp +flashrom supports ROM layouts given by an Intel Firmware Descriptor +(IFD). The on-chip descriptor will be read and used to generate the +layout. If you need to change the layout, you have to update the IFD +only first. +.sp +The following ROM images may be present in an IFD: +.sp + fd the IFD itself + bios the host firmware aka. BIOS + me Intel Management Engine firmware + gbe gigabit ethernet firmware + pd platform specific data +.TP .B "\-i, \-\-image <imagename>" Only flash region/image .B <imagename> diff --git a/flashrom.c b/flashrom.c index fc555fb..b7eaac8 100644 --- a/flashrom.c +++ b/flashrom.c @@ -2168,9 +2168,9 @@ return 0; } -static int prepare_flash_access(struct flashctx *const flash, - const bool read_it, const bool write_it, - const bool erase_it, const bool verify_it) +int prepare_flash_access(struct flashctx *const flash, + const bool read_it, const bool write_it, + const bool erase_it, const bool verify_it) { if (chip_safety_check(flash, flash->flags.force, read_it, write_it, erase_it, verify_it)) { msg_cerr("Aborting.\n"); @@ -2193,7 +2193,7 @@ return 0; } -static void finalize_flash_access(struct flashctx *const flash) +void finalize_flash_access(struct flashctx *const flash) { unmap_flash(flash); } diff --git a/ich_descriptors.c b/ich_descriptors.c index 2cc1c73..4af8764 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -23,6 +23,7 @@ #ifdef ICH_DESCRIPTORS_FROM_DUMP_ONLY #include <stdio.h> +#include <string.h> #define print(t, ...) printf(__VA_ARGS__) #endif @@ -38,7 +39,7 @@ #include "programmer.h" #ifndef min -#define min(a, b) (a < b) ? a : b +#define min(a, b) (((a) < (b)) ? (a) : (b)) #endif void prettyprint_ich_reg_vscc(uint32_t reg_val, int verbosity, bool print_vcl) @@ -919,4 +920,42 @@ return ICH_RET_OK; } #endif + +/** + * @brief Read a layout from the dump of an Intel ICH descriptor. + * + * @param layout Pointer where to store the layout. + * @param dump The descriptor dump to read from. + * @param len The length of the descriptor dump. + * + * @return 0 on success, + * 1 if the descriptor couldn't be parsed. + */ +int layout_from_ich_descriptors(struct ich_layout *const layout, const void *const dump, const size_t len) +{ + static const char *regions[] = { "fd", "bios", "me", "gbe", "pd" }; + + struct ich_descriptors desc; + if (read_ich_descriptors_from_dump(dump, len, &desc)) + return 1; + + memset(layout, 0x00, sizeof(*layout)); + + size_t i, j; + for (i = 0, j = 0; i < min(desc.content.NR + 1, ARRAY_SIZE(regions)); ++i) { + const chipoff_t base = ICH_FREG_BASE(desc.region.FLREGs[i]); + const chipoff_t limit = ICH_FREG_LIMIT(desc.region.FLREGs[i]) + 0xfff; + if (limit <= base) + continue; + layout->entries[j].start = base; + layout->entries[j].end = limit; + layout->entries[j].included = false; + snprintf(layout->entries[j].name, sizeof(layout->entries[j].name), "%s", regions[i]); + ++j; + } + layout->base.entries = layout->entries; + layout->base.num_entries = j; + return 0; +} + #endif /* ICH_DESCRIPTORS_FROM_DUMP_ONLY */ diff --git a/ich_descriptors.h b/ich_descriptors.h index e355e54..ecf44bf 100644 --- a/ich_descriptors.h +++ b/ich_descriptors.h @@ -584,4 +584,6 @@ int read_ich_descriptors_via_fdo(void *spibar, struct ich_descriptors *desc); int getFCBA_component_density(enum ich_chipset cs, const struct ich_descriptors *desc, uint8_t idx); +int layout_from_ich_descriptors(struct ich_layout *, const void *dump, size_t len); + #endif /* __ICH_DESCRIPTORS_H__ */ diff --git a/layout.c b/layout.c index 2d53295..9bf0b03 100644 --- a/layout.c +++ b/layout.c @@ -35,7 +35,7 @@ static char *include_args[MAX_ROMLAYOUT]; static int num_include_args = 0; /* the number of valid include_args. */ -const struct flashrom_layout *get_global_layout(void) +struct flashrom_layout *get_global_layout(void) { return &layout; } @@ -132,17 +132,17 @@ } /* returns the index of the entry (or a negative value if it is not found) */ -static int find_romentry(char *name) +static int find_romentry(struct flashrom_layout *const l, char *name) { int i; - if (layout.num_entries == 0) + if (l->num_entries == 0) return -1; msg_gspew("Looking for region \"%s\"... ", name); - for (i = 0; i < layout.num_entries; i++) { - if (!strcmp(layout.entries[i].name, name)) { - layout.entries[i].included = 1; + for (i = 0; i < l->num_entries; i++) { + if (!strcmp(l->entries[i].name, name)) { + l->entries[i].included = 1; msg_gspew("found.\n"); return i; } @@ -154,7 +154,7 @@ /* process -i arguments * returns 0 to indicate success, >0 to indicate failure */ -int process_include_args(void) +int process_include_args(struct flashrom_layout *const l) { int i; unsigned int found = 0; @@ -163,7 +163,7 @@ return 0; /* User has specified an area, but no layout file is loaded. */ - if (layout.num_entries == 0) { + if (l->num_entries == 0) { msg_gerr("Region requested (with -i \"%s\"), " "but no layout data is available.\n", include_args[0]); @@ -171,7 +171,7 @@ } for (i = 0; i < num_include_args; i++) { - if (find_romentry(include_args[i]) < 0) { + if (find_romentry(l, include_args[i]) < 0) { msg_gerr("Invalid region specified: \"%s\".\n", include_args[i]); return 1; diff --git a/layout.h b/layout.h index 349cebc..c93d754 100644 --- a/layout.h +++ b/layout.h @@ -57,6 +57,13 @@ struct romentry entry; }; -const struct flashrom_layout *get_global_layout(void); +struct ich_layout { + struct flashrom_layout base; + struct romentry entries[5]; +}; + +struct flashrom_layout *get_global_layout(void); + +int process_include_args(struct flashrom_layout *); #endif /* !__LAYOUT_H__ */ diff --git a/libflashrom.c b/libflashrom.c index f17b627..962e96f 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -31,6 +31,8 @@ #include "flash.h" #include "programmer.h" #include "layout.h" +#include "hwaccess.h" +#include "ich_descriptors.h" #include "libflashrom.h" /** @@ -305,6 +307,86 @@ } /** + * @brief Read a layout from the Intel ICH descriptor in the flash. + * + * Optionally verify that the layout matches the one in the given + * descriptor dump. + * + * @param[out] layout Points to a struct flashrom_layout pointer that + * gets set if the descriptor is read and parsed + * successfully. + * @param[in] flashctx Flash context to read the descriptor from flash. + * @param[in] dump The descriptor dump to compare to or NULL. + * @param[in] len The length of the descriptor dump. + * + * @return 0 on success, + * 6 if descriptor parsing isn't implemented for the host, + * 5 if the descriptors don't match, + * 4 if the descriptor dump couldn't be parsed, + * 3 if the descriptor on flash couldn't be parsed, + * 2 if the descriptor on flash couldn't be read, + * 1 on any other error. + */ +int flashrom_layout_read_from_ifd(struct flashrom_layout **const layout, struct flashctx *const flashctx, + const void *const dump, const size_t len) +{ +#ifndef __FLASHROM_LITTLE_ENDIAN__ + return 6; +#else + struct ich_layout dump_layout; + int ret = 1; + + void *const desc = malloc(0x1000); + struct ich_layout *const chip_layout = malloc(sizeof(*chip_layout)); + if (!desc || !chip_layout) { + msg_gerr("Out of memory!\n"); + goto _free_ret; + } + + if (prepare_flash_access(flashctx, true, false, false, false)) + goto _free_ret; + + msg_cinfo("Reading ich descriptor... "); + if (flashctx->chip->read(flashctx, desc, 0, 0x1000)) { + msg_cerr("Read operation failed!\n"); + msg_cinfo("FAILED.\n"); + ret = 2; + goto _finalize_ret; + } + msg_cinfo("done.\n"); + + if (layout_from_ich_descriptors(chip_layout, desc, 0x1000)) { + ret = 3; + goto _finalize_ret; + } + + if (dump) { + if (layout_from_ich_descriptors(&dump_layout, dump, len)) { + ret = 4; + goto _finalize_ret; + } + + if (chip_layout->base.num_entries != dump_layout.base.num_entries || + memcmp(chip_layout->entries, dump_layout.entries, sizeof(dump_layout.entries))) { + ret = 5; + goto _finalize_ret; + } + } + + *layout = (struct flashrom_layout *)chip_layout; + ret = 0; + +_finalize_ret: + finalize_flash_access(flashctx); +_free_ret: + if (ret) + free(chip_layout); + free(desc); + return ret; +#endif +} + +/** * @brief Free a layout. * * @param layout Layout to free. diff --git a/libflashrom.h b/libflashrom.h index 9fb5a47..c5d972e 100644 --- a/libflashrom.h +++ b/libflashrom.h @@ -64,6 +64,7 @@ int flashrom_image_verify(struct flashrom_flashctx *, const void *buffer, size_t buffer_len); struct flashrom_layout; +int flashrom_layout_read_from_ifd(struct flashrom_layout **, struct flashrom_flashctx *, const void *dump, size_t len); int flashrom_layout_include_region(struct flashrom_layout *, const char *name); void flashrom_layout_release(struct flashrom_layout *); void flashrom_layout_set(struct flashrom_flashctx *, const struct flashrom_layout *); -- To view, visit https://review.coreboot.org/21795 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: stable Gerrit-MessageType: newchange Gerrit-Change-Id: I7d45b16c350385c09cf11e5493f50748830dd5e3 Gerrit-Change-Number: 21795 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

Change in flashrom[stable]: Add iMac5, 2 to board_enable
by build bot (Jenkins) (Code Review) 30 Sep '17

30 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21779 ) Change subject: Add iMac5,2 to board_enable ...................................................................... Patch Set 1: Verified-1 Build Failed https://qa.coreboot.org/job/flashrom-customrules/573/ : FAILURE https://qa.coreboot.org/job/flashrom_gerrit/519/ : SUCCESS -- To view, visit https://review.coreboot.org/21779 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: stable Gerrit-MessageType: comment Gerrit-Change-Id: I618e27f8e726f40ab305b68af2bb31ffd7d96408 Gerrit-Change-Number: 21779 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sat, 30 Sep 2017 20:48:24 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[stable]: Make read_ich_descriptors_from_dump() available in flashrom
by Nico Huber (Code Review) 30 Sep '17

30 Sep '17

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/21794 Change subject: Make read_ich_descriptors_from_dump() available in flashrom ...................................................................... Make read_ich_descriptors_from_dump() available in flashrom I didn't really know what I was doing and hope removing the #ifdefs doesn't have negative side effects. The idea is to make the functions generally available for external flashing (e.g. you might want to flash an Intel machine using an ARM device as programmer). Beware of big endian trouble, I guess. :-P Original-Change-Id: Ib3d38a622a581afee87b49777e775942cc901fc8 Original-Reviewed-on: https://review.coreboot.org/17952 Original-Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Original-Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Change-Id: Iaa35f4723ae3bd99f1a1eb3a15eee899e9cf595a Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- M ich_descriptors.c M ich_descriptors.h M util/ich_descriptors_tool/Makefile 3 files changed, 12 insertions(+), 27 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/94/21794/1 diff --git a/ich_descriptors.c b/ich_descriptors.c index 90f70ee..2cc1c73 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -19,14 +19,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined(__i386__) || defined(__x86_64__) - #include "ich_descriptors.h" -#ifdef ICH_DESCRIPTORS_FROM_DUMP - +#ifdef ICH_DESCRIPTORS_FROM_DUMP_ONLY #include <stdio.h> #define print(t, ...) printf(__VA_ARGS__) +#endif + #define DESCRIPTOR_MODE_SIGNATURE 0x0ff0a55a /* The upper map is located in the word before the 256B-long OEM section at the * end of the 4kB-long flash descriptor. @@ -34,12 +33,9 @@ #define UPPER_MAP_OFFSET (4096 - 256 - 4) #define getVTBA(flumap) (((flumap)->FLUMAP1 << 4) & 0x00000ff0) -#else /* ICH_DESCRIPTORS_FROM_DUMP */ - +#include <string.h> #include "flash.h" /* for msg_* */ #include "programmer.h" - -#endif /* ICH_DESCRIPTORS_FROM_DUMP */ #ifndef min #define min(a, b) (a < b) ? a : b @@ -69,12 +65,12 @@ prettyprint_ich_descriptor_component(cs, desc); prettyprint_ich_descriptor_region(desc); prettyprint_ich_descriptor_master(&desc->master); -#ifdef ICH_DESCRIPTORS_FROM_DUMP +#ifdef ICH_DESCRIPTORS_FROM_DUMP_ONLY if (cs >= CHIPSET_ICH8) { prettyprint_ich_descriptor_upper_map(&desc->upper); prettyprint_ich_descriptor_straps(cs, desc); } -#endif /* ICH_DESCRIPTORS_FROM_DUMP */ +#endif /* ICH_DESCRIPTORS_FROM_DUMP_ONLY */ } void prettyprint_ich_descriptor_content(const struct ich_desc_content *cont) @@ -300,8 +296,6 @@ (mstr->GbE_plat_r) ?'r':' ', (mstr->GbE_plat_w) ?'w':' '); msg_pdbg2("\n"); } - -#ifdef ICH_DESCRIPTORS_FROM_DUMP void prettyprint_ich_descriptor_straps_ich8(const struct ich_descriptors *desc) { @@ -792,7 +786,7 @@ return ICH_RET_OK; } -#else /* ICH_DESCRIPTORS_FROM_DUMP */ +#ifndef ICH_DESCRIPTORS_FROM_DUMP_ONLY /** Returns the integer representation of the component density with index \em idx in bytes or -1 if the correct size can not be determined. */ @@ -851,6 +845,8 @@ return (1 << (19 + size_enc)); } +/* Only used by ichspi.c */ +#if CONFIG_INTERNAL == 1 && (defined(__i386__) || defined(__x86_64__)) static uint32_t read_descriptor_reg(uint8_t section, uint16_t offset, void *spibar) { uint32_t control = 0; @@ -922,5 +918,5 @@ msg_pdbg2(" done.\n"); return ICH_RET_OK; } -#endif /* ICH_DESCRIPTORS_FROM_DUMP */ -#endif /* defined(__i386__) || defined(__x86_64__) */ +#endif +#endif /* ICH_DESCRIPTORS_FROM_DUMP_ONLY */ diff --git a/ich_descriptors.h b/ich_descriptors.h index 2c21598..e355e54 100644 --- a/ich_descriptors.h +++ b/ich_descriptors.h @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined(__i386__) || defined(__x86_64__) #ifndef __ICH_DESCRIPTORS_H__ #define __ICH_DESCRIPTORS_H__ 1 @@ -250,7 +249,6 @@ }; }; -#ifdef ICH_DESCRIPTORS_FROM_DUMP struct ich_desc_north_strap { union { uint32_t STRPs[1]; /* current maximum: ich8 */ @@ -561,18 +559,15 @@ }; } vscc_table[128]; }; -#endif /* ICH_DESCRIPTORS_FROM_DUMP */ struct ich_descriptors { struct ich_desc_content content; struct ich_desc_component component; struct ich_desc_region region; struct ich_desc_master master; -#ifdef ICH_DESCRIPTORS_FROM_DUMP struct ich_desc_north_strap north; struct ich_desc_south_strap south; struct ich_desc_upper_map upper; -#endif /* ICH_DESCRIPTORS_FROM_DUMP */ }; void prettyprint_ich_descriptors(enum ich_chipset cs, const struct ich_descriptors *desc); @@ -582,17 +577,11 @@ void prettyprint_ich_descriptor_region(const struct ich_descriptors *desc); void prettyprint_ich_descriptor_master(const struct ich_desc_master *master); -#ifdef ICH_DESCRIPTORS_FROM_DUMP - void prettyprint_ich_descriptor_upper_map(const struct ich_desc_upper_map *umap); void prettyprint_ich_descriptor_straps(enum ich_chipset cs, const struct ich_descriptors *desc); int read_ich_descriptors_from_dump(const uint32_t *dump, unsigned int len, struct ich_descriptors *desc); -#else /* ICH_DESCRIPTORS_FROM_DUMP */ - int read_ich_descriptors_via_fdo(void *spibar, struct ich_descriptors *desc); int getFCBA_component_density(enum ich_chipset cs, const struct ich_descriptors *desc, uint8_t idx); -#endif /* ICH_DESCRIPTORS_FROM_DUMP */ #endif /* __ICH_DESCRIPTORS_H__ */ -#endif /* defined(__i386__) || defined(__x86_64__) */ diff --git a/util/ich_descriptors_tool/Makefile b/util/ich_descriptors_tool/Makefile index 9cbc150..e312996 100644 --- a/util/ich_descriptors_tool/Makefile +++ b/util/ich_descriptors_tool/Makefile @@ -32,7 +32,7 @@ FLASHROM_CFLAGS += -MMD -MP -MF $(DEPPATH)/$((a)F).d # enables functions that populate the descriptor structs from plain binary dumps -FLASHROM_CFLAGS += -D ICH_DESCRIPTORS_FROM_DUMP +FLASHROM_CFLAGS += -D ICH_DESCRIPTORS_FROM_DUMP_ONLY FLASHROM_CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) OBJ = $(OBJATH)/$(SRC:%.c=%.o) -- To view, visit https://review.coreboot.org/21794 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: stable Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa35f4723ae3bd99f1a1eb3a15eee899e9cf595a Gerrit-Change-Number: 21794 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

Change in flashrom[stable]: Remove djgpp-dos target
by build bot (Jenkins) (Code Review) 30 Sep '17

30 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21777 ) Change subject: Remove djgpp-dos target ...................................................................... Patch Set 1: Verified-1 Build Failed https://qa.coreboot.org/job/flashrom-customrules/572/ : FAILURE https://qa.coreboot.org/job/flashrom_gerrit/517/ : SUCCESS -- To view, visit https://review.coreboot.org/21777 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: stable Gerrit-MessageType: comment Gerrit-Change-Id: I81598358f85443d1d53c9fdf5c5ae705ef360c0d Gerrit-Change-Number: 21777 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sat, 30 Sep 2017 20:48:22 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[stable]: cli_classic: Remove layout-for-write-only check
by Nico Huber (Code Review) 30 Sep '17

30 Sep '17

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/21793 Change subject: cli_classic: Remove layout-for-write-only check ...................................................................... cli_classic: Remove layout-for-write-only check Original-Change-Id: I0f5e9623ca75bc4503aeb45ae346d7573c0fef2c Original-Reviewed-on: https://review.coreboot.org/17951 Original-Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Original-Reviewed-by: David Hendricks <david.hendricks(a)gmail.com> Change-Id: I3bd385de3b20e60cc86a91cb28fb7ad61a7bf10d Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- M cli_classic.c 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/93/21793/1 diff --git a/cli_classic.c b/cli_classic.c index 30ff140..33d3e4b 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -376,12 +376,6 @@ ret = 1; goto out; } - if (layoutfile != NULL && !write_it) { - msg_gerr("Layout files are currently supported for write operations only.\n"); - ret = 1; - goto out; - } - if (process_include_args()) { ret = 1; goto out; -- To view, visit https://review.coreboot.org/21793 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: stable Gerrit-MessageType: newchange Gerrit-Change-Id: I3bd385de3b20e60cc86a91cb28fb7ad61a7bf10d Gerrit-Change-Number: 21793 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit