July 2018 - flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: Add support to get layout from fmap (e.g. coreboot rom)
by David Hendricks (Code Review) July 20, 2018

July 20, 2018

David Hendricks has uploaded a new patch set (#12) to the change originally created by Arthur Heymans. ( https://review.coreboot.org/23203 ) Change subject: Add support to get layout from fmap (e.g. coreboot rom) ...................................................................... Add support to get layout from fmap (e.g. coreboot rom) Using the --fmap argument one can give flashrom a layout in fmap binary format like is found of coreboot roms (it will also look for this on coreboot roms). An example of how to use: "flashrom -p programmer --fmap coreboot.rom -w coreboot.rom -i COREBOOT" to only flash the COREBOOT fmap region. The fmap functions are mostly copied from cbfstool. Currently it is made mutually exclusive with --ifd while still allowing --layout until we are more clever about this input. Change-Id: I0e7fad38ed79a84d41358e1f175c36d255786c12 Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M Makefile M cli_classic.c M flashrom.8.tmpl A fmap.c A fmap.h M layout.c 6 files changed, 254 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/03/23203/12 -- To view, visit https://review.coreboot.org/23203 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0e7fad38ed79a84d41358e1f175c36d255786c12 Gerrit-Change-Number: 23203 Gerrit-PatchSet: 12 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Werner Zeh <werner.zeh(a)siemens.com>

1 0

Change in flashrom[master]: Forward-port Arthur's patch for latest upstream flashrom
by David Hendricks (Code Review) July 20, 2018

July 20, 2018

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/27479 to look at the new patch set (#2). Change subject: Forward-port Arthur's patch for latest upstream flashrom ...................................................................... Forward-port Arthur's patch for latest upstream flashrom This should probably be squashed into Arthur's patch. Change-Id: I0e0866cb836e6a3af2294d4bdcfefe38d65d0e6a Signed-off-by: David Hendricks <dhendricks(a)fb.com> --- M cli_classic.c M fmap.h M layout.c M libflashrom.c M libflashrom.h 5 files changed, 84 insertions(+), 52 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/79/27479/2 -- To view, visit https://review.coreboot.org/27479 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0e0866cb836e6a3af2294d4bdcfefe38d65d0e6a Gerrit-Change-Number: 27479 Gerrit-PatchSet: 2 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[master]: Add ability to read fmap from ROM
by David Hendricks (Code Review) July 20, 2018

July 20, 2018

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/27480 to look at the new patch set (#2). Change subject: Add ability to read fmap from ROM ...................................................................... Add ability to read fmap from ROM This adds logic to search the ROM for the flashmap. It also changes the fmap-related CLI options so that --fmap will cause flashrom to search the ROM for the fmap, while --fmap-file <filename> will look in <filename>. Signed-off-by: David Hendricks <dhendricks(a)fb.com> Change-Id: I83119528afeef7a864e7b774b7b7d60cb9750bb4 --- M cli_classic.c M fmap.c M fmap.h M libflashrom.c 4 files changed, 147 insertions(+), 28 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/80/27480/2 -- To view, visit https://review.coreboot.org/27480 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I83119528afeef7a864e7b774b7b7d60cb9750bb4 Gerrit-Change-Number: 27480 Gerrit-PatchSet: 2 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[master]: digilent_spi: Avoid deprecated libusb functions
by Martin Roth (Code Review) July 17, 2018

July 17, 2018

Martin Roth has posted comments on this change. ( https://review.coreboot.org/27503 ) Change subject: digilent_spi: Avoid deprecated libusb functions ...................................................................... Patch Set 1: Code-Review+2 Passes on new builder. -- To view, visit https://review.coreboot.org/27503 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie139de36f15c4f4d87787cab0f968a2f0e6f0c8c Gerrit-Change-Number: 27503 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Tue, 17 Jul 2018 16:41:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in flashrom[master]: board_enable.c: Fix dmi_match string for ThinkPad X201
by Paul Menzel (Code Review) July 17, 2018

July 17, 2018

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/27504 ) Change subject: board_enable.c: Fix dmi_match string for ThinkPad X201 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/27504 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I40dc7204499323148707b392d94ecd4b212f9ace Gerrit-Change-Number: 27504 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Tue, 17 Jul 2018 13:21:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in flashrom[master]: board_enable.c: Fix dmi_match string for ThinkPad X201
by Patrick Rudolph (Code Review) July 17, 2018

July 17, 2018

Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/27504 ) Change subject: board_enable.c: Fix dmi_match string for ThinkPad X201 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/27504 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I40dc7204499323148707b392d94ecd4b212f9ace Gerrit-Change-Number: 27504 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Tue, 17 Jul 2018 05:58:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in flashrom[master]: board_enable.c: Fix dmi_match string for ThinkPad X201
by Arthur Heymans (Code Review) July 17, 2018

July 17, 2018

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/27504 Change subject: board_enable.c: Fix dmi_match string for ThinkPad X201 ...................................................................... board_enable.c: Fix dmi_match string for ThinkPad X201 TESTED, flashrom now properly works on Thinkpad X201 running vendor firmware. Change-Id: I40dc7204499323148707b392d94ecd4b212f9ace Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M board_enable.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/04/27504/1 diff --git a/board_enable.c b/board_enable.c index c3494bd..9d45813 100644 --- a/board_enable.c +++ b/board_enable.c @@ -2434,7 +2434,7 @@ {0x8086, 0x27a0, 0x17aa, 0x2017, 0x8086, 0x27b9, 0x17aa, 0x2009, "^ThinkPad T60", NULL, NULL, P2, "IBM/Lenovo", "ThinkPad T60(s)", 0, OK, p2_whitelist_laptop}, {0x8086, 0x2917, 0x17AA, 0x20F5, 0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad W500", NULL, NULL, P2, "IBM/Lenovo", "ThinkPad W500", 0, OK, p2_whitelist_laptop}, {0x8086, 0x2917, 0x17AA, 0x20F5, 0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad X200", NULL, NULL, P2, "IBM/Lenovo", "ThinkPad X200", 0, OK, p2_whitelist_laptop}, - {0x8086, 0x3B07, 0x17AA, 0x2166, 0x8086, 0x3B30, 0x17AA, 0x2167, "^Lenovo X201", NULL, NULL, P2, "IBM/Lenovo", "ThinkPad X201", 0, OK, p2_whitelist_laptop}, + {0x8086, 0x3B07, 0x17AA, 0x2166, 0x8086, 0x3B30, 0x17AA, 0x2167, "^ThinkPad X201", NULL, NULL, P2, "IBM/Lenovo", "ThinkPad X201", 0, OK, p2_whitelist_laptop}, {0x8086, 0x1C22, 0x17AA, 0x21DB, 0x8086, 0x1C4F, 0x17AA, 0x21DB, NULL, "lenovo", "x220", P2, "IBM/Lenovo", "ThinkPad X220", 0, OK, p2_whitelist_laptop}, {0x8086, 0x1E22, 0x17AA, 0x21FA, 0x8086, 0x1E55, 0x17AA, 0x21FA, "^ThinkPad X230", NULL, NULL, P2, "IBM/Lenovo", "ThinkPad X230", 0, OK, p2_whitelist_laptop}, {0x8086, 0x27A0, 0x17AA, 0x2017, 0x8086, 0x27B9, 0x17AA, 0x2009, "^ThinkPad X60", NULL, NULL, P2, "IBM/Lenovo", "ThinkPad X60(s)", 0, OK, p2_whitelist_laptop}, -- To view, visit https://review.coreboot.org/27504 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I40dc7204499323148707b392d94ecd4b212f9ace Gerrit-Change-Number: 27504 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>

1 0

Change in flashrom[master]: digilent_spi: Avoid deprecated libusb functions
by Arthur Heymans (Code Review) July 17, 2018

July 17, 2018

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/27503 Change subject: digilent_spi: Avoid deprecated libusb functions ...................................................................... digilent_spi: Avoid deprecated libusb functions libusb 1.0.22 marked libusb_set_debug as deprecated. For such versions of libusb, use libusb_set_option instead. Change-Id: Ie139de36f15c4f4d87787cab0f968a2f0e6f0c8c Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M digilent_spi.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/03/27503/1 diff --git a/digilent_spi.c b/digilent_spi.c index 458e1b6..d42c90f 100644 --- a/digilent_spi.c +++ b/digilent_spi.c @@ -386,7 +386,11 @@ return -1; } +#if LIBUSB_API_VERSION < 0x01000106 libusb_set_debug(NULL, 3); +#else + libusb_set_option(NULL, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_INFO); +#endif uint16_t vid = devs_digilent_spi[0].vendor_id; uint16_t pid = devs_digilent_spi[0].device_id; -- To view, visit https://review.coreboot.org/27503 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie139de36f15c4f4d87787cab0f968a2f0e6f0c8c Gerrit-Change-Number: 27503 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>

1 0

Change in flashrom[master]: Forward-port Arthur's patch for latest upstream flashrom
by David Hendricks (Code Review) July 14, 2018

July 14, 2018

David Hendricks has uploaded this change for review. ( https://review.coreboot.org/27479 Change subject: Forward-port Arthur's patch for latest upstream flashrom ...................................................................... Forward-port Arthur's patch for latest upstream flashrom This should probably be squashed into Arthur's patch. Change-Id: I0e0866cb836e6a3af2294d4bdcfefe38d65d0e6a Signed-off-by: David Hendricks <dhendricks(a)fb.com> --- M cli_classic.c M fmap.h M layout.c M libflashrom.c M libflashrom.h 5 files changed, 73 insertions(+), 52 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/79/27479/1 diff --git a/cli_classic.c b/cli_classic.c index b3a7478..4b1999f 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -420,12 +420,7 @@ goto out; } - if (fmapfile && read_fmapfile(fmapfile)) { - ret = 1; - goto out; - } - - if (!ifd && process_include_args(get_global_layout())) { + if (!ifd && !fmapfile && process_include_args(get_global_layout())) { ret = 1; goto out; } @@ -584,6 +579,10 @@ process_include_args(layout))) { ret = 1; goto out_shutdown; + } else if (fmapfile && (flashrom_layout_read_from_fmap(&layout, fill_flash, fmapfile) || + process_include_args(layout))) { + ret = 1; + goto out_shutdown; } flashrom_layout_set(fill_flash, layout); diff --git a/fmap.h b/fmap.h index 51655c2..ee4c16f 100644 --- a/fmap.h +++ b/fmap.h @@ -26,4 +26,3 @@ } __attribute__((packed)); long int fmap_find(const uint8_t *image, unsigned int image_len); -int read_fmapfile(const char *filename); diff --git a/layout.c b/layout.c index 4a093c7..5207bb3 100644 --- a/layout.c +++ b/layout.c @@ -102,50 +102,6 @@ return 0; } -int read_fmapfile(const char *filename) -{ - int i; - FILE *fmapfile; - struct stat st; - - stat(filename, &st); - size_t filesize = st.st_size; - uint8_t *buff = malloc(filesize); - - fmapfile = fopen(filename, "r"); - - if (!fmapfile) { - msg_gerr("ERROR: Could not open fmap file (%s).\n", filename); - return -1; - } - - fread(buff, filesize, 1, fmapfile); - unsigned long int offset = fmap_find(buff, filesize); - if (offset < 0) { - msg_gerr("ERROR: Invalid fmap file (%s).\n", filename); - return -1; - } - - const struct fmap *fmap = (const struct fmap *)(buff + offset); - - for (i = 0; i < fmap->nareas; i++) { - layout.entries[layout.num_entries].start = fmap->areas[i].offset; - layout.entries[layout.num_entries].end = fmap->areas[i].offset + fmap->areas[i].size - 1; - layout.entries[layout.num_entries].included = false; - memcpy(layout.entries[layout.num_entries].name, fmap->areas[i].name, - sizeof(layout.entries[i].name)); - msg_gdbg("fmap %08x - %08x named %s\n", - layout.entries[layout.num_entries].start, - layout.entries[layout.num_entries].end, - layout.entries[layout.num_entries].name); - layout.num_entries++; - } - - free(buff); - (void)fclose(fmapfile); - return 0; -} - #endif /* returns the index of the entry (or a negative value if it is not found) */ diff --git a/libflashrom.c b/libflashrom.c index 34e881a..28e1999 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -23,8 +23,10 @@ #include <stdlib.h> #include <string.h> #include <stdarg.h> +#include <sys/stat.h> #include "flash.h" +#include "fmap.h" #include "programmer.h" #include "layout.h" #include "hwaccess.h" @@ -383,6 +385,69 @@ } /** + * @brief Read a layout from flashmap (fmap) from a file. + * + * @param[out] layout Points to a struct flashrom_layout pointer that + * gets set if the fmap is read and parsed successfully. + * @param[in] flashctx Flash context + * + * @return 0 on success, + * 3 if the fmap in file couldn't be parsed, + * 2 if the fmap in file couldn't be read, + * 1 on any other error. + */ +int flashrom_layout_read_from_fmap(struct flashrom_layout **const layout, struct flashctx *const flashctx, + const char *filename) +{ + int i; + FILE *fmapfile; + struct stat st; + + stat(filename, &st); + size_t filesize = st.st_size; + uint8_t *buff = malloc(filesize); + + fmapfile = fopen(filename, "r"); + + if (!fmapfile) { + msg_gerr("ERROR: Could not open fmap file (%s).\n", filename); + return 1; + } + + if (!fread(buff, filesize, 1, fmapfile)) { + msg_gerr("ERROR: Cannot read fmap file (%s).\n", filename); + return 1; + } + + unsigned long int offset = fmap_find(buff, filesize); + if (offset < 0) { + msg_gerr("ERROR: Invalid fmap file (%s).\n", filename); + return 2; + } + + const struct fmap *fmap = (const struct fmap *)(buff + offset); + + struct flashrom_layout *l = get_global_layout(); + for (i = 0; i < fmap->nareas; i++) { + l->entries[l->num_entries].start = fmap->areas[i].offset; + l->entries[l->num_entries].end = fmap->areas[i].offset + fmap->areas[i].size - 1; + l->entries[l->num_entries].included = false; + memcpy(l->entries[l->num_entries].name, fmap->areas[i].name, + sizeof(l->entries[i].name)); + msg_gdbg("fmap %08x - %08x named %s\n", + l->entries[l->num_entries].start, + l->entries[l->num_entries].end, + l->entries[l->num_entries].name); + l->num_entries++; + } + + free(buff); + (void)fclose(fmapfile); + *layout = l; + return 0; +} + +/** * @brief Free a layout. * * @param layout Layout to free. diff --git a/libflashrom.h b/libflashrom.h index 04907b2..2cf6d90 100644 --- a/libflashrom.h +++ b/libflashrom.h @@ -61,8 +61,10 @@ struct flashrom_layout; int flashrom_layout_read_from_ifd(struct flashrom_layout **, struct flashrom_flashctx *, const void *dump, size_t len); +int flashrom_layout_read_from_fmap(struct flashrom_layout **const layout, struct flashrom_flashctx *const flashctx, + const char *filename); int flashrom_layout_include_region(struct flashrom_layout *, const char *name); void flashrom_layout_release(struct flashrom_layout *); void flashrom_layout_set(struct flashrom_flashctx *, const struct flashrom_layout *); -#endif /* !__LIBFLASHROM_H__ */ \ No newline at end of file +#endif /* !__LIBFLASHROM_H__ */ -- To view, visit https://review.coreboot.org/27479 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0e0866cb836e6a3af2294d4bdcfefe38d65d0e6a Gerrit-Change-Number: 27479 Gerrit-PatchSet: 1 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com>

1 0

Change in flashrom[master]: Add ability to read fmap from ROM
by David Hendricks (Code Review) July 14, 2018

July 14, 2018

David Hendricks has uploaded this change for review. ( https://review.coreboot.org/27480 Change subject: Add ability to read fmap from ROM ...................................................................... Add ability to read fmap from ROM This adds logic to search the ROM for the flashmap. It also changes the fmap-related CLI options so that --fmap will cause flashrom to search the ROM for the fmap, while --fmap-file <filename> will look in <filename>. Signed-off-by: David Hendricks <dhendricks(a)fb.com> Change-Id: I83119528afeef7a864e7b774b7b7d60cb9750bb4 --- M cli_classic.c M fmap.c M fmap.h M libflashrom.c 4 files changed, 139 insertions(+), 29 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/80/27480/1 diff --git a/cli_classic.c b/cli_classic.c index 4b1999f..9d9f3e1 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -99,7 +99,7 @@ struct flashctx *fill_flash; const char *name; int namelen, opt, i, j; - int startchip = -1, chipcount = 0, option_index = 0, force = 0, ifd = 0; + int startchip = -1, chipcount = 0, option_index = 0, force = 0, ifd = 0, fmap = 0; #if CONFIG_PRINT_WIKI == 1 int list_supported_wiki = 0; #endif @@ -109,7 +109,8 @@ enum programmer prog = PROGRAMMER_INVALID; enum { OPTION_IFD = 0x0100, - OPTION_FMAP = 0x0101, + OPTION_FMAP, + OPTION_FMAP_FILE, OPTION_FLASH_CONTENTS, }; int ret = 0; @@ -127,7 +128,8 @@ {"force", 0, NULL, 'f'}, {"layout", 1, NULL, 'l'}, {"ifd", 0, NULL, OPTION_IFD}, - {"fmap", 1, NULL, OPTION_FMAP}, + {"fmap", 0, NULL, OPTION_FMAP}, + {"fmap-file", 1, NULL, OPTION_FMAP_FILE}, {"image", 1, NULL, 'i'}, {"flash-contents", 1, NULL, OPTION_FLASH_CONTENTS}, {"list-supported", 0, NULL, 'L'}, @@ -244,9 +246,13 @@ } ifd = 1; break; + case OPTION_FMAP_FILE: + if (optarg) + fmapfile = strdup(optarg); + /* fall through */ case OPTION_FMAP: if (fmapfile) { - fprintf(stderr, "Error: --fmap specified " + fprintf(stderr, "Error: --fmap or --fmap-file specified " "more than once. Aborting.\n"); cli_classic_abort_usage(); } @@ -254,7 +260,7 @@ fprintf(stderr, "Error: --fmap and --ifd both specified. Aborting.\n"); cli_classic_abort_usage(); } - fmapfile = strdup(optarg); + fmap = 1; break; case 'i': tempstr = strdup(optarg); @@ -420,7 +426,7 @@ goto out; } - if (!ifd && !fmapfile && process_include_args(get_global_layout())) { + if (!ifd && !fmap && process_include_args(get_global_layout())) { ret = 1; goto out; } @@ -579,7 +585,7 @@ process_include_args(layout))) { ret = 1; goto out_shutdown; - } else if (fmapfile && (flashrom_layout_read_from_fmap(&layout, fill_flash, fmapfile) || + } else if (fmap && (flashrom_layout_read_from_fmap(&layout, fill_flash, fmapfile) || process_include_args(layout))) { ret = 1; goto out_shutdown; diff --git a/fmap.c b/fmap.c index d915d2d..992ae44 100644 --- a/fmap.c +++ b/fmap.c @@ -5,7 +5,7 @@ #include "fmap.h" #include "flash.h" -static int is_valid_fmap(const struct fmap *fmap) +int is_valid_fmap(const struct fmap *fmap) { if (memcmp(fmap, FMAP_SIGNATURE, strlen(FMAP_SIGNATURE)) != 0) return 0; diff --git a/fmap.h b/fmap.h index ee4c16f..fa6ace2 100644 --- a/fmap.h +++ b/fmap.h @@ -25,4 +25,5 @@ struct fmap_area areas[]; } __attribute__((packed)); +int is_valid_fmap(const struct fmap *fmap); long int fmap_find(const uint8_t *image, unsigned int image_len); diff --git a/libflashrom.c b/libflashrom.c index 28e1999..ba04135 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -384,22 +384,9 @@ #endif } -/** - * @brief Read a layout from flashmap (fmap) from a file. - * - * @param[out] layout Points to a struct flashrom_layout pointer that - * gets set if the fmap is read and parsed successfully. - * @param[in] flashctx Flash context - * - * @return 0 on success, - * 3 if the fmap in file couldn't be parsed, - * 2 if the fmap in file couldn't be read, - * 1 on any other error. - */ -int flashrom_layout_read_from_fmap(struct flashrom_layout **const layout, struct flashctx *const flashctx, - const char *filename) +static int read_fmap_from_file(struct fmap **fmap_out, const char *filename) { - int i; + int ret = 0; FILE *fmapfile; struct stat st; @@ -408,24 +395,141 @@ uint8_t *buff = malloc(filesize); fmapfile = fopen(filename, "r"); - if (!fmapfile) { msg_gerr("ERROR: Could not open fmap file (%s).\n", filename); - return 1; + ret = 1; + goto out; } if (!fread(buff, filesize, 1, fmapfile)) { msg_gerr("ERROR: Cannot read fmap file (%s).\n", filename); - return 1; + ret = 1; + goto out; } unsigned long int offset = fmap_find(buff, filesize); if (offset < 0) { msg_gerr("ERROR: Invalid fmap file (%s).\n", filename); - return 2; + ret = 2; + goto out; } const struct fmap *fmap = (const struct fmap *)(buff + offset); + size_t len = sizeof(struct fmap) + sizeof(struct fmap_area) * fmap->nareas; + *fmap_out = malloc(len); + if (!fmap_out) { + msg_gerr("Out of memory.\n"); + ret = 1; + goto out; + } + memcpy(*fmap_out, fmap, len); + +out: + (void)fclose(fmapfile); + return ret; +} + +static int read_fmap_from_chip(struct fmap **fmap_out, struct flashctx *const flashctx) +{ + size_t stride, fmap_len = 0; + int ret = 1; + struct fmap *fmap; + unsigned int chip_size = flashctx->chip->total_size * 1024; + uint8_t signature[strlen(FMAP_SIGNATURE)]; + + if (!flashctx || !flashctx->chip) + return 1; + + if (prepare_flash_access(flashctx, true, false, false, false)) + return 1; + + /* FIXME: This duplicates the logic in fmap_bsearch(). We should + * refactor that function to be more generic. */ + for (stride = chip_size / 2; stride >= 16; stride /= 2) { + int fmap_found = 0; + unsigned int offset; + + for (offset = 0; + offset < chip_size - sizeof(struct fmap); + offset += stride) { + if ((offset % (stride * 2) == 0) && (offset != 0)) + continue; + + if (flashctx->chip->read(flashctx, signature, offset, strlen(FMAP_SIGNATURE))) { + msg_cerr("Cannot read %zu bytes at offset %u\n", strlen(FMAP_SIGNATURE), offset); + break; + } + + if (memcmp(signature, FMAP_SIGNATURE, strlen(FMAP_SIGNATURE)) != 0) + continue; + + if (chip_size - offset < sizeof(struct fmap)) { + msg_gerr("Flashmap is truncated, aborting.\n"); + ret = 2; + break; + } + + fmap = malloc(sizeof(struct fmap)); + if (flashctx->chip->read(flashctx, (uint8_t *)fmap, offset, sizeof(*fmap))) { + msg_cerr("Cannot read %zu bytes at offset %06x\n", sizeof(*fmap), offset); + break; + } + + fmap_len = sizeof(struct fmap) + sizeof(struct fmap_area) * fmap->nareas; + fmap = realloc(fmap, fmap_len); + + if (flashctx->chip->read(flashctx, (uint8_t *)fmap, offset, fmap_len)) { + msg_cerr("Cannot read %zu bytes at offset %06x\n", fmap_len, offset); + break; + } + + if (is_valid_fmap(fmap)) { + fmap_found = 1; + *fmap_out = fmap; + ret = 0; + msg_gdbg("Flashmap found at offset 0x%06x\n", offset); + } else { + ret = 2; + msg_gdbg("Flashmap is invalid.\n"); + } + break; + } + + if (fmap_found) + break; + } + + return ret; +} + +/** + * @brief Read a layout from flashmap (fmap) from a file. + * + * @param[out] layout Points to a struct flashrom_layout pointer that + * gets set if the fmap is read and parsed successfully. + * @param[in] flashctx Flash context + * @param[in] filename (Optional) Name of file containing flashmap. If NULL, + * flashmap will be read from contents on chip. + * + * @return 0 on success, + * 2 if the fmap couldn't be read, + * 1 on any other error. + */ +int flashrom_layout_read_from_fmap(struct flashrom_layout **const layout, struct flashctx *const flashctx, + const char *filename) +{ + int i, ret; + struct fmap *fmap = NULL; + + if (filename) { + msg_gdbg("Attempting to read fmap from file %s.\n", filename); + ret = read_fmap_from_file(&fmap, filename); + } else { + msg_gdbg("Attempting to read fmap from ROM content.\n"); + ret = read_fmap_from_chip(&fmap, flashctx); + } + if (ret) + return ret; struct flashrom_layout *l = get_global_layout(); for (i = 0; i < fmap->nareas; i++) { @@ -441,8 +545,7 @@ l->num_entries++; } - free(buff); - (void)fclose(fmapfile); + free(fmap); *layout = l; return 0; } -- To view, visit https://review.coreboot.org/27480 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I83119528afeef7a864e7b774b7b7d60cb9750bb4 Gerrit-Change-Number: 27480 Gerrit-PatchSet: 1 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com>

1 0