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

Change in flashrom[master]: cli_classic.c: add -x option for do_extract()
by Edward O'Callaghan (Code Review) 02 May '21

02 May '21

Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/52450 ) Change subject: cli_classic.c: add -x option for do_extract() ...................................................................... Patch Set 12: (1 comment) Patchset: PS12: Daniel, I just realised after hitting submit this is missing the manpage update. Can you please follow up with that -- To view, visit https://review.coreboot.org/c/flashrom/+/52450 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I8c69223fa92cf5b50abe070f1ab9f19d3b42f6ff Gerrit-Change-Number: 52450 Gerrit-PatchSet: 12 Gerrit-Owner: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Sam McNally <sammc(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Comment-Date: Sun, 02 May 2021 23:47:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: lspcon_i2c_spi: Release I2C fd on failed init
by Anastasia Klimchuk (Code Review) 02 May '21

02 May '21

Attention is currently required from: Nico Huber, Angel Pons, Peter Marheine. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/52829 ) Change subject: lspcon_i2c_spi: Release I2C fd on failed init ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/52829 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Idec3cd349ab8d6e2ebb0fafae70c5d69bb2c8880 Gerrit-Change-Number: 52829 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Sun, 02 May 2021 23:47:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: cli_classic.c: add -x option for do_extract()
by Edward O'Callaghan (Code Review) 02 May '21

02 May '21

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/52450 ) Change subject: cli_classic.c: add -x option for do_extract() ...................................................................... cli_classic.c: add -x option for do_extract() This change introduces a new option to extract all layout regions to files with the name of each region (or with the provided filename via -i region:file). It is implemented by mutating the flash layout to include all regions and backfilling the entry->file with entry->name (replacing spaces with underscores) Signed-off-by: Daniel Campello <campello(a)chromium.org> Change-Id: I8c69223fa92cf5b50abe070f1ab9f19d3b42f6ff Reviewed-on: https://review.coreboot.org/c/flashrom/+/52450 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> --- M cli_classic.c M flash.h M flashrom.c M layout.c M layout.h 5 files changed, 39 insertions(+), 4 deletions(-) Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved diff --git a/cli_classic.c b/cli_classic.c index 7d4dee0..57f8dfb 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -40,7 +40,7 @@ #endif "\n\t-p <programmername>[:<parameters>] [-c <chipname>]\n" "\t\t(--flash-name|--flash-size|\n" - "\t\t [-E|(-r|-w|-v) <file>]\n" + "\t\t [-E|-x|(-r|-w|-v) <file>]\n" "\t\t [(-l <layoutfile>|--ifd| --fmap|--fmap-file <file>) [-i <region>[:<file>]]...]\n" "\t\t [-n] [-N] [-f])]\n" "\t[-V[V[V]]] [-o <logfile>]\n\n", name); @@ -58,6 +58,7 @@ " -f | --force force specific operations (see man page)\n" " -n | --noverify don't auto-verify\n" " -N | --noverify-all verify included regions only (cf. -i)\n" + " -x | --extract extract regions to files\n" " -l | --layout <layoutfile> read ROM layout from <layoutfile>\n" " --wp-disable disable write protection\n" " --wp-enable enable write protection\n" @@ -167,7 +168,7 @@ int flash_name = 0, flash_size = 0; int set_wp_enable = 0, set_wp_disable = 0, wp_status = 0; int set_wp_range = 0, set_wp_region = 0, wp_list = 0; - int read_it = 0, write_it = 0, erase_it = 0, verify_it = 0; + int read_it = 0, extract_it = 0, write_it = 0, erase_it = 0, verify_it = 0; int dont_verify_it = 0, dont_verify_all = 0, list_supported = 0, operation_specified = 0; struct flashrom_layout *layout = NULL; enum programmer prog = PROGRAMMER_INVALID; @@ -188,7 +189,7 @@ int ret = 0; unsigned int wp_start = 0, wp_len = 0; - static const char optstring[] = "r:Rw:v:nNVEfc:l:i:p:Lzho:"; + static const char optstring[] = "r:Rw:v:nNVEfc:l:i:p:Lzho:x"; static const struct option long_options[] = { {"read", 1, NULL, 'r'}, {"write", 1, NULL, 'w'}, @@ -196,6 +197,7 @@ {"verify", 1, NULL, 'v'}, {"noverify", 0, NULL, 'n'}, {"noverify-all", 0, NULL, 'N'}, + {"extract", 0, NULL, 'x'}, {"chip", 1, NULL, 'c'}, {"verbose", 0, NULL, 'V'}, {"force", 0, NULL, 'f'}, @@ -287,6 +289,10 @@ case 'N': dont_verify_all = 1; break; + case 'x': + cli_classic_validate_singleop(&operation_specified); + extract_it = 1; + break; case 'c': chip_to_probe = strdup(optarg); break; @@ -658,7 +664,7 @@ if (!(read_it | write_it | verify_it | erase_it | flash_name | flash_size | set_wp_range | set_wp_region | set_wp_enable | - set_wp_disable | wp_status | wp_list)) { + set_wp_disable | wp_status | wp_list | extract_it)) { msg_ginfo("No operations were specified.\n"); goto out_shutdown; } @@ -813,6 +819,8 @@ programmer_delay(100000); if (read_it) ret = do_read(fill_flash, filename); + else if (extract_it) + ret = do_extract(fill_flash); else if (erase_it) ret = do_erase(fill_flash); else if (write_it) diff --git a/flash.h b/flash.h index c0e5c27..dd8e156 100644 --- a/flash.h +++ b/flash.h @@ -357,6 +357,7 @@ int prepare_flash_access(struct flashctx *, bool read_it, bool write_it, bool erase_it, bool verify_it); void finalize_flash_access(struct flashctx *); int do_read(struct flashctx *, const char *filename); +int do_extract(struct flashctx *); int do_erase(struct flashctx *); int do_write(struct flashctx *, const char *const filename, const char *const referencefile); int do_verify(struct flashctx *, const char *const filename); diff --git a/flashrom.c b/flashrom.c index e1121d8..0af5057 100644 --- a/flashrom.c +++ b/flashrom.c @@ -2695,6 +2695,12 @@ return ret; } +int do_extract(struct flashctx *const flash) +{ + prepare_layout_for_extraction(flash); + return do_read(flash, NULL); +} + int do_erase(struct flashctx *const flash) { const int ret = flashrom_flash_erase(flash); diff --git a/layout.c b/layout.c index d0d2607..7fd203d 100644 --- a/layout.c +++ b/layout.c @@ -15,6 +15,7 @@ * GNU General Public License for more details. */ +#include <ctype.h> #include <errno.h> #include <stdio.h> #include <stdlib.h> @@ -308,6 +309,24 @@ return ret; } +void prepare_layout_for_extraction(struct flashctx *flash) +{ + const struct flashrom_layout *const l = get_layout(flash); + unsigned int i, j; + + for (i = 0; i < l->num_entries; ++i) { + l->entries[i].included = true; + + if (!l->entries[i].file) + l->entries[i].file = strdup(l->entries[i].name); + + for (j = 0; l->entries[i].file[j]; j++) { + if (isspace(l->entries[i].file[j])) + l->entries[i].file[j] = '_'; + } + } +} + const struct romentry *layout_next_included_region( const struct flashrom_layout *const l, const chipoff_t where) { diff --git a/layout.h b/layout.h index b11c432..327f5bf 100644 --- a/layout.h +++ b/layout.h @@ -69,5 +69,6 @@ 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 *); int included_regions_overlap(const struct flashrom_layout *const flashrom_layout); +void prepare_layout_for_extraction(struct flashrom_flashctx *flash); #endif /* !__LAYOUT_H__ */ -- To view, visit https://review.coreboot.org/c/flashrom/+/52450 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I8c69223fa92cf5b50abe070f1ab9f19d3b42f6ff Gerrit-Change-Number: 52450 Gerrit-PatchSet: 12 Gerrit-Owner: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Sam McNally <sammc(a)google.com> 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]: realtek_mst_i2c_spi: Use `i2c_open_from_programmer_params`
by Edward O'Callaghan (Code Review) 02 May '21

02 May '21

Attention is currently required from: Nico Huber, Angel Pons, Anastasia Klimchuk, Peter Marheine. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/52831 ) Change subject: realtek_mst_i2c_spi: Use `i2c_open_from_programmer_params` ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/52831 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ibdf07a9fde0ddfcda1c0bfa35a3e7cde5c22cedb Gerrit-Change-Number: 52831 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Sun, 02 May 2021 23:43:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: lspcon_i2c_spi: Extract I2C bus parameter handling
by Edward O'Callaghan (Code Review) 02 May '21

02 May '21

Attention is currently required from: Nico Huber, Angel Pons, Anastasia Klimchuk, Peter Marheine. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/52830 ) Change subject: lspcon_i2c_spi: Extract I2C bus parameter handling ...................................................................... Patch Set 1: Code-Review+2 (1 comment) File i2c_helper_linux.c: https://review.coreboot.org/c/flashrom/+/52830/comment/3126eac7_579391b2 PS1, Line 80: * TODO: Move this function to a common place, it is not specific to I2C */ I guess this todo is fixed now in this commit? -- To view, visit https://review.coreboot.org/c/flashrom/+/52830 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I006b311c88feea37fe4b217f769b21ca1505def9 Gerrit-Change-Number: 52830 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Sun, 02 May 2021 23:43:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: lspcon_i2c_spi: Release I2C fd on failed init
by Edward O'Callaghan (Code Review) 02 May '21

02 May '21

Attention is currently required from: Nico Huber, Angel Pons, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/52829 ) Change subject: lspcon_i2c_spi: Release I2C fd on failed init ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/52829 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Idec3cd349ab8d6e2ebb0fafae70c5d69bb2c8880 Gerrit-Change-Number: 52829 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> 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-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Sun, 02 May 2021 23:41:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: i2c_helper_linux: Clean up whitespace a bit
by Edward O'Callaghan (Code Review) 02 May '21

02 May '21

Attention is currently required from: Nico Huber, Angel Pons, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/52828 ) Change subject: i2c_helper_linux: Clean up whitespace a bit ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/52828 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I8fe4a8b9213677e0d0bee9681abf94726c934cc6 Gerrit-Change-Number: 52828 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> 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-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Sun, 02 May 2021 23:41:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: Start port-i/o mocking framework
by Edward O'Callaghan (Code Review) 02 May '21

02 May '21

Attention is currently required from: Nico Huber. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/52794 ) Change subject: tests: Start port-i/o mocking framework ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/52794 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I8df02832deba80761b57435244a29d0d9b4e2649 Gerrit-Change-Number: 52794 Gerrit-PatchSet: 1 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: 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-Comment-Date: Sun, 02 May 2021 23:39:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: nicintel_eeprom.c: Mark 8086:1531 as tested
by Edward O'Callaghan (Code Review) 02 May '21

02 May '21

Attention is currently required from: Angel Pons, Arthur Heymans, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/52825 ) Change subject: nicintel_eeprom.c: Mark 8086:1531 as tested ...................................................................... Patch Set 1: (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/52825/comment/05a5c5f1_afbbf165 PS1, Line 9: Reading, erasing and writing works on an i210 NIC of an Asus Z10PA-D8. > Is it important to have TEST=something something line in commit message? I noticed that some commits […] The BUG+BRANCH+TEST lines is a Chromium requirement, upstream does not generally care for it so this is optional for them. -- To view, visit https://review.coreboot.org/c/flashrom/+/52825 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I9cabea5dfb9424b9c30d82840089506f2bd943da Gerrit-Change-Number: 52825 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> 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-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Sun, 02 May 2021 23:39:10 +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]: nicintel_eeprom.c: Mark 8086:1531 as tested
by Edward O'Callaghan (Code Review) 02 May '21

02 May '21

Attention is currently required from: Angel Pons, Arthur Heymans. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/52825 ) Change subject: nicintel_eeprom.c: Mark 8086:1531 as tested ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/52825 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I9cabea5dfb9424b9c30d82840089506f2bd943da Gerrit-Change-Number: 52825 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> 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-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Comment-Date: Sun, 02 May 2021 23:36:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit May 2021