September 2013 - flashrom - mail.coreboot.org

[PATCH 2/6] layout: Add -i <region>[:<file>] support.
by Stefan Tauner Sept. 23, 2013

Sept. 23, 2013

Add an optional sub-parameter to the -i parameter to allow building the image to be written from multiple files. This will also allow regions to be read from flash and written to separate image files in a later patch. Existing function read_buf_from_file() is refined and reused to read the file. based on chromiumos' d0ea9ed71e7f86bb8e8db2ca7c32a96de25343d8 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- cli_classic.c | 9 ++++--- dummyflasher.c | 2 +- flash.h | 2 +- flashrom.c | 18 +++++++++----- layout.c | 78 ++++++++++++++++++++++++++++++++++++++++++++-------------- 5 files changed, 78 insertions(+), 31 deletions(-) diff --git a/cli_classic.c b/cli_classic.c index a0c2d64..ed6d6aa 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -40,8 +40,8 @@ static void cli_classic_usage(const char *name) #if CONFIG_PRINT_WIKI == 1 "-z|" #endif - "-p <programmername>[:<parameters>] [-c <chipname>]\n" - "[-E|(-r|-w|-v) <file>] [-l <layoutfile> [-i <imagename>]...] [-n] [-f]]\n" + "-p <programmername>[:<parameter>[,<parameter>]...] [-c <chipname>]\n" + "[-E|(-r|-w|-v) <imagefile>] [-l <layoutfile> [-i <region>[:<regionfile>]...] [-n] [-f]]\n" "[-V[V[V]]] [-o <logfile>]\n\n", name); printf(" -h | --help print this help text\n" @@ -54,8 +54,9 @@ static void cli_classic_usage(const char *name) " -c | --chip <chipname> probe only for specified flash chip\n" " -f | --force force specific operations (see man page)\n" " -n | --noverify don't auto-verify\n" - " -l | --layout <layoutfile> read ROM layout from <layoutfile>\n" - " -i | --image <name> only flash image <name> from flash layout\n" + " -l | --layout <layoutfile> read layout from <layoutfile>\n" + " -i | --include <region>[<:file>] only flash image <region> from layout \n" + " (optionally with data from <file>)\n" " -o | --output <logfile> log output to <logfile>\n" " -L | --list-supported print supported devices\n" #if CONFIG_PRINT_WIKI == 1 diff --git a/dummyflasher.c b/dummyflasher.c index 9c0d868..90d2261 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -389,7 +389,7 @@ int dummy_init(void) msg_pdbg("matches.\n"); msg_pdbg("Reading %s\n", emu_persistent_image); read_buf_from_file(flashchip_contents, emu_chip_size, - emu_persistent_image); + emu_persistent_image, NULL); } else { msg_pdbg("doesn't match.\n"); } diff --git a/flash.h b/flash.h index a942b9b..be5918b 100644 --- a/flash.h +++ b/flash.h @@ -261,7 +261,7 @@ void print_banner(void); void list_programmers_linebreak(int startcol, int cols, int paren); int selfcheck(void); int doit(struct flashctx *flash, int force, const char *filename, int read_it, int write_it, int erase_it, int verify_it); -int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename); +int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename, const char *size_msg); int write_buf_to_file(unsigned char *buf, unsigned long size, const char *filename); /* helpers.c */ diff --git a/flashrom.c b/flashrom.c index afab57c..7db2696 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1165,8 +1165,7 @@ notfound: return chip - flashchips; } -int read_buf_from_file(unsigned char *buf, unsigned long size, - const char *filename) +int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename, const char *size_msg) { #ifdef __LIBPAYLOAD__ msg_gerr("Error: No file I/O support in libpayload\n"); @@ -1186,8 +1185,10 @@ int read_buf_from_file(unsigned char *buf, unsigned long size, return 1; } if (image_stat.st_size != size) { - msg_gerr("Error: Image size (%jd B) doesn't match the flash chip's size (%lu B)!\n", - (intmax_t)image_stat.st_size, size); + if (size_msg == NULL) + size_msg = "the expected size"; + msg_gerr("Error: Image size (%jd B) doesn't match %s (%lu B)!\n", + (intmax_t)image_stat.st_size, size_msg, size); fclose(image); return 1; } @@ -1968,7 +1969,7 @@ int doit(struct flashctx *flash, int force, const char *filename, int read_it, } if (write_it || verify_it) { - if (read_buf_from_file(newcontents, size, filename)) { + if (read_buf_from_file(newcontents, size, filename, "the flash chip's size")) { ret = 1; goto out; } @@ -2002,7 +2003,12 @@ int doit(struct flashctx *flash, int force, const char *filename, int read_it, msg_cinfo("done.\n"); /* Build a new image taking the given layout into account. */ - build_new_image(flash, oldcontents, newcontents); + if (build_new_image(flash, oldcontents, newcontents)) { + msg_gerr("Could not prepare the data to be written due to problems with the layout,\n" + "aborting.\n"); + ret = 1; + goto out; + } // //////////////////////////////////////////////////////////// diff --git a/layout.c b/layout.c index 08cc776..7e2e904 100644 --- a/layout.c +++ b/layout.c @@ -33,6 +33,7 @@ typedef struct { chipoff_t end; unsigned int included; char name[256]; + char *file; } romentry_t; /* rom_entries store the entries specified in a layout file and associated run-time data */ @@ -54,7 +55,7 @@ int read_romlayout(char *name) romlayout = fopen(name, "r"); if (!romlayout) { - msg_gerr("ERROR: Could not open ROM layout (%s).\n", + msg_gerr("ERROR: Could not open layout file (%s).\n", name); return -1; } @@ -63,8 +64,7 @@ int read_romlayout(char *name) char *tstr1, *tstr2; if (num_rom_entries >= MAX_ROMLAYOUT) { - msg_gerr("Maximum number of ROM images (%i) in layout " - "file reached.\n", MAX_ROMLAYOUT); + msg_gerr("Maximum number of entries (%i) in layout file reached.\n", MAX_ROMLAYOUT); return 1; } if (2 != fscanf(romlayout, "%s %s\n", tempstr, rom_entries[num_rom_entries].name)) @@ -85,6 +85,7 @@ int read_romlayout(char *name) rom_entries[num_rom_entries].start = strtol(tstr1, (char **)NULL, 16); rom_entries[num_rom_entries].end = strtol(tstr2, (char **)NULL, 16); rom_entries[num_rom_entries].included = 0; + rom_entries[num_rom_entries].file = NULL; num_rom_entries++; } @@ -138,14 +139,9 @@ int register_include_arg(char *name) static int find_romentry(char *name) { int i; - - if (num_rom_entries == 0) - return -1; - msg_gspew("Looking for region \"%s\"... ", name); for (i = 0; i < num_rom_entries; i++) { - if (!strcmp(rom_entries[i].name, name)) { - rom_entries[i].included = 1; + if (strcmp(rom_entries[i].name, name) == 0) { msg_gspew("found.\n"); return i; } @@ -165,27 +161,61 @@ int process_include_args(void) if (num_include_args == 0) return 0; - /* User has specified an area, but no layout file is loaded. */ + /* User has specified an include argument, but no layout file is loaded. */ if (num_rom_entries == 0) { - msg_gerr("Region requested (with -i \"%s\"), " - "but no layout data is available.\n", + msg_gerr("Region requested (with -i/--include \"%s\"),\n" + "but no layout data is available. To include one use the -l/--layout syntax).\n", include_args[0]); return 1; } for (i = 0; i < num_include_args; i++) { - if (find_romentry(include_args[i]) < 0) { - msg_gerr("Invalid region specified: \"%s\".\n", - include_args[i]); + char *file; + char *name = include_args[i]; + int ret = unquote_string(&name, &file, ":"); /* -i <region>[:<file>] */ + if (ret != 0) { + msg_gerr("Invalid include argument specified: \"%s\".\n", name); return 1; } + int idx = find_romentry(name); + if (idx < 0) { + msg_gerr("Invalid region name specified: \"%s\".\n", name); + return 1; + } + rom_entries[idx].included = 1; found++; + + if (file[0] != '\0') { + /* The remaining characters are interpreted as possible quoted filename. */ + ret = unquote_string(&file, NULL, NULL); + if (ret != 0) { + msg_gerr("Invalid region file name specified: \"%s\".\n", file); + return 1; + } +#ifdef __LIBPAYLOAD__ + msg_gerr("Error: No file I/O support in libpayload\n"); + return 1; +#else + file = strdup(file); + if (file == NULL) { + msg_gerr("Out of memory!\n"); + return 1; + } + rom_entries[idx].file = file; +#endif + } } - msg_ginfo("Using region%s: \"%s\"", num_include_args > 1 ? "s" : "", - include_args[0]); - for (i = 1; i < num_include_args; i++) - msg_ginfo(", \"%s\"", include_args[i]); + msg_ginfo("Using region%s: ", num_rom_entries > 1 ? "s" : ""); + bool first = true; + for (i = 0; i < num_rom_entries; i++) + if (rom_entries[i].included) { + if (first) + first = false; + else + msg_ginfo(", "); + msg_ginfo("\"%s\"", rom_entries[i].name); + } msg_ginfo(".\n"); return 0; } @@ -200,6 +230,8 @@ void layout_cleanup(void) num_include_args = 0; for (i = 0; i < num_rom_entries; i++) { + free(rom_entries[i].file); + rom_entries[i].file = NULL; rom_entries[i].included = 0; } num_rom_entries = 0; @@ -283,6 +315,14 @@ int build_new_image(const struct flashctx *flash, uint8_t *oldcontents, uint8_t if (entry->start > start) memcpy(newcontents + start, oldcontents + start, entry->start - start); + /* If a file name is specified for this region, read the file contents and + * overwrite @newcontents in the range specified by @entry. */ + if (entry->file != NULL) { + if (read_buf_from_file(newcontents + entry->start, entry->end - entry->start + 1, + entry->file, "the region's size") != 0) + return 1; + } + /* Skip to location after current romentry. */ start = entry->end + 1; /* Catch overflow. */ -- Kind regards, Stefan Tauner

1 0

[PATCH 1/6] Introduce helpers.c and unquote_string().
by Stefan Tauner Sept. 23, 2013

Sept. 23, 2013

The unquoting function is the first to be moved to the new file which will host various utility functions to be shared by multiple files but which do not fit elsewhere. unquote_string() extracts a possibly quoted phrase from a string by using a set of separator characters, which is useful to allow user input to be optionally quoted to support spaces within names such a region or file names. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- Makefile | 2 +- flash.h | 3 +++ helpers.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 helpers.c diff --git a/Makefile b/Makefile index 346d46a..69e0b9c 100644 --- a/Makefile +++ b/Makefile @@ -338,7 +338,7 @@ CHIP_OBJS = jedec.o stm50.o w39.o w29ee011.o \ ############################################################################### # Library code. -LIB_OBJS = layout.o flashrom.o udelay.o programmer.o +LIB_OBJS = layout.o flashrom.o udelay.o programmer.o helpers.o ############################################################################### # Frontend related stuff. diff --git a/flash.h b/flash.h index e320ced..a942b9b 100644 --- a/flash.h +++ b/flash.h @@ -264,6 +264,9 @@ int doit(struct flashctx *flash, int force, const char *filename, int read_it, i int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename); int write_buf_to_file(unsigned char *buf, unsigned long size, const char *filename); +/* helpers.c */ +int unquote_string(char **startp, char **endp, const char *delimiters); + enum test_state { OK = 0, NT = 1, /* Not tested */ diff --git a/helpers.c b/helpers.c new file mode 100644 index 0000000..ba82a0f --- /dev/null +++ b/helpers.c @@ -0,0 +1,88 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2013 Carl-Daniel Hailfinger + * Copyright (C) 2013 Stefan Tauner + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <string.h> +#include "flash.h" + +/** Parse a \em possibly quoted string. + * + * \a startp points to the string which should be parsed. If the string does not start with a quote, it is + * terminated at the first character contained in \a delimiters by replacing it with '\0'. If the string starts + * with a quote, it is terminated at the second quote by replacing it with '\0'. In the latter case a character + * contained in \a delimiters has to follow the terminating quote. + * + * If \a delimiters is NULL an empty set is assumed. + * + * After returning \a startp will point to a string that is either the first quoted part of the + * original string with the quotation marks removed, or the first word of that string before any delimiter. + * + * If \a endp is not NULL it will be set to point to the first character after the parsed string + * (i.e. a delimiter), or to the '\0' at the end of the string if there are no more subsequent characters. + * + * @param start Points to the input string. + * @param end Is set to the first char following the input string (possibly NULL). + * @param delimiters Set of characters which terminate a string (possibly NULL). + * @return -1 if a quotation mark is not matched, + * 0 on success, + * 1 if the parsed string is empty. + */ +int unquote_string(char **startp, char **endp, const char *delimiters) +{ + msg_gspew("unquoting \'%s\'\n", *startp); + + if (delimiters == NULL) + delimiters = ""; + + char *end; + if (**startp == '"') { + (*startp)++; + size_t len = strcspn(*startp, "\""); + end = *startp + len + 1; + /* Catch unclosed quotes and string not followed immediately by delimiter or end-of-string. */ + if ((*startp)[len] == '\0' && strcspn(end, delimiters) != 0) + return -1; + + /* Eliminate closing quote. */ + (*startp)[len] = '\0'; + } else { + size_t len = strcspn(*startp, delimiters); + /* Check for (forbidden) quotes in the middle. */ + if (strcspn(*startp, "\"") < len) + return -1; + end = *startp + len; + } + + /* end points to the first character after the (possibly quoted) string, i.e. the delimiter or \0. */ + if (*end != '\0') { + *end = '\0'; + end++; + } + if (endp != NULL) + *endp = end; + + if (strlen(*startp) == 0) { + *startp = '\0'; + return 1; + } + + msg_gspew("%s: start=\'%s\', end=\'%s\'\n", __func__, *startp, end); + return 0; +} -- Kind regards, Stefan Tauner

1 0

[PATCH 0/6] layout patches 4.0
by Stefan Tauner Sept. 23, 2013

Sept. 23, 2013

Implementation of unquote_string() combining ideas from CD and myself. Refined parser, new support for top-aligned address and flags. And the last patch is open for discussion... it tests readability and size of the --include files while parsing it and before actually reading them (which only happens after a full chip read). It is obviously useful for slow programmers because it can bail out early when there are obvious problems with the file, but it is still quite some overhead and it feels rather dumb to check this twice. Maybe we should already read them in early instead of just checking? The disadvantage is that we would need to allocate extra buffers for them. The late read writes directly to newcontents and hence does not need an extra buffer. Stefan Tauner (6): Introduce helpers.c and unquote_string(). layout: Add -i <region>[:<file>] support. layout: Better file parsing. layout: Add support for top-aligned addresses. layout: Add preliminary support for flags. [WIP] layout: Bailout early in process_include_args() if region file is inaccessible. Makefile | 2 +- cli_classic.c | 9 +- dummyflasher.c | 2 +- flash.h | 5 +- flashrom.8.tmpl | 139 +++++++----- flashrom.c | 18 +- helpers.c | 88 ++++++++ layout.c | 478 +++++++++++++++++++++++++++++++++------- util/convert_layout_v1_to_v2.sh | 79 +++++++ 9 files changed, 683 insertions(+), 137 deletions(-) create mode 100644 helpers.c create mode 100755 util/convert_layout_v1_to_v2.sh -- Kind regards, Stefan Tauner

1 0

[PATCH] Fix layout parser bugs
by Carl-Daniel Hailfinger Sept. 23, 2013

Sept. 23, 2013

Fix 3 parser bugs, details later. Code now. Untested, compiles. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-parserbugs/layout.c =================================================================== --- flashrom-parserbugs/layout.c (Revision 1750) +++ flashrom-parserbugs/layout.c (Arbeitskopie) @@ -60,30 +60,33 @@ } while (!feof(romlayout)) { - char *tstr1, *tstr2; + char *tstr1, *tstr2, *tstr3, *tstr4; if (num_rom_entries >= MAX_ROMLAYOUT) { msg_gerr("Maximum number of ROM images (%i) in layout " "file reached.\n", MAX_ROMLAYOUT); + fclose(romlayout); return 1; } - if (2 != fscanf(romlayout, "%s %s\n", tempstr, rom_entries[num_rom_entries].name)) - continue; -#if 0 - // fscanf does not like arbitrary comments like that :( later - if (tempstr[0] == '#') { - continue; + if (!fgets(tempstr, 256, romlayout)) { + printf("Failing fgets without EOF should not happen!\n"); + break; } -#endif + tstr1 = strtok(tempstr, ":"); - tstr2 = strtok(NULL, ":"); - if (!tstr1 || !tstr2) { - msg_gerr("Error parsing layout file. Offending string: \"%s\"\n", tempstr); + tstr2 = strtok(NULL, " \t"); + tstr3 = strtok(NULL, " \t\r\n"); + tstr4 = strtok(NULL, " \t\r\n"); + if (!tstr1 || !tstr2 || !tstr3 || tstr4) { + msg_gerr("Error parsing layout file. Offending string after parsing: \"%s:%s %s%s\"\n", tstr1 ? : "(null)", tstr2 ? : "(null)", tstr3 ? : "(null)", tstr4 ? "trailing garbage" : ""); fclose(romlayout); - return 1; + return 2; } + printf("strlen(tempstr)=%lu, strlen(name)=%lu\n", strlen(tempstr), strlen(rom_entries[num_rom_entries].name)); rom_entries[num_rom_entries].start = strtol(tstr1, (char **)NULL, 16); rom_entries[num_rom_entries].end = strtol(tstr2, (char **)NULL, 16); + /* strcpy is actually safe here because tstr3 is shorter than 256 bytes because strlen(tempstr)<256. */ + strcpy(rom_entries[num_rom_entries].name, tstr3); rom_entries[num_rom_entries].included = 0; num_rom_entries++; } -- http://www.hailfinger.org/

1 0

Re: [flashrom] [PATCH] layout: Verify layout entries before building a new image using them.
by Carl-Daniel Hailfinger Sept. 23, 2013

Sept. 23, 2013

Am 23.09.2013 05:42 schrieb Stefan Tauner: > This fixes a SEGFAULT if a layout entry is included that addresses memory > outside the current chip's address range. > > Also, abort for non-write operations if a layout file is given. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Thanks for your patch! Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> with one small comment (no need to change the code, just think about it) > --- > cli_classic.c | 6 ++++++ > flash.h | 11 ++++++++++- > flashrom.c | 11 ++++++++--- > layout.c | 33 +++++++++++++++++++++++++++++---- > 4 files changed, 53 insertions(+), 8 deletions(-) > > diff --git a/layout.c b/layout.c > index 86351b8..5254115 100644 > --- a/layout.c > +++ b/layout.c > @@ -232,7 +232,32 @@ romentry_t *get_next_included_romentry(unsigned int start) > return best_entry; > } > > -int handle_romentries(const struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents) > +/* Validate and - if needed - normalize layout entries. */ > +int normalize_romentries(const struct flashctx *flash) > +{ > + chipsize_t total_size = flash->chip->total_size * 1024; > + int ret = 0; > + > + int i; > + for (i = 0; i < num_rom_entries; i++) { > + if (rom_entries[i].start >= total_size || rom_entries[i].end >= total_size) { > + msg_gwarn("Warning: Address range of region \"%s\" exceeds the current chip's " > + "address space.\n", rom_entries[i].name); > + if (rom_entries[i].included) Shouldn't we warn about invalid rom entries in all cases, not just when they are active/included? I'm a bit torn on that question. > + ret = 1; > + } > + if (rom_entries[i].start > rom_entries[i].end) { > + msg_gwarn("Warning: Size of the address range of region \"%s\" is not positive.\n", > + rom_entries[i].name); > + if (rom_entries[i].included) Same here. > + ret = 1; > + } > + } > + > + return ret; > +} > + > +int build_new_image(const struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents) > { > unsigned int start = 0; > romentry_t *entry; Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

[commit] r1752 - branches/0.9.7
by repository service Sept. 23, 2013

Sept. 23, 2013

Author: stefanct Date: Mon Sep 23 17:32:25 2013 New Revision: 1752 URL: http://flashrom.org/trac/flashrom/changeset/1752 Log: layout: Verify layout entries before building a new image using them. This fixes a SEGFAULT if a layout entry is included that addresses memory outside the current chip's address range. flashrom will only abort if the offending region(s) is/are included else it will just warn. It will print warnings for regions with negative or zero-length address ranges too, but it will only abort if they are included with -i/--image to reduce the potential of regressions. This is different to the patch committed to the development branch in r1751. Also, abort for non-write operations if a layout file is given because there is no layout support for non-write operations yet, and some reports show that users expect it to work at least for -r/--read. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: branches/0.9.7/cli_classic.c branches/0.9.7/flash.h branches/0.9.7/flashrom.8 branches/0.9.7/flashrom.c branches/0.9.7/layout.c Modified: branches/0.9.7/cli_classic.c ============================================================================== --- branches/0.9.7/cli_classic.c Mon Sep 23 16:21:06 2013 (r1751) +++ branches/0.9.7/cli_classic.c Mon Sep 23 17:32:25 2013 (r1752) @@ -372,6 +372,12 @@ 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; Modified: branches/0.9.7/flash.h ============================================================================== --- branches/0.9.7/flash.h Mon Sep 23 16:21:06 2013 (r1751) +++ branches/0.9.7/flash.h Mon Sep 23 17:32:25 2013 (r1752) @@ -45,6 +45,14 @@ typedef uintptr_t chipaddr; #define PRIxPTR_WIDTH ((int)(sizeof(uintptr_t)*2)) +/* Types and macros regarding the maximum flash space size supported by generic code. */ +typedef uint32_t chipoff_t; /* Able to store any addressable offset within a supported flash memory. */ +typedef uint32_t chipsize_t; /* Able to store the number of bytes of any supported flash memory. */ +#define FL_MAX_CHIPADDR_BITS (24) +#define FL_MAX_CHIPADDR ((chipoff_t)(1ULL<<FL_MAX_CHIPADDR_BITS)-1) +#define PRIxCHIPADDR "06"PRIx32 +#define PRIuCHIPSIZE PRIu32 + int register_shutdown(int (*function) (void *data), void *data); void *programmer_map_flash_region(const char *descr, uintptr_t phys_addr, size_t len); void programmer_unmap_flash_region(void *virt_addr, size_t len); @@ -319,7 +327,8 @@ int register_include_arg(char *name); int process_include_args(void); int read_romlayout(char *name); -int handle_romentries(const struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents); +int normalize_romentries(const struct flashctx *flash); +int build_new_image(const struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents); /* spi.c */ struct spi_command { Modified: branches/0.9.7/flashrom.8 ============================================================================== --- branches/0.9.7/flashrom.8 Mon Sep 23 16:21:06 2013 (r1751) +++ branches/0.9.7/flashrom.8 Mon Sep 23 17:32:25 2013 (r1752) @@ -106,7 +106,7 @@ Read ROM layout from .BR <file> . .sp -flashrom supports ROM layouts. This allows you to flash certain parts of +flashrom supports ROM layouts in write operations only. This allows you to flash certain parts of the flash chip only. A ROM layout file contains multiple lines with the following syntax: .sp Modified: branches/0.9.7/flashrom.c ============================================================================== --- branches/0.9.7/flashrom.c Mon Sep 23 16:21:06 2013 (r1751) +++ branches/0.9.7/flashrom.c Mon Sep 23 17:32:25 2013 (r1752) @@ -1904,6 +1904,12 @@ goto out_nofree; } + if (normalize_romentries(flash)) { + msg_cerr("Requested regions can not be handled. Aborting.\n"); + ret = 1; + goto out_nofree; + } + /* Given the existence of read locks, we want to unlock for read, * erase and write. */ @@ -1983,9 +1989,8 @@ } msg_cinfo("done.\n"); - // This should be moved into each flash part's code to do it - // cleanly. This does the job. - handle_romentries(flash, oldcontents, newcontents); + /* Build a new image taking the given layout into account. */ + build_new_image(flash, oldcontents, newcontents); // //////////////////////////////////////////////////////////// Modified: branches/0.9.7/layout.c ============================================================================== --- branches/0.9.7/layout.c Mon Sep 23 16:21:06 2013 (r1751) +++ branches/0.9.7/layout.c Mon Sep 23 17:32:25 2013 (r1752) @@ -30,8 +30,8 @@ #define MAX_ROMLAYOUT 32 typedef struct { - unsigned int start; - unsigned int end; + chipoff_t start; + chipoff_t end; unsigned int included; char name[256]; } romlayout_t; @@ -217,7 +217,32 @@ return best_entry; } -int handle_romentries(const struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents) +/* Validate and - if needed - normalize layout entries. */ +int normalize_romentries(const struct flashctx *flash) +{ + chipsize_t total_size = flash->chip->total_size * 1024; + int ret = 0; + + int i; + for (i = 0; i < romimages; i++) { + if (rom_entries[i].start >= total_size || rom_entries[i].end >= total_size) { + msg_gwarn("Warning: Address range of region \"%s\" exceeds the current chip's " + "address space.\n", rom_entries[i].name); + if (rom_entries[i].included) + ret = 1; + } + if (rom_entries[i].start > rom_entries[i].end) { + msg_gwarn("Warning: Size of the address range of region \"%s\" is not positive.\n", + rom_entries[i].name); + if (rom_entries[i].included) + ret = 1; + } + } + + return ret; +} + +int build_new_image(const struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents) { unsigned int start = 0; romlayout_t *entry;

1 0

[commit] r1751 - trunk
by repository service Sept. 23, 2013

Sept. 23, 2013

Author: stefanct Date: Mon Sep 23 16:21:06 2013 New Revision: 1751 URL: http://flashrom.org/trac/flashrom/changeset/1751 Log: layout: Verify layout entries before building a new image using them. This fixes a SEGFAULT if a layout entry is included that addresses memory outside the current chip's address range. flashrom will only abort if the offending region(s) is/are included else it will just warn. It will print warnings for regions with negative or zero-length address ranges and bail out after checking all of them. Also, abort for non-write operations if a layout file is given because there is no layout support for other operations yet. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/cli_classic.c trunk/flash.h trunk/flashrom.c trunk/layout.c Modified: trunk/cli_classic.c ============================================================================== --- trunk/cli_classic.c Sun Sep 15 16:17:39 2013 (r1750) +++ trunk/cli_classic.c Mon Sep 23 16:21:06 2013 (r1751) @@ -370,6 +370,12 @@ 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; Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Sun Sep 15 16:17:39 2013 (r1750) +++ trunk/flash.h Mon Sep 23 16:21:06 2013 (r1751) @@ -45,6 +45,14 @@ typedef uintptr_t chipaddr; #define PRIxPTR_WIDTH ((int)(sizeof(uintptr_t)*2)) +/* Types and macros regarding the maximum flash space size supported by generic code. */ +typedef uint32_t chipoff_t; /* Able to store any addressable offset within a supported flash memory. */ +typedef uint32_t chipsize_t; /* Able to store the number of bytes of any supported flash memory. */ +#define FL_MAX_CHIPADDR_BITS (24) +#define FL_MAX_CHIPADDR ((chipoff_t)(1ULL<<FL_MAX_CHIPADDR_BITS)-1) +#define PRIxCHIPADDR "06"PRIx32 +#define PRIuCHIPSIZE PRIu32 + int register_shutdown(int (*function) (void *data), void *data); void *programmer_map_flash_region(const char *descr, uintptr_t phys_addr, size_t len); void programmer_unmap_flash_region(void *virt_addr, size_t len); @@ -319,7 +327,8 @@ int register_include_arg(char *name); int process_include_args(void); int read_romlayout(char *name); -int handle_romentries(const struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents); +int normalize_romentries(const struct flashctx *flash); +int build_new_image(const struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents); void layout_cleanup(void); /* spi.c */ Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sun Sep 15 16:17:39 2013 (r1750) +++ trunk/flashrom.c Mon Sep 23 16:21:06 2013 (r1751) @@ -1916,6 +1916,12 @@ goto out_nofree; } + if (normalize_romentries(flash)) { + msg_cerr("Requested regions can not be handled. Aborting.\n"); + ret = 1; + goto out_nofree; + } + /* Given the existence of read locks, we want to unlock for read, * erase and write. */ @@ -1995,9 +2001,8 @@ } msg_cinfo("done.\n"); - // This should be moved into each flash part's code to do it - // cleanly. This does the job. - handle_romentries(flash, oldcontents, newcontents); + /* Build a new image taking the given layout into account. */ + build_new_image(flash, oldcontents, newcontents); // //////////////////////////////////////////////////////////// Modified: trunk/layout.c ============================================================================== --- trunk/layout.c Sun Sep 15 16:17:39 2013 (r1750) +++ trunk/layout.c Mon Sep 23 16:21:06 2013 (r1751) @@ -29,15 +29,15 @@ #define MAX_ROMLAYOUT 32 typedef struct { - unsigned int start; - unsigned int end; + chipoff_t start; + chipoff_t end; unsigned int included; char name[256]; } romentry_t; /* rom_entries store the entries specified in a layout file and associated run-time data */ static romentry_t rom_entries[MAX_ROMLAYOUT]; -static int num_rom_entries = 0; /* the number of valid rom_entries */ +static int num_rom_entries = 0; /* the number of successfully parsed rom_entries */ /* include_args holds the arguments specified at the command line with -i. They must be processed at some point * so that desired regions are marked as "included" in the rom_entries list. */ @@ -232,7 +232,31 @@ return best_entry; } -int handle_romentries(const struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents) +/* Validate and - if needed - normalize layout entries. */ +int normalize_romentries(const struct flashctx *flash) +{ + chipsize_t total_size = flash->chip->total_size * 1024; + int ret = 0; + + int i; + for (i = 0; i < num_rom_entries; i++) { + if (rom_entries[i].start >= total_size || rom_entries[i].end >= total_size) { + msg_gwarn("Warning: Address range of region \"%s\" exceeds the current chip's " + "address space.\n", rom_entries[i].name); + if (rom_entries[i].included) + ret = 1; + } + if (rom_entries[i].start > rom_entries[i].end) { + msg_gerr("Error: Size of the address range of region \"%s\" is not positive.\n", + rom_entries[i].name); + ret = 1; + } + } + + return ret; +} + +int build_new_image(const struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents) { unsigned int start = 0; romentry_t *entry;

1 0

Re: [flashrom] [PATCH] layout: Verify layout entries before building a new image using them.
by Carl-Daniel Hailfinger Sept. 23, 2013

Sept. 23, 2013

Am 22.09.2013 21:10 schrieb Stefan Tauner: > This fixes a SEGFAULT if a layout entry is included that addresses memory > outside the current chip's address range. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > > Before continuing with the other layout patches, I'd like to fix this > issue (and copy the patch that fixes this also to the .7 stable branch). Good idea. > The macros are open for discussion not only regarding naming... > e.g. it might be easier to declare a macro that provides the full printf > format specification for the address, '0x06" PRIx32 "' to make the > resulting code more readable. > > flash.h | 11 ++++++++++- > flashrom.c | 11 ++++++++--- > layout.c | 29 +++++++++++++++++++++++++++-- > 3 files changed, 45 insertions(+), 6 deletions(-) > > diff --git a/flash.h b/flash.h > index 7b88477..a5033ef 100644 > --- a/flash.h > +++ b/flash.h > @@ -45,6 +45,14 @@ > typedef uintptr_t chipaddr; > #define PRIxPTR_WIDTH ((int)(sizeof(uintptr_t)*2)) > > +/* To be used in technology-independent code. */ > +#define FL_MAX_CHIPADDR (24) This looks suspiciously like the number of address bits. It's not, and that confused me. > +#define FL_MAX_CHIPSIZE ((1<<FL_MAX_CHIPADDR)-1) AFAICS it should be 1ULL, not 1. > +#define PRIxCHIPADDR_WIDTH ((int)(FL_MAX_CHIPADDR/4)) Incorrect rounding. If FL_MAX_CHIPADDR=23, PRIxCHIPADDR_WIDTH is 5, but it should be 6. Suggested fix: Replace FL_MAX_CHIPADDR/4 with (FL_MAX_CHIPADDR+3)/4. > +typedef uint32_t chipoff_t; /* Able to store any addressable offset within a supported flash memory. */ > +typedef uint32_t chipsize_t; /* Able to store the number of bytes of any supported flash memory. */ > +#define PRIxCHIPADDR PRIx32 > + > int register_shutdown(int (*function) (void *data), void *data); > void *programmer_map_flash_region(const char *descr, uintptr_t phys_addr, size_t len); > void programmer_unmap_flash_region(void *virt_addr, size_t len); > @@ -319,7 +327,8 @@ __attribute__((format(printf, 2, 3))); > int register_include_arg(char *name); > int process_include_args(void); > int read_romlayout(char *name); > -int handle_romentries(const struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents); > +int normalize_romentries(const struct flashctx *flash); > +int build_new_image(const struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents); Good idea. > void layout_cleanup(void); > > /* spi.c */ > diff --git a/flashrom.c b/flashrom.c > index 9169620..afab57c 100644 > --- a/flashrom.c > +++ b/flashrom.c > @@ -1916,6 +1916,12 @@ int doit(struct flashctx *flash, int force, const char *filename, int read_it, > goto out_nofree; > } > > + if (normalize_romentries(flash)) { > + msg_cerr("Requested regions can not be handled. Aborting.\n"); > + ret = 1; > + goto out_nofree; > + } > + > /* Given the existence of read locks, we want to unlock for read, > * erase and write. > */ > @@ -1995,9 +2001,8 @@ int doit(struct flashctx *flash, int force, const char *filename, int read_it, > } > msg_cinfo("done.\n"); > > - // This should be moved into each flash part's code to do it > - // cleanly. This does the job. > - handle_romentries(flash, oldcontents, newcontents); > + /* Build a new image taking the given layout into account. */ > + build_new_image(flash, oldcontents, newcontents); > > // //////////////////////////////////////////////////////////// > > diff --git a/layout.c b/layout.c > index 86351b8..5adec67 100644 > --- a/layout.c > +++ b/layout.c > @@ -37,7 +37,7 @@ typedef struct { > > /* rom_entries store the entries specified in a layout file and associated run-time data */ > static romentry_t rom_entries[MAX_ROMLAYOUT]; > -static int num_rom_entries = 0; /* the number of valid rom_entries */ > +static int num_rom_entries = 0; /* the number of successfully parsed rom_entries */ > > /* include_args holds the arguments specified at the command line with -i. They must be processed at some point > * so that desired regions are marked as "included" in the rom_entries list. */ > @@ -232,7 +232,32 @@ romentry_t *get_next_included_romentry(unsigned int start) > return best_entry; > } > > -int handle_romentries(const struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents) > +/* Validate and - if needed - normalize layout entries. */ > +int normalize_romentries(const struct flashctx *flash) > +{ > + chipsize_t total_size = flash->chip->total_size * 1024; > + int ret = 0; > + > + int i; > + for (i = 0; i < num_rom_entries; i++) { > + if (rom_entries[i].start >= total_size || rom_entries[i].end >= total_size) { If you want to do this, please make sure struct romentry has members start/end with type chipoff_t. Otherwise that check may backfire eventually. > + msg_gwarn("Warning: Address range of region \"%s\" exeeds the current chip's " > + "address space.\n", rom_entries[i].name); > + if (rom_entries[i].included) > + ret = 1; > + } > + if (rom_entries[i].start >= rom_entries[i].end) { Off-by-one: If start==end, the length is 1, but this check will trigger. The check should be > instead of >=. > + msg_gwarn("Warning: Size of the address range of region \"%s\" is not positive.\n", > + rom_entries[i].name); > + if (rom_entries[i].included) > + ret = 1; > + } > + } > + > + return ret; > +} > + > +int build_new_image(const struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents) > { > unsigned int start = 0; > romentry_t *entry; Looks good otherwise. Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

[PATCH] layout: Verify layout entries before building a new image using them.
by Stefan Tauner Sept. 22, 2013

Sept. 22, 2013

This fixes a SEGFAULT if a layout entry is included that addresses memory outside the current chip's address range. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- Before continuing with the other layout patches, I'd like to fix this issue (and copy the patch that fixes this also to the .7 stable branch). The macros are open for discussion not only regarding naming... e.g. it might be easier to declare a macro that provides the full printf format specification for the address, '0x06" PRIx32 "' to make the resulting code more readable. flash.h | 11 ++++++++++- flashrom.c | 11 ++++++++--- layout.c | 29 +++++++++++++++++++++++++++-- 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/flash.h b/flash.h index 7b88477..a5033ef 100644 --- a/flash.h +++ b/flash.h @@ -45,6 +45,14 @@ typedef uintptr_t chipaddr; #define PRIxPTR_WIDTH ((int)(sizeof(uintptr_t)*2)) +/* To be used in technology-independent code. */ +#define FL_MAX_CHIPADDR (24) +#define FL_MAX_CHIPSIZE ((1<<FL_MAX_CHIPADDR)-1) +#define PRIxCHIPADDR_WIDTH ((int)(FL_MAX_CHIPADDR/4)) +typedef uint32_t chipoff_t; /* Able to store any addressable offset within a supported flash memory. */ +typedef uint32_t chipsize_t; /* Able to store the number of bytes of any supported flash memory. */ +#define PRIxCHIPADDR PRIx32 + int register_shutdown(int (*function) (void *data), void *data); void *programmer_map_flash_region(const char *descr, uintptr_t phys_addr, size_t len); void programmer_unmap_flash_region(void *virt_addr, size_t len); @@ -319,7 +327,8 @@ __attribute__((format(printf, 2, 3))); int register_include_arg(char *name); int process_include_args(void); int read_romlayout(char *name); -int handle_romentries(const struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents); +int normalize_romentries(const struct flashctx *flash); +int build_new_image(const struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents); void layout_cleanup(void); /* spi.c */ diff --git a/flashrom.c b/flashrom.c index 9169620..afab57c 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1916,6 +1916,12 @@ int doit(struct flashctx *flash, int force, const char *filename, int read_it, goto out_nofree; } + if (normalize_romentries(flash)) { + msg_cerr("Requested regions can not be handled. Aborting.\n"); + ret = 1; + goto out_nofree; + } + /* Given the existence of read locks, we want to unlock for read, * erase and write. */ @@ -1995,9 +2001,8 @@ int doit(struct flashctx *flash, int force, const char *filename, int read_it, } msg_cinfo("done.\n"); - // This should be moved into each flash part's code to do it - // cleanly. This does the job. - handle_romentries(flash, oldcontents, newcontents); + /* Build a new image taking the given layout into account. */ + build_new_image(flash, oldcontents, newcontents); // //////////////////////////////////////////////////////////// diff --git a/layout.c b/layout.c index 86351b8..5adec67 100644 --- a/layout.c +++ b/layout.c @@ -37,7 +37,7 @@ typedef struct { /* rom_entries store the entries specified in a layout file and associated run-time data */ static romentry_t rom_entries[MAX_ROMLAYOUT]; -static int num_rom_entries = 0; /* the number of valid rom_entries */ +static int num_rom_entries = 0; /* the number of successfully parsed rom_entries */ /* include_args holds the arguments specified at the command line with -i. They must be processed at some point * so that desired regions are marked as "included" in the rom_entries list. */ @@ -232,7 +232,32 @@ romentry_t *get_next_included_romentry(unsigned int start) return best_entry; } -int handle_romentries(const struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents) +/* Validate and - if needed - normalize layout entries. */ +int normalize_romentries(const struct flashctx *flash) +{ + chipsize_t total_size = flash->chip->total_size * 1024; + int ret = 0; + + int i; + for (i = 0; i < num_rom_entries; i++) { + if (rom_entries[i].start >= total_size || rom_entries[i].end >= total_size) { + msg_gwarn("Warning: Address range of region \"%s\" exeeds the current chip's " + "address space.\n", rom_entries[i].name); + if (rom_entries[i].included) + ret = 1; + } + if (rom_entries[i].start >= rom_entries[i].end) { + msg_gwarn("Warning: Size of the address range of region \"%s\" is not positive.\n", + rom_entries[i].name); + if (rom_entries[i].included) + ret = 1; + } + } + + return ret; +} + +int build_new_image(const struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents) { unsigned int start = 0; romentry_t *entry; -- Kind regards, Stefan Tauner

1 0

Report: Gigabyte Z77-DS3H F10f read
by dpcimanager＠users.sourceforge.net Sept. 22, 2013

Sept. 22, 2013

flashrom v0.9.7-r1711 on Darwin 12.5.0 (x86_64) flashrom is free software, get the source code at http://www.flashrom.org flashrom was built with libpci 3.2.0, LLVM Clang 4.2 (clang-425.0.28), little endian Command line (5 args): ~/Desktop/DPCIManager_ML/DPCIManager.app/Contents/MacOS/flashrom -VV -r ~/Desktop/DPCIManager_ML/Gigabyte Z77-DS3H F10f.rom -p internal Calibrating delay loop... OS timer resolution is 1 usecs, 521M loops per second, 10 myus = 9 us, 100 myus = 135 us, 1000 myus = 1037 us, 10000 myus = 10057 us, 4 myus = 4 us, OK. Initializing internal programmer Mapping low megabyte at 0x0000000000000400, unaligned size 0xffc00. Mapping low megabyte, 0xffc00 bytes at unaligned 0x0000000000000400. No coreboot table found. DMI string system-manufacturer: "Gigabyte Technology Co., Ltd." DMI string system-product-name: "To be filled by O.E.M." DMI string system-version: "To be filled by O.E.M." DMI string baseboard-manufacturer: "Gigabyte Technology Co., Ltd." DMI string baseboard-product-name: "Z77-DS3H" DMI string baseboard-version: "x.x" DMI string chassis-type: "Desktop" Found ITE Super I/O, ID 0x8728 on port 0x2e Found chipset "Intel Z77" with PCI ID 8086:1e44. Enabling flash write... 0xfff80000/0xffb80000 FWH IDSEL: 0x0 0xfff00000/0xffb00000 FWH IDSEL: 0x0 0xffe80000/0xffa80000 FWH IDSEL: 0x1 0xffe00000/0xffa00000 FWH IDSEL: 0x1 0xffd80000/0xff980000 FWH IDSEL: 0x2 0xffd00000/0xff900000 FWH IDSEL: 0x2 0xffc80000/0xff880000 FWH IDSEL: 0x3 0xffc00000/0xff800000 FWH IDSEL: 0x3 0xff700000/0xff300000 FWH IDSEL: 0x4 0xff600000/0xff200000 FWH IDSEL: 0x5 0xff500000/0xff100000 FWH IDSEL: 0x6 0xff400000/0xff000000 FWH IDSEL: 0x7 0xfff80000/0xffb80000 FWH decode enabled 0xfff00000/0xffb00000 FWH decode enabled 0xffe80000/0xffa80000 FWH decode enabled 0xffe00000/0xffa00000 FWH decode enabled 0xffd80000/0xff980000 FWH decode enabled 0xffd00000/0xff900000 FWH decode enabled 0xffc80000/0xff880000 FWH decode enabled 0xffc00000/0xff800000 FWH decode enabled 0xff700000/0xff300000 FWH decode enabled 0xff600000/0xff200000 FWH decode enabled 0xff500000/0xff100000 FWH decode enabled 0xff400000/0xff000000 FWH decode enabled Maximum FWH chip size: 0x100000 bytes BIOS_CNTL = 0x09: BIOS Lock Enable: disabled, BIOS Write Enable: enabled Root Complex Register Block address = 0xfed1c000 GCS = 0xc64: BIOS Interface Lock-Down: disabled, Boot BIOS Straps: 0x3 (SPI) Top Swap : not enabled SPIBAR = 0xfed1c000 + 0x3800 0x04: 0xe008 (HSFS) HSFS: FDONE=0, FCERR=0, AEL=0, BERASE=1, SCIP=0, FDOPSS=1, FDV=1, FLOCKDN=1 Warning: SPI Configuration Lockdown activated. Reading OPCODES... done OP Type Pre-OP op[0]: 0x02, write w/ addr, none op[1]: 0x03, read w/ addr, none op[2]: 0x20, write w/ addr, none op[3]: 0x05, read w/o addr, none op[4]: 0x9f, read w/o addr, none op[5]: 0x01, write w/o addr, none op[6]: 0x00, read w/o addr, none op[7]: 0x00, read w/o addr, none Pre-OP 0: 0x06, Pre-OP 1: 0x00 0x06: 0x0000 (HSFC) HSFC: FGO=0, FCYCLE=0, FDBC=0, SME=0 0x08: 0x0020536d (FADDR) 0x50: 0x0000ffff (FRAP) BMWAG 0x00, BMRAG 0x00, BRWA 0xff, BRRA 0xff 0x54: 0x00000000 FREG0: Flash Descriptor region (0x00000000-0x00000fff) is read-write. 0x58: 0x07ff0000 FREG1: BIOS region (0x00000000-0x007fffff) is read-write. 0x5C: 0x01ff0001 FREG2: Management Engine region (0x00001000-0x001fffff) is read-write. 0x60: 0x00001fff FREG3: Gigabit Ethernet region is unused. 0x64: 0x00001fff FREG4: Platform Data region is unused. 0x74: 0x00000000 (PR0 is unused) 0x78: 0x00000000 (PR1 is unused) 0x7C: 0x00000000 (PR2 is unused) 0x80: 0x00000000 (PR3 is unused) 0x84: 0x00000000 (PR4 is unused) 0x90: 0x80 (SSFS) SSFS: SCIP=0, FDONE=0, FCERR=0, AEL=0 0x91: 0xf94010 (SSFC) SSFC: SCGO=0, ACS=0, SPOP=0, COP=1, DBC=0, SME=0, SCF=1 0x94: 0x0006 (PREOP) 0x96: 0x043b (OPTYPE) 0x98: 0x05200302 (OPMENU) 0x9C: 0x0000019f (OPMENU+4) 0xA0: 0x00000000 (BBAR) 0xC4: 0x00802005 (LVSCC) LVSCC: BES=0x1, WG=1, WSR=0, WEWS=0, EO=0x20, VCL=1 0xC8: 0x00002005 (UVSCC) UVSCC: BES=0x1, WG=1, WSR=0, WEWS=0, EO=0x20, VCL=0 0xD0: 0x00000000 (FPB) Reading flash descriptors mapped by the chipset via FDOC/FDOD... done. === Content Section === FLVALSIG 0x0ff0a55a FLMAP0 0x02040003 FLMAP1 0x12100206 FLMAP2 0x00210120 --- Details --- NR (Number of Regions): 3 FRBA (Flash Region Base Address): 0x040 NC (Number of Components): 1 FCBA (Flash Component Base Address): 0x030 ISL (ICH/PCH Strap Length): 18 FISBA/FPSBA (Flash ICH/PCH Strap Base Address): 0x100 NM (Number of Masters): 3 FMBA (Flash Master Base Address): 0x060 MSL/PSL (MCH/PROC Strap Length): 1 FMSBA (Flash MCH/PROC Strap Base Address): 0x200 === Component Section === FLCOMP 0x09300024 FLILL 0x00000000 --- Details --- Component 1 density: 8 MB Component 2 is not used. Read Clock Frequency: 20 MHz Read ID and Status Clock Freq.: 33 MHz Write and Erase Clock Freq.: 33 MHz Fast Read is supported. Fast Read Clock Frequency: 33 MHz No forbidden opcodes. === Region Section === FLREG0 0x00000000 FLREG1 0x07ff0000 FLREG2 0x01ff0001 FLREG3 0x00001fff FLREG4 0x00001fff --- Details --- Region 0 (Descr.) 0x00000000 - 0x00000fff Region 1 (BIOS ) 0x00000000 - 0x007fffff Region 2 (ME ) 0x00001000 - 0x001fffff Region 3 (GbE ) is unused. Region 4 (Platf.) is unused. === Master Section === FLMSTR1 0xffff0000 FLMSTR2 0xffff0000 FLMSTR3 0xffff0118 --- Details --- Descr. BIOS ME GbE Platf. BIOS rw rw rw rw rw ME rw rw rw rw rw GbE rw rw rw rw rw SPI Read Configuration: prefetching enabled, caching enabled, OK. Super I/O ID 0x8728 is not on the list of flash capable controllers. The following protocols are supported: FWH, SPI. Probing for AMIC A25L05PT, 64 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for AMIC A25L05PU, 64 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for AMIC A25L10PT, 128 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for AMIC A25L10PU, 128 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for AMIC A25L20PT, 256 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for AMIC A25L20PU, 256 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for AMIC A25L40PT, 512 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for AMIC A25L40PU, 512 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for AMIC A25L80P, 1024 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for AMIC A25L16PT, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for AMIC A25L16PU, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for AMIC A25L512, 64 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for AMIC A25L010, 128 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for AMIC A25L020, 256 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for AMIC A25L040, 512 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for AMIC A25L080, 1024 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for AMIC A25L016, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for AMIC A25L032, 4096 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for AMIC A25LQ16, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for AMIC A25LQ032/A25LQ32A, 4096 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for AMIC A25LQ64, 8192 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT25DF021, 256 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT25DF041A, 512 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT25DF081, 1024 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT25DF081A, 1024 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT25DF161, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT25DF321, 4096 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT25DF321A, 4096 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT25DF641(A), 8192 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT25DQ161, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT25F512, 64 kB: Invalid OPCODE 0x15, will not execute. Probing for Atmel AT25F512A, 64 kB: Invalid OPCODE 0x15, will not execute. Probing for Atmel AT25F512B, 64 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT25F1024(A), 128 kB: Invalid OPCODE 0x15, will not execute. Probing for Atmel AT25F2048, 256 kB: Invalid OPCODE 0x15, will not execute. Probing for Atmel AT25F4096, 512 kB: Invalid OPCODE 0x15, will not execute. Probing for Atmel AT25FS010, 128 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT25FS040, 512 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT26DF041, 512 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT26DF081A, 1024 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT26DF161, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT26DF161A, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT26F004, 512 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT45CS1282, 16896 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT45DB011D, 128 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT45DB021D, 256 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT45DB041D, 512 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT45DB081D, 1024 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT45DB161D, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT45DB321C, 4224 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT45DB321D, 4096 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Atmel AT45DB642D, 8192 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for ESMT F25L008A, 1024 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25B05, 64 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25B05T, 64 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25B10, 128 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25B10T, 128 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25B20, 256 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25B20T, 256 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25B40, 512 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25B40T, 512 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25B80, 1024 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25B80T, 1024 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25B16, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25B16T, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25B32, 4096 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25B32T, 4096 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25B64, 8192 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25B64T, 8192 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25F05, 64 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25F10, 128 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25F20, 256 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25F40, 512 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25F80, 1024 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25F16, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25F32, 4096 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25F64, 8192 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25Q40, 512 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25Q80(A), 1024 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25Q16, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25Q32(A/B), 4096 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25Q64, 8192 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25Q128, 16384 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25QH16, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25QH32, 4096 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25QH64, 8192 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25QH128, 16384 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25S10, 128 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25S20, 256 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25S40, 512 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25S80, 1024 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25S16, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25S32, 4096 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Eon EN25S64, 8192 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for GigaDevice GD25LQ32, 4096 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for GigaDevice GD25Q512, 64 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for GigaDevice GD25Q10, 128 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for GigaDevice GD25Q20(B), 256 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for GigaDevice GD25Q40(B), 512 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for GigaDevice GD25Q80(B), 1024 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for GigaDevice GD25Q16(B), 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for GigaDevice GD25Q32(B), 4096 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for GigaDevice GD25Q64(B), 8192 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for GigaDevice GD25Q128B, 16384 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for GigaDevice GD25T80, 1024 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Intel 25F160S33B8, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Intel 25F160S33T8, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Intel 25F320S33B8, 4096 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Intel 25F320S33T8, 4096 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Intel 25F640S33B8, 8192 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Intel 25F640S33T8, 8192 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Macronix MX25L512(E)/MX25V512(C), 64 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Macronix MX25L1005(C)/MX25L1006E, 128 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Macronix MX25L2005(C), 256 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Macronix MX25L4005(A/C), 512 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Macronix MX25L8005/MX25V8005, 1024 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Macronix MX25L1605, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Macronix MX25L1605A/MX25L1606E, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Macronix MX25L1605D/MX25L1608D, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Macronix MX25L1635D, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Macronix MX25L1635E, 2048 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Macronix MX25L3205(A), 4096 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Macronix MX25L3205D/MX25L3208D, 4096 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Macronix MX25L3206E, 4096 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Macronix MX25L3235D, 4096 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Probing for Macronix MX25L6405(D), 8192 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Found Macronix flash chip "MX25L6405(D)" (8192 kB, SPI) at physical address 0xff800000. Chip status register is 0x00. Chip status register: Status Register Write Disable (SRWD, SRP, ...) is not set Chip status register: Bit 6 is not set Chip status register: Block Protect 3 (BP3) is not set Chip status register: Block Protect 2 (BP2) is not set Chip status register: Block Protect 1 (BP1) is not set Chip status register: Block Protect 0 (BP0) is not set Chip status register: Write Enable Latch (WEL) is not set Chip status register: Write In Progress (WIP/BUSY) is not set Probing for Macronix MX25L6406E/MX25L6436E, 8192 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Found Macronix flash chip "MX25L6406E/MX25L6436E" (8192 kB, SPI) at physical address 0xff800000. Chip status register is 0x00. Chip status register: Status Register Write Disable (SRWD, SRP, ...) is not set Chip status register: Bit 6 is not set Chip status register: Block Protect 3 (BP3) is not set Chip status register: Block Protect 2 (BP2) is not set Chip status register: Block Protect 1 (BP1) is not set Chip status register: Block Protect 0 (BP0) is not set Chip status register: Write Enable Latch (WEL) is not set Chip status register: Write In Progress (WIP/BUSY) is not set Probing for Macronix MX25L6445E, 8192 kB: probe_spi_rdid_generic: id1 0xc2, id2 0x2017 Found Macronix flash chip "MX25L6445E" (8192 kB, SPI) at physical address 0xff800000. Chip status register is 0x00. Chip status register: Status Register Write Disable (SRWD, SRP, ...) is not set Chip status register: Bit 6 is not set Chip status register: Block Protect 3 (BP3) is not set Chip status register: Block Protect 2 (BP2) is not set Chip status register: Block Protect 1 (BP1) is not set Chip status register: Block Protect 0 (BP0) is not set Chip status register: Write Enable Latch (WEL) is not set Chip status register: Write In Progress (WIP/BUSY) is not set Multiple flash chip definitions match the detected chip(s): "MX25L6405(D)", "MX25L6406E/MX25L6436E", "MX25L6445E" Please specify which chip definition to use with the -c <chipname> option. Restoring MMIO space at 0x1082618a0 Restoring PCI config space for 00:1f:0 reg 0xdc

1 0