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

Change in flashrom[master]: layout: Introduce get_default_layout()
by Nico Huber (Code Review) 26 Jun '21

26 Jun '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/33519 ) Change subject: layout: Introduce get_default_layout() ...................................................................... layout: Introduce get_default_layout() Containing an included, full-flash-chip sized default region. This allows us to query the default layout specifically, also if an additional layout is attached to the flash context. Change-Id: Ia343e9775ec5bdc3fea5cdb6b347298515996e34 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/33519 Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-by: Peter Marheine <pmarheine(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M layout.c M layout.h 2 files changed, 8 insertions(+), 2 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved Peter Marheine: Looks good to me, but someone else must approve Anastasia Klimchuk: Looks good to me, approved diff --git a/layout.c b/layout.c index ede476a..11df15c 100644 --- a/layout.c +++ b/layout.c @@ -33,12 +33,17 @@ return &global_layout; } +const struct flashrom_layout *get_default_layout(const struct flashrom_flashctx *const flashctx) +{ + return flashctx->default_layout; +} + const struct flashrom_layout *get_layout(const struct flashrom_flashctx *const flashctx) { if (flashctx->layout && flashctx->layout->num_entries) return flashctx->layout; else - return flashctx->default_layout; + return get_default_layout(flashctx); } static struct romentry *mutable_layout_next( diff --git a/layout.h b/layout.h index c05d1e7..49c1a13 100644 --- a/layout.h +++ b/layout.h @@ -58,8 +58,9 @@ struct layout_include_args *next; }; -struct flashrom_layout *get_global_layout(void); struct flashrom_flashctx; +struct flashrom_layout *get_global_layout(void); +const struct flashrom_layout *get_default_layout(const struct flashrom_flashctx *); const struct flashrom_layout *get_layout(const struct flashrom_flashctx *const flashctx); int get_region_range(struct flashrom_layout *const l, const char *name, -- To view, visit https://review.coreboot.org/c/flashrom/+/33519 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia343e9775ec5bdc3fea5cdb6b347298515996e34 Gerrit-Change-Number: 33519 Gerrit-PatchSet: 10 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in ...flashrom[master]: layout: Introduce flashrom_layout_empty()
by Nico Huber (Code Review) 26 Jun '21

26 Jun '21

Hello Angel Pons, Arthur Heymans, David Hendricks, Thomas Heijligen, I'd like you to do a code review. Please visit https://review.coreboot.org/c/flashrom/+/33543 to review the following change. Change subject: layout: Introduce flashrom_layout_empty() ...................................................................... layout: Introduce flashrom_layout_empty() It initializes an empty layout. Currently the maximum number of entries has to be specified, which will vanisch once we use dynamic allocation. Change-Id: I2ae7246493ff592e631cce924777925c7825e398 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M cli_classic.c M flash.h M flashrom.c M ich_descriptors.c M ich_descriptors.h M layout.c M libflashrom.c M libflashrom.h 8 files changed, 54 insertions(+), 37 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/43/33543/1 diff --git a/cli_classic.c b/cli_classic.c index 2e07612..a98be47 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -673,8 +673,10 @@ out_shutdown: programmer_shutdown(); out: - for (i = 0; i < chipcount; i++) + for (i = 0; i < chipcount; i++) { + flashrom_layout_release(flashes[i].default_layout); free(flashes[i].chip); + } layout_cleanup(&include_args); free(filename); diff --git a/flash.h b/flash.h index 5bbfa0a..84de7a7 100644 --- a/flash.h +++ b/flash.h @@ -252,7 +252,7 @@ chipaddr virtual_registers; struct registered_master *mst; const struct flashrom_layout *layout; - struct single_layout fallback_layout; + struct flashrom_layout *default_layout; struct { bool force; bool force_boardmismatch; diff --git a/flashrom.c b/flashrom.c index e355731..3436a59 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1331,15 +1331,12 @@ if (!flash->chip) return -1; - /* Fill fallback layout covering the whole chip. */ - struct single_layout *const fallback = &flash->fallback_layout; - fallback->base.entries = &fallback->entry; - fallback->base.max_entries = 1; - fallback->base.num_entries = 0; - if (flashrom_layout_add_region(&fallback->base, + /* Fill default layout covering the whole chip. */ + if (flashrom_layout_empty(&flash->default_layout, 1) || + flashrom_layout_add_region(flash->default_layout, 0, flash->chip->total_size * 1024 - 1, "complete flash") || - flashrom_layout_include_region(&fallback->base, "complete flash")) - return -1; + flashrom_layout_include_region(flash->default_layout, "complete flash")) + 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 b2c5d4c..8383801 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -1156,7 +1156,9 @@ * 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) +int layout_from_ich_descriptors( + struct flashrom_layout **const layout, + const void *const dump, const size_t len) { static const char *const regions[] = { "fd", "bios", "me", "gbe", "pd", "reg5", "bios2", "reg7", "ec", "reg9", "ie", @@ -1168,10 +1170,8 @@ if (read_ich_descriptors_from_dump(dump, len, &cs, &desc)) return 1; - memset(layout, 0x00, sizeof(*layout)); - layout->base.entries = layout->entries; - layout->base.max_entries = ARRAY_SIZE(layout->entries); - layout->base.num_entries = 0; + if (flashrom_layout_empty(layout, ARRAY_SIZE(regions))) + return 2; ssize_t i; for (i = 0; i < min(ich_number_of_regions(cs, &desc.content), ARRAY_SIZE(regions)); ++i) { @@ -1179,8 +1179,11 @@ const chipoff_t limit = ICH_FREG_LIMIT(desc.region.FLREGs[i]); if (limit <= base) continue; - if (flashrom_layout_add_region(&layout->base, base, limit, regions[i])) + if (flashrom_layout_add_region(*layout, base, limit, regions[i])) { + flashrom_layout_release(*layout); + *layout = NULL; return 2; + } } return 0; } diff --git a/ich_descriptors.h b/ich_descriptors.h index 4225286..498af21 100644 --- a/ich_descriptors.h +++ b/ich_descriptors.h @@ -562,11 +562,6 @@ struct ich_desc_upper_map upper; }; -struct ich_layout { - struct flashrom_layout base; - struct romentry entries[MAX_NUM_FLREGS]; -}; - ssize_t ich_number_of_regions(enum ich_chipset cs, const struct ich_desc_content *content); ssize_t ich_number_of_masters(enum ich_chipset cs, const struct ich_desc_content *content); @@ -585,6 +580,6 @@ int read_ich_descriptors_via_fdo(enum ich_chipset cs, void *spibar, struct ich_descriptors *desc); int getFCBA_component_density(enum ich_chipset cs, const struct ich_descriptors *desc, uint8_t idx); -int layout_from_ich_descriptors(struct ich_layout *, const void *dump, size_t len); +int layout_from_ich_descriptors(struct flashrom_layout **, const void *dump, size_t len); #endif /* __ICH_DESCRIPTORS_H__ */ diff --git a/layout.c b/layout.c index 0978a67..8198f17 100644 --- a/layout.c +++ b/layout.c @@ -37,7 +37,7 @@ if (flashctx->layout && flashctx->layout->num_entries) return flashctx->layout; else - return &flashctx->fallback_layout.base; + return flashctx->default_layout; } #ifndef __LIBPAYLOAD__ @@ -270,6 +270,29 @@ */ /** + * @brief Create a new, empty layout. + * + * @param layout Pointer to returned layout reference. + * @param count Number of layout entries to allocate. + * + * @return 0 on success, + * 1 if out of memory. + */ +int flashrom_layout_empty(struct flashrom_layout **const layout, const unsigned int count) +{ + *layout = malloc(sizeof(**layout) + count * sizeof(struct romentry)); + if (!*layout) { + msg_gerr("Error creating layout: %s\n", strerror(errno)); + return 1; + } + + (*layout)->entries = (void *)((char *)*layout + sizeof(**layout)); + (*layout)->max_entries = count; + (*layout)->num_entries = 0; + return 0; +} + +/** * @brief Add another region to an existing layout. * * @param layout The existing layout. diff --git a/libflashrom.c b/libflashrom.c index aa43e65..d891944 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -205,13 +205,14 @@ ret = 0; /* We found one chip, now check that there is no second match. */ if (probe_flash(&registered_masters[i], flash_idx + 1, &second_flashctx, 0) != -1) { + flashrom_layout_release(second_flashctx.default_layout); ret = 3; break; } } } if (ret) { - free(*flashctx); + flashrom_flash_release(*flashctx); *flashctx = NULL; } return ret; @@ -235,6 +236,7 @@ */ void flashrom_flash_release(struct flashrom_flashctx *const flashctx) { + flashrom_layout_release(flashctx->default_layout); free(flashctx); } @@ -310,16 +312,10 @@ #ifndef __FLASHROM_LITTLE_ENDIAN__ return 6; #else - struct ich_layout dump_layout; + struct flashrom_layout *dump_layout, *chip_layout; int ret = 1; void *const desc = malloc(0x1000); - struct ich_layout *const chip_layout = malloc(sizeof(*chip_layout)); - if (!desc || !chip_layout) { - msg_gerr("Out of memory!\n"); - goto _free_ret; - } - if (prepare_flash_access(flashctx, true, false, false, false)) goto _free_ret; @@ -332,7 +328,7 @@ } msg_cinfo("done.\n"); - if (layout_from_ich_descriptors(chip_layout, desc, 0x1000)) { + if (layout_from_ich_descriptors(&chip_layout, desc, 0x1000)) { msg_cerr("Couldn't parse the descriptor!\n"); ret = 3; goto _finalize_ret; @@ -345,11 +341,11 @@ goto _finalize_ret; } - const struct romentry *chip_entry = layout_next(&chip_layout->base, NULL); - const struct romentry *dump_entry = layout_next(&dump_layout.base, NULL); + const struct romentry *chip_entry = layout_next(chip_layout, NULL); + const struct romentry *dump_entry = layout_next(dump_layout, NULL); while (chip_entry && dump_entry && !memcmp(chip_entry, dump_entry, sizeof(*chip_entry))) { - chip_entry = layout_next(&chip_layout->base, chip_entry); - dump_entry = layout_next(&dump_layout.base, dump_entry); + chip_entry = layout_next(chip_layout, chip_entry); + dump_entry = layout_next(dump_layout, dump_entry); } if (chip_entry || dump_entry) { msg_cerr("Descriptors don't match!\n"); @@ -365,7 +361,7 @@ finalize_flash_access(flashctx); _free_ret: if (ret) - free(chip_layout); + flashrom_layout_release(chip_layout); free(desc); return ret; #endif diff --git a/libflashrom.h b/libflashrom.h index 2b84bd4..90f3e2c 100644 --- a/libflashrom.h +++ b/libflashrom.h @@ -62,6 +62,7 @@ int flashrom_image_verify(struct flashrom_flashctx *, const void *buffer, size_t buffer_len); struct flashrom_layout; +int flashrom_layout_empty(struct flashrom_layout **layout, unsigned int count); int flashrom_layout_read_from_ifd(struct flashrom_layout **, struct flashrom_flashctx *, const void *dump, size_t len); int flashrom_layout_read_fmap_from_rom(struct flashrom_layout **, struct flashrom_flashctx *, off_t offset, size_t length); -- To view, visit https://review.coreboot.org/c/flashrom/+/33543 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2ae7246493ff592e631cce924777925c7825e398 Gerrit-Change-Number: 33543 Gerrit-PatchSet: 1 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: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

5 26

Change in flashrom[master]: layout: Introduce flashrom_layout_add_region()
by Nico Huber (Code Review) 26 Jun '21

26 Jun '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/33517 ) Change subject: layout: Introduce flashrom_layout_add_region() ...................................................................... layout: Introduce flashrom_layout_add_region() Adds a region to an existing layout, as long as there is space. Change-Id: I50d473d0d5d1fb38bd6f9ae3d7127e9ea66a94e1 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/33517 Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-by: Peter Marheine <pmarheine(a)chromium.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M flashrom.c M ich_descriptors.c M layout.c M libflashrom.c M libflashrom.h 5 files changed, 55 insertions(+), 50 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved Peter Marheine: Looks good to me, but someone else must approve Anastasia Klimchuk: Looks good to me, approved diff --git a/flashrom.c b/flashrom.c index 8d260cb..ffba5c4 100644 --- a/flashrom.c +++ b/flashrom.c @@ -826,15 +826,11 @@ struct single_layout *const fallback = &flash->fallback_layout; fallback->base.entries = &fallback->entry; fallback->base.capacity = 1; - fallback->base.num_entries = 1; - fallback->entry.start = 0; - fallback->entry.end = flash->chip->total_size * 1024 - 1; - fallback->entry.included = true; - fallback->entry.name = strdup("complete flash"); - if (!fallback->entry.name) { - msg_cerr("Failed to probe chip: %s\n", strerror(errno)); + fallback->base.num_entries = 0; + if (flashrom_layout_add_region(&fallback->base, + 0, flash->chip->total_size * 1024 - 1, "complete flash") || + flashrom_layout_include_region(&fallback->base, "complete flash")) 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 143e392..ad1a88b 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -1278,25 +1278,20 @@ } memset(layout, 0x00, sizeof(*layout)); + layout->base.entries = layout->entries; + layout->base.capacity = ARRAY_SIZE(layout->entries); + layout->base.num_entries = 0; - ssize_t i, j; + ssize_t i; const ssize_t nr = MIN(ich_number_of_regions(cs, &desc.content), (ssize_t)ARRAY_SIZE(regions)); - for (i = 0, j = 0; i < nr; ++i) { + for (i = 0; i < nr; ++i) { const chipoff_t base = ICH_FREG_BASE(desc.region.FLREGs[i]); const chipoff_t limit = ICH_FREG_LIMIT(desc.region.FLREGs[i]); if (limit <= base) continue; - layout->entries[j].start = base; - layout->entries[j].end = limit; - layout->entries[j].included = false; - layout->entries[j].name = strdup(regions[i]); - if (!layout->entries[j].name) + if (flashrom_layout_add_region(&layout->base, base, limit, regions[i])) return 2; - ++j; } - layout->base.entries = layout->entries; - layout->base.capacity = ARRAY_SIZE(layout->entries); - layout->base.num_entries = j; return 0; } diff --git a/layout.c b/layout.c index 0771d42..2f56b27 100644 --- a/layout.c +++ b/layout.c @@ -73,7 +73,6 @@ struct flashrom_layout *const layout = get_global_layout(); FILE *romlayout; char tempstr[256], tempname[256]; - unsigned int i; int ret = 1; romlayout = fopen(name, "r"); @@ -106,24 +105,10 @@ msg_gerr("Error parsing layout file. Offending string: \"%s\"\n", tempstr); 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 = false; - layout->entries[layout->num_entries].file = NULL; - 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)); + if (flashrom_layout_add_region(layout, + strtol(tstr1, NULL, 16), strtol(tstr2, NULL, 16), tempname)) goto _close_ret; - } - layout->num_entries++; } - - 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); - } - ret = 0; _close_ret: @@ -399,6 +384,43 @@ */ /** + * @brief Add another region to an existing layout. + * + * @param layout The existing layout. + * @param start Start address of the region. + * @param end End address (inclusive) of the region. + * @param name Name of the region. + * + * @return 0 on success, + * 1 if out of memory, + * 2 if the layout is full already. + */ +int flashrom_layout_add_region( + struct flashrom_layout *const layout, + const size_t start, const size_t end, const char *const name) +{ + if (layout->num_entries >= layout->capacity) { + msg_gerr("Error adding layout entry: No space left\n"); + return 2; + } + + struct romentry *const entry = &layout->entries[layout->num_entries]; + entry->start = start; + entry->end = end; + entry->included = false; + entry->name = strdup(name); + entry->file = NULL; + if (!entry->name) { + msg_gerr("Error adding layout entry: %s\n", strerror(errno)); + return 1; + } + + msg_gdbg("Added layout entry %08zx - %08zx named %s\n", start, end, name); + ++layout->num_entries; + return 0; +} + +/** * @brief Mark given region as included. * * @param layout The layout to alter. diff --git a/libflashrom.c b/libflashrom.c index 2a39a80..c5c4c89 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -501,6 +501,8 @@ struct flashctx *const flashctx, const struct fmap *const fmap) { int i; + char name[FMAP_STRLEN + 1]; + const struct fmap_area *area; struct flashrom_layout *l = get_global_layout(); if (!fmap || !l) @@ -511,21 +513,10 @@ return 1; } - 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; - 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)); + for (i = 0, area = fmap->areas; i < fmap->nareas; i++, area++) { + snprintf(name, sizeof(name), "%s", area->name); + if (flashrom_layout_add_region(l, area->offset, area->offset + area->size - 1, name)) return 1; - } - 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++; } *layout = l; diff --git a/libflashrom.h b/libflashrom.h index eab78ad..d04eeb6 100644 --- a/libflashrom.h +++ b/libflashrom.h @@ -111,6 +111,7 @@ struct flashrom_flashctx *, off_t offset, size_t length); int flashrom_layout_read_fmap_from_buffer(struct flashrom_layout **layout, struct flashrom_flashctx *, const uint8_t *buf, size_t len); +int flashrom_layout_add_region(struct flashrom_layout *, size_t start, size_t end, const char *name); 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 *); -- To view, visit https://review.coreboot.org/c/flashrom/+/33517 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I50d473d0d5d1fb38bd6f9ae3d7127e9ea66a94e1 Gerrit-Change-Number: 33517 Gerrit-PatchSet: 10 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: layout: Add `capacity` field
by Nico Huber (Code Review) 26 Jun '21

26 Jun '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/33516 ) Change subject: layout: Add `capacity` field ...................................................................... layout: Add `capacity` field Use it to keep track of the size of the `entries` array. An interim solution until we have dynamic allocation. Change-Id: Ib5f431bc0a72a79a53fa1376c3417942b19dd3a0 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/33516 Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-by: Peter Marheine <pmarheine(a)chromium.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M flashrom.c M ich_descriptors.c M layout.c M layout.h M libflashrom.c 5 files changed, 9 insertions(+), 5 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved Peter Marheine: Looks good to me, but someone else must approve Anastasia Klimchuk: Looks good to me, approved diff --git a/flashrom.c b/flashrom.c index 90e1864..8d260cb 100644 --- a/flashrom.c +++ b/flashrom.c @@ -825,6 +825,7 @@ /* Fill fallback layout covering the whole chip. */ struct single_layout *const fallback = &flash->fallback_layout; fallback->base.entries = &fallback->entry; + fallback->base.capacity = 1; fallback->base.num_entries = 1; fallback->entry.start = 0; fallback->entry.end = flash->chip->total_size * 1024 - 1; diff --git a/ich_descriptors.c b/ich_descriptors.c index 4ae3a1b..143e392 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -1295,6 +1295,7 @@ ++j; } layout->base.entries = layout->entries; + layout->base.capacity = ARRAY_SIZE(layout->entries); layout->base.num_entries = j; return 0; } diff --git a/layout.c b/layout.c index 2446e8f..0771d42 100644 --- a/layout.c +++ b/layout.c @@ -26,7 +26,7 @@ #include "layout.h" static struct romentry entries[MAX_ROMLAYOUT]; -static struct flashrom_layout global_layout = { entries, 0 }; +static struct flashrom_layout global_layout = { entries, MAX_ROMLAYOUT, 0 }; struct flashrom_layout *get_global_layout(void) { @@ -87,9 +87,9 @@ while (!feof(romlayout)) { char *tstr1, *tstr2; - if (layout->num_entries >= MAX_ROMLAYOUT) { - msg_gerr("Maximum number of ROM images (%i) in layout " - "file reached.\n", MAX_ROMLAYOUT); + if (layout->num_entries >= layout->capacity) { + msg_gerr("Maximum number of ROM images (%zu) in layout " + "file reached.\n", layout->capacity); goto _close_ret; } if (2 != fscanf(romlayout, "%255s %255s\n", tempstr, tempname)) diff --git a/layout.h b/layout.h index d60c89e..2a0f869 100644 --- a/layout.h +++ b/layout.h @@ -46,6 +46,8 @@ struct flashrom_layout { /* entries store the entries specified in a layout file and associated run-time data */ struct romentry *entries; + /* the maximum number of entries */ + size_t capacity; /* the number of successfully parsed entries */ size_t num_entries; }; diff --git a/libflashrom.c b/libflashrom.c index c6a598b..2a39a80 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -506,7 +506,7 @@ if (!fmap || !l) return 1; - if (l->num_entries + fmap->nareas > MAX_ROMLAYOUT) { + if (l->num_entries + fmap->nareas > l->capacity) { msg_gerr("Cannot add fmap entries to layout - Too many entries.\n"); return 1; } -- To view, visit https://review.coreboot.org/c/flashrom/+/33516 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ib5f431bc0a72a79a53fa1376c3417942b19dd3a0 Gerrit-Change-Number: 33516 Gerrit-PatchSet: 10 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: util: Name udev-rules file accordingly
by Felix Singer (Code Review) 26 Jun '21

26 Jun '21

Attention is currently required from: Nico Huber, Paul Menzel. Hello build bot (Jenkins), Nico Huber, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/55866 to look at the new patch set (#3). Change subject: util: Name udev-rules file accordingly ...................................................................... util: Name udev-rules file accordingly Rename `z60_flashrom.rules` to `flashrom_udev.rules`. Change-Id: I1e7918d3121d89d3c388745e433a3a413eac0e21 Signed-off-by: Felix Singer <felixsinger(a)posteo.net> --- R util/flashrom_udev.rules 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/66/55866/3 -- To view, visit https://review.coreboot.org/c/flashrom/+/55866 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I1e7918d3121d89d3c388745e433a3a413eac0e21 Gerrit-Change-Number: 55866 Gerrit-PatchSet: 3 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: util: Name udev-rules file meaningfully
by Felix Singer (Code Review) 26 Jun '21

26 Jun '21

Attention is currently required from: Nico Huber, Paul Menzel. Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/55866 ) Change subject: util: Name udev-rules file meaningfully ...................................................................... Patch Set 2: (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/55866/comment/454ac8ec_31235645 PS1, Line 9: Rename `z60_flashrom.rules` to `flashrom_udev.rules`. > @Paul: Maybe. However, since this is the flashrom repository it might be not clear. […] Done -- To view, visit https://review.coreboot.org/c/flashrom/+/55866 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I1e7918d3121d89d3c388745e433a3a413eac0e21 Gerrit-Change-Number: 55866 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Comment-Date: Sat, 26 Jun 2021 14:54:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Felix Singer <felixsinger(a)posteo.net> Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Comment-In-Reply-To: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: util: Name udev-rules file meaningfully
by Felix Singer (Code Review) 26 Jun '21

26 Jun '21

Attention is currently required from: Nico Huber, Paul Menzel. Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/55866 ) Change subject: util: Name udev-rules file meaningfully ...................................................................... Patch Set 2: (2 comments) Commit Message: https://review.coreboot.org/c/flashrom/+/55866/comment/353ec083_1674a7cf PS1, Line 7: util: Give the udev-rules file a meaningful name > Name udev-rules meaningfully Done https://review.coreboot.org/c/flashrom/+/55866/comment/09e51e02_c86ac898 PS1, Line 9: Rename `z60_flashrom.rules` to `flashrom_udev.rules`. > Is there a standard for that ordering? @Paul: Maybe. However, since this is the flashrom repository it might be not clear. This way it's more recognizable. Package maintainers can still rename it. -- To view, visit https://review.coreboot.org/c/flashrom/+/55866 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I1e7918d3121d89d3c388745e433a3a413eac0e21 Gerrit-Change-Number: 55866 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Comment-Date: Sat, 26 Jun 2021 14:54:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Comment-In-Reply-To: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: util: Name udev-rules file meaningfully
by Felix Singer (Code Review) 26 Jun '21

26 Jun '21

Attention is currently required from: Felix Singer, Paul Menzel. Hello build bot (Jenkins), Nico Huber, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/55866 to look at the new patch set (#2). Change subject: util: Name udev-rules file meaningfully ...................................................................... util: Name udev-rules file meaningfully Rename `z60_flashrom.rules` to `flashrom_udev.rules`. Change-Id: I1e7918d3121d89d3c388745e433a3a413eac0e21 Signed-off-by: Felix Singer <felixsinger(a)posteo.net> --- R util/flashrom_udev.rules 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/66/55866/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/55866 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I1e7918d3121d89d3c388745e433a3a413eac0e21 Gerrit-Change-Number: 55866 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: layout: Tidy up forward declarations
by Angel Pons (Code Review) 26 Jun '21

26 Jun '21

Attention is currently required from: Nico Huber, Thomas Heijligen, Daniel Campello, Peter Marheine. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/54288 ) Change subject: layout: Tidy up forward declarations ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/54288 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iadcc1670ff86578a400dec9e804d6dda93e0fcf0 Gerrit-Change-Number: 54288 Gerrit-PatchSet: 7 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Daniel Campello <campello(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Sat, 26 Jun 2021 14:24:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: layout: Tidy up the include-args API
by Angel Pons (Code Review) 26 Jun '21

26 Jun '21

Attention is currently required from: Nico Huber, Thomas Heijligen, Daniel Campello, Peter Marheine. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/54287 ) Change subject: layout: Tidy up the include-args API ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/54287 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I0e87c9d91b9bc4d78f9cee98caff6985803f7be7 Gerrit-Change-Number: 54287 Gerrit-PatchSet: 7 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Daniel Campello <campello(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Sat, 26 Jun 2021 14:23:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit June 2021