- flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: [UNTESTED] bitbang_spi.c: Support changing clock polarity and phase
by Angel Pons (Code Review) 27 Jun '21

27 Jun '21

Attention is currently required from: Nico Huber, Xiang W. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/49271 ) Change subject: [UNTESTED] bitbang_spi.c: Support changing clock polarity and phase ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > I had a look at it. But before anyone continues, please ask yourself […] I can't test this myself, and I don't need it anyway -- To view, visit https://review.coreboot.org/c/flashrom/+/49271 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I415a528c013f1a523e883d812b6890be39bfcc7b Gerrit-Change-Number: 49271 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Xiang W <wxjstz(a)126.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Shawn C <citypw(a)hardenedlinux.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Xiang W <wxjstz(a)126.com> Gerrit-Comment-Date: Sat, 26 Jun 2021 21:33:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: board_enable: Wyse Cx0 thin client is not a laptop
by Nico Huber (Code Review) 27 Jun '21

27 Jun '21

Nico Huber has abandoned this change. ( https://review.coreboot.org/c/flashrom/+/23157 ) Change subject: board_enable: Wyse Cx0 thin client is not a laptop ...................................................................... Abandoned There was no response in 3 years. Please revive the patch if there is still interest. -- To view, visit https://review.coreboot.org/c/flashrom/+/23157 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Icc9d48c61680f2dc6818b4dc7e1e721a97f0c0bb Gerrit-Change-Number: 23157 Gerrit-PatchSet: 2 Gerrit-Owner: Lubomir Rintel <lkundrak(a)v3.sk> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: abandon

1 0

Change in flashrom[master]: Added support for GigaDevices GD25Q256C (4-byte addressing), Tested PREW
by Nico Huber (Code Review) 27 Jun '21

27 Jun '21

Attention is currently required from: David Hendricks. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/22824 ) Change subject: Added support for GigaDevices GD25Q256C (4-byte addressing), Tested PREW ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: The newer version GD25Q256D was added in the meantime. I'm going to abandon this change if nobody objects. Incompatibility seems unlikely; for other vendors we usually don't track the version letter (I guess it's a die stepping?). -- To view, visit https://review.coreboot.org/c/flashrom/+/22824 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ie73de31748f767bae2455bd809209721d698803d Gerrit-Change-Number: 22824 Gerrit-PatchSet: 1 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Comment-Date: Sat, 26 Jun 2021 17:02:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: layout: Tidy up forward declarations
by Nico Huber (Code Review) 27 Jun '21

27 Jun '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/54288 ) Change subject: layout: Tidy up forward declarations ...................................................................... layout: Tidy up forward declarations * Parameter names like `flashctx` for a `struct flashrom_flashctx` don't add any value. * `const` qualification of parameters is meaningless in forward declarations. Arguments are always passed by copy and an API user does not need to know what callees do with their copy. Change-Id: Iadcc1670ff86578a400dec9e804d6dda93e0fcf0 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/54288 Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M layout.h 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/layout.h b/layout.h index 0cb8879..713241f 100644 --- a/layout.h +++ b/layout.h @@ -51,21 +51,21 @@ struct flashrom_flashctx; const struct flashrom_layout *get_default_layout(const struct flashrom_flashctx *); -const struct flashrom_layout *get_layout(const struct flashrom_flashctx *const flashctx); +const struct flashrom_layout *get_layout(const struct flashrom_flashctx *); int layout_from_file(struct flashrom_layout **, const char *name); -int register_include_arg(struct layout_include_args **args, const char *arg); -int process_include_args(struct flashrom_layout *l, const struct layout_include_args *const args); -void cleanup_include_args(struct layout_include_args **args); +int register_include_arg(struct layout_include_args **, const char *arg); +int process_include_args(struct flashrom_layout *, const struct layout_include_args *); +void cleanup_include_args(struct layout_include_args **); -int get_region_range(struct flashrom_layout *const l, const char *name, +int get_region_range(struct flashrom_layout *, const char *name, unsigned int *start, unsigned int *len); 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 *); const struct romentry *layout_next(const struct flashrom_layout *, const struct romentry *); -int included_regions_overlap(const struct flashrom_layout *const flashrom_layout); -void prepare_layout_for_extraction(struct flashrom_flashctx *flash); +int included_regions_overlap(const struct flashrom_layout *); +void prepare_layout_for_extraction(struct flashrom_flashctx *); int layout_sanity_checks(const struct flashrom_flashctx *); #endif /* !__LAYOUT_H__ */ -- 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: 8 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: 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: Tidy up the include-args API
by Nico Huber (Code Review) 27 Jun '21

27 Jun '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/54287 ) Change subject: layout: Tidy up the include-args API ...................................................................... layout: Tidy up the include-args API Move all forward declarations into `layout.h`, use consistent naming. Change-Id: I0e87c9d91b9bc4d78f9cee98caff6985803f7be7 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/54287 Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M cli_classic.c M flash.h M layout.c M layout.h 4 files changed, 6 insertions(+), 7 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/cli_classic.c b/cli_classic.c index 3b6fbf8..d69b798 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -857,7 +857,7 @@ free(flashes[i].chip); } - layout_cleanup(&include_args); + cleanup_include_args(&include_args); free(filename); free(fmapfile); free(referencefile); diff --git a/flash.h b/flash.h index c50c892..c6a53b1 100644 --- a/flash.h +++ b/flash.h @@ -417,10 +417,6 @@ #define msg_pspew(...) print(FLASHROM_MSG_SPEW, __VA_ARGS__) /* programmer debug spew */ #define msg_cspew(...) print(FLASHROM_MSG_SPEW, __VA_ARGS__) /* chip debug spew */ -/* layout.c */ -int register_include_arg(struct layout_include_args **args, const char *arg); -void layout_cleanup(struct layout_include_args **args); - /* spi.c */ struct spi_command { unsigned int writecnt; diff --git a/layout.c b/layout.c index a043d21..e688f79 100644 --- a/layout.c +++ b/layout.c @@ -274,7 +274,7 @@ return overlap_detected; } -void layout_cleanup(struct layout_include_args **args) +void cleanup_include_args(struct layout_include_args **args) { struct layout_include_args *tmp; diff --git a/layout.h b/layout.h index e62fdf9..0cb8879 100644 --- a/layout.h +++ b/layout.h @@ -55,9 +55,12 @@ int layout_from_file(struct flashrom_layout **, const char *name); +int register_include_arg(struct layout_include_args **args, const char *arg); +int process_include_args(struct flashrom_layout *l, const struct layout_include_args *const args); +void cleanup_include_args(struct layout_include_args **args); + int get_region_range(struct flashrom_layout *const l, const char *name, unsigned int *start, unsigned int *len); -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 *); const struct romentry *layout_next(const struct flashrom_layout *, const struct romentry *); -- 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: 8 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: 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: Kill the global layout
by Nico Huber (Code Review) 27 Jun '21

27 Jun '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/54286 ) Change subject: layout: Kill the global layout ...................................................................... layout: Kill the global layout Change-Id: Ic302e9c5faf1368e5ca244ce461e55e14f916ab8 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/54286 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> --- M cli_classic.c M flash.h M layout.c M layout.h 4 files changed, 11 insertions(+), 27 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved diff --git a/cli_classic.c b/cli_classic.c index fc91989..3b6fbf8 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -519,12 +519,12 @@ } msg_gdbg("\n"); - if (layoutfile && read_romlayout(layoutfile)) { + if (layoutfile && layout_from_file(&layout, layoutfile)) { ret = 1; goto out; } - if (!ifd && !fmap && process_include_args(get_global_layout(), include_args)) { + if (!ifd && !fmap && process_include_args(layout, include_args)) { ret = 1; goto out; } @@ -716,9 +716,7 @@ goto out_shutdown; } - if (layoutfile) { - layout = get_global_layout(); - } else if (ifd && (flashrom_layout_read_from_ifd(&layout, fill_flash, NULL, 0) || + if (ifd && (flashrom_layout_read_from_ifd(&layout, fill_flash, NULL, 0) || process_include_args(layout, include_args))) { ret = 1; goto out_shutdown; diff --git a/flash.h b/flash.h index c8c0f9d..c50c892 100644 --- a/flash.h +++ b/flash.h @@ -419,7 +419,6 @@ /* layout.c */ int register_include_arg(struct layout_include_args **args, const char *arg); -int read_romlayout(const char *name); void layout_cleanup(struct layout_include_args **args); /* spi.c */ diff --git a/layout.c b/layout.c index e4f1681..a043d21 100644 --- a/layout.c +++ b/layout.c @@ -35,15 +35,6 @@ struct layout_include_args *next; }; -static struct flashrom_layout *global_layout; - -struct flashrom_layout *get_global_layout(void) -{ - if (!global_layout) - flashrom_layout_new(&global_layout); - return global_layout; -} - const struct flashrom_layout *get_default_layout(const struct flashrom_flashctx *const flashctx) { return flashctx->default_layout; @@ -75,13 +66,15 @@ } #ifndef __LIBPAYLOAD__ -int read_romlayout(const char *name) +int layout_from_file(struct flashrom_layout **layout, const char *name) { - struct flashrom_layout *const layout = get_global_layout(); FILE *romlayout; char tempstr[256], tempname[256]; int ret = 1; + if (flashrom_layout_new(layout)) + return 1; + romlayout = fopen(name, "r"); if (!romlayout) { @@ -107,7 +100,7 @@ msg_gerr("Error parsing layout file. Offending string: \"%s\"\n", tempstr); goto _close_ret; } - if (flashrom_layout_add_region(layout, + if (flashrom_layout_add_region(*layout, strtol(tstr1, NULL, 16), strtol(tstr2, NULL, 16), tempname)) goto _close_ret; } @@ -219,7 +212,7 @@ return 0; /* User has specified an include argument, but no layout is loaded. */ - if (!l->head) { + if (!l || !l->head) { msg_gerr("Region requested (with -i \"%s\"), " "but no layout data is available.\n", args->name); @@ -283,7 +276,6 @@ void layout_cleanup(struct layout_include_args **args) { - struct flashrom_layout *const layout = get_global_layout(); struct layout_include_args *tmp; while (*args) { @@ -293,9 +285,6 @@ free(*args); *args = tmp; } - - global_layout = NULL; - flashrom_layout_release(layout); } int layout_sanity_checks(const struct flashrom_flashctx *const flash) @@ -462,9 +451,6 @@ */ void flashrom_layout_release(struct flashrom_layout *const layout) { - if (layout == global_layout) - return; - if (!layout) return; diff --git a/layout.h b/layout.h index f5fbc50..e62fdf9 100644 --- a/layout.h +++ b/layout.h @@ -50,10 +50,11 @@ struct layout_include_args; 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 layout_from_file(struct flashrom_layout **, const char *name); + int get_region_range(struct flashrom_layout *const l, const char *name, unsigned int *start, unsigned int *len); int process_include_args(struct flashrom_layout *l, const struct layout_include_args *const args); -- To view, visit https://review.coreboot.org/c/flashrom/+/54286 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic302e9c5faf1368e5ca244ce461e55e14f916ab8 Gerrit-Change-Number: 54286 Gerrit-PatchSet: 8 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: 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: Rework normalize_romentries() API
by Nico Huber (Code Review) 27 Jun '21

27 Jun '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/54285 ) Change subject: layout: Rework normalize_romentries() API ...................................................................... layout: Rework normalize_romentries() API Rename it to layout_sanity_checks() as that is what it does and let it work on the currently active layout instead of the global layout. Change-Id: Ifae3480d4bd68c939c291f05734544e93f00306c Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/54285 Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M flash.h M flashrom.c M layout.c M layout.h 4 files changed, 5 insertions(+), 6 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/flash.h b/flash.h index 3912e73..c8c0f9d 100644 --- a/flash.h +++ b/flash.h @@ -420,7 +420,6 @@ /* layout.c */ int register_include_arg(struct layout_include_args **args, const char *arg); int read_romlayout(const char *name); -int normalize_romentries(const struct flashctx *flash); void layout_cleanup(struct layout_include_args **args); /* spi.c */ diff --git a/flashrom.c b/flashrom.c index b20e3e1..6cc899f 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1865,7 +1865,7 @@ return 1; } - if (flash->layout == get_global_layout() && normalize_romentries(flash)) { + if (layout_sanity_checks(flash)) { msg_cerr("Requested regions can not be handled. Aborting.\n"); return 1; } diff --git a/layout.c b/layout.c index 9df0035..e4f1681 100644 --- a/layout.c +++ b/layout.c @@ -298,11 +298,10 @@ flashrom_layout_release(layout); } -/* Validate and - if needed - normalize layout entries. */ -int normalize_romentries(const struct flashctx *flash) +int layout_sanity_checks(const struct flashrom_flashctx *const flash) { - struct flashrom_layout *const layout = get_global_layout(); - chipsize_t total_size = flash->chip->total_size * 1024; + const struct flashrom_layout *const layout = get_layout(flash); + const chipsize_t total_size = flash->chip->total_size * 1024; int ret = 0; const struct romentry *entry = NULL; diff --git a/layout.h b/layout.h index 808c516..f5fbc50 100644 --- a/layout.h +++ b/layout.h @@ -62,5 +62,6 @@ const struct romentry *layout_next(const struct flashrom_layout *, const struct romentry *); int included_regions_overlap(const struct flashrom_layout *const flashrom_layout); void prepare_layout_for_extraction(struct flashrom_flashctx *flash); +int layout_sanity_checks(const struct flashrom_flashctx *); #endif /* !__LAYOUT_H__ */ -- To view, visit https://review.coreboot.org/c/flashrom/+/54285 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ifae3480d4bd68c939c291f05734544e93f00306c Gerrit-Change-Number: 54285 Gerrit-PatchSet: 8 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: 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]: libflashrom: Avoid using the global layout
by Nico Huber (Code Review) 27 Jun '21

27 Jun '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/54284 ) Change subject: libflashrom: Avoid using the global layout ...................................................................... libflashrom: Avoid using the global layout We used to borrow the global layout from the CLI here. Create a dynamically allocated one instead that doesn't need special treatment. Change-Id: Ic48c9e73a3d00782f638f6ff41b620910b24ab6f Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/54284 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> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M libflashrom.c 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/libflashrom.c b/libflashrom.c index d0f94a9..1ecf650 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -502,15 +502,17 @@ int i; char name[FMAP_STRLEN + 1]; const struct fmap_area *area; - struct flashrom_layout *l = get_global_layout(); + struct flashrom_layout *l; - if (!fmap || !l) + if (!fmap || flashrom_layout_new(&l)) return 1; 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)) + if (flashrom_layout_add_region(l, area->offset, area->offset + area->size - 1, name)) { + flashrom_layout_release(l); return 1; + } } *layout = l; -- To view, visit https://review.coreboot.org/c/flashrom/+/54284 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic48c9e73a3d00782f638f6ff41b620910b24ab6f Gerrit-Change-Number: 54284 Gerrit-PatchSet: 8 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: 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]: libflashrom: Free `chip` instance upon flashctx teardown
by Nico Huber (Code Review) 27 Jun '21

27 Jun '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/33546 ) Change subject: libflashrom: Free `chip` instance upon flashctx teardown ...................................................................... libflashrom: Free `chip` instance upon flashctx teardown Change-Id: I761d7e167a43e5bf08b5b3d269b0a476e3d343c5 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/33546 Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M libflashrom.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/libflashrom.c b/libflashrom.c index cb0d470..d0f94a9 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -331,6 +331,7 @@ /* 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); + free(second_flashctx.chip); ret = 3; break; } @@ -362,6 +363,7 @@ void flashrom_flash_release(struct flashrom_flashctx *const flashctx) { flashrom_layout_release(flashctx->default_layout); + free(flashctx->chip); free(flashctx); } -- To view, visit https://review.coreboot.org/c/flashrom/+/33546 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I761d7e167a43e5bf08b5b3d269b0a476e3d343c5 Gerrit-Change-Number: 33546 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: Make `struct layout_include_args` private to `layout.c`
by Nico Huber (Code Review) 27 Jun '21

27 Jun '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/33545 ) Change subject: layout: Make `struct layout_include_args` private to `layout.c` ...................................................................... layout: Make `struct layout_include_args` private to `layout.c` Change-Id: Icbfee68e85429fe41db1cad6b99f25e9f30cd672 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/33545 Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-by: Edward O'Callaghan <quasisec(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, 7 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/layout.c b/layout.c index e71f6a4..9df0035 100644 --- a/layout.c +++ b/layout.c @@ -29,6 +29,12 @@ struct romentry *head; }; +struct layout_include_args { + char *name; + char *file; + struct layout_include_args *next; +}; + static struct flashrom_layout *global_layout; struct flashrom_layout *get_global_layout(void) diff --git a/layout.h b/layout.h index bf183a6..808c516 100644 --- a/layout.h +++ b/layout.h @@ -47,11 +47,7 @@ struct flashrom_layout; -struct layout_include_args { - char *name; - char *file; - struct layout_include_args *next; -}; +struct layout_include_args; struct flashrom_flashctx; struct flashrom_layout *get_global_layout(void); -- To view, visit https://review.coreboot.org/c/flashrom/+/33545 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Icbfee68e85429fe41db1cad6b99f25e9f30cd672 Gerrit-Change-Number: 33545 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

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit