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

Change in flashrom[master]: programmer.h,chipset_enable.c: Make penable fn ptr more descript
by Edward O'Callaghan (Code Review) 20 Apr '21

20 Apr '21

Attention is currently required from: Edward O'Callaghan, Angel Pons, Anastasia Klimchuk. Hello build bot (Jenkins), Nico Huber, Angel Pons, Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/52364 to look at the new patch set (#2). Change subject: programmer.h,chipset_enable.c: Make penable fn ptr more descript ...................................................................... programmer.h,chipset_enable.c: Make penable fn ptr more descript The enable_flash callback function pointer embedded within the penable struct is used by the chipset_enable entry-point to dispatch to the correct concrete implementation. The handles have the canonical form `flash_enable_<chipset-name>()` and therefore `doit()` is hard to comprehend while groking code and seeing to what it refers to. It is also a little more confusing as there used to be another doit() in flashrom once upon a time. BUG=none TEST=builds Change-Id: I8b3a4ec51ea488c40c20ccafea883f8dea93577d Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M chipset_enable.c M programmer.h 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/64/52364/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/52364 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I8b3a4ec51ea488c40c20ccafea883f8dea93577d Gerrit-Change-Number: 52364 Gerrit-PatchSet: 2 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> 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: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: ft2232_spi.c: Pack WREN and op in one ftdi_write_data() call
by Alan Green (Code Review) 20 Apr '21

20 Apr '21

Attention is currently required from: Simon Buhrow, Nico Huber, Edward O'Callaghan, Samir Ibradžić. Alan Green has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/40477 ) Change subject: ft2232_spi.c: Pack WREN and op in one ftdi_write_data() call ...................................................................... Patch Set 25: Code-Review+1 (2 comments) Patchset: PS25: I'd be happy to see faster programming. Thank you for putting this together. I'm sorry I didn't see it earlier! If you'd like someone to pick up this change (I see it has been in flight for over a year) let me know. File ft2232_spi.c: https://review.coreboot.org/c/flashrom/+/40477/comment/c1a0b99a_3f6b582e PS25, Line 189: ft2232_spi_send_command There's much repeated code between send_command and send_multicommand. Can send_command be implemented by calling ft2232_spi_send_multicommand() ? -- To view, visit https://review.coreboot.org/c/flashrom/+/40477 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ie4a07499ec5ef0af23818593f45dc427285a9e8a Gerrit-Change-Number: 40477 Gerrit-PatchSet: 25 Gerrit-Owner: Simon Buhrow Gerrit-Reviewer: Alan Green <avg(a)google.com> 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: Samir Ibradžić <sibradzic(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Patrick Georgi <pgeorgi(a)google.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Simon Buhrow Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Samir Ibradžić <sibradzic(a)gmail.com> Gerrit-Comment-Date: Tue, 20 Apr 2021 01:17:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: hwaccess.h: Split hwaccess.h and extract hwaccess_io.h out of it
by Anastasia Klimchuk (Code Review) 20 Apr '21

20 Apr '21

Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/52499 ) Change subject: hwaccess.h: Split hwaccess.h and extract hwaccess_io.h out of it ...................................................................... Patch Set 3: (1 comment) Patchset: PS1: > This needs to be tested by comparing binaries Done -- To view, visit https://review.coreboot.org/c/flashrom/+/52499 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Idd04c7b36b24e9da339348a015df4f43a03744f7 Gerrit-Change-Number: 52499 Gerrit-PatchSet: 3 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Tue, 20 Apr 2021 01:15:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: Add unit test to run init/shutdown for mec1308.c
by Anastasia Klimchuk (Code Review) 20 Apr '21

20 Apr '21

Attention is currently required from: Nico Huber, Edward O'Callaghan, Angel Pons. Hello build bot (Jenkins), Nico Huber, Angel Pons, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/51487 to look at the new patch set (#5). Change subject: tests: Add unit test to run init/shutdown for mec1308.c ...................................................................... tests: Add unit test to run init/shutdown for mec1308.c This patch includes mocks for io operations in hwaccess_io.h because those are needed to test lifecycle of mec1308.c BUG=b:181803212 TEST=builds and ninja test Change-Id: I3af612defe1af3850dfc1626a208d873e3a3eddc Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- A hwaccess_io_unittest.h M meson.build M tests/init_shutdown.c M tests/meson.build M tests/tests.c M tests/tests.h 6 files changed, 107 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/87/51487/5 -- To view, visit https://review.coreboot.org/c/flashrom/+/51487 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3af612defe1af3850dfc1626a208d873e3a3eddc Gerrit-Change-Number: 51487 Gerrit-PatchSet: 5 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: hwaccess.h: Split hwaccess.h and extract hwaccess_io.h out of it
by Anastasia Klimchuk (Code Review) 20 Apr '21

20 Apr '21

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/52499 to look at the new patch set (#3). Change subject: hwaccess.h: Split hwaccess.h and extract hwaccess_io.h out of it ...................................................................... hwaccess.h: Split hwaccess.h and extract hwaccess_io.h out of it This change makes it possible to mock functions from hwaccess_io.h in tests. The rest of hwaccess.h is fine and works for the test environment. BUG=b:181803212 TEST=make clean && make CONFIG_EVERYTHING=yes VERSION=none Build flashrom before and after this patch, flashrom binary is the same (diff flashrom_before flashrom_after shows no diffs) Change-Id: Idd04c7b36b24e9da339348a015df4f43a03744f7 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M hwaccess.h A hwaccess_io.h 2 files changed, 157 insertions(+), 136 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/99/52499/3 -- To view, visit https://review.coreboot.org/c/flashrom/+/52499 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Idd04c7b36b24e9da339348a015df4f43a03744f7 Gerrit-Change-Number: 52499 Gerrit-PatchSet: 3 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: flashrom.c: allow - as filename for stdin/stdout
by Daniel Campello (Code Review) 20 Apr '21

20 Apr '21

Attention is currently required from: Nico Huber, Edward O'Callaghan, Angel Pons. Daniel Campello has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/52383 ) Change subject: flashrom.c: allow - as filename for stdin/stdout ...................................................................... Patch Set 12: (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/52383/comment/e3dba591_0bd9ebd4 PS11, Line 9: Allows - as filename for -r/-w/-v options > Do add a rational here, perhaps something like - "It is sometimes useful to script flashrom and allo […] Done -- To view, visit https://review.coreboot.org/c/flashrom/+/52383 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I97889cfdf7ba9a257e182c4ee2b20075cfa58d4d Gerrit-Change-Number: 52383 Gerrit-PatchSet: 12 Gerrit-Owner: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Jack Rosenthal <jrosenth(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-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Tue, 20 Apr 2021 01:03:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: layout: Add -i <region>[:<file>] support
by Daniel Campello (Code Review) 20 Apr '21

20 Apr '21

Attention is currently required from: Sam McNally, Nico Huber, Nicola Corna, Jack Rosenthal, Paul Menzel, Stefan Reinauer, David Hendricks, Arthur Heymans, Carl-Daniel Hailfinger. Daniel Campello has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/23021 ) Change subject: layout: Add -i <region>[:<file>] support ...................................................................... Patch Set 34: (1 comment) File layout.c: https://review.coreboot.org/c/flashrom/+/23021/comment/7490f045_9749833e PS27, Line 221: } > Done I had used msg_gdbg() instead of msg_ginfo()... Fixed now -- To view, visit https://review.coreboot.org/c/flashrom/+/23021 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic5465659605d8431d931053967b40290195cfd99 Gerrit-Change-Number: 23021 Gerrit-PatchSet: 34 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> 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: Jack Rosenthal <jrosenth(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Nicola Corna <nicola(a)corna.info> Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Reviewer: Sam McNally <sammc(a)google.com> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Sam McNally <sammc(a)google.com> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Nicola Corna <nicola(a)corna.info> Gerrit-Attention: Jack Rosenthal <jrosenth(a)chromium.org> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Attention: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Gerrit-Comment-Date: Tue, 20 Apr 2021 01:03:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Comment-In-Reply-To: Daniel Campello <campello(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: cli_classic.c: implement set_wp_region operation
by Daniel Campello (Code Review) 20 Apr '21

20 Apr '21

Daniel Campello has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/52531 ) Change subject: cli_classic.c: implement set_wp_region operation ...................................................................... cli_classic.c: implement set_wp_region operation set_wp_region allows to set the wp_range based on a layout region. Signed-off-by: Daniel Campello <campello(a)chromium.org> Change-Id: Ibad68a038ab38b9986b0d8b5f5eb6c73b20ef381 --- M cli_classic.c M layout.c M layout.h 3 files changed, 42 insertions(+), 10 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/31/52531/1 diff --git a/cli_classic.c b/cli_classic.c index 78ae76f..f9a2a14 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -66,6 +66,7 @@ " --wp-list list write protect range\n" " --wp-status show write protect status\n" " --wp-range=<start>,<len> set write protect range\n" + " --wp-region <region> set write protect region\n" " --flash-name read out the detected flash name\n" " --flash-size read out the detected flash size\n" " --fmap read ROM layout from fmap embedded in ROM\n" @@ -254,6 +255,7 @@ char *pparam = NULL; struct layout_include_args *include_args = NULL; char *wp_mode_opt = NULL; + char *wp_region = NULL; /* * Safety-guard against a user who has (mistakenly) closed @@ -480,6 +482,10 @@ } #endif /* STANDALONE */ break; + case OPTION_WP_SET_REGION: + set_wp_region = 1; + wp_region = strdup(optarg); + break; default: cli_classic_abort_usage(NULL); break; @@ -746,8 +752,9 @@ goto out_shutdown; } + struct wp *wp = fill_flash->chip->wp; if (set_wp_range || set_wp_region) { - if (!fill_flash->chip->wp || !fill_flash->chip->wp->set_range) { + if (!wp || !wp->set_range) { msg_gerr("Error: write protect is not supported on this flash chip.\n"); ret = 1; goto out_shutdown; @@ -812,8 +819,8 @@ flashrom_layout_set(fill_flash, layout); if (wp_status) { - if (fill_flash->chip->wp && fill_flash->chip->wp->wp_status) { - ret |= fill_flash->chip->wp->wp_status(fill_flash); + if (wp && wp->wp_status) { + ret |= wp->wp_status(fill_flash); } else { msg_gerr("Error: write protect is not supported on this flash chip.\n"); ret = 1; @@ -823,8 +830,8 @@ /* Note: set_wp_disable should be done before setting the range */ if (set_wp_disable) { - if (fill_flash->chip->wp && fill_flash->chip->wp->disable) { - ret |= fill_flash->chip->wp->disable(fill_flash); + if (wp && wp->disable) { + ret |= wp->disable(fill_flash); } else { msg_gerr("Error: write protect is not supported on this flash chip.\n"); ret = 1; @@ -834,7 +841,16 @@ /* Note: set_wp_range must happen before set_wp_enable */ if (set_wp_range) { - ret |= fill_flash->chip->wp->set_range(fill_flash, wp_start, wp_len); + ret |= wp->set_range(fill_flash, wp_start, wp_len); + } + + if (set_wp_region && wp_region) { + if (get_region_range(layout, wp_region, &wp_start, &wp_len)) { + ret = 1; + goto out_shutdown; + } + ret |= wp->set_range(fill_flash, wp_start, wp_len); + free(wp_region); } if (!ret && set_wp_enable) { @@ -851,8 +867,8 @@ goto out_shutdown; } - if (fill_flash->chip->wp && fill_flash->chip->wp->enable) { - ret |= fill_flash->chip->wp->enable(fill_flash, wp_mode); + if (wp && wp->enable) { + ret |= wp->enable(fill_flash, wp_mode); } else { msg_gerr("Error: write protect is not supported on this flash chip.\n"); ret = 1; @@ -862,8 +878,8 @@ if (wp_list) { msg_ginfo("Valid write protection ranges:\n"); - if (fill_flash->chip->wp && fill_flash->chip->wp->list_ranges) { - ret |= fill_flash->chip->wp->list_ranges(fill_flash); + if (wp && wp->list_ranges) { + ret |= wp->list_ranges(fill_flash); } else { msg_gerr("Error: write protect is not supported on this flash chip.\n"); ret = 1; diff --git a/layout.c b/layout.c index 7fd203d..4d1dd56 100644 --- a/layout.c +++ b/layout.c @@ -184,6 +184,20 @@ return 0; } +int get_region_range(struct flashrom_layout *const l, const char *name, + unsigned int *start, unsigned int *len) +{ + size_t i; + for (i = 0; i < l->num_entries; ++i) { + if (!strcmp(l->entries[i].name, name)) { + *start = l->entries[i].start; + *len = l->entries[i].end - l->entries[i].start + 1; + return 0; + } + } + return 1; +} + /* process -i arguments * returns 0 to indicate success, >0 to indicate failure */ diff --git a/layout.h b/layout.h index 327f5bf..f574097 100644 --- a/layout.h +++ b/layout.h @@ -65,6 +65,8 @@ 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, + 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 *); -- To view, visit https://review.coreboot.org/c/flashrom/+/52531 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ibad68a038ab38b9986b0d8b5f5eb6c73b20ef381 Gerrit-Change-Number: 52531 Gerrit-PatchSet: 1 Gerrit-Owner: Daniel Campello <campello(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: cli_classic.c: reorder writeprotect operation processing
by Daniel Campello (Code Review) 20 Apr '21

20 Apr '21

Daniel Campello has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/52530 ) Change subject: cli_classic.c: reorder writeprotect operation processing ...................................................................... cli_classic.c: reorder writeprotect operation processing Make sure that layout is set before. Also as the comment instructs make sure that set_rw_range happens before set_wp_enable. Signed-off-by: Daniel Campello <campello(a)chromium.org> Change-Id: I7480d3f947aaaf30093d056226fe0c402763efdc --- M cli_classic.c 1 file changed, 61 insertions(+), 61 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/30/52530/1 diff --git a/cli_classic.c b/cli_classic.c index 0557b80..78ae76f 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -770,66 +770,6 @@ goto out_shutdown; } - if (wp_status) { - if (fill_flash->chip->wp && fill_flash->chip->wp->wp_status) { - ret |= fill_flash->chip->wp->wp_status(fill_flash); - } else { - msg_gerr("Error: write protect is not supported on this flash chip.\n"); - ret = 1; - } - goto out_shutdown; - } - - /* Note: set_wp_disable should be done before setting the range */ - if (set_wp_disable) { - if (fill_flash->chip->wp && fill_flash->chip->wp->disable) { - ret |= fill_flash->chip->wp->disable(fill_flash); - } else { - msg_gerr("Error: write protect is not supported on this flash chip.\n"); - ret = 1; - goto out_shutdown; - } - } - - if (!ret && set_wp_enable) { - enum wp_mode wp_mode; - - if (wp_mode_opt) - wp_mode = get_wp_mode(wp_mode_opt); - else - wp_mode = WP_MODE_HARDWARE; /* default */ - - if (wp_mode == WP_MODE_UNKNOWN) { - msg_gerr("Error: Invalid WP mode: \"%s\"\n", wp_mode_opt); - ret = 1; - goto out_shutdown; - } - - if (fill_flash->chip->wp && fill_flash->chip->wp->enable) { - ret |= fill_flash->chip->wp->enable(fill_flash, wp_mode); - } else { - msg_gerr("Error: write protect is not supported on this flash chip.\n"); - ret = 1; - goto out_shutdown; - } - } - - if (wp_list) { - msg_ginfo("Valid write protection ranges:\n"); - if (fill_flash->chip->wp && fill_flash->chip->wp->list_ranges) { - ret |= fill_flash->chip->wp->list_ranges(fill_flash); - } else { - msg_gerr("Error: write protect is not supported on this flash chip.\n"); - ret = 1; - } - goto out_shutdown; - } - - /* Note: set_wp_range must happen before set_wp_enable */ - if (set_wp_range) { - ret |= fill_flash->chip->wp->set_range(fill_flash, wp_start, wp_len); - } - if (layoutfile) { layout = get_global_layout(); } else if (ifd && (flashrom_layout_read_from_ifd(&layout, fill_flash, NULL, 0) || @@ -869,8 +809,68 @@ ret = 1; goto out_shutdown; } - flashrom_layout_set(fill_flash, layout); + + if (wp_status) { + if (fill_flash->chip->wp && fill_flash->chip->wp->wp_status) { + ret |= fill_flash->chip->wp->wp_status(fill_flash); + } else { + msg_gerr("Error: write protect is not supported on this flash chip.\n"); + ret = 1; + } + goto out_shutdown; + } + + /* Note: set_wp_disable should be done before setting the range */ + if (set_wp_disable) { + if (fill_flash->chip->wp && fill_flash->chip->wp->disable) { + ret |= fill_flash->chip->wp->disable(fill_flash); + } else { + msg_gerr("Error: write protect is not supported on this flash chip.\n"); + ret = 1; + goto out_shutdown; + } + } + + /* Note: set_wp_range must happen before set_wp_enable */ + if (set_wp_range) { + ret |= fill_flash->chip->wp->set_range(fill_flash, wp_start, wp_len); + } + + if (!ret && set_wp_enable) { + enum wp_mode wp_mode; + + if (wp_mode_opt) + wp_mode = get_wp_mode(wp_mode_opt); + else + wp_mode = WP_MODE_HARDWARE; /* default */ + + if (wp_mode == WP_MODE_UNKNOWN) { + msg_gerr("Error: Invalid WP mode: \"%s\"\n", wp_mode_opt); + ret = 1; + goto out_shutdown; + } + + if (fill_flash->chip->wp && fill_flash->chip->wp->enable) { + ret |= fill_flash->chip->wp->enable(fill_flash, wp_mode); + } else { + msg_gerr("Error: write protect is not supported on this flash chip.\n"); + ret = 1; + goto out_shutdown; + } + } + + if (wp_list) { + msg_ginfo("Valid write protection ranges:\n"); + if (fill_flash->chip->wp && fill_flash->chip->wp->list_ranges) { + ret |= fill_flash->chip->wp->list_ranges(fill_flash); + } else { + msg_gerr("Error: write protect is not supported on this flash chip.\n"); + ret = 1; + } + goto out_shutdown; + } + flashrom_flag_set(fill_flash, FLASHROM_FLAG_FORCE, !!force); #if CONFIG_INTERNAL == 1 flashrom_flag_set(fill_flash, FLASHROM_FLAG_FORCE_BOARDMISMATCH, !!force_boardmismatch); -- To view, visit https://review.coreboot.org/c/flashrom/+/52530 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7480d3f947aaaf30093d056226fe0c402763efdc Gerrit-Change-Number: 52530 Gerrit-PatchSet: 1 Gerrit-Owner: Daniel Campello <campello(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: flashrom.c: allow - as filename for stdin/stdout
by Daniel Campello (Code Review) 20 Apr '21

20 Apr '21

Attention is currently required from: Nico Huber, Angel Pons, Daniel Campello. Hello build bot (Jenkins), Nico Huber, Jack Rosenthal, Edward O'Callaghan, Angel Pons, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/52383 to look at the new patch set (#12). Change subject: flashrom.c: allow - as filename for stdin/stdout ...................................................................... flashrom.c: allow - as filename for stdin/stdout Allows - as filename for -r/-w/-v options. It is sometimes useful to script flashrom and allowing it to work with pipes allows for more flexibility in this specific use-case. Signed-off-by: Daniel Campello <campello(a)chromium.org> Change-Id: I97889cfdf7ba9a257e182c4ee2b20075cfa58d4d --- M cli_classic.c M flashrom.c 2 files changed, 25 insertions(+), 9 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/83/52383/12 -- To view, visit https://review.coreboot.org/c/flashrom/+/52383 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I97889cfdf7ba9a257e182c4ee2b20075cfa58d4d Gerrit-Change-Number: 52383 Gerrit-PatchSet: 12 Gerrit-Owner: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Jack Rosenthal <jrosenth(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-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Daniel Campello <campello(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit April 2021