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

Change in flashrom[master]: layout: Tidy up the include-args API
by Nico Huber (Code Review) 13 May '21

13 May '21

Attention is currently required from: Edward O'Callaghan, Daniel Campello, Anastasia Klimchuk, Peter Marheine. Hello Edward O'Callaghan, Daniel Campello, Anastasia Klimchuk, Peter Marheine, I'd like you to do a code review. Please visit https://review.coreboot.org/c/flashrom/+/54287 to review the following change. 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> --- M cli_classic.c M flash.h M layout.c M layout.h 4 files changed, 6 insertions(+), 7 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/87/54287/1 diff --git a/cli_classic.c b/cli_classic.c index 2ed52ff..524512b 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -852,7 +852,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 2ed670f..8ca28ec 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: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> 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-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Daniel Campello <campello(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: layout: Rework normalize_romentries() API
by Nico Huber (Code Review) 13 May '21

13 May '21

Attention is currently required from: Edward O'Callaghan, Daniel Campello, Anastasia Klimchuk, Peter Marheine. Hello Edward O'Callaghan, Daniel Campello, Anastasia Klimchuk, Peter Marheine, I'd like you to do a code review. Please visit https://review.coreboot.org/c/flashrom/+/54285 to review the following change. Change subject: layout: Rework normalize_romentries() API ...................................................................... layout: Rework normalize_romentries() API Rename it to layout_sanity_checks() as that it 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> --- M flash.h M flashrom.c M layout.c M layout.h 4 files changed, 5 insertions(+), 6 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/85/54285/1 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 b10ba23..05b681a 100644 --- a/flashrom.c +++ b/flashrom.c @@ -2347,7 +2347,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 decb3c5..bb83580 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: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> 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-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Daniel Campello <campello(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: layout: Kill the global layout
by Nico Huber (Code Review) 13 May '21

13 May '21

Attention is currently required from: Edward O'Callaghan, Daniel Campello, Anastasia Klimchuk, Peter Marheine. Hello Edward O'Callaghan, Daniel Campello, Anastasia Klimchuk, Peter Marheine, I'd like you to do a code review. Please visit https://review.coreboot.org/c/flashrom/+/54286 to review the following change. 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> --- M cli_classic.c M flash.h M layout.c M layout.h 4 files changed, 11 insertions(+), 27 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/86/54286/1 diff --git a/cli_classic.c b/cli_classic.c index 9c5f22b..2ed52ff 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -516,12 +516,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; } @@ -711,9 +711,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 bb83580..2ed670f 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_empty(&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_empty(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) @@ -459,9 +448,6 @@ */ void flashrom_layout_release(struct flashrom_layout *const layout) { - if (layout == global_layout) - return; - while (layout && layout->head) { struct romentry *const entry = layout->head; layout->head = entry->next; 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: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> 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-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Daniel Campello <campello(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: libflashrom: Avoid using the global layout
by Nico Huber (Code Review) 13 May '21

13 May '21

Attention is currently required from: Edward O'Callaghan, Daniel Campello, Anastasia Klimchuk, Peter Marheine. Hello Edward O'Callaghan, Daniel Campello, Anastasia Klimchuk, Peter Marheine, I'd like you to do a code review. Please visit https://review.coreboot.org/c/flashrom/+/54284 to review the following change. 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> --- M libflashrom.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/84/54284/1 diff --git a/libflashrom.c b/libflashrom.c index 2577022..a8ae0df 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -522,9 +522,9 @@ 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_empty(&l)) return 1; for (i = 0, area = fmap->areas; i < fmap->nareas; i++, area++) { -- 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: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> 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-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Daniel Campello <campello(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: newchange

1 0

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

13 May '21

Attention is currently required from: Nico Huber, Edward O'Callaghan, Daniel Campello, Anastasia Klimchuk, Peter Marheine. Hello build bot (Jenkins), Thomas Heijligen, David Hendricks, Edward O'Callaghan, Angel Pons, Daniel Campello, Arthur Heymans, Anastasia Klimchuk, Peter Marheine, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/33519 to look at the new patch set (#4). 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> --- M layout.c M layout.h 2 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/19/33519/4 -- 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: 4 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-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Daniel Campello <campello(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: layout: Make `struct layout_include_args` private to `layout.c`
by Nico Huber (Code Review) 13 May '21

13 May '21

Attention is currently required from: Nico Huber, Edward O'Callaghan, Daniel Campello, Anastasia Klimchuk, Peter Marheine. Hello build bot (Jenkins), David Hendricks, Thomas Heijligen, Edward O'Callaghan, Angel Pons, Daniel Campello, Arthur Heymans, Anastasia Klimchuk, Peter Marheine, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/33545 to look at the new patch set (#3). 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> --- M layout.c M layout.h 2 files changed, 7 insertions(+), 5 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/45/33545/3 -- 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: 3 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: 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-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Daniel Campello <campello(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: layout: Use linked list for `struct romentry`
by Nico Huber (Code Review) 13 May '21

13 May '21

Attention is currently required from: Nico Huber, Edward O'Callaghan, Daniel Campello, Anastasia Klimchuk, Peter Marheine. Hello build bot (Jenkins), Thomas Heijligen, David Hendricks, Edward O'Callaghan, Angel Pons, Daniel Campello, Arthur Heymans, Anastasia Klimchuk, Peter Marheine, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/33521 to look at the new patch set (#4). Change subject: layout: Use linked list for `struct romentry` ...................................................................... layout: Use linked list for `struct romentry` This gets rid of the entry limit and hopefully makes future layout handling easier. We start by making `struct flashrom_layout` private to `layout.c`. Change-Id: I60a0aa1007ebcd5eb401db116f835d129b3e9732 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M layout.c M layout.h M libflashrom.c 3 files changed, 41 insertions(+), 69 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/21/33521/4 -- To view, visit https://review.coreboot.org/c/flashrom/+/33521 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I60a0aa1007ebcd5eb401db116f835d129b3e9732 Gerrit-Change-Number: 33521 Gerrit-PatchSet: 4 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-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Daniel Campello <campello(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

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

13 May '21

Attention is currently required from: Edward O'Callaghan, Daniel Campello, Anastasia Klimchuk, Peter Marheine. Hello build bot (Jenkins), Thomas Heijligen, David Hendricks, Edward O'Callaghan, Angel Pons, Daniel Campello, Arthur Heymans, Anastasia Klimchuk, Peter Marheine, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/33517 to look at the new patch set (#4). 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> --- M flashrom.c M ich_descriptors.c M layout.c M libflashrom.c M libflashrom.h 5 files changed, 55 insertions(+), 50 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/17/33517/4 -- 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: 4 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-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Daniel Campello <campello(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: layout: Add `max_entries` field
by Nico Huber (Code Review) 13 May '21

13 May '21

Attention is currently required from: Edward O'Callaghan, Daniel Campello, Anastasia Klimchuk, Peter Marheine. Hello build bot (Jenkins), Thomas Heijligen, David Hendricks, Edward O'Callaghan, Angel Pons, Daniel Campello, Arthur Heymans, Anastasia Klimchuk, Peter Marheine, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/33516 to look at the new patch set (#4). Change subject: layout: Add `max_entries` field ...................................................................... layout: Add `max_entries` field An interim solution until we have dynamic allocation. Change-Id: Ib5f431bc0a72a79a53fa1376c3417942b19dd3a0 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M flashrom.c M ich_descriptors.c M layout.c M layout.h M libflashrom.c 5 files changed, 9 insertions(+), 5 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/16/33516/4 -- 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: 4 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-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Daniel Campello <campello(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: programmer: Make use of new register_spi_master() API
by Nico Huber (Code Review) 13 May '21

13 May '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/54067 ) Change subject: programmer: Make use of new register_spi_master() API ...................................................................... programmer: Make use of new register_spi_master() API Pass pointers to dynamically allocated data to register_spi_master(). This way we can avoid some mutable globals. Change-Id: Id7821f1db3284b7b5b3d0abfd878b979c53870a1 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/54067 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> --- M digilent_spi.c M dummyflasher.c M ft2232_spi.c M it85spi.c M it87spi.c M jlink_spi.c M linux_spi.c M lspcon_i2c_spi.c M pickit2_spi.c M usbblaster_spi.c M wbsio_spi.c 11 files changed, 22 insertions(+), 35 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved diff --git a/digilent_spi.c b/digilent_spi.c index 5471724..ee78890 100644 --- a/digilent_spi.c +++ b/digilent_spi.c @@ -315,7 +315,7 @@ return 0; } -static struct spi_master spi_master_digilent_spi = { +static const struct spi_master spi_master_digilent_spi = { .features = SPI_MASTER_4BA, .max_data_read = 252, .max_data_write = 252, @@ -454,10 +454,9 @@ } digilent_data->reset_board = reset_board; digilent_data->handle = handle; - spi_master_digilent_spi.data = digilent_data; register_shutdown(digilent_spi_shutdown, digilent_data); - register_spi_master(&spi_master_digilent_spi, NULL); + register_spi_master(&spi_master_digilent_spi, digilent_data); return 0; diff --git a/dummyflasher.c b/dummyflasher.c index 74075f4..d434eec 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -611,7 +611,7 @@ -static struct spi_master spi_master_dummyflasher = { +static const struct spi_master spi_master_dummyflasher = { .features = SPI_MASTER_4BA, .max_data_read = MAX_DATA_READ_UNLIMITED, .max_data_write = MAX_DATA_UNSPECIFIED, @@ -674,7 +674,6 @@ } data->emu_chip = EMULATE_NONE; data->delay_us = 0; - spi_master_dummyflasher.data = data; par_master_dummy.data = data; msg_pspew("%s\n", __func__); @@ -1030,7 +1029,7 @@ register_par_master(&par_master_dummy, dummy_buses_supported & (BUS_PARALLEL | BUS_LPC | BUS_FWH)); if (dummy_buses_supported & BUS_SPI) - register_spi_master(&spi_master_dummyflasher, NULL); + register_spi_master(&spi_master_dummyflasher, data); return 0; } diff --git a/ft2232_spi.c b/ft2232_spi.c index 8d50d20..6072cd2 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -276,7 +276,7 @@ return failed ? -1 : 0; } -static struct spi_master spi_master_ft2232 = { +static const struct spi_master spi_master_ft2232 = { .features = SPI_MASTER_4BA, .max_data_read = 64 * 1024, .max_data_write = 256, @@ -620,13 +620,11 @@ spi_data->pindir = pindir; spi_data->ftdic_context = ftdic; - spi_master_ft2232.data = spi_data; - if (register_shutdown(ft2232_shutdown, spi_data)) { free(spi_data); goto ftdi_err; } - register_spi_master(&spi_master_ft2232, NULL); + register_spi_master(&spi_master_ft2232, spi_data); return 0; diff --git a/it85spi.c b/it85spi.c index 4d0f988..810f062 100644 --- a/it85spi.c +++ b/it85spi.c @@ -281,7 +281,7 @@ return 0; } -static struct spi_master spi_master_it85xx = { +static const struct spi_master spi_master_it85xx = { .max_data_read = 64, .max_data_write = 64, .command = it85xx_spi_send_command, @@ -358,15 +358,13 @@ return 1; } - spi_master_it85xx.data = data; - /* FIXME: Really leave FWH enabled? We can't use this region * anymore since accessing it would mess up IT85 communication. * If we decide to disable FWH for this region, we should print * a debug message about it. */ /* Set this as SPI controller. */ - register_spi_master(&spi_master_it85xx, NULL); + register_spi_master(&spi_master_it85xx, data); return 0; } diff --git a/it87spi.c b/it87spi.c index 0760ac8..92c95fa 100644 --- a/it87spi.c +++ b/it87spi.c @@ -290,7 +290,7 @@ return 0; } -static struct spi_master spi_master_it87xx = { +static const struct spi_master spi_master_it87xx = { .max_data_read = 3, .max_data_write = MAX_DATA_UNSPECIFIED, .command = it8716f_spi_send_command, @@ -419,14 +419,13 @@ data->flashport = flashport; data->fast_spi = 1; - spi_master_it87xx.data = data; register_shutdown(it8716f_shutdown, data); if (internal_buses_supported & BUS_SPI) msg_pdbg("Overriding chipset SPI with IT87 SPI.\n"); /* FIXME: Add the SPI bus or replace the other buses with it? */ - register_spi_master(&spi_master_it87xx, NULL); + register_spi_master(&spi_master_it87xx, data); return 0; } diff --git a/jlink_spi.c b/jlink_spi.c index 9fe44a5..6342e7f 100644 --- a/jlink_spi.c +++ b/jlink_spi.c @@ -155,7 +155,7 @@ return 0; } -static struct spi_master spi_master_jlink_spi = { +static const struct spi_master spi_master_jlink_spi = { /* Maximum data read size in one go (excluding opcode+address). */ .max_data_read = JTAG_MAX_TRANSFER_SIZE - 5, /* Maximum data write size in one go (excluding opcode+address). */ @@ -464,7 +464,6 @@ jlink_data->ctx = jaylink_ctx; jlink_data->devh = jaylink_devh; jlink_data->reset_cs = reset_cs; - spi_master_jlink_spi.data = jlink_data; /* Ensure that the CS signal is not active initially. */ if (!deassert_cs(jlink_data)) @@ -472,7 +471,7 @@ if (register_shutdown(jlink_spi_shutdown, jlink_data)) goto init_err; - register_spi_master(&spi_master_jlink_spi, NULL); + register_spi_master(&spi_master_jlink_spi, jlink_data); return 0; diff --git a/linux_spi.c b/linux_spi.c index 82741bf..7d866f4 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -113,7 +113,7 @@ return 0; } -static struct spi_master spi_master_linux = { +static const struct spi_master spi_master_linux = { .features = SPI_MASTER_4BA, .max_data_read = MAX_DATA_UNSPECIFIED, /* TODO? */ .max_data_write = MAX_DATA_UNSPECIFIED, /* TODO? */ @@ -238,13 +238,12 @@ } spi_data->fd = fd; spi_data->max_kernel_buf_size = max_kernel_buf_size; - spi_master_linux.data = spi_data; if (register_shutdown(linux_spi_shutdown, spi_data)) { free(spi_data); goto init_err; } - register_spi_master(&spi_master_linux, NULL); + register_spi_master(&spi_master_linux, spi_data); return 0; init_err: diff --git a/lspcon_i2c_spi.c b/lspcon_i2c_spi.c index 6b8dfe6..7f5e3ef 100644 --- a/lspcon_i2c_spi.c +++ b/lspcon_i2c_spi.c @@ -408,7 +408,7 @@ return SPI_GENERIC_ERROR; } -static struct spi_master spi_master_i2c_lspcon = { +static const struct spi_master spi_master_i2c_lspcon = { .max_data_read = 16, .max_data_write = 12, .command = lspcon_i2c_spi_send_command, @@ -454,10 +454,9 @@ } data->fd = fd; - spi_master_i2c_lspcon.data = data; ret |= register_shutdown(lspcon_i2c_spi_shutdown, data); - ret |= register_spi_master(&spi_master_i2c_lspcon, NULL); + ret |= register_spi_master(&spi_master_i2c_lspcon, data); return ret; } diff --git a/pickit2_spi.c b/pickit2_spi.c index 47316d0..9c423b9 100644 --- a/pickit2_spi.c +++ b/pickit2_spi.c @@ -340,7 +340,7 @@ return millivolt; } -static struct spi_master spi_master_pickit2 = { +static const struct spi_master spi_master_pickit2 = { .max_data_read = 40, .max_data_write = 40, .command = pickit2_spi_send_command, @@ -477,7 +477,6 @@ return 1; } pickit2_data->pickit2_handle = pickit2_handle; - spi_master_pickit2.data = pickit2_data; if (pickit2_get_firmware_version(pickit2_handle)) goto init_err_cleanup_exit; @@ -501,7 +500,7 @@ if (register_shutdown(pickit2_shutdown, pickit2_data)) goto init_err_cleanup_exit; - register_spi_master(&spi_master_pickit2, NULL); + register_spi_master(&spi_master_pickit2, pickit2_data); return 0; diff --git a/usbblaster_spi.c b/usbblaster_spi.c index b652a3d..115876e 100644 --- a/usbblaster_spi.c +++ b/usbblaster_spi.c @@ -168,7 +168,7 @@ return 0; } -static struct spi_master spi_master_usbblaster = { +static const struct spi_master spi_master_usbblaster = { .max_data_read = 256, .max_data_write = 256, .command = usbblaster_spi_send_command, @@ -226,13 +226,12 @@ return -1; } usbblaster_data->ftdic = ftdic; - spi_master_usbblaster.data = usbblaster_data; if (register_shutdown(usbblaster_shutdown, usbblaster_data)) { free(usbblaster_data); return -1; } - register_spi_master(&spi_master_usbblaster, NULL); + register_spi_master(&spi_master_usbblaster, usbblaster_data); return 0; } diff --git a/wbsio_spi.c b/wbsio_spi.c index 9eed495..d17d49d 100644 --- a/wbsio_spi.c +++ b/wbsio_spi.c @@ -177,7 +177,7 @@ return 0; } -static struct spi_master spi_master_wbsio = { +static const struct spi_master spi_master_wbsio = { .max_data_read = MAX_DATA_UNSPECIFIED, .max_data_write = MAX_DATA_UNSPECIFIED, .command = wbsio_spi_send_command, @@ -215,8 +215,7 @@ data->spibase = wbsio_spibase; register_shutdown(wbsio_spi_shutdown, data); - spi_master_wbsio.data = data; - register_spi_master(&spi_master_wbsio, NULL); + register_spi_master(&spi_master_wbsio, data); return 0; } -- To view, visit https://review.coreboot.org/c/flashrom/+/54067 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Id7821f1db3284b7b5b3d0abfd878b979c53870a1 Gerrit-Change-Number: 54067 Gerrit-PatchSet: 4 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: Edward O'Callaghan <quasisec(a)chromium.org> 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-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit May 2021