coreboot-gerrit February 2014

coreboot-gerrit@coreboot.org

1 participants
1135 discussions

Patch set updated for coreboot: 8e4b3c5 util/ifdtool: cleanup some magic numbers
by Christopher Douglass 28 Feb '14

28 Feb '14

Christopher Douglass (cdouglass.orion(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5313 -gerrit commit 8e4b3c56abf8083f1816b607760f3ad8fdcc7873 Author: Chris Douglass <cdouglass.orion(a)gmail.com> Date: Fri Feb 28 08:54:41 2014 -0500 util/ifdtool: cleanup some magic numbers There are five firmware regions that are (currently) defined. This was assumed throughout the ifdtool code with many literal 4s and 5s. This patch changes them to refer to a new #define NUM_REGIONS. Change-Id: I523d3763942f875025ebc4b9ba8b2ccf1db5b2f5 Signed-off-by: Christopher Douglass <cdouglass.orion(a)gmail.com> --- util/ifdtool/ifdtool.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c index 28dbaac..0425b1c 100644 --- a/util/ifdtool/ifdtool.c +++ b/util/ifdtool/ifdtool.c @@ -27,7 +27,9 @@ #include <sys/stat.h> #include "ifdtool.h" -static const struct region_name region_names[5] = { +#define NUM_REGIONS 5 + +static const struct region_name region_names[NUM_REGIONS] = { { "Flash Descriptor", "fd" }, { "BIOS", "bios" }, { "Intel ME", "me" }, @@ -126,7 +128,7 @@ static void set_region(frba_t *frba, int region_type, region_t region) static const char *region_name(int region_type) { - if (region_type < 0 || region_type > 4) { + if (region_type < 0 || region_type >= NUM_REGIONS) { fprintf(stderr, "Invalid region type.\n"); exit (EXIT_FAILURE); } @@ -136,7 +138,7 @@ static const char *region_name(int region_type) static const char *region_name_short(int region_type) { - if (region_type < 0 || region_type > 4) { + if (region_type < 0 || region_type >= NUM_REGIONS) { fprintf(stderr, "Invalid region type.\n"); exit (EXIT_FAILURE); } @@ -148,7 +150,7 @@ static int region_num(const char *name) { int i; - for (i = 0; i < 5; i++) { + for (i = 0; i < NUM_REGIONS; i++) { if (strcasecmp(name, region_names[i].pretty) == 0) return i; if (strcasecmp(name, region_names[i].terse) == 0) @@ -160,7 +162,7 @@ static int region_num(const char *name) static const char *region_filename(int region_type) { - static const char *region_filenames[5] = { + static const char *region_filenames[NUM_REGIONS] = { "flashregion_0_flashdescriptor.bin", "flashregion_1_bios.bin", "flashregion_2_intel_me.bin", @@ -168,7 +170,7 @@ static const char *region_filename(int region_type) "flashregion_4_platform_data.bin" }; - if (region_type < 0 || region_type > 4) { + if (region_type < 0 || region_type >= NUM_REGIONS) { fprintf(stderr, "Invalid region type.\n"); exit (EXIT_FAILURE); } @@ -219,7 +221,7 @@ static void dump_frba_layout(frba_t * frba, char *layout_fname) exit(EXIT_FAILURE); } - for (i = 0; i <= 4; i++) { + for (i = 0; i < NUM_REGIONS; i++) { dump_region_layout(buf, bufsize, i, frba); if (write(layout_fd, buf, strlen(buf)) < 0) { perror("Could not write to file"); @@ -530,7 +532,7 @@ static void write_regions(char *image, int size) frba_t *frba = (frba_t *) (image + (((fdb->flmap0 >> 16) & 0xff) << 4)); - for (i = 0; i<5; i++) { + for (i = 0; i < NUM_REGIONS; i++) { region_t region = get_region(frba, i); dump_region(i, frba); if (region.size > 0) { @@ -721,8 +723,8 @@ void new_layout(char *filename, char *image, int size, char *layout_fname) char layout_region_name[256]; int i, j; int region_number; - region_t current_regions[5]; - region_t new_regions[5]; + region_t current_regions[NUM_REGIONS]; + region_t new_regions[NUM_REGIONS]; int new_extent = 0; char *new_image; @@ -734,7 +736,7 @@ void new_layout(char *filename, char *image, int size, char *layout_fname) frba_t *frba = (frba_t *) (image + (((fdb->flmap0 >> 16) & 0xff) << 4)); - for (i = 0; i < 5; i++) { + for (i = 0; i < NUM_REGIONS; i++) { current_regions[i] = get_region(frba, i); new_regions[i] = get_region(frba, i); } @@ -778,7 +780,7 @@ void new_layout(char *filename, char *image, int size, char *layout_fname) fclose(romlayout); /* check new layout */ - for (i = 0; i < 5; i++) { + for (i = 0; i < NUM_REGIONS; i++) { if (new_regions[i].size == 0) continue; @@ -789,7 +791,7 @@ void new_layout(char *filename, char *image, int size, char *layout_fname) printf(" This may result in an unusable image.\n"); } - for (j = i + 1; j < 5; j++) { + for (j = i + 1; j < NUM_REGIONS; j++) { if (regions_collide(new_regions[i], new_regions[j])) { fprintf(stderr, "Regions would overlap.\n"); exit(EXIT_FAILURE); @@ -811,7 +813,7 @@ void new_layout(char *filename, char *image, int size, char *layout_fname) /* copy regions to a new image */ new_image = malloc(new_extent); memset(new_image, 0xff, new_extent); - for (i = 0; i < 5; i++) { + for (i = 0; i < NUM_REGIONS; i++) { int copy_size = new_regions[i].size; int offset_current = 0, offset_new = 0; region_t current = current_regions[i]; @@ -849,7 +851,7 @@ void new_layout(char *filename, char *image, int size, char *layout_fname) exit(EXIT_FAILURE); frba = (frba_t *) (new_image + (((fdb->flmap0 >> 16) & 0xff) << 4)); - for (i = 1; i < 5; i++) { + for (i = 1; i < NUM_REGIONS; i++) { set_region(frba, i, new_regions[i]); }

1 0

New patch to review for coreboot: 7bcb01d util/ifdtool: cleanup some magic numbers
by Christopher Douglass 28 Feb '14

28 Feb '14

Christopher Douglass (cdouglass.orion(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5313 -gerrit commit 7bcb01d803c514166b28080dae3fddb2d19c14d0 Author: Chris Douglass <cdouglass.orion(a)gmail.com> Date: Fri Feb 28 08:54:41 2014 -0500 util/ifdtool: cleanup some magic numbers There are five firmware regions that are (currently) defined. This was assumed throughout the ifdtool code with many literal 4s and 5a. This patch changes them to refer to a new #define NUM_REGIONS. Change-Id: I523d3763942f875025ebc4b9ba8b2ccf1db5b2f5 Signed-off-by: Christopher Douglass <cdouglass.orion(a)gmail.com> --- util/ifdtool/ifdtool.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c index 28dbaac..0425b1c 100644 --- a/util/ifdtool/ifdtool.c +++ b/util/ifdtool/ifdtool.c @@ -27,7 +27,9 @@ #include <sys/stat.h> #include "ifdtool.h" -static const struct region_name region_names[5] = { +#define NUM_REGIONS 5 + +static const struct region_name region_names[NUM_REGIONS] = { { "Flash Descriptor", "fd" }, { "BIOS", "bios" }, { "Intel ME", "me" }, @@ -126,7 +128,7 @@ static void set_region(frba_t *frba, int region_type, region_t region) static const char *region_name(int region_type) { - if (region_type < 0 || region_type > 4) { + if (region_type < 0 || region_type >= NUM_REGIONS) { fprintf(stderr, "Invalid region type.\n"); exit (EXIT_FAILURE); } @@ -136,7 +138,7 @@ static const char *region_name(int region_type) static const char *region_name_short(int region_type) { - if (region_type < 0 || region_type > 4) { + if (region_type < 0 || region_type >= NUM_REGIONS) { fprintf(stderr, "Invalid region type.\n"); exit (EXIT_FAILURE); } @@ -148,7 +150,7 @@ static int region_num(const char *name) { int i; - for (i = 0; i < 5; i++) { + for (i = 0; i < NUM_REGIONS; i++) { if (strcasecmp(name, region_names[i].pretty) == 0) return i; if (strcasecmp(name, region_names[i].terse) == 0) @@ -160,7 +162,7 @@ static int region_num(const char *name) static const char *region_filename(int region_type) { - static const char *region_filenames[5] = { + static const char *region_filenames[NUM_REGIONS] = { "flashregion_0_flashdescriptor.bin", "flashregion_1_bios.bin", "flashregion_2_intel_me.bin", @@ -168,7 +170,7 @@ static const char *region_filename(int region_type) "flashregion_4_platform_data.bin" }; - if (region_type < 0 || region_type > 4) { + if (region_type < 0 || region_type >= NUM_REGIONS) { fprintf(stderr, "Invalid region type.\n"); exit (EXIT_FAILURE); } @@ -219,7 +221,7 @@ static void dump_frba_layout(frba_t * frba, char *layout_fname) exit(EXIT_FAILURE); } - for (i = 0; i <= 4; i++) { + for (i = 0; i < NUM_REGIONS; i++) { dump_region_layout(buf, bufsize, i, frba); if (write(layout_fd, buf, strlen(buf)) < 0) { perror("Could not write to file"); @@ -530,7 +532,7 @@ static void write_regions(char *image, int size) frba_t *frba = (frba_t *) (image + (((fdb->flmap0 >> 16) & 0xff) << 4)); - for (i = 0; i<5; i++) { + for (i = 0; i < NUM_REGIONS; i++) { region_t region = get_region(frba, i); dump_region(i, frba); if (region.size > 0) { @@ -721,8 +723,8 @@ void new_layout(char *filename, char *image, int size, char *layout_fname) char layout_region_name[256]; int i, j; int region_number; - region_t current_regions[5]; - region_t new_regions[5]; + region_t current_regions[NUM_REGIONS]; + region_t new_regions[NUM_REGIONS]; int new_extent = 0; char *new_image; @@ -734,7 +736,7 @@ void new_layout(char *filename, char *image, int size, char *layout_fname) frba_t *frba = (frba_t *) (image + (((fdb->flmap0 >> 16) & 0xff) << 4)); - for (i = 0; i < 5; i++) { + for (i = 0; i < NUM_REGIONS; i++) { current_regions[i] = get_region(frba, i); new_regions[i] = get_region(frba, i); } @@ -778,7 +780,7 @@ void new_layout(char *filename, char *image, int size, char *layout_fname) fclose(romlayout); /* check new layout */ - for (i = 0; i < 5; i++) { + for (i = 0; i < NUM_REGIONS; i++) { if (new_regions[i].size == 0) continue; @@ -789,7 +791,7 @@ void new_layout(char *filename, char *image, int size, char *layout_fname) printf(" This may result in an unusable image.\n"); } - for (j = i + 1; j < 5; j++) { + for (j = i + 1; j < NUM_REGIONS; j++) { if (regions_collide(new_regions[i], new_regions[j])) { fprintf(stderr, "Regions would overlap.\n"); exit(EXIT_FAILURE); @@ -811,7 +813,7 @@ void new_layout(char *filename, char *image, int size, char *layout_fname) /* copy regions to a new image */ new_image = malloc(new_extent); memset(new_image, 0xff, new_extent); - for (i = 0; i < 5; i++) { + for (i = 0; i < NUM_REGIONS; i++) { int copy_size = new_regions[i].size; int offset_current = 0, offset_new = 0; region_t current = current_regions[i]; @@ -849,7 +851,7 @@ void new_layout(char *filename, char *image, int size, char *layout_fname) exit(EXIT_FAILURE); frba = (frba_t *) (new_image + (((fdb->flmap0 >> 16) & 0xff) << 4)); - for (i = 1; i < 5; i++) { + for (i = 1; i < NUM_REGIONS; i++) { set_region(frba, i, new_regions[i]); }

1 0

Patch set updated for coreboot: d6c514c util/ifdtool: add option to dump flashrom layout
by Christopher Douglass 28 Feb '14

28 Feb '14

Christopher Douglass (cdouglass.orion(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5306 -gerrit commit d6c514c05327e5399e90a95e95d5dbdccd7841d5 Author: Chris Douglass <cdouglass.orion(a)gmail.com> Date: Wed Feb 26 13:30:13 2014 -0500 util/ifdtool: add option to dump flashrom layout Dump the Intel Flash Descriptor map in the format expected by flashrom's "layout" option. Example usage: Given a 4MB flash image vpx7654.bin that was generated by Intel's FITC tool for a 6-Series chipset... ./ifdtool --layout l.txt vpx7654.bin cat l.txt 00000000:00000fff fd 00180000:003fffff bios 00001000:0017ffff me 00fff000:00000fff gbe 00fff000:00000fff pd Change-Id: Ib740178ed6935b5f6e1dba1be674303f9f980429 Signed-off-by: Christopher Douglass <cdouglass.orion(a)gmail.com> --- util/ifdtool/ifdtool.c | 96 +++++++++++++++++++++++++++++++++++++++++++------- util/ifdtool/ifdtool.h | 7 ++++ 2 files changed, 90 insertions(+), 13 deletions(-) diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c index 9eadc0a..b5a0ac2 100644 --- a/util/ifdtool/ifdtool.c +++ b/util/ifdtool/ifdtool.c @@ -27,6 +27,14 @@ #include <sys/stat.h> #include "ifdtool.h" +static const struct region_name region_names[5] = { + { "Flash Descriptor", "fd" }, + { "BIOS", "bios" }, + { "Intel ME", "me" }, + { "GbE", "gbe" }, + { "Platform Data", "pd" } +}; + static fdbar_t *find_fd(char *image, int size) { int i, found = 0; @@ -81,26 +89,30 @@ static region_t get_region(frba_t *frba, int region_type) } region.size = region.limit - region.base + 1; + if (region.size < 0) + region.size = 0; return region; } static const char *region_name(int region_type) { - static const char *regions[5] = { - "Flash Descriptor", - "BIOS", - "Intel ME", - "GbE", - "Platform Data" - }; + if (region_type < 0 || region_type > 4) { + fprintf(stderr, "Invalid region type.\n"); + exit (EXIT_FAILURE); + } + + return region_names[region_type].pretty; +} +static const char *region_name_short(int region_type) +{ if (region_type < 0 || region_type > 4) { fprintf(stderr, "Invalid region type.\n"); exit (EXIT_FAILURE); } - return regions[region_type]; + return region_names[region_type].terse; } static const char *region_filename(int region_type) @@ -129,6 +141,13 @@ static void dump_region(int num, frba_t *frba) region.size < 1 ? "(unused)" : ""); } +static void dump_region_layout(char *buf, size_t bufsize, int num, frba_t *frba) +{ + region_t region = get_region(frba, num); + snprintf(buf, bufsize, "%08x:%08x %s\n", + region.base, region.limit, region_name_short(num)); +} + static void dump_frba(frba_t * frba) { printf("Found Region Section\n"); @@ -144,6 +163,30 @@ static void dump_frba(frba_t * frba) dump_region(4, frba); } +static void dump_frba_layout(frba_t * frba, char *layout_fname) +{ + char buf[LAYOUT_LINELEN]; + size_t bufsize = LAYOUT_LINELEN; + int i; + + int layout_fd = open(layout_fname, O_WRONLY | O_CREAT | O_TRUNC, + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + if (layout_fd == -1) { + perror("Could not open file"); + exit(EXIT_FAILURE); + } + + for (i = 0; i <= 4; i++) { + dump_region_layout(buf, bufsize, i, frba); + if (write(layout_fd, buf, strlen(buf)) < 0) { + perror("Could not write to file"); + exit(EXIT_FAILURE); + } + } + close(layout_fd); + printf("Wrote layout to %s\n", layout_fname); +} + static void decode_spi_frequency(unsigned int freq) { switch (freq) { @@ -422,6 +465,17 @@ static void dump_fd(char *image, int size) dump_fmsba((fmsba_t *) (image + (((fdb->flmap2) & 0xff) << 4))); } +static void dump_layout(char *image, int size, char *layout_fname) +{ + fdbar_t *fdb = find_fd(image, size); + if (!fdb) + exit(EXIT_FAILURE); + + dump_frba_layout((frba_t *) + (image + (((fdb->flmap0 >> 16) & 0xff) << 4)), + layout_fname); +} + static void write_regions(char *image, int size) { int i; @@ -608,6 +662,7 @@ static void print_usage(const char *name) printf("usage: %s [-vhdix?] <filename>\n", name); printf("\n" " -d | --dump: dump intel firmware descriptor\n" + " -f | --layout <filename> dump regions into a flashrom layout file\n" " -x | --extract: extract intel fd modules\n" " -i | --inject <region>:<module> inject file <module> into region <region>\n" " -s | --spifreq <20|33|50> set the SPI frequency\n" @@ -626,12 +681,14 @@ int main(int argc, char *argv[]) int opt, option_index = 0; int mode_dump = 0, mode_extract = 0, mode_inject = 0, mode_spifreq = 0; int mode_em100 = 0, mode_locked = 0, mode_unlocked = 0; - char *region_type_string = NULL, *region_fname = NULL; + int mode_layout = 0; + char *region_type_string = NULL, *region_fname = NULL, *layout_fname = NULL; int region_type = -1, inputfreq = 0; enum spi_frequency spifreq = SPI_FREQUENCY_20MHZ; static struct option long_options[] = { {"dump", 0, NULL, 'd'}, + {"layout", 1, NULL, 'f'}, {"extract", 0, NULL, 'x'}, {"inject", 1, NULL, 'i'}, {"spifreq", 1, NULL, 's'}, @@ -643,12 +700,21 @@ int main(int argc, char *argv[]) {0, 0, 0, 0} }; - while ((opt = getopt_long(argc, argv, "dxi:s:eluvh?", + while ((opt = getopt_long(argc, argv, "df:xi:s:eluvh?", long_options, &option_index)) != EOF) { switch (opt) { case 'd': mode_dump = 1; break; + case 'f': + mode_layout = 1; + layout_fname = strdup(optarg); + if (!layout_fname) { + fprintf(stderr, "No layout file specified\n"); + print_usage(argv[0]); + exit(EXIT_FAILURE); + } + break; case 'x': mode_extract = 1; break; @@ -733,7 +799,7 @@ int main(int argc, char *argv[]) } } - if ((mode_dump + mode_extract + mode_inject + + if ((mode_dump + mode_layout + mode_extract + mode_inject + (mode_spifreq | mode_em100 | mode_unlocked | mode_locked)) > 1) { fprintf(stderr, "You may not specify more than one mode.\n\n"); @@ -741,8 +807,9 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } - if ((mode_dump + mode_extract + mode_inject + mode_spifreq + - mode_em100 + mode_locked + mode_unlocked) == 0) { + if ((mode_dump + mode_layout + mode_extract + mode_inject + + mode_spifreq + mode_em100 + mode_locked + + mode_unlocked) == 0) { fprintf(stderr, "You need to specify a mode.\n\n"); print_usage(argv[0]); exit(EXIT_FAILURE); @@ -785,6 +852,9 @@ int main(int argc, char *argv[]) if (mode_dump) dump_fd(image, size); + if (mode_layout) + dump_layout(image, size, layout_fname); + if (mode_extract) write_regions(image, size); diff --git a/util/ifdtool/ifdtool.h b/util/ifdtool/ifdtool.h index 7537f1d..ed8f440 100644 --- a/util/ifdtool/ifdtool.h +++ b/util/ifdtool/ifdtool.h @@ -20,6 +20,8 @@ #include <stdint.h> #define IFDTOOL_VERSION "1.1" +#define LAYOUT_LINELEN 80 + enum spi_frequency { SPI_FREQUENCY_20MHZ = 0, SPI_FREQUENCY_33MHZ = 1, @@ -109,3 +111,8 @@ typedef struct { typedef struct { int base, limit, size; } region_t; + +struct region_name { + char *pretty; + char *terse; +};

1 0

Patch set updated for coreboot: 4a26616 util/ifdtool: add option to change flash layout
by Christopher Douglass 28 Feb '14

28 Feb '14

Christopher Douglass (cdouglass.orion(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5312 -gerrit commit 4a2661620347a6e8deba6ed579f9c4ecf17c3c18 Author: Chris Douglass <cdouglass.orion(a)gmail.com> Date: Thu Feb 27 09:25:19 2014 -0500 util/ifdtool: add option to change flash layout The new option "--newlayout <file>" will read <file> in flashrom's layout format and copy flash regions from the current flash image file to a new flash image file. If a region grows, the padding is added at the beginning of the target region in the new file so that the data is "right-aligned" to the end of the region. If a region shrinks, a warning is given and the tail end of existing data is copied to the target region in the new file. Regions of zero or negative size are ignored. (In the example below 00fff000:00000fff regions are an artifact of the address encoding in the register fields.) Example Usage: Given a flash image for a board with a Sandy Bridge processor and Intel 6-Series chipset in the file vpx7654.bin ifdtool --layout layout.txt vpx7564.bin will yield the file layout.txt: 00000000:00000fff fd 00180000:003fffff bios 00001000:0017ffff me 00fff000:00000fff gbe 00fff000:00000fff pd Notice that the "bios" portion extends to the end of the 4MB flash. It may be edited to extend the bios portion to consume to the extent of an 8MB flash. like layout2.txt: 00000000:00000fff fd 00180000:007fffff bios 00001000:0017ffff me 00fff000:00000fff gbe 00fff000:00000fff pd ifdtool --newlayout layout.txt vpx7654.bin will create a file vpx7654.bin.new that is 8MB. Change-Id: I0e0925a725c40fa44d8c4b6e86552028779d0523 Signed-off-by: Christopher Douglass <cdouglass.orion(a)gmail.com> --- util/ifdtool/ifdtool.c | 238 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 234 insertions(+), 4 deletions(-) diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c index b5a0ac2..28dbaac 100644 --- a/util/ifdtool/ifdtool.c +++ b/util/ifdtool/ifdtool.c @@ -95,6 +95,35 @@ static region_t get_region(frba_t *frba, int region_type) return region; } +static void set_region(frba_t *frba, int region_type, region_t region) +{ + switch (region_type) { + case 0: + frba->flreg0 = (((region.limit >> 12) & 0x7fff) << 16) + | ((region.base >> 12) & 0x7fff); + break; + case 1: + frba->flreg1 = (((region.limit >> 12) & 0x7fff) << 16) + | ((region.base >> 12) & 0x7fff); + break; + case 2: + frba->flreg2 = (((region.limit >> 12) & 0x7fff) << 16) + | ((region.base >> 12) & 0x7fff); + break; + case 3: + frba->flreg3 = (((region.limit >> 12) & 0x7fff) << 16) + | ((region.base >> 12) & 0x7fff); + break; + case 4: + frba->flreg4 = (((region.limit >> 12) & 0x7fff) << 16) + | ((region.base >> 12) & 0x7fff); + break; + default: + fprintf(stderr, "Invalid region type.\n"); + exit (EXIT_FAILURE); + } +} + static const char *region_name(int region_type) { if (region_type < 0 || region_type > 4) { @@ -115,6 +144,20 @@ static const char *region_name_short(int region_type) return region_names[region_type].terse; } +static int region_num(const char *name) +{ + int i; + + for (i = 0; i < 5; i++) { + if (strcasecmp(name, region_names[i].pretty) == 0) + return i; + if (strcasecmp(name, region_names[i].terse) == 0) + return i; + } + + return -1; +} + static const char *region_filename(int region_type) { static const char *region_filenames[5] = { @@ -641,6 +684,179 @@ void inject_region(char *filename, char *image, int size, int region_type, write_image(filename, image, size); } +unsigned int next_pow2(unsigned int x) +{ + unsigned int y = 1; + if (x == 0) + return 0; + while (y <= x) + y = y << 1; + + return y; +} + +/** + * Determine if two memory regions overlap. + * + * @param r1, r2 Memory regions to compare. + * @return 0 if the two regions are seperate + * @return 1 if the two regions overlap + */ +static int regions_collide(region_t r1, region_t r2) +{ + if ((r1.size == 0) || (r2.size == 0)) + return 0; + + if ( ((r1.base >= r2.base) && (r1.base <= r2.limit)) || + ((r1.limit >= r2.base) && (r1.limit <= r2.limit)) ) + return 1; + + return 0; +} + +void new_layout(char *filename, char *image, int size, char *layout_fname) +{ + FILE *romlayout; + char tempstr[256]; + char layout_region_name[256]; + int i, j; + int region_number; + region_t current_regions[5]; + region_t new_regions[5]; + int new_extent = 0; + char *new_image; + + /* load current descriptor map and regions */ + fdbar_t *fdb = find_fd(image, size); + if (!fdb) + exit(EXIT_FAILURE); + + frba_t *frba = + (frba_t *) (image + (((fdb->flmap0 >> 16) & 0xff) << 4)); + + for (i = 0; i < 5; i++) { + current_regions[i] = get_region(frba, i); + new_regions[i] = get_region(frba, i); + } + + /* read new layout */ + romlayout = fopen(layout_fname, "r"); + + if (!romlayout) { + perror("Could not read layout file.\n"); + exit(EXIT_FAILURE); + } + + while (!feof(romlayout)) { + char *tstr1, *tstr2; + + if (2 != fscanf(romlayout, "%s %s\n", tempstr, + layout_region_name)) + continue; + + region_number = region_num(layout_region_name); + if (region_number < 0) + continue; + + tstr1 = strtok(tempstr, ":"); + tstr2 = strtok(NULL, ":"); + if (!tstr1 || !tstr2) { + fprintf(stderr, "Could not parse layout file.\n"); + exit(EXIT_FAILURE); + } + new_regions[region_number].base = strtol(tstr1, + (char **)NULL, 16); + new_regions[region_number].limit = strtol(tstr2, + (char **)NULL, 16); + new_regions[region_number].size = + new_regions[region_number].limit - + new_regions[region_number].base + 1; + + if (new_regions[region_number].size < 0) + new_regions[region_number].size = 0; + } + fclose(romlayout); + + /* check new layout */ + for (i = 0; i < 5; i++) { + if (new_regions[i].size == 0) + continue; + + if (new_regions[i].size < current_regions[i].size) { + printf("DANGER: Region %s is shrinking.\n", + region_name(i)); + printf(" The region will be truncated to fit.\n"); + printf(" This may result in an unusable image.\n"); + } + + for (j = i + 1; j < 5; j++) { + if (regions_collide(new_regions[i], new_regions[j])) { + fprintf(stderr, "Regions would overlap.\n"); + exit(EXIT_FAILURE); + } + } + + /* detect if the image size should grow */ + if (new_extent < new_regions[i].limit) + new_extent = new_regions[i].limit; + } + + new_extent = next_pow2(new_extent - 1); + if (new_extent != size) { + printf("The image has changed in size.\n"); + printf("The old image is %d bytes.\n", size); + printf("The new image is %d bytes.\n", new_extent); + } + + /* copy regions to a new image */ + new_image = malloc(new_extent); + memset(new_image, 0xff, new_extent); + for (i = 0; i < 5; i++) { + int copy_size = new_regions[i].size; + int offset_current = 0, offset_new = 0; + region_t current = current_regions[i]; + region_t new = new_regions[i]; + + if (new.size == 0) + continue; + + if (new.size > current.size) { + /* copy from the end of the current region */ + copy_size = current.size; + offset_new = new.size - current.size; + } + + if (new.size < current.size) { + /* copy to the end of the new region */ + offset_current = current.size - new.size; + } + + printf("Copy Descriptor %d (%s) (%d bytes)\n", i, + region_name(i), copy_size); + printf(" from %08x+%08x:%08x (%10d)\n", current.base, + offset_current, current.limit, current.size); + printf(" to %08x+%08x:%08x (%10d)\n", new.base, + offset_new, new.limit, new.size); + + memcpy(new_image + new.base + offset_new, + image + current.base + offset_current, + copy_size); + } + + /* update new descriptor regions */ + fdb = find_fd(new_image, new_extent); + if (!fdb) + exit(EXIT_FAILURE); + + frba = (frba_t *) (new_image + (((fdb->flmap0 >> 16) & 0xff) << 4)); + for (i = 1; i < 5; i++) { + set_region(frba, i, new_regions[i]); + } + + write_image(filename, new_image, new_extent); + free(new_image); +} + static void print_version(void) { printf("ifdtool v%s -- ", IFDTOOL_VERSION); @@ -665,6 +881,7 @@ static void print_usage(const char *name) " -f | --layout <filename> dump regions into a flashrom layout file\n" " -x | --extract: extract intel fd modules\n" " -i | --inject <region>:<module> inject file <module> into region <region>\n" + " -n | --newlayout <filename> update regions using a flashrom layout file\n" " -s | --spifreq <20|33|50> set the SPI frequency\n" " -e | --em100 set SPI frequency to 20MHz and disable\n" " Dual Output Fast Read Support\n" @@ -681,7 +898,7 @@ int main(int argc, char *argv[]) int opt, option_index = 0; int mode_dump = 0, mode_extract = 0, mode_inject = 0, mode_spifreq = 0; int mode_em100 = 0, mode_locked = 0, mode_unlocked = 0; - int mode_layout = 0; + int mode_layout = 0, mode_newlayout = 0; char *region_type_string = NULL, *region_fname = NULL, *layout_fname = NULL; int region_type = -1, inputfreq = 0; enum spi_frequency spifreq = SPI_FREQUENCY_20MHZ; @@ -691,6 +908,7 @@ int main(int argc, char *argv[]) {"layout", 1, NULL, 'f'}, {"extract", 0, NULL, 'x'}, {"inject", 1, NULL, 'i'}, + {"newlayout", 1, NULL, 'n'}, {"spifreq", 1, NULL, 's'}, {"em100", 0, NULL, 'e'}, {"lock", 0, NULL, 'l'}, @@ -700,7 +918,7 @@ int main(int argc, char *argv[]) {0, 0, 0, 0} }; - while ((opt = getopt_long(argc, argv, "df:xi:s:eluvh?", + while ((opt = getopt_long(argc, argv, "df:xi:n:s:eluvh?", long_options, &option_index)) != EOF) { switch (opt) { case 'd': @@ -748,6 +966,15 @@ int main(int argc, char *argv[]) } mode_inject = 1; break; + case 'n': + mode_newlayout = 1; + layout_fname = strdup(optarg); + if (!layout_fname) { + fprintf(stderr, "No layout file specified\n"); + print_usage(argv[0]); + exit(EXIT_FAILURE); + } + break; case 's': // Parse the requested SPI frequency inputfreq = strtol(optarg, NULL, 0); @@ -800,7 +1027,7 @@ int main(int argc, char *argv[]) } if ((mode_dump + mode_layout + mode_extract + mode_inject + - (mode_spifreq | mode_em100 | mode_unlocked | + mode_newlayout + (mode_spifreq | mode_em100 | mode_unlocked | mode_locked)) > 1) { fprintf(stderr, "You may not specify more than one mode.\n\n"); print_usage(argv[0]); @@ -808,7 +1035,7 @@ int main(int argc, char *argv[]) } if ((mode_dump + mode_layout + mode_extract + mode_inject + - mode_spifreq + mode_em100 + mode_locked + + mode_newlayout + mode_spifreq + mode_em100 + mode_locked + mode_unlocked) == 0) { fprintf(stderr, "You need to specify a mode.\n\n"); print_usage(argv[0]); @@ -862,6 +1089,9 @@ int main(int argc, char *argv[]) inject_region(filename, image, size, region_type, region_fname); + if (mode_newlayout) + new_layout(filename, image, size, layout_fname); + if (mode_spifreq) set_spi_frequency(filename, image, size, spifreq);

1 0

Patch set updated for coreboot: 3dea35e x86: add MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING option
by Aaron Durbin 28 Feb '14

28 Feb '14

Aaron Durbin (adurbin(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5305 -gerrit commit 3dea35e5a1a69c600feb2c16eef5d957b85c46ee Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue Feb 25 20:36:56 2014 -0600 x86: add MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING option Boot speeds can be sped up by mirroring the payload into main memory before doing the actual loading. Systems that would benefit from this are typically Intel ones whose SPI are memory mapped. Without the SPI being cached all accesses to the payload in SPI while being loaded result in uncacheable accesses. Instead take advantage of the on-board SPI controller which has an internal cache and prefetcher by copying 64-byte cachelines using 32-bit word copies. Change-Id: I4aac856b1b5130fa2d68a6c45a96cfeead472a52 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/cpu/x86/Kconfig | 9 +++++ src/cpu/x86/Makefile.inc | 1 + src/cpu/x86/mirror_payload.c | 71 ++++++++++++++++++++++++++++++++++ src/include/payload_loader.h | 3 ++ src/lib/loaders/load_and_run_payload.c | 7 ++++ 5 files changed, 91 insertions(+) diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig index 19fa246..b5bb7e6 100644 --- a/src/cpu/x86/Kconfig +++ b/src/cpu/x86/Kconfig @@ -121,3 +121,12 @@ config BACKUP_DEFAULT_SMM_REGION help The cpu support will select this option if the default SMM region needs to be backed up for suspend/resume purposes. + +config MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING + def_bool n + help + On certain platforms a boot speed gain can be realized if mirroring + the payload data stored in non-volatile storage. On x86 systems the + payload would typically live in a memory-mapped SPI part. Copying + the SPI contents to ram before performing the load can speed up + the boot process. diff --git a/src/cpu/x86/Makefile.inc b/src/cpu/x86/Makefile.inc index d5bc2fd..277ba48 100644 --- a/src/cpu/x86/Makefile.inc +++ b/src/cpu/x86/Makefile.inc @@ -3,6 +3,7 @@ romstage-$(CONFIG_HAVE_ACPI_RESUME) += car.c subdirs-$(CONFIG_PARALLEL_MP) += name ramstage-$(CONFIG_PARALLEL_MP) += mp_init.c +ramstage-$(CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING) += mirror_payload.c SIPI_ELF=$(obj)/cpu/x86/sipi_vector.elf SIPI_BIN=$(SIPI_ELF:.elf=) diff --git a/src/cpu/x86/mirror_payload.c b/src/cpu/x86/mirror_payload.c new file mode 100644 index 0000000..edd2641 --- /dev/null +++ b/src/cpu/x86/mirror_payload.c @@ -0,0 +1,71 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2014 Google Inc. + * + * 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; version 2 of the License. + * + * 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 <stdint.h> +#include <stdlib.h> +#include <string.h> +#include <console/console.h> +#include <bootmem.h> +#include <payload_loader.h> + +void mirror_payload(struct payload *payload) +{ + char *buffer; + size_t size; + char *src; + uintptr_t alignment_diff; + const unsigned long cacheline_size = 64; + const uintptr_t intra_cacheline_mask = cacheline_size - 1; + const uintptr_t cacheline_mask = ~intra_cacheline_mask; + + src = payload->backing_store.data; + size = payload->backing_store.size; + + /* + * Adjust size so that the start and end points are aligned to a + * cacheline. The SPI hardware controllers on Intel machines should + * cache full length cachelines as well as prefetch data. Once the + * data is mirrored in memory all accesses should hit the CPU's cache. + */ + alignment_diff = (intra_cacheline_mask & (uintptr_t)src); + size += alignment_diff; + + size = ALIGN(size, cacheline_size); + + printk(BIOS_DEBUG, "Payload aligned size: 0x%zx\n", size); + + buffer = bootmem_allocate_buffer(size); + + if (buffer == NULL) { + printk(BIOS_DEBUG, "No buffer for mirroring payload.\n"); + return; + } + + src = (void *)(cacheline_mask & (uintptr_t)src); + + /* + * Note that if mempcy is not using 32-bit moves the performance will + * degrade because the SPI hardware prefetchers look for + * cacheline-aligned 32-bit accesses to kick in. + */ + memcpy(buffer, src, size); + + /* Update the payload's backing store. */ + payload->backing_store.data = &buffer[alignment_diff]; +} diff --git a/src/include/payload_loader.h b/src/include/payload_loader.h index 7ef5806..7a3f045 100644 --- a/src/include/payload_loader.h +++ b/src/include/payload_loader.h @@ -44,6 +44,9 @@ struct payload *payload_load(void); /* Run the loaded payload. */ void payload_run(const struct payload *payload); +/* Mirror the payload to be loaded. */ +void mirror_payload(struct payload *payload); + /* architecture specific function to run payload. */ void arch_payload_run(const struct payload *payload); diff --git a/src/lib/loaders/load_and_run_payload.c b/src/lib/loaders/load_and_run_payload.c index 7e1383e..2204090 100644 --- a/src/lib/loaders/load_and_run_payload.c +++ b/src/lib/loaders/load_and_run_payload.c @@ -39,6 +39,11 @@ static struct payload global_payload = { .name = CONFIG_CBFS_PREFIX "/payload", }; +void __attribute__((weak)) mirror_payload(struct payload *payload) +{ + return; +} + struct payload *payload_load(void) { int i; @@ -62,6 +67,8 @@ struct payload *payload_load(void) if (i == ARRAY_SIZE(payload_ops)) return NULL; + mirror_payload(payload); + entry = selfload(payload); if (entry == NULL)

1 0

Patch merged into coreboot/master: 802956f boardstatus/towiki: Skip OVERRIDE_FANCTL
by gerrit＠coreboot.org 28 Feb '14

28 Feb '14

the following patch was just integrated into master: commit 802956f3d7061af397ac2602b664bc12424b3466 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Wed Feb 5 12:20:58 2014 +0100 boardstatus/towiki: Skip OVERRIDE_FANCTL Change-Id: I4c5f69db198c8aa4757c82856fb04aa5ee16879f Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> See http://review.coreboot.org/5123 for details. -gerrit

1 0

Patch merged into coreboot/master: ebfee55 boardstatus/towiki: Skip comments after options.
by gerrit＠coreboot.org 28 Feb '14

28 Feb '14

the following patch was just integrated into master: commit ebfee55aaaaf727b6a273387b30ac92ef69d96ac Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Wed Feb 5 12:20:24 2014 +0100 boardstatus/towiki: Skip comments after options. Change-Id: Id1213f4a44cd3a7a698b761d4942707d7dc1dee6 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> See http://review.coreboot.org/5122 for details. -gerrit

1 0

Patch merged into coreboot/master: cb1aea4 boardstatus/to-wiki.sh: Accept Kconfig with non-tab separators.
by gerrit＠coreboot.org 28 Feb '14

28 Feb '14

the following patch was just integrated into master: commit cb1aea4b43c9864f8397d84d14e6d4077f19a7da Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Tue Jan 28 04:16:41 2014 +0100 boardstatus/to-wiki.sh: Accept Kconfig with non-tab separators. Change-Id: I3812c6bd6fb11d9e98ef60afb205782f2b1f0e44 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> See http://review.coreboot.org/5069 for details. -gerrit

1 0

New patch to review for coreboot: 01ca949 util/ifdtool: add option to change flash layout
by Christopher Douglass 27 Feb '14

27 Feb '14

Christopher Douglass (cdouglass.orion(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5312 -gerrit commit 01ca949aa9cc714e3080eb529bce57f5563eef50 Author: Chris Douglass <cdouglass.orion(a)gmail.com> Date: Thu Feb 27 09:25:19 2014 -0500 util/ifdtool: add option to change flash layout The new option "--newlayout <file>" fill read <file> in flashrom's layout format and copy flash regions from the current flash image file to a new flash image file. If a region grows, the padding is added at the beginning of the target region in the new file so that the data is "right-aligned" to the end of the region. If a region shrinks, a warning is given and the tail end of existing data is copied to the target region in the new file. Regions of zero or negative size are ignored. (In the example below 00fff000:00000fff regions are an artifact of the address encoding in the register fields.) Example Usage: Given a flash image for a board with a Sandy Bridge processor and Intel 6-Series chipset in the file vpx7654.bin ifdtool --layout layout.txt vpx7564.bin will yield the file layout.txt: 00000000:00000fff fd 00180000:003fffff bios 00001000:0017ffff me 00fff000:00000fff gbe 00fff000:00000fff pd Notice that the "bios" protion extends to the end of the 4MB flash. It may be edited to extend the bios portion to consume to the extent of and 8MB flash. like layout2.txt: 00000000:00000fff fd 00180000:007fffff bios 00001000:0017ffff me 00fff000:00000fff gbe 00fff000:00000fff pd ifdtool --newlayout layout.txt vpx7654.bin Will create a file vpx7654.bin.new that is 8MB. Change-Id: I0e0925a725c40fa44d8c4b6e86552028779d0523 Signed-off-by: Christopher Douglass <cdouglass.orion(a)gmail.com> --- util/ifdtool/ifdtool.c | 228 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 224 insertions(+), 4 deletions(-) diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c index de73a20..8a44806 100644 --- a/util/ifdtool/ifdtool.c +++ b/util/ifdtool/ifdtool.c @@ -95,6 +95,35 @@ static region_t get_region(frba_t *frba, int region_type) return region; } +static void set_region(frba_t *frba, int region_type, region_t region) +{ + switch (region_type) { + case 0: + frba->flreg0 = (((region.limit >> 12) & 0x7fff) << 16) + | ((region.base >> 12) & 0x7fff); + break; + case 1: + frba->flreg1 = (((region.limit >> 12) & 0x7fff) << 16) + | ((region.base >> 12) & 0x7fff); + break; + case 2: + frba->flreg2 = (((region.limit >> 12) & 0x7fff) << 16) + | ((region.base >> 12) & 0x7fff); + break; + case 3: + frba->flreg3 = (((region.limit >> 12) & 0x7fff) << 16) + | ((region.base >> 12) & 0x7fff); + break; + case 4: + frba->flreg4 = (((region.limit >> 12) & 0x7fff) << 16) + | ((region.base >> 12) & 0x7fff); + break; + default: + fprintf(stderr, "Invalid region type.\n"); + exit (EXIT_FAILURE); + } +} + static const char *region_name(int region_type) { if (region_type < 0 || region_type > 4) { @@ -115,6 +144,20 @@ static const char *region_name_short(int region_type) return region_names[region_type].terse; } +static int region_num(const char *name) +{ + int i; + + for (i = 0; i < 5; i++) { + if (strcasecmp(name, region_names[i].pretty) == 0) + return i; + if (strcasecmp(name, region_names[i].terse) == 0) + return i; + } + + return -1; +} + static const char *region_filename(int region_type) { static const char *region_filenames[5] = { @@ -641,6 +684,169 @@ void inject_region(char *filename, char *image, int size, int region_type, write_image(filename, image, size); } +unsigned int next_pow2(unsigned int x) +{ + unsigned int y = 1; + if (x == 0) + return 0; + while (y <= x) + y = y << 1; + + return y; +} + +static int regions_collide(region_t r1, region_t r2) +{ + if ((r1.size ==0) || (r2.size = 0)) + return 0; + + if ( ((r1.base >= r2.base) && (r1.base <= r2.limit)) || + ((r1.limit >= r2.base) && (r1.limit <= r2.limit)) ) + return 1; + + return 0; +} + +void new_layout(char *filename, char *image, int size, char *layout_fname) +{ + FILE *romlayout; + char tempstr[256]; + char layout_region_name[256]; + int i, j; + int region_number; + region_t current_regions[5]; + region_t new_regions[5]; + int new_extent = 0; + char *new_image; + + /* load current descriptor map and regions */ + fdbar_t *fdb = find_fd(image, size); + if (!fdb) + exit(EXIT_FAILURE); + + frba_t *frba = + (frba_t *) (image + (((fdb->flmap0 >> 16) & 0xff) << 4)); + + for (i = 0; i < 5; i++) { + current_regions[i] = get_region(frba, i); + new_regions[i] = get_region(frba, i); + } + + /* read new layout */ + romlayout = fopen(layout_fname, "r"); + + if (!romlayout) { + perror("Could not read layout file.\n"); + exit(EXIT_FAILURE); + } + + while (!feof(romlayout)) { + char *tstr1, *tstr2; + + if (2 != fscanf(romlayout, "%s %s\n", tempstr, + layout_region_name)) + continue; + + region_number = region_num(layout_region_name); + if (region_number < 0) + continue; + + tstr1 = strtok(tempstr, ":"); + tstr2 = strtok(NULL, ":"); + if (!tstr1 || !tstr2) { + fprintf(stderr, "Could not parse layout file.\n"); + exit(EXIT_FAILURE); + } + new_regions[region_number].base = strtol(tstr1, + (char **)NULL, 16); + new_regions[region_number].limit = strtol(tstr2, + (char **)NULL, 16); + new_regions[region_number].size = + new_regions[region_number].limit - + new_regions[region_number].base + 1; + + if (new_regions[region_number].size < 0) + new_regions[region_number].size = 0; + } + fclose(romlayout); + + /* check new layout */ + for (i = 0; i < 5; i++) { + if (new_regions[i].size == 0) + continue; + + if (new_regions[i].size < current_regions[i].size) { + printf("DANGER: Region %s is shrinking.\n", + region_name(i)); + printf(" The region will be truncated to fit.\n"); + printf(" This may result in an unusable image.\n"); + } + + for (j = i + 1; j < 5; j++) { + if (regions_collide(new_regions[i], new_regions[j])) { + fprintf(stderr, "Regions would overlap.\n"); + exit(EXIT_FAILURE); + } + } + + /* detect if the image size should grow */ + if (new_extent < new_regions[i].limit) + new_extent = new_regions[i].limit; + } + + new_extent = next_pow2(new_extent - 1); + if (new_extent != size) { + printf("The image has changed in size.\n"); + printf("The old image is %d bytes.\n", size); + printf("The new image is %d bytes.\n", new_extent); + } + + /* copy regions to a new image */ + new_image = malloc(new_extent); + memset(new_image, 0xff, new_extent); + for (i = 0; i < 5; i++) { + int copy_size = new_regions[i].size; + int offset_current = 0, offset_new = 0; + region_t current = current_regions[i]; + region_t new = new_regions[i]; + + if (new.size == 0) + continue; + + if (new.size > current.size) { + /* copy from the end of the current region */ + copy_size = current.size; + offset_new = new.size - current.size; + } + + if (new.size < current.size) { + /* copy to the end of the new region */ + offset_current = current.size - new.size; + } + + printf("Copy Descriptor %d (%s) (%d bytes)\n", i, region_name(i), copy_size); + printf(" from %08x+%08x:%08x (%10d)\n", current.base, offset_current, current.limit, current.size); + printf(" to %08x+%08x:%08x (%10d)\n", new.base, offset_new, new.limit, new.size); + + memcpy(new_image + new.base + offset_new, + image + current.base + offset_current, + copy_size); + } + + /* update new descriptor regions */ + fdb = find_fd(new_image, new_extent); + if (!fdb) + exit(EXIT_FAILURE); + + frba = (frba_t *) (new_image + (((fdb->flmap0 >> 16) & 0xff) << 4)); + for (i = 1; i < 5; i++) { + set_region(frba, i, new_regions[i]); + } + + write_image(filename, new_image, new_extent); + free(new_image); +} + static void print_version(void) { printf("ifdtool v%s -- ", IFDTOOL_VERSION); @@ -665,6 +871,7 @@ static void print_usage(const char *name) " -f | --layout <filename> dump regions into a flashrom layout file\n" " -x | --extract: extract intel fd modules\n" " -i | --inject <region>:<module> inject file <module> into region <region>\n" + " -n | --newlayout <filename> update regions using a flashrom layout file\n" " -s | --spifreq <20|33|50> set the SPI frequency\n" " -e | --em100 set SPI frequency to 20MHz and disable\n" " Dual Output Fast Read Support\n" @@ -681,7 +888,7 @@ int main(int argc, char *argv[]) int opt, option_index = 0; int mode_dump = 0, mode_extract = 0, mode_inject = 0, mode_spifreq = 0; int mode_em100 = 0, mode_locked = 0, mode_unlocked = 0; - int mode_layout = 0; + int mode_layout = 0, mode_newlayout = 0; char *region_type_string = NULL, *region_fname = NULL, *layout_fname = NULL; int region_type = -1, inputfreq = 0; enum spi_frequency spifreq = SPI_FREQUENCY_20MHZ; @@ -691,6 +898,7 @@ int main(int argc, char *argv[]) {"layout", 1, NULL, 'f'}, {"extract", 0, NULL, 'x'}, {"inject", 1, NULL, 'i'}, + {"newlayout", 1, NULL, 'n'}, {"spifreq", 1, NULL, 's'}, {"em100", 0, NULL, 'e'}, {"lock", 0, NULL, 'l'}, @@ -700,7 +908,7 @@ int main(int argc, char *argv[]) {0, 0, 0, 0} }; - while ((opt = getopt_long(argc, argv, "df:xi:s:eluvh?", + while ((opt = getopt_long(argc, argv, "df:xi:n:s:eluvh?", long_options, &option_index)) != EOF) { switch (opt) { case 'd': @@ -748,6 +956,15 @@ int main(int argc, char *argv[]) } mode_inject = 1; break; + case 'n': + mode_newlayout = 1; + layout_fname = strdup(optarg); + if (!layout_fname) { + fprintf(stderr, "No layout file specified\n"); + print_usage(argv[0]); + exit(EXIT_FAILURE); + } + break; case 's': // Parse the requested SPI frequency inputfreq = strtol(optarg, NULL, 0); @@ -800,7 +1017,7 @@ int main(int argc, char *argv[]) } if ((mode_dump + mode_layout + mode_extract + mode_inject + - (mode_spifreq | mode_em100 | mode_unlocked | + mode_newlayout + (mode_spifreq | mode_em100 | mode_unlocked | mode_locked)) > 1) { fprintf(stderr, "You may not specify more than one mode.\n\n"); print_usage(argv[0]); @@ -808,7 +1025,7 @@ int main(int argc, char *argv[]) } if ((mode_dump + mode_layout + mode_extract + mode_inject + - mode_spifreq + mode_em100 + mode_locked + + mode_newlayout + mode_spifreq + mode_em100 + mode_locked + mode_unlocked) == 0) { fprintf(stderr, "You need to specify a mode.\n\n"); print_usage(argv[0]); @@ -862,6 +1079,9 @@ int main(int argc, char *argv[]) inject_region(filename, image, size, region_type, region_fname); + if (mode_newlayout) + new_layout(filename, image, size, layout_fname); + if (mode_spifreq) set_spi_frequency(filename, image, size, spifreq);

1 0

Patch set updated for coreboot: ca66112 util/ifdtool: add option to dump flashrom layout
by Christopher Douglass 27 Feb '14

27 Feb '14

Christopher Douglass (cdouglass.orion(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5306 -gerrit commit ca66112def7209eb2a025116b36fcb7151d94755 Author: Chris Douglass <cdouglass.orion(a)gmail.com> Date: Wed Feb 26 13:30:13 2014 -0500 util/ifdtool: add option to dump flashrom layout Dump the Intel Flash Descriptor map in the format expected by flashrom's "layout" option. Example usage: Given a 4MB flash image vpx7654.bin that was generated by Intel's FITC tool for a 6-Series chipset... ./ifdtool --layout l.txt vpx7654.bin cat l.txt 00000000:00000fff fd 00180000:003fffff bios 00001000:0017ffff me 00fff000:00000fff gbe 00fff000:00000fff pd Change-Id: Ib740178ed6935b5f6e1dba1be674303f9f980429 Signed-off-by: Christopher Douglass <cdouglass.orion(a)gmail.com> --- util/ifdtool/ifdtool.c | 96 +++++++++++++++++++++++++++++++++++++++++++------- util/ifdtool/ifdtool.h | 7 ++++ 2 files changed, 90 insertions(+), 13 deletions(-) diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c index 9eadc0a..de73a20 100644 --- a/util/ifdtool/ifdtool.c +++ b/util/ifdtool/ifdtool.c @@ -27,6 +27,14 @@ #include <sys/stat.h> #include "ifdtool.h" +static const struct region_name region_names[5] = { + { "Flash Descriptor", "fd" }, + { "BIOS", "bios" }, + { "Intel ME", "me" }, + { "GbE", "gbe" }, + { "Platform Data", "pd"} +}; + static fdbar_t *find_fd(char *image, int size) { int i, found = 0; @@ -81,26 +89,30 @@ static region_t get_region(frba_t *frba, int region_type) } region.size = region.limit - region.base + 1; + if (region.size < 0) + region.size = 0; return region; } static const char *region_name(int region_type) { - static const char *regions[5] = { - "Flash Descriptor", - "BIOS", - "Intel ME", - "GbE", - "Platform Data" - }; + if (region_type < 0 || region_type > 4) { + fprintf(stderr, "Invalid region type.\n"); + exit (EXIT_FAILURE); + } + + return region_names[region_type].pretty; +} +static const char *region_name_short(int region_type) +{ if (region_type < 0 || region_type > 4) { fprintf(stderr, "Invalid region type.\n"); exit (EXIT_FAILURE); } - return regions[region_type]; + return region_names[region_type].terse; } static const char *region_filename(int region_type) @@ -129,6 +141,13 @@ static void dump_region(int num, frba_t *frba) region.size < 1 ? "(unused)" : ""); } +static void dump_region_layout(char *buf, size_t bufsize, int num, frba_t *frba) +{ + region_t region = get_region(frba, num); + snprintf(buf, bufsize, "%08x:%08x %s\n", + region.base, region.limit, region_name_short(num)); +} + static void dump_frba(frba_t * frba) { printf("Found Region Section\n"); @@ -144,6 +163,30 @@ static void dump_frba(frba_t * frba) dump_region(4, frba); } +static void dump_frba_layout(frba_t * frba, char *layout_fname) +{ + char buf[LAYOUT_LINELEN]; + size_t bufsize = LAYOUT_LINELEN; + int i; + + int layout_fd = open(layout_fname, O_WRONLY | O_CREAT | O_TRUNC, + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + if (layout_fd == -1) { + perror("Could not open file"); + exit(EXIT_FAILURE); + } + + for (i = 0; i <= 4; i++) { + dump_region_layout(buf, bufsize, i, frba); + if (write(layout_fd, buf, strlen(buf)) < 0) { + perror("Could not write to file"); + exit(EXIT_FAILURE); + } + } + close(layout_fd); + printf("Wrote layout to %s\n", layout_fname); +} + static void decode_spi_frequency(unsigned int freq) { switch (freq) { @@ -422,6 +465,17 @@ static void dump_fd(char *image, int size) dump_fmsba((fmsba_t *) (image + (((fdb->flmap2) & 0xff) << 4))); } +static void dump_layout(char *image, int size, char *layout_fname) +{ + fdbar_t *fdb = find_fd(image, size); + if (!fdb) + exit(EXIT_FAILURE); + + dump_frba_layout((frba_t *) + (image + (((fdb->flmap0 >> 16) & 0xff) << 4)), + layout_fname); +} + static void write_regions(char *image, int size) { int i; @@ -608,6 +662,7 @@ static void print_usage(const char *name) printf("usage: %s [-vhdix?] <filename>\n", name); printf("\n" " -d | --dump: dump intel firmware descriptor\n" + " -f | --layout <filename> dump regions into a flashrom layout file\n" " -x | --extract: extract intel fd modules\n" " -i | --inject <region>:<module> inject file <module> into region <region>\n" " -s | --spifreq <20|33|50> set the SPI frequency\n" @@ -626,12 +681,14 @@ int main(int argc, char *argv[]) int opt, option_index = 0; int mode_dump = 0, mode_extract = 0, mode_inject = 0, mode_spifreq = 0; int mode_em100 = 0, mode_locked = 0, mode_unlocked = 0; - char *region_type_string = NULL, *region_fname = NULL; + int mode_layout = 0; + char *region_type_string = NULL, *region_fname = NULL, *layout_fname = NULL; int region_type = -1, inputfreq = 0; enum spi_frequency spifreq = SPI_FREQUENCY_20MHZ; static struct option long_options[] = { {"dump", 0, NULL, 'd'}, + {"layout", 1, NULL, 'f'}, {"extract", 0, NULL, 'x'}, {"inject", 1, NULL, 'i'}, {"spifreq", 1, NULL, 's'}, @@ -643,12 +700,21 @@ int main(int argc, char *argv[]) {0, 0, 0, 0} }; - while ((opt = getopt_long(argc, argv, "dxi:s:eluvh?", + while ((opt = getopt_long(argc, argv, "df:xi:s:eluvh?", long_options, &option_index)) != EOF) { switch (opt) { case 'd': mode_dump = 1; break; + case 'f': + mode_layout = 1; + layout_fname = strdup(optarg); + if (!layout_fname) { + fprintf(stderr, "No layout file specified\n"); + print_usage(argv[0]); + exit(EXIT_FAILURE); + } + break; case 'x': mode_extract = 1; break; @@ -733,7 +799,7 @@ int main(int argc, char *argv[]) } } - if ((mode_dump + mode_extract + mode_inject + + if ((mode_dump + mode_layout + mode_extract + mode_inject + (mode_spifreq | mode_em100 | mode_unlocked | mode_locked)) > 1) { fprintf(stderr, "You may not specify more than one mode.\n\n"); @@ -741,8 +807,9 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } - if ((mode_dump + mode_extract + mode_inject + mode_spifreq + - mode_em100 + mode_locked + mode_unlocked) == 0) { + if ((mode_dump + mode_layout + mode_extract + mode_inject + + mode_spifreq + mode_em100 + mode_locked + + mode_unlocked) == 0) { fprintf(stderr, "You need to specify a mode.\n\n"); print_usage(argv[0]); exit(EXIT_FAILURE); @@ -785,6 +852,9 @@ int main(int argc, char *argv[]) if (mode_dump) dump_fd(image, size); + if (mode_layout) + dump_layout(image, size, layout_fname); + if (mode_extract) write_regions(image, size); diff --git a/util/ifdtool/ifdtool.h b/util/ifdtool/ifdtool.h index 7537f1d..ed8f440 100644 --- a/util/ifdtool/ifdtool.h +++ b/util/ifdtool/ifdtool.h @@ -20,6 +20,8 @@ #include <stdint.h> #define IFDTOOL_VERSION "1.1" +#define LAYOUT_LINELEN 80 + enum spi_frequency { SPI_FREQUENCY_20MHZ = 0, SPI_FREQUENCY_33MHZ = 1, @@ -109,3 +111,8 @@ typedef struct { typedef struct { int base, limit, size; } region_t; + +struct region_name { + char *pretty; + char *terse; +};

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit February 2014