June 2019 - flashrom-gerrit - mail.coreboot.org

Change in ...flashrom[staging]: print: Update Asus URLs to use more secure HTTPS
by Nico Huber (Code Review) 20 Jun '19

20 Jun '19

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/22354 ) Change subject: print: Update Asus URLs to use more secure HTTPS ...................................................................... Patch Set 3: Please cherry-pick for master branch or abandon. -- To view, visit https://review.coreboot.org/c/flashrom/+/22354 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-Change-Id: I62319bfbf39c73f98ed3f865a11f4fe870befee4 Gerrit-Change-Number: 22354 Gerrit-PatchSet: 3 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-Comment-Date: Thu, 20 Jun 2019 13:08:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in ...flashrom[1.0.x]: Fix serprog on FreeBSD
by Nico Huber (Code Review) 20 Jun '19

20 Jun '19

Nico Huber has abandoned this change. ( https://review.coreboot.org/c/flashrom/+/22334 ) Change subject: Fix serprog on FreeBSD ...................................................................... Abandoned I don't care anymore. -- To view, visit https://review.coreboot.org/c/flashrom/+/22334 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: 1.0.x Gerrit-Change-Id: I7aa6a283d523c544d9b8923cd4c622bf08c0fb3f Gerrit-Change-Number: 22334 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Urja Rannikko <urjaman(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: abandon

1 0

Change in ...flashrom[staging]: nicintel_eeprom: Reduce usage of is_i210()
by Nico Huber (Code Review) 20 Jun '19

20 Jun '19

Nico Huber has abandoned this change. ( https://review.coreboot.org/c/flashrom/+/21935 ) Change subject: nicintel_eeprom: Reduce usage of is_i210() ...................................................................... Abandoned cherry-picked to master -- To view, visit https://review.coreboot.org/c/flashrom/+/21935 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-Change-Id: I59164ccf54afbbd64a0598282d13e80ff7fd6fa4 Gerrit-Change-Number: 21935 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.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-MessageType: abandon

1 0

Change in ...flashrom[staging]: Constify arguments in flashrom_image_* prototypes
by Nico Huber (Code Review) 20 Jun '19

20 Jun '19

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/20812 ) Change subject: Constify arguments in flashrom_image_* prototypes ...................................................................... Patch Set 1: Can be abandoned? -- To view, visit https://review.coreboot.org/c/flashrom/+/20812 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-Change-Id: I5840b95f9f9254e20d99bd01d0b1009c4b2252c4 Gerrit-Change-Number: 20812 Gerrit-PatchSet: 1 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 20 Jun 2019 12:54:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in ...flashrom[master]: dediprog: Break apart large (>=32MiB) transfers
by David Hendricks (Code Review) 20 Jun '19

20 Jun '19

David Hendricks has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/30520 Change subject: dediprog: Break apart large (>=32MiB) transfers ...................................................................... dediprog: Break apart large (>=32MiB) transfers The 2-byte length defined in the command spec appears to be 1-based, that is to say that we can transfer 65536 - 1 data packets of 512 bytes in one bulk read request, just shy of 32MiB. Attempting to read >=32MiB at once will result in bulk read failure (with "SPI bulk read failed!" messages). This patch breaks the transfer at 32MiB - 512 bytes to avoid that. Tested using an SF600 (FW v7.2.21), IS25LP256D, W25Q256JV, and MX25L25735. Change-Id: Ia42253137719607c1525581049239cc9e88880a3 Signed-off-by: David Hendricks <david.hendricks(a)gmail.com> --- M dediprog.c 1 file changed, 23 insertions(+), 9 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/20/30520/1 diff --git a/dediprog.c b/dediprog.c index 7738459..2a190d2 100644 --- a/dediprog.c +++ b/dediprog.c @@ -557,6 +557,7 @@ const unsigned int chunksize = 0x200; unsigned int residue = start % chunksize ? min(len, chunksize - start % chunksize) : 0; unsigned int bulklen; + uint32_t max_xfer = 0x2000000 - chunksize; dediprog_set_leds(LED_BUSY); @@ -570,18 +571,31 @@ /* Round down. */ bulklen = (len - residue) / chunksize * chunksize; - ret = dediprog_spi_bulk_read(flash, buf + residue, start + residue, bulklen); - if (ret) - goto err; - len -= residue + bulklen; - if (len != 0) { - msg_pdbg("Slow read for partial block from 0x%x, length 0x%x\n", - start, len); - ret = spi_read_chunked(flash, buf + residue + bulklen, - start + residue + bulklen, len, 16); + /* Break apart large transfers (32MB - chunksize) to avoid "SPI bulk + * read failed!" errors */ + while (bulklen > 0) { + unsigned int xfer_size = min(bulklen, max_xfer); + ret = dediprog_spi_bulk_read(flash, buf + residue, start + residue, xfer_size); if (ret) goto err; + + len -= residue + xfer_size; + if (len == chunksize) { + ret = dediprog_spi_bulk_read(flash, + buf + residue + xfer_size, + start + residue + xfer_size, chunksize); + len -= chunksize; + bulklen -= chunksize; + } else if (len != 0) { + msg_pdbg("Slow read for partial block from 0x%x, length 0x%x\n", + start, len); + ret = spi_read_chunked(flash, buf + residue + xfer_size, + start + residue + xfer_size, len, 16); + if (ret) + goto err; + } + bulklen -= xfer_size; } dediprog_set_leds(LED_PASS); -- To view, visit https://review.coreboot.org/c/flashrom/+/30520 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia42253137719607c1525581049239cc9e88880a3 Gerrit-Change-Number: 30520 Gerrit-PatchSet: 1 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-MessageType: newchange

1 1

Change in ...flashrom[master]: layout: Introduce layout_next_included()
by Nico Huber (Code Review) 17 Jun '19

17 Jun '19

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/flashrom/+/33518 ) Change subject: layout: Introduce layout_next_included() ...................................................................... layout: Introduce layout_next_included() Change-Id: Ib01c8af06c3f84eafbd585760e74c3c287b9fa7d Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/33518 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M flashrom.c M layout.c M layout.h 3 files changed, 31 insertions(+), 21 deletions(-) Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved diff --git a/flashrom.c b/flashrom.c index 2d3cd18..b47d0a2 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1597,14 +1597,11 @@ static int read_by_layout(struct flashctx *const flashctx, uint8_t *const buffer) { const struct flashrom_layout *const layout = get_layout(flashctx); + const struct romentry *entry = NULL; - size_t i; - for (i = 0; i < layout->num_entries; ++i) { - if (!layout->entries[i].included) - continue; - - const chipoff_t region_start = layout->entries[i].start; - const chipsize_t region_len = layout->entries[i].end - layout->entries[i].start + 1; + while ((entry = layout_next_included(layout, entry))) { + const chipoff_t region_start = entry->start; + const chipsize_t region_len = entry->end - entry->start + 1; if (flashctx->chip->read(flashctx, buffer + region_start, region_start, region_len)) return 1; @@ -1681,17 +1678,14 @@ const per_blockfn_t per_blockfn) { const struct flashrom_layout *const layout = get_layout(flashctx); + const struct romentry *entry = NULL; all_skipped = true; msg_cinfo("Erasing and writing flash chip... "); - size_t i; - for (i = 0; i < layout->num_entries; ++i) { - if (!layout->entries[i].included) - continue; - - info->region_start = layout->entries[i].start; - info->region_end = layout->entries[i].end; + while ((entry = layout_next_included(layout, entry))) { + info->region_start = entry->start; + info->region_end = entry->end; size_t j; int error = 1; /* retry as long as it's 1 */ @@ -1962,14 +1956,11 @@ void *const curcontents, const uint8_t *const newcontents) { const struct flashrom_layout *const layout = get_layout(flashctx); + const struct romentry *entry = NULL; - size_t i; - for (i = 0; i < layout->num_entries; ++i) { - if (!layout->entries[i].included) - continue; - - const chipoff_t region_start = layout->entries[i].start; - const chipsize_t region_len = layout->entries[i].end - layout->entries[i].start + 1; + while ((entry = layout_next_included(layout, entry))) { + const chipoff_t region_start = entry->start; + const chipsize_t region_len = entry->end - entry->start + 1; if (flashctx->chip->read(flashctx, curcontents + region_start, region_start, region_len)) return 1; diff --git a/layout.c b/layout.c index 52aa388..e49189e 100644 --- a/layout.c +++ b/layout.c @@ -252,6 +252,24 @@ return lowest; } +const struct romentry *layout_next_included( + const struct flashrom_layout *const layout, const struct romentry *iterator) +{ + const struct romentry *const end = layout->entries + layout->num_entries; + + if (iterator) + ++iterator; + else + iterator = &layout->entries[0]; + + for (; iterator < end; ++iterator) { + if (!iterator->included) + continue; + return iterator; + } + return NULL; +} + /** * @addtogroup flashrom-layout * @{ diff --git a/layout.h b/layout.h index b9454a8..53a20d6 100644 --- a/layout.h +++ b/layout.h @@ -65,5 +65,6 @@ int process_include_args(struct flashrom_layout *l, const struct layout_include_args *const args); const struct romentry *layout_next_included_region(const struct flashrom_layout *, chipoff_t); +const struct romentry *layout_next_included(const struct flashrom_layout *, const struct romentry *); #endif /* !__LAYOUT_H__ */ -- To view, visit https://review.coreboot.org/c/flashrom/+/33518 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ib01c8af06c3f84eafbd585760e74c3c287b9fa7d Gerrit-Change-Number: 33518 Gerrit-PatchSet: 4 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in ...flashrom[master]: layout: Make `romentry.name` a pointer
by Nico Huber (Code Review) 17 Jun '19

17 Jun '19

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/flashrom/+/33515 ) Change subject: layout: Make `romentry.name` a pointer ...................................................................... layout: Make `romentry.name` a pointer This should provide more flexibility while we don't have to allocate 256B extra per layout entry. Change-Id: Ibb903113550ec13f43cbbd0a412c8f35fe1cf454 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/33515 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M flashrom.c M ich_descriptors.c M layout.c M layout.h M libflashrom.c 5 files changed, 39 insertions(+), 17 deletions(-) Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved diff --git a/flashrom.c b/flashrom.c index d6c4d24..2d3cd18 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1338,7 +1338,11 @@ fallback->entry.start = 0; fallback->entry.end = flash->chip->total_size * 1024 - 1; fallback->entry.included = true; - strcpy(fallback->entry.name, "complete flash"); + fallback->entry.name = strdup("complete flash"); + if (!fallback->entry.name) { + msg_cerr("Failed to probe chip: %s\n", strerror(errno)); + return -1; + } tmp = flashbuses_to_text(flash->chip->bustype); msg_cinfo("%s %s flash chip \"%s\" (%d kB, %s) ", force ? "Assuming" : "Found", diff --git a/ich_descriptors.c b/ich_descriptors.c index 251f636..0a4cf75 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -1153,7 +1153,8 @@ * @param len The length of the descriptor dump. * * @return 0 on success, - * 1 if the descriptor couldn't be parsed. + * 1 if the descriptor couldn't be parsed, + * 2 when out of memory. */ int layout_from_ich_descriptors(struct ich_layout *const layout, const void *const dump, const size_t len) { @@ -1178,7 +1179,9 @@ layout->entries[j].start = base; layout->entries[j].end = limit; layout->entries[j].included = false; - snprintf(layout->entries[j].name, sizeof(layout->entries[j].name), "%s", regions[i]); + layout->entries[j].name = strdup(regions[i]); + if (!layout->entries[j].name) + return 2; ++j; } layout->base.entries = layout->entries; diff --git a/layout.c b/layout.c index 6963e61..52aa388 100644 --- a/layout.c +++ b/layout.c @@ -15,6 +15,7 @@ * GNU General Public License for more details. */ +#include <errno.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -44,8 +45,8 @@ { struct flashrom_layout *const layout = get_global_layout(); FILE *romlayout; - char tempstr[256]; - int i; + char tempstr[256], tempname[256]; + int i, ret = 1; romlayout = fopen(name, "r"); @@ -61,10 +62,9 @@ if (layout->num_entries >= MAX_ROMLAYOUT) { msg_gerr("Maximum number of ROM images (%i) in layout " "file reached.\n", MAX_ROMLAYOUT); - (void)fclose(romlayout); - return 1; + goto _close_ret; } - if (2 != fscanf(romlayout, "%255s %255s\n", tempstr, layout->entries[layout->num_entries].name)) + if (2 != fscanf(romlayout, "%255s %255s\n", tempstr, tempname)) continue; #if 0 // fscanf does not like arbitrary comments like that :( later @@ -76,12 +76,16 @@ tstr2 = strtok(NULL, ":"); if (!tstr1 || !tstr2) { msg_gerr("Error parsing layout file. Offending string: \"%s\"\n", tempstr); - (void)fclose(romlayout); - return 1; + goto _close_ret; } layout->entries[layout->num_entries].start = strtol(tstr1, (char **)NULL, 16); layout->entries[layout->num_entries].end = strtol(tstr2, (char **)NULL, 16); layout->entries[layout->num_entries].included = 0; + layout->entries[layout->num_entries].name = strdup(tempname); + if (!layout->entries[layout->num_entries].name) { + msg_gerr("Error adding layout entry: %s\n", strerror(errno)); + goto _close_ret; + } layout->num_entries++; } @@ -91,9 +95,11 @@ layout->entries[i].end, layout->entries[i].name); } - (void)fclose(romlayout); + ret = 0; - return 0; +_close_ret: + (void)fclose(romlayout); + return ret; } #endif @@ -197,6 +203,7 @@ } for (i = 0; i < layout->num_entries; i++) { + free(layout->entries[i].name); layout->entries[i].included = 0; } layout->num_entries = 0; @@ -278,9 +285,13 @@ */ void flashrom_layout_release(struct flashrom_layout *const layout) { - if (layout == get_global_layout()) + unsigned int i; + + if (!layout || layout == get_global_layout()) return; + for (i = 0; i < layout->num_entries; ++i) + free(layout->entries[i].name); free(layout); } diff --git a/layout.h b/layout.h index 0f07e09..b9454a8 100644 --- a/layout.h +++ b/layout.h @@ -39,7 +39,7 @@ chipoff_t start; chipoff_t end; bool included; - char name[256]; + char *name; }; struct flashrom_layout { diff --git a/libflashrom.c b/libflashrom.c index 721a11c..af62002 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -20,6 +20,7 @@ * Have a look at the Modules section for a function reference. */ +#include <errno.h> #include <stdlib.h> #include <string.h> #include <stdarg.h> @@ -384,9 +385,12 @@ 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; - memset(l->entries[l->num_entries].name, 0, sizeof(l->entries[i].name)); - memcpy(l->entries[l->num_entries].name, fmap->areas[i].name, - min(FMAP_STRLEN, sizeof(l->entries[i].name))); + l->entries[l->num_entries].name = + strndup((const char *)fmap->areas[i].name, FMAP_STRLEN); + if (!l->entries[l->num_entries].name) { + msg_gerr("Error adding layout entry: %s\n", strerror(errno)); + return 1; + } msg_gdbg("fmap %08x - %08x named %s\n", l->entries[l->num_entries].start, l->entries[l->num_entries].end, -- To view, visit https://review.coreboot.org/c/flashrom/+/33515 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ibb903113550ec13f43cbbd0a412c8f35fe1cf454 Gerrit-Change-Number: 33515 Gerrit-PatchSet: 3 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in ...flashrom[master]: layout: Move generic layout functions into `layout.c`
by Nico Huber (Code Review) 17 Jun '19

17 Jun '19

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/flashrom/+/33514 ) Change subject: layout: Move generic layout functions into `layout.c` ...................................................................... layout: Move generic layout functions into `layout.c` Change-Id: If1edde70fc51e88e6e1c560d79a0d51941b9627c Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/33514 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M Doxyfile M layout.c M libflashrom.c 3 files changed, 43 insertions(+), 35 deletions(-) Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved diff --git a/Doxyfile b/Doxyfile index d2a7695..6906cc8 100644 --- a/Doxyfile +++ b/Doxyfile @@ -782,7 +782,8 @@ INPUT = libflashrom.c \ libflashrom.h \ - flashrom.c + flashrom.c \ + layout.c \ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/layout.c b/layout.c index 6e34814..6963e61 100644 --- a/layout.c +++ b/layout.c @@ -244,3 +244,44 @@ return lowest; } + +/** + * @addtogroup flashrom-layout + * @{ + */ + +/** + * @brief Mark given region as included. + * + * @param layout The layout to alter. + * @param name The name of the region to include. + * + * @return 0 on success, + * 1 if the given name can't be found. + */ +int flashrom_layout_include_region(struct flashrom_layout *const layout, const char *name) +{ + size_t i; + for (i = 0; i < layout->num_entries; ++i) { + if (!strcmp(layout->entries[i].name, name)) { + layout->entries[i].included = true; + return 0; + } + } + return 1; +} + +/** + * @brief Free a layout. + * + * @param layout Layout to free. + */ +void flashrom_layout_release(struct flashrom_layout *const layout) +{ + if (layout == get_global_layout()) + return; + + free(layout); +} + +/** @} */ /* end flashrom-layout */ diff --git a/libflashrom.c b/libflashrom.c index fee60ff..721a11c 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -283,27 +283,6 @@ */ /** - * @brief Mark given region as included. - * - * @param layout The layout to alter. - * @param name The name of the region to include. - * - * @return 0 on success, - * 1 if the given name can't be found. - */ -int flashrom_layout_include_region(struct flashrom_layout *const layout, const char *name) -{ - size_t i; - for (i = 0; i < layout->num_entries; ++i) { - if (!strcmp(layout->entries[i].name, name)) { - layout->entries[i].included = true; - return 0; - } - } - return 1; -} - -/** * @brief Read a layout from the Intel ICH descriptor in the flash. * * Optionally verify that the layout matches the one in the given @@ -507,19 +486,6 @@ } /** - * @brief Free a layout. - * - * @param layout Layout to free. - */ -void flashrom_layout_release(struct flashrom_layout *const layout) -{ - if (layout == get_global_layout()) - return; - - free(layout); -} - -/** * @brief Set the active layout for a flash context. * * Note: This just sets a pointer. The caller must not release the layout -- To view, visit https://review.coreboot.org/c/flashrom/+/33514 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If1edde70fc51e88e6e1c560d79a0d51941b9627c Gerrit-Change-Number: 33514 Gerrit-PatchSet: 3 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in ...flashrom[master]: layout: Never use global `layout` directly
by Nico Huber (Code Review) 17 Jun '19

17 Jun '19

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/flashrom/+/33513 ) Change subject: layout: Never use global `layout` directly ...................................................................... layout: Never use global `layout` directly And rename it to `global_layout` to free `layout` as a local variable name. We will get rid of the global layout entirely later. Change-Id: Ia2d7d1f4f649cd239b559ba6a40ee0977004e774 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/33513 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> --- M layout.c 1 file changed, 23 insertions(+), 20 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved diff --git a/layout.c b/layout.c index 52a0c2e..6e34814 100644 --- a/layout.c +++ b/layout.c @@ -24,11 +24,11 @@ #include "layout.h" struct romentry entries[MAX_ROMLAYOUT]; -static struct flashrom_layout layout = { entries, 0 }; +static struct flashrom_layout global_layout = { entries, 0 }; struct flashrom_layout *get_global_layout(void) { - return &layout; + return &global_layout; } const struct flashrom_layout *get_layout(const struct flashrom_flashctx *const flashctx) @@ -42,6 +42,7 @@ #ifndef __LIBPAYLOAD__ int read_romlayout(const char *name) { + struct flashrom_layout *const layout = get_global_layout(); FILE *romlayout; char tempstr[256]; int i; @@ -57,13 +58,13 @@ while (!feof(romlayout)) { char *tstr1, *tstr2; - if (layout.num_entries >= MAX_ROMLAYOUT) { + if (layout->num_entries >= MAX_ROMLAYOUT) { msg_gerr("Maximum number of ROM images (%i) in layout " "file reached.\n", MAX_ROMLAYOUT); (void)fclose(romlayout); return 1; } - if (2 != fscanf(romlayout, "%255s %255s\n", tempstr, layout.entries[layout.num_entries].name)) + if (2 != fscanf(romlayout, "%255s %255s\n", tempstr, layout->entries[layout->num_entries].name)) continue; #if 0 // fscanf does not like arbitrary comments like that :( later @@ -78,16 +79,16 @@ (void)fclose(romlayout); return 1; } - layout.entries[layout.num_entries].start = strtol(tstr1, (char **)NULL, 16); - layout.entries[layout.num_entries].end = strtol(tstr2, (char **)NULL, 16); - layout.entries[layout.num_entries].included = 0; - layout.num_entries++; + layout->entries[layout->num_entries].start = strtol(tstr1, (char **)NULL, 16); + layout->entries[layout->num_entries].end = strtol(tstr2, (char **)NULL, 16); + layout->entries[layout->num_entries].included = 0; + layout->num_entries++; } - for (i = 0; i < layout.num_entries; i++) { + for (i = 0; i < layout->num_entries; i++) { msg_gdbg("romlayout %08x - %08x named %s\n", - layout.entries[i].start, - layout.entries[i].end, layout.entries[i].name); + layout->entries[i].start, + layout->entries[i].end, layout->entries[i].name); } (void)fclose(romlayout); @@ -185,6 +186,7 @@ void layout_cleanup(struct layout_include_args **args) { + struct flashrom_layout *const layout = get_global_layout(); int i; struct layout_include_args *tmp; @@ -194,29 +196,30 @@ *args = tmp; } - for (i = 0; i < layout.num_entries; i++) { - layout.entries[i].included = 0; + for (i = 0; i < layout->num_entries; i++) { + layout->entries[i].included = 0; } - layout.num_entries = 0; + layout->num_entries = 0; } /* Validate and - if needed - normalize layout entries. */ int normalize_romentries(const struct flashctx *flash) { + struct flashrom_layout *const layout = get_global_layout(); chipsize_t total_size = flash->chip->total_size * 1024; int ret = 0; int i; - for (i = 0; i < layout.num_entries; i++) { - if (layout.entries[i].start >= total_size || layout.entries[i].end >= total_size) { + for (i = 0; i < layout->num_entries; i++) { + if (layout->entries[i].start >= total_size || layout->entries[i].end >= total_size) { msg_gwarn("Warning: Address range of region \"%s\" exceeds the current chip's " - "address space.\n", layout.entries[i].name); - if (layout.entries[i].included) + "address space.\n", layout->entries[i].name); + if (layout->entries[i].included) ret = 1; } - if (layout.entries[i].start > layout.entries[i].end) { + if (layout->entries[i].start > layout->entries[i].end) { msg_gerr("Error: Size of the address range of region \"%s\" is not positive.\n", - layout.entries[i].name); + layout->entries[i].name); ret = 1; } } -- To view, visit https://review.coreboot.org/c/flashrom/+/33513 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia2d7d1f4f649cd239b559ba6a40ee0977004e774 Gerrit-Change-Number: 33513 Gerrit-PatchSet: 3 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in ...flashrom[master]: layout: Never use global `layout` directly
by Nico Huber (Code Review) 17 Jun '19

17 Jun '19

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/33513 ) Change subject: layout: Never use global `layout` directly ...................................................................... Patch Set 2: > Patch Set 2: Code-Review+2 Thanks! -- To view, visit https://review.coreboot.org/c/flashrom/+/33513 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia2d7d1f4f649cd239b559ba6a40ee0977004e774 Gerrit-Change-Number: 33513 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Mon, 17 Jun 2019 08:31:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit June 2019