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

Change in flashrom[master]: test_build.sh: use sh from env
by Nico Huber (Code Review) April 14, 2021

April 14, 2021

Attention is currently required from: Thomas Heijligen, Paul Menzel. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/51978 ) Change subject: test_build.sh: use sh from env ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Given that we exactly know the environment in which test_build.sh runs (cf. CB:46894), I don't think this makes any difference. -- To view, visit https://review.coreboot.org/c/flashrom/+/51978 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3897b8d980425ecbb89b238d4a766f628cf9d3e6 Gerrit-Change-Number: 51978 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> 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-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Comment-Date: Wed, 14 Apr 2021 15:53:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: test_build.sh: use sh from env
by Thomas Heijligen (Code Review) April 14, 2021

April 14, 2021

Attention is currently required from: Nico Huber, Paul Menzel. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/51978 ) Change subject: test_build.sh: use sh from env ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Which ones? I'm curious. […] with an absolute path as interpreter you are sure that your script will run by that binary, or the linked one. With /usr/bin/env the first suitable binary with this name in your path is chosen to run the script. On "/bin/sh" it's not this necessary, since most distributions provide /bin/sh for compatibility. Other interpreter may be only available though PATH and not as /bin/xyz -- To view, visit https://review.coreboot.org/c/flashrom/+/51978 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3897b8d980425ecbb89b238d4a766f628cf9d3e6 Gerrit-Change-Number: 51978 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> 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-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Comment-Date: Wed, 14 Apr 2021 11:37:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Paul Menzel <paulepanter(a)mailbox.org> Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Added support for Spansion/Cypress chip S25FL256L.
by Angel Pons (Code Review) April 14, 2021

April 14, 2021

Attention is currently required from: Nico Huber, Thomas Walker. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/52310 ) Change subject: Added support for Spansion/Cypress chip S25FL256L. ...................................................................... Patch Set 1: (8 comments) Commit Message: https://review.coreboot.org/c/flashrom/+/52310/comment/d1e017ff_a91c06e1 PS1, Line 7: Added support for Spansion/Cypress chip S25FL256L. Commit messages are written in present tense, do not end with a period and usually have a prefix. I'd suggest: flashchips: Add Spansion/Cypress S25FL256L https://review.coreboot.org/c/flashrom/+/52310/comment/69990759_7a45c3f5 PS1, Line 9: Testing has been conducted on ~60 individual chips and confirmed as working. One thing about write tests: flashrom compares the current contents of the flash chip to the provided data. If they are equal, flashrom does nothing. For example, you may see something like this in a verbose log: 0x000000-0x000fff:S The S tells us that the block was *S*kipped. To really test writes, one could use random data, e.g. dd if=/dev/urandom bs=1M count=32 of=random.rom flashrom -p ... -w random.rom If flashrom says VERIFIED, we're all good. Patchset: PS1: Welcome! File flashchips.c: https://review.coreboot.org/c/flashrom/+/52310/comment/b82cff71_03b288fa PS1, Line 16387: | Please add spaces around `|` https://review.coreboot.org/c/flashrom/+/52310/comment/af561af6_19e55bfd PS1, Line 16391: .block_erasers = Many block erasers are missing, and only the first entry is correct. This happened to work because flashrom only uses the other block erasers when the first one fails. From the datasheet, the correct block erasers should be, in order: .block_erasers = { { .eraseblocks = { {4 * 1024, 8192} }, .block_erase = spi_block_erase_21, }, { .eraseblocks = { {4 * 1024, 8192} }, .block_erase = spi_block_erase_20, }, { .eraseblocks = { {32 * 1024, 1024} }, .block_erase = spi_block_erase_53, }, { .eraseblocks = { {32 * 1024, 1024} }, .block_erase = spi_block_erase_52, }, { .eraseblocks = { {64 * 1024, 512} }, .block_erase = spi_block_erase_dc, }, { .eraseblocks = { {64 * 1024, 512} }, .block_erase = spi_block_erase_d8, }, { .eraseblocks = { {32 * 1024 * 1024, 1} }, .block_erase = spi_block_erase_60, }, { .eraseblocks = { {32 * 1024 * 1024, 1} }, .block_erase = spi_block_erase_c7, } }, Other chips place the 4BA (4-Byte Address) opcodes first, so I did the same here. https://review.coreboot.org/c/flashrom/+/52310/comment/7fe33be1_b808e25f PS1, Line 16401: spi_prettyprint_status_register_plain spi_prettyprint_status_register_bp3_srwd https://review.coreboot.org/c/flashrom/+/52310/comment/49e4ffce_f6adb287 PS1, Line 16402: spi_disable_blockprotect spi_disable_blockprotect_bp3_srwd https://review.coreboot.org/c/flashrom/+/52310/comment/225fd020_3bb6432c PS1, Line 16406: }, Please use tabs for indentation -- To view, visit https://review.coreboot.org/c/flashrom/+/52310 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I4e8cba554d0590c94dac92aa91e9ab400efca281 Gerrit-Change-Number: 52310 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Walker <thh.walker(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Thomas Walker <thh.walker(a)gmail.com> Gerrit-Comment-Date: Wed, 14 Apr 2021 10:25:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: meson: remove rayer_spi dependency on libpci
by Edward O'Callaghan (Code Review) April 14, 2021

April 14, 2021

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/51929 ) Change subject: meson: remove rayer_spi dependency on libpci ...................................................................... meson: remove rayer_spi dependency on libpci This change removes the build dependency on libpci for config_rayer_spi it also makes sure that dependency on raw_access is maintained. Signed-off-by: Daniel Campello <campello(a)chromium.org> Change-Id: If7206a69d031c9bba9475a9e6769f6ef35701379 Reviewed-on: https://review.coreboot.org/c/flashrom/+/51929 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M meson.build 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Angel Pons: Looks good to me, but someone else must approve Edward O'Callaghan: Looks good to me, approved diff --git a/meson.build b/meson.build index db62541..368820c 100644 --- a/meson.build +++ b/meson.build @@ -123,7 +123,6 @@ config_nicnatsemi = false config_nicrealtek = false config_ogp_spi = false - config_rayer_spi = false config_satamv = false config_satasii = false endif @@ -279,6 +278,7 @@ if config_rayer_spi srcs += 'rayer_spi.c' config_bitbang_spi = true + need_raw_access = true cargs += '-DCONFIG_RAYER_SPI=1' endif if config_satamv -- To view, visit https://review.coreboot.org/c/flashrom/+/51929 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If7206a69d031c9bba9475a9e6769f6ef35701379 Gerrit-Change-Number: 51929 Gerrit-PatchSet: 3 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: 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

Change in flashrom[master]: layout: Add -i <region>[:<file>] support
by Daniel Campello (Code Review) April 14, 2021

April 14, 2021

Attention is currently required from: Nico Huber, Nicola Corna, Paul Menzel, Stefan Reinauer, David Hendricks, Edward O'Callaghan, Arthur Heymans, Carl-Daniel Hailfinger. Daniel Campello has uploaded a new patch set (#25) to the change originally created by David Hendricks. ( https://review.coreboot.org/c/flashrom/+/23021 ) Change subject: layout: Add -i <region>[:<file>] support ...................................................................... layout: Add -i <region>[:<file>] support Add an optional sub-parameter to the -i parameter to allow building the image to be written from multiple files. This will also allow regions to be read from flash and written to separate image files. This is a rebase of a patch that was ported from chromiumos. A lot of things have changed, but the idea is the same. Original patch by Louis Yung-Chieh Lo <yjlou(a)chromium.org>: Summary: Support -i partition:file feature for both read and write. Commit: 9c7525f Review URL: http://codereview.chromium.org/6611015 Ported version by Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> and Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net>: Summary: [PATCH 2/6] layout: Add -i <region>[:<file>] support. Review URL: https://mail.coreboot.org/pipermail/flashrom/2013-October/011729.html Change-Id: Ic5465659605d8431d931053967b40290195cfd99 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Signed-off-by: Daniel Campello <campello(a)chromium.org> Co-Authored-by: Edward O'Callaghan <quasisec(a)google.com> Co-Authored-by: Daniel Campello <campello(a)chromium.org> --- M cli_classic.c M flashrom.8.tmpl M flashrom.c M layout.c M layout.h 5 files changed, 306 insertions(+), 40 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/21/23021/25 -- 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: 25 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: 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: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Nicola Corna <nicola(a)corna.info> 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: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: layout: Add -i <region>[:<file>] support
by Daniel Campello (Code Review) April 14, 2021

April 14, 2021

Attention is currently required from: Nico Huber, Nicola Corna, Paul Menzel, Stefan Reinauer, David Hendricks, Edward O'Callaghan, Arthur Heymans, Carl-Daniel Hailfinger. Daniel Campello has uploaded a new patch set (#24) to the change originally created by David Hendricks. ( https://review.coreboot.org/c/flashrom/+/23021 ) Change subject: layout: Add -i <region>[:<file>] support ...................................................................... layout: Add -i <region>[:<file>] support Add an optional sub-parameter to the -i parameter to allow building the image to be written from multiple files. This will also allow regions to be read from flash and written to separate image files. This is a rebase of a patch that was ported from chromiumos. A lot of things have changed, but the idea is the same. Original patch by Louis Yung-Chieh Lo <yjlou(a)chromium.org>: Summary: Support -i partition:file feature for both read and write. Commit: 9c7525f Review URL: http://codereview.chromium.org/6611015 Ported version by Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> and Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net>: Summary: [PATCH 2/6] layout: Add -i <region>[:<file>] support. Review URL: https://mail.coreboot.org/pipermail/flashrom/2013-October/011729.html Change-Id: Ic5465659605d8431d931053967b40290195cfd99 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Signed-off-by: Daniel Campello <campello(a)chromium.org> Co-Authored-by: Edward O'Callaghan <quasisec(a)google.com> Co-Authored-by: Daniel Campello <campello(a)chromium.org> --- M cli_classic.c M flashrom.8.tmpl M flashrom.c M layout.c M layout.h 5 files changed, 305 insertions(+), 41 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/21/23021/24 -- 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: 24 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: 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: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Nicola Corna <nicola(a)corna.info> 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: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: Added support for Spansion/Cypress chip S25FL256L.
by Thomas Walker (Code Review) April 14, 2021

April 14, 2021

Thomas Walker has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/52310 ) Change subject: Added support for Spansion/Cypress chip S25FL256L. ...................................................................... Added support for Spansion/Cypress chip S25FL256L. Testing has been conducted on ~60 individual chips and confirmed as working. Signed-off-by: Thomas Walker <thh.walker(a)gmail.com> Change-Id: I4e8cba554d0590c94dac92aa91e9ab400efca281 --- M flashchips.c M flashchips.h 2 files changed, 30 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/10/52310/1 diff --git a/flashchips.c b/flashchips.c index 5b328f8..1f5b8ad 100644 --- a/flashchips.c +++ b/flashchips.c @@ -16376,6 +16376,35 @@ .voltage = {2700, 3600}, }, + { + .vendor = "Spansion", + .name = "S25FL256L", + .bustype = BUS_SPI, + .manufacture_id = SPANSION_ID, + .model_id = SPANSION_S25FL256L, + .total_size = 32768, + .page_size = 256, + .feature_bits = FEATURE_WRSR_WREN|FEATURE_4BA, + .tested = TEST_OK_PREW, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {64 * 1024, 0x200} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {512 * 1024, 0x200} }, + .block_erase = spi_block_erase_c7, + } + }, + .printlock = spi_prettyprint_status_register_plain, + .unlock = spi_disable_blockprotect, + .write = spi_chip_write_256, + .read = spi_chip_read, + .voltage = {2700, 3600}, + }, + { .vendor = "Spansion", .name = "S25FL204K", diff --git a/flashchips.h b/flashchips.h index 2ad09df..6fae9c6 100644 --- a/flashchips.h +++ b/flashchips.h @@ -666,6 +666,7 @@ #define SPANSION_S25FL116K 0x4015 #define SPANSION_S25FL132K 0x4016 #define SPANSION_S25FL164K 0x4017 +#define SPANSION_S25FL256L 0x6019 #define SPANSION_S25FS128S_L 0x20180081 /* Large sectors. */ #define SPANSION_S25FS128S_S 0x20180181 /* Small sectors. */ #define SPANSION_S25FS256S_L 0x02190081 /* Large sectors. */ -- To view, visit https://review.coreboot.org/c/flashrom/+/52310 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I4e8cba554d0590c94dac92aa91e9ab400efca281 Gerrit-Change-Number: 52310 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Walker <thh.walker(a)gmail.com> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: jlink_spi.c: Separate shutdown from failed init cleanup
by Anastasia Klimchuk (Code Review) April 14, 2021

April 14, 2021

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/52308 ) Change subject: jlink_spi.c: Separate shutdown from failed init cleanup ...................................................................... jlink_spi.c: Separate shutdown from failed init cleanup Shutdown function was covering two different jobs here: 1) the actual shutdown which is run at the end of the driver's lifecycle and 2) cleanup in cases when initialisation failed. Now, shutdown is only doing its main job (#1), and the driver itself is doing cleanup when init fails (#2). The good thing is that now resources are released/closed immediately in cases when init fails (vs shutdown function which was run at some point later), and the driver leaves clean space after itself if init fails. And very importantly this unlocks API change which plans to move register_shutdown inside register master API, see this https://review.coreboot.org/c/flashrom/+/51761 TEST=builds BUG=b:185191942 Change-Id: I71f64ed38154af670d4d28b8c7914d87fbc75679 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M jlink_spi.c 1 file changed, 47 insertions(+), 19 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/08/52308/1 diff --git a/jlink_spi.c b/jlink_spi.c index 3a73c01..fcdcd28 100644 --- a/jlink_spi.c +++ b/jlink_spi.c @@ -178,8 +178,7 @@ { char *arg; unsigned long speed = 0; - - register_shutdown(jlink_spi_shutdown, NULL); + int init_ret = 0; arg = extract_programmer_param("spispeed"); @@ -269,7 +268,8 @@ if (ret != JAYLINK_OK) { msg_perr("jaylink_discover_scan() failed: %s.\n", jaylink_strerror(ret)); - return 1; + init_ret = 1; + goto init_err; } struct jaylink_device **devs; @@ -278,7 +278,8 @@ if (ret != JAYLINK_OK) { msg_perr("jaylink_get_devices() failed: %s.\n", jaylink_strerror(ret)); - return 1; + init_ret = 1; + goto init_err; } if (!use_serial_number) @@ -321,7 +322,8 @@ if (!device_found) { msg_perr("No J-Link device found.\n"); - return 1; + init_ret = 1; + goto init_err; } size_t length; @@ -332,7 +334,8 @@ if (ret != JAYLINK_OK) { msg_perr("jaylink_get_firmware_version() failed: %s.\n", jaylink_strerror(ret)); - return 1; + init_ret = 1; + goto init_err; } else if (length > 0) { msg_pdbg("Firmware: %s\n", firmware_version); free(firmware_version); @@ -346,7 +349,8 @@ msg_pdbg("S/N: N/A\n"); } else { msg_perr("jaylink_device_get_serial_number() failed: %s.\n", jaylink_strerror(ret)); - return 1; + init_ret = 1; + goto init_err; } uint8_t caps[JAYLINK_DEV_EXT_CAPS_SIZE]; @@ -356,7 +360,8 @@ if (ret != JAYLINK_OK) { msg_perr("jaylink_get_caps() failed: %s.\n", jaylink_strerror(ret)); - return 1; + init_ret = 1; + goto init_err; } if (jaylink_has_cap(caps, JAYLINK_DEV_CAP_GET_EXT_CAPS)) { @@ -364,7 +369,8 @@ if (ret != JAYLINK_OK) { msg_perr("jaylink_get_available_interfaces() failed: %s.\n", jaylink_strerror(ret)); - return 1; + init_ret = 1; + goto init_err; } } @@ -374,19 +380,22 @@ if (ret != JAYLINK_OK) { msg_perr("jaylink_get_available_interfaces() failed: %s.\n", jaylink_strerror(ret)); - return 1; + init_ret = 1; + goto init_err; } if (!(ifaces & (1 << JAYLINK_TIF_JTAG))) { msg_perr("Device does not support JTAG interface.\n"); - return 1; + init_ret = 1; + goto init_err; } ret = jaylink_select_interface(jaylink_devh, JAYLINK_TIF_JTAG, NULL); if (ret != JAYLINK_OK) { msg_perr("jaylink_select_interface() failed: %s.\n", jaylink_strerror(ret)); - return 1; + init_ret = 1; + goto init_err; } struct jaylink_hardware_status hwstat; @@ -395,7 +404,8 @@ if (ret != JAYLINK_OK) { msg_perr("jaylink_get_hardware_status() failed: %s.\n", jaylink_strerror(ret)); - return 1; + init_ret = 1; + goto init_err; } msg_pdbg("VTarget: %u.%03u V\n", hwstat.target_voltage / 1000, @@ -404,7 +414,8 @@ if (hwstat.target_voltage < MIN_TARGET_VOLTAGE) { msg_perr("Target voltage is below %u.%03u V. You need to attach VTref to the I/O voltage of " "the chip.\n", MIN_TARGET_VOLTAGE / 1000, MIN_TARGET_VOLTAGE % 1000); - return 1; + init_ret = 1; + goto init_err; } struct jaylink_speed device_speeds; @@ -417,7 +428,8 @@ if (ret != JAYLINK_OK) { msg_perr("jaylink_get_speeds() failed: %s.\n", jaylink_strerror(ret)); - return 1; + init_ret = 1; + goto init_err; } } @@ -433,23 +445,39 @@ if (speed > (device_speeds.freq / device_speeds.div)) { msg_perr("Specified SPI speed of %lu kHz is too high. Maximum is %" PRIu32 " kHz.\n", speed, device_speeds.freq / device_speeds.div); - return 1; + init_ret = 1; + goto init_err; } ret = jaylink_set_speed(jaylink_devh, speed); if (ret != JAYLINK_OK) { msg_perr("jaylink_set_speed() failed: %s.\n", jaylink_strerror(ret)); - return 1; + init_ret = 1; + goto init_err; } msg_pdbg("SPI speed: %lu kHz\n", speed); /* Ensure that the CS signal is not active initially. */ - if (!deassert_cs()) - return 1; + if (!deassert_cs()) { + init_ret = 1; + goto init_err; + } + if (register_shutdown(jlink_spi_shutdown, NULL)) { + init_ret = 1; + goto init_err; + } register_spi_master(&spi_master_jlink_spi); return 0; + +init_err: + if (jaylink_devh) + jaylink_close(jaylink_devh); + + jaylink_exit(jaylink_ctx); + + return init_ret; } -- To view, visit https://review.coreboot.org/c/flashrom/+/52308 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I71f64ed38154af670d4d28b8c7914d87fbc75679 Gerrit-Change-Number: 52308 Gerrit-PatchSet: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: layout: Add -i <region>[:<file>] support
by Daniel Campello (Code Review) April 13, 2021

April 13, 2021

Attention is currently required from: David Hendricks, Edward O'Callaghan. Daniel Campello has uploaded a new patch set (#23) to the change originally created by David Hendricks. ( https://review.coreboot.org/c/flashrom/+/23021 ) Change subject: layout: Add -i <region>[:<file>] support ...................................................................... layout: Add -i <region>[:<file>] support Add an optional sub-parameter to the -i parameter to allow building the image to be written from multiple files. This will also allow regions to be read from flash and written to separate image files. This is a rebase of a patch that was ported from chromiumos. A lot of things have changed, but the idea is the same. Original patch by Louis Yung-Chieh Lo <yjlou(a)chromium.org>: Summary: Support -i partition:file feature for both read and write. Commit: 9c7525f Review URL: http://codereview.chromium.org/6611015 Ported version by Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> and Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net>: Summary: [PATCH 2/6] layout: Add -i <region>[:<file>] support. Review URL: https://mail.coreboot.org/pipermail/flashrom/2013-October/011729.html Change-Id: Ic5465659605d8431d931053967b40290195cfd99 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Signed-off-by: Daniel Campello <campello(a)chromium.org> Co-Authored-by: Edward O'Callaghan <quasisec(a)google.com> Co-Authored-by: Daniel Campello <campello(a)chromium.org> --- M cli_classic.c M flashrom.8.tmpl M flashrom.c M layout.c M layout.h 5 files changed, 303 insertions(+), 38 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/21/23021/23 -- 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: 23 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: 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: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: layout: Add -i <region>[:<file>] support
by Daniel Campello (Code Review) April 13, 2021

April 13, 2021

Attention is currently required from: David Hendricks, Edward O'Callaghan. Daniel Campello has uploaded a new patch set (#22) to the change originally created by David Hendricks. ( https://review.coreboot.org/c/flashrom/+/23021 ) Change subject: layout: Add -i <region>[:<file>] support ...................................................................... layout: Add -i <region>[:<file>] support Add an optional sub-parameter to the -i parameter to allow building the image to be written from multiple files. This will also allow regions to be read from flash and written to separate image files. This is a rebase of a patch that was ported from chromiumos. A lot of things have changed, but the idea is the same. Original patch by Louis Yung-Chieh Lo <yjlou(a)chromium.org>: Summary: Support -i partition:file feature for both read and write. Commit: 9c7525f Review URL: http://codereview.chromium.org/6611015 Ported version by Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> and Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net>: Summary: [PATCH 2/6] layout: Add -i <region>[:<file>] support. Review URL: https://mail.coreboot.org/pipermail/flashrom/2013-October/011729.html Change-Id: Ic5465659605d8431d931053967b40290195cfd99 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Signed-off-by: Daniel Campello <campello(a)chromium.org> Co-Authored-by: Edward O'Callaghan <quasisec(a)google.com> Co-Authored-by: Daniel Campello <campello(a)chromium.org> --- M cli_classic.c M flashrom.8.tmpl M flashrom.c M layout.c M layout.h 5 files changed, 235 insertions(+), 28 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/21/23021/22 -- 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: 22 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: 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: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newpatchset

1 0