April 2017 - flashrom-gerrit - mail.coreboot.org

Change in flashrom[staging]: Make coreboot.org the upstream server
by build bot (Jenkins) (Code Review) 07 Apr '17

07 Apr '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/19187 ) Change subject: Make coreboot.org the upstream server ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/flashrom-customrules/72/ : SUCCESS https://qa.coreboot.org/job/flashrom_gerrit/88/ : SUCCESS -- To view, visit https://review.coreboot.org/19187 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9461dc4d2d461fff253392c4a1249a8835d5c9a4 Gerrit-PatchSet: 1 Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) Gerrit-HasComments: No

1 0

Change in flashrom[staging]: Give layouts their own type
by build bot (Jenkins) (Code Review) 07 Apr '17

07 Apr '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/19188 ) Change subject: Give layouts their own type ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/flashrom-customrules/73/ : SUCCESS https://qa.coreboot.org/job/flashrom_gerrit/89/ : SUCCESS -- To view, visit https://review.coreboot.org/19188 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic728fc9f64958f62a2e2f321f4ec440e8658c808 Gerrit-PatchSet: 1 Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) Gerrit-HasComments: No

1 0

Change in flashrom[staging]: Add a convenient libflashrom interface
by build bot (Jenkins) (Code Review) 07 Apr '17

07 Apr '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/19190 ) Change subject: Add a convenient libflashrom interface ...................................................................... Patch Set 1: Verified-1 Build Failed https://qa.coreboot.org/job/flashrom_gerrit/91/ : FAILURE https://qa.coreboot.org/job/flashrom-customrules/75/ : SUCCESS -- To view, visit https://review.coreboot.org/19190 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibd25aa58c165119a9f31ee9e9285bd793693d884 Gerrit-PatchSet: 1 Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) Gerrit-HasComments: No

1 0

Change in flashrom[staging]: Add Doxyfile for libflashrom documentation
by build bot (Jenkins) (Code Review) 07 Apr '17

07 Apr '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/19191 ) Change subject: Add Doxyfile for libflashrom documentation ...................................................................... Patch Set 1: Verified-1 Build Failed https://qa.coreboot.org/job/flashrom_gerrit/92/ : FAILURE https://qa.coreboot.org/job/flashrom-customrules/76/ : SUCCESS -- To view, visit https://review.coreboot.org/19191 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I38052378ab417727323ff36009304108b347c2b7 Gerrit-PatchSet: 1 Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) Gerrit-HasComments: No

1 0

Change in flashrom[staging]: Add functions to read/erase/write/verify by layout
by build bot (Jenkins) (Code Review) 07 Apr '17

07 Apr '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/19189 ) Change subject: Add functions to read/erase/write/verify by layout ...................................................................... Patch Set 1: Verified-1 Build Failed https://qa.coreboot.org/job/flashrom_gerrit/90/ : FAILURE https://qa.coreboot.org/job/flashrom-customrules/74/ : SUCCESS -- To view, visit https://review.coreboot.org/19189 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I060d9c42d71c83c3f95a6189cd22dad8b1504784 Gerrit-PatchSet: 1 Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) Gerrit-HasComments: No

1 0

Change in flashrom[staging]: This is a combination of 2 commits. The first commit's messa...
by build bot (Jenkins) (Code Review) 07 Apr '17

07 Apr '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/19185 ) Change subject: This is a combination of 2 commits. The first commit's message is: ...................................................................... Patch Set 2: Verified-1 Build Failed https://qa.coreboot.org/job/flashrom_gerrit/87/ : FAILURE https://qa.coreboot.org/job/flashrom-customrules/71/ : SUCCESS -- To view, visit https://review.coreboot.org/19185 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8d3f54c3e87d3875b73a6f24c15d2ae43b84819f Gerrit-PatchSet: 2 Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) Gerrit-HasComments: No

1 0

Change in flashrom[staging]: Enable writes with active ME
by David Hendricks (Code Review) 07 Apr '17

07 Apr '17

Hello Nico Huber, I'd like you to do a code review. Please visit https://review.coreboot.org/19200 to review the following change. Change subject: Enable writes with active ME ...................................................................... Enable writes with active ME At least with the -A,--noverify-all switch, this warning isn't true any more. Maybe we want to force -A in that case? Change-Id: I2245d40d67b1433784eeb79612daaf5e839b3c2b Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- M flashrom.8.tmpl M ichspi.c 2 files changed, 1 insertion(+), 37 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/00/19200/1 diff --git a/flashrom.8.tmpl b/flashrom.8.tmpl index 02d79e3..c786a86 100644 --- a/flashrom.8.tmpl +++ b/flashrom.8.tmpl @@ -472,14 +472,7 @@ the ME firmware and so on respectively. The flash descriptor can also specify up to 5 so called "Protected Regions", which are freely chosen address ranges independent from the aforementioned "Flash Regions". All of them can be write -and/or read protected individually. If flashrom detects such a lock it will -disable write support unless the user forces it with the -.sp -.B " flashrom \-p internal:ich_spi_force=yes" -.sp -syntax. If this leads to erase or write accesses to the flash it would most -probably bring it into an inconsistent and unbootable state and we will not -provide any support in such a case. +and/or read protected individually. .sp If you have an Intel chipset with an ICH2 or later southbridge and if you want to set specific IDSEL values for a non-default flash chip or an embedded diff --git a/ichspi.c b/ichspi.c index e1395ee..6821b5d 100644 --- a/ichspi.c +++ b/ichspi.c @@ -1567,7 +1567,6 @@ uint16_t tmp2; uint32_t tmp; char *arg; - int ich_spi_force = 0; int ich_spi_rw_restricted = 0; int desc_valid = 0; struct ich_descriptors desc = {{ 0 }}; @@ -1639,22 +1638,6 @@ } free(arg); - arg = extract_programmer_param("ich_spi_force"); - if (arg && !strcmp(arg, "yes")) { - ich_spi_force = 1; - msg_pspew("ich_spi_force enabled.\n"); - } else if (arg && !strlen(arg)) { - msg_perr("Missing argument for ich_spi_force.\n"); - free(arg); - return ERROR_FATAL; - } else if (arg) { - msg_perr("Unknown argument for ich_spi_force: \"%s\" " - "(not \"yes\").\n", arg); - free(arg); - return ERROR_FATAL; - } - free(arg); - tmp2 = mmio_readw(ich_spibar + ICH9_REG_HSFS); msg_pdbg("0x04: 0x%04x (HSFS)\n", tmp2); prettyprint_ich9_reg_hsfs(tmp2); @@ -1702,18 +1685,6 @@ if (!ichspi_lock) ich9_set_pr(i, 0, 0); ich_spi_rw_restricted |= ich9_handle_pr(i); - } - - if (ich_spi_rw_restricted) { - if (!ich_spi_force) - programmer_may_write = 0; - msg_pinfo("Writes have been disabled for safety reasons. You can enforce write\n" - "support with the ich_spi_force programmer option, but you will most likely\n" - "harm your hardware! If you force flashrom you will get no support if\n" - "something breaks. On a few mainboards it is possible to enable write\n" - "access by setting a jumper (see its documentation or the board itself).\n"); - if (ich_spi_force) - msg_pinfo("Continuing with write support because the user forced us to!\n"); } tmp = mmio_readl(ich_spibar + ICH9_REG_SSFS); -- To view, visit https://review.coreboot.org/19200 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2245d40d67b1433784eeb79612daaf5e839b3c2b Gerrit-PatchSet: 1 Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>

1 0

Change in flashrom[staging]: Whitelist Roda/RV11 laptop
by David Hendricks (Code Review) 07 Apr '17

07 Apr '17

Hello Nico Huber, I'd like you to do a code review. Please visit https://review.coreboot.org/19199 to review the following change. Change subject: Whitelist Roda/RV11 laptop ...................................................................... Whitelist Roda/RV11 laptop Change-Id: Id8e794f263d5fb5bc7e98437d17fc137ffd91e25 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/99/19199/1 diff --git a/board_enable.c b/board_enable.c index 2f0c1c0..22e45b4 100644 --- a/board_enable.c +++ b/board_enable.c @@ -2457,6 +2457,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/19199 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8e794f263d5fb5bc7e98437d17fc137ffd91e25 Gerrit-PatchSet: 1 Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>

1 0

Change in flashrom[staging]: Add option to read ROM layout from IFD
by David Hendricks (Code Review) 07 Apr '17

07 Apr '17

Hello Nico Huber, I'd like you to do a code review. Please visit https://review.coreboot.org/19197 to review the following change. Change subject: Add option to read ROM layout from IFD ...................................................................... Add option to read ROM layout from IFD Add an option (-d|--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. Change-Id: Ic25d9c90605d81b5c2dd8180dc87558f16353891 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- 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 10 files changed, 196 insertions(+), 21 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/97/19197/1 diff --git a/cli_classic.c b/cli_classic.c index aef7693..0853a2f 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] [-A] [-f]]\n" + "[-E|(-r|-w|-v) <file>] [(-l <layoutfile>|-d) [-i <imagename>]...] [-n] [-A] [-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" " -A | --noverify-all don't auto-verify whole chip\n" " -l | --layout <layoutfile> read ROM layout from <layoutfile>\n" + " -d | --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,16 +100,17 @@ 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 fl_layout *layout = NULL; enum programmer prog = PROGRAMMER_INVALID; int ret = 0; - static const char optstring[] = "r:Rw:v:nAVEfc:l:i:p:Lzho:"; + static const char optstring[] = "r:Rw:v:nAVEfc:l:di:p:Lzho:"; static const struct option long_options[] = { {"read", 1, NULL, 'r'}, {"write", 1, NULL, 'w'}, @@ -120,6 +122,7 @@ {"verbose", 0, NULL, 'V'}, {"force", 0, NULL, 'f'}, {"layout", 1, NULL, 'l'}, + {"ifd", 0, NULL, 'd'}, {"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 'd': + 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; } @@ -530,8 +544,14 @@ } if (layoutfile) - fl_layout_set(fill_flash, get_global_layout()); + layout = get_global_layout(); + else if (ifd && (fl_layout_read_from_ifd(fill_flash, &layout, NULL, 0) || + process_include_args(layout))) { + ret = 1; + goto out_shutdown; + } + fl_layout_set(fill_flash, layout); fl_flag_set(fill_flash, FL_FLAG_FORCE, !!force); fl_flag_set(fill_flash, FL_FLAG_FORCE_BOARDMISMATCH, !!force_boardmismatch); fl_flag_set(fill_flash, FL_FLAG_VERIFY_AFTER_WRITE, !dont_verify_it); @@ -551,6 +571,9 @@ else if (verify_it) ret = do_verify(fill_flash, filename); + if (ifd) + fl_layout_release(layout); + out_shutdown: programmer_shutdown(); out: diff --git a/flash.h b/flash.h index fc024ac..05cb59b 100644 --- a/flash.h +++ b/flash.h @@ -285,6 +285,7 @@ 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); int do_read(struct flashctx *, const char *filename); int do_erase(struct flashctx *); int do_write(struct flashctx *, const char *const filename); @@ -352,7 +353,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); int build_new_image(struct flashctx *flash, bool oldcontents_valid, uint8_t *oldcontents, uint8_t *newcontents); diff --git a/flashrom.8.tmpl b/flashrom.8.tmpl index 34e1fe7..02d79e3 100644 --- a/flashrom.8.tmpl +++ b/flashrom.8.tmpl @@ -48,7 +48,7 @@ \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\-f\fR]] + [(\fB\-l\fR <file>|\fB\-d\fR) [\fB\-i\fR <image>]] [\fB\-n\fR] [\fB\-f\fR]] [\fB\-V\fR[\fBV\fR[\fBV\fR]]] [\fB-o\fR <logfile>] .SH DESCRIPTION .B flashrom @@ -179,6 +179,22 @@ .sp Overlapping sections are not supported. .TP +.B "\-d, \-\-ifd" +Read ROM layout from Intel Firmware Descriptor. +.sp +flashrom supports ROM layouts given by an Intel Firmware Descriptor +(IFD). Both, the current flash ROM chips contents and the file's +contents which are to be flashed, must contain an IFD with the same ROM +regions. +.sp +The following ROM images may be present in an IFD: +.sp + Flash_Descriptor the IFD itself + BIOS the host firmware aka. BIOS + Intel_ME Intel Management Engine firmware + GbE Gigabit Ethernet firmware + Platform_Data platform specific data +.TP .B "\-i, \-\-image <imagename>" Only flash region/image .B <imagename> diff --git a/flashrom.c b/flashrom.c index cf956ef..2d73163 100644 --- a/flashrom.c +++ b/flashrom.c @@ -2143,9 +2143,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"); diff --git a/ich_descriptors.c b/ich_descriptors.c index c9e82eb..5d6b66f 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) @@ -916,4 +917,55 @@ msg_pdbg2(" done.\n"); return ICH_RET_OK; } + +/** + * @addtogroup fl-layout + * @{ + */ + +/** + * @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 fl_layout_ich *const layout, const void *const dump, const size_t len) +{ + static const char *regions[5] = { + "Flash_Descriptor", + "BIOS", + "Intel_ME", + "GbE", + "Platform_Data" + }; + + 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..107fad6 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 fl_layout_ich *, const void *dump, size_t len); + #endif /* __ICH_DESCRIPTORS_H__ */ diff --git a/layout.c b/layout.c index 9eadb22..ab80bb8 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 fl_layout *get_global_layout(void) +struct fl_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 fl_layout *const fl_layout, char *name) { int i; - if (layout.num_entries == 0) + if (fl_layout->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 < fl_layout->num_entries; i++) { + if (!strcmp(fl_layout->entries[i].name, name)) { + fl_layout->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 fl_layout *const fl_layout) { 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 (fl_layout->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(fl_layout, 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 3aebe8a..71bcac3 100644 --- a/layout.h +++ b/layout.h @@ -54,6 +54,13 @@ struct fl_romentry entry; }; -const struct fl_layout *get_global_layout(void); +struct fl_layout_ich { + struct fl_layout base; + struct fl_romentry entries[5]; +}; + +struct fl_layout *get_global_layout(void); + +int process_include_args(struct fl_layout *); #endif /* !__LAYOUT_H__ */ diff --git a/libflashrom.c b/libflashrom.c index eab9548..9adb484 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -31,6 +31,7 @@ #include "flash.h" #include "programmer.h" #include "layout.h" +#include "ich_descriptors.h" #include "libflashrom.h" /** @@ -293,6 +294,79 @@ } /** + * @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 flashctx Flash context to read the descriptor from flash. + * @param layout Pointer that getwhere to store the layout. + * @param dump The descriptor dump to compare to or NULL. + * @param len The length of the descriptor dump. + * + * @return 0 on success, + * 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 fl_layout_read_from_ifd(struct flashctx *const flashctx, fl_layout_t **const layout, + const void *const dump, const size_t len) +{ + struct fl_layout_ich dump_layout; + int ret = 1; + + void *const desc = malloc(0x1000); + struct fl_layout_ich *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 _unmap_ret; + } + msg_cinfo("done.\n"); + + if (layout_from_ich_descriptors(chip_layout, desc, 0x1000)) { + ret = 3; + goto _unmap_ret; + } + + if (dump) { + if (layout_from_ich_descriptors(&dump_layout, dump, len)) { + ret = 4; + goto _unmap_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 _unmap_ret; + } + } + + *layout = (struct fl_layout *)chip_layout; + ret = 0; + +_unmap_ret: + unmap_flash(flashctx); +_free_ret: + if (ret) + free(chip_layout); + free(desc); + return ret; +} + +/** * @brief Free a layout. * * @param layout Layout to free. diff --git a/libflashrom.h b/libflashrom.h index af56bc8..aceb388 100644 --- a/libflashrom.h +++ b/libflashrom.h @@ -63,6 +63,7 @@ struct fl_layout; typedef struct fl_layout fl_layout_t; +int fl_layout_read_from_ifd(fl_flashctx_t *, fl_layout_t **, const void *dump, size_t len); int fl_layout_include_region(fl_layout_t *, const char *name); void fl_layout_release(fl_layout_t *); void fl_layout_set(fl_flashctx_t *, const fl_layout_t *); -- To view, visit https://review.coreboot.org/19197 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic25d9c90605d81b5c2dd8180dc87558f16353891 Gerrit-PatchSet: 1 Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>

1 0

Change in flashrom[staging]: Fix linking with libpayload
by David Hendricks (Code Review) 07 Apr '17

07 Apr '17

Hello Nico Huber, I'd like you to do a code review. Please visit https://review.coreboot.org/19198 to review the following change. Change subject: Fix linking with libpayload ...................................................................... Fix linking with libpayload o flashbuses_to_text() is a cli function and should actually be moved or not be called from flashrom.c. o I couldn't find any libc that defines HAVE_STRNLEN. Change-Id: I24349b4c06b30eeb89062f164ec0377463cfc5bc Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- M flash.h M flashrom.c M helpers.c 3 files changed, 8 insertions(+), 5 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/98/19198/1 diff --git a/flash.h b/flash.h index 05cb59b..765ae4f 100644 --- a/flash.h +++ b/flash.h @@ -262,7 +262,7 @@ #ifdef __MINGW32__ char* strtok_r(char *str, const char *delim, char **nextp); #endif -#if defined(__DJGPP__) || !defined(HAVE_STRNLEN) +#if defined(__DJGPP__) size_t strnlen(const char *str, size_t n); #endif diff --git a/flashrom.c b/flashrom.c index 2d73163..5a156ea 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1166,7 +1166,7 @@ { const struct flashchip *chip; enum chipbustype buses_common; - char *tmp; + char *tmp = NULL; for (chip = flashchips + startchip; chip && chip->name; chip++) { if (chip_to_probe && strcmp(chip->name, chip_to_probe) != 0) @@ -1248,9 +1248,12 @@ return -1; +#ifndef __LIBPAYLOAD__ tmp = flashbuses_to_text(flash->chip->bustype); - msg_cinfo("%s %s flash chip \"%s\" (%d kB, %s) ", force ? "Assuming" : "Found", - flash->chip->vendor, flash->chip->name, flash->chip->total_size, tmp); +#endif + msg_cinfo("%s %s flash chip \"%s\" (%d kB%s%s) ", force ? "Assuming" : "Found", + flash->chip->vendor, flash->chip->name, flash->chip->total_size, + tmp ? ", " : "", tmp ? tmp : ""); free(tmp); #if CONFIG_INTERNAL == 1 if (programmer_table[programmer].map_flash_region == physmap) diff --git a/helpers.c b/helpers.c index f6eae46..7a146c3 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__) size_t strnlen(const char *str, size_t n) { size_t i; -- To view, visit https://review.coreboot.org/19198 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I24349b4c06b30eeb89062f164ec0377463cfc5bc Gerrit-PatchSet: 1 Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit April 2017